From c8e2d50f332a1c606e0fbddf2c710b549b7d11a6 Mon Sep 17 00:00:00 2001 From: sim Date: Mon, 8 Jun 2026 11:47:09 +0200 Subject: [PATCH 1/2] Fido: Fix request with FidoAppIdExtension The JSON key is `appid`, and if it was present we were trying to get `appId` which always failed with an exception "No value for appId" --- .../org/microg/gms/auth/credentials/provider/JsonExtensions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/play-services-core/src/main/kotlin/org/microg/gms/auth/credentials/provider/JsonExtensions.kt b/play-services-core/src/main/kotlin/org/microg/gms/auth/credentials/provider/JsonExtensions.kt index 2e3b0148c3..b21c302071 100644 --- a/play-services-core/src/main/kotlin/org/microg/gms/auth/credentials/provider/JsonExtensions.kt +++ b/play-services-core/src/main/kotlin/org/microg/gms/auth/credentials/provider/JsonExtensions.kt @@ -182,7 +182,7 @@ fun JSONObject.parseTokenBinding() = when (TokenBindingStatus.fromString(getStri fun JSONObject.parseAuthenticationExtensions(): AuthenticationExtensions { val builder = AuthenticationExtensions.Builder() if (has("fidoAppIdExtension")) builder.setFido2Extension(FidoAppIdExtension(getJSONObject("fidoAppIdExtension").getString("appId"))) - if (has("appid")) builder.setFido2Extension(FidoAppIdExtension(getString("appId"))) + if (has("appid")) builder.setFido2Extension(FidoAppIdExtension(getString("appid"))) // TODO: Add support for other extensions return builder.build() } From cb1a9a342d188d76743e8d302cf3410ab7b08bbb Mon Sep 17 00:00:00 2001 From: Marvin W Date: Mon, 29 Jun 2026 10:21:52 +0200 Subject: [PATCH 2/2] Fix fidoAppIdExtension.appid extension field name --- .../org/microg/gms/auth/credentials/provider/JsonExtensions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/play-services-core/src/main/kotlin/org/microg/gms/auth/credentials/provider/JsonExtensions.kt b/play-services-core/src/main/kotlin/org/microg/gms/auth/credentials/provider/JsonExtensions.kt index b21c302071..2dc45016a5 100644 --- a/play-services-core/src/main/kotlin/org/microg/gms/auth/credentials/provider/JsonExtensions.kt +++ b/play-services-core/src/main/kotlin/org/microg/gms/auth/credentials/provider/JsonExtensions.kt @@ -181,7 +181,7 @@ fun JSONObject.parseTokenBinding() = when (TokenBindingStatus.fromString(getStri fun JSONObject.parseAuthenticationExtensions(): AuthenticationExtensions { val builder = AuthenticationExtensions.Builder() - if (has("fidoAppIdExtension")) builder.setFido2Extension(FidoAppIdExtension(getJSONObject("fidoAppIdExtension").getString("appId"))) + if (has("fidoAppIdExtension")) builder.setFido2Extension(FidoAppIdExtension(getJSONObject("fidoAppIdExtension").getString("appid"))) if (has("appid")) builder.setFido2Extension(FidoAppIdExtension(getString("appid"))) // TODO: Add support for other extensions return builder.build()