Update Responses to use GMS toJson() methods
These update our preU responses to utilize toJson() for the PKCs that
are returned to us from the Fido library. We still use our own flows as
a fallback flow in case there are errors in this new approach.
This modifies the libs.versions.toml, as well as runs some verification
given the warnings shown in the update of the toml file.
Bug: 297098376
Test: Built and used in sample app
Change-Id: I708e3c2183f3b57595ccfa43bfe43497904bbc7c
diff --git a/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/CreatePublicKeyCredential/CredentialProviderCreatePublicKeyCredentialController.kt b/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/CreatePublicKeyCredential/CredentialProviderCreatePublicKeyCredentialController.kt
index 1a37158..e86df83 100644
--- a/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/CreatePublicKeyCredential/CredentialProviderCreatePublicKeyCredentialController.kt
+++ b/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/CreatePublicKeyCredential/CredentialProviderCreatePublicKeyCredentialController.kt
@@ -186,9 +186,12 @@
@VisibleForTesting(otherwise = VisibleForTesting.PROTECTED)
public override fun convertResponseToCredentialManager(response: PublicKeyCredential):
CreateCredentialResponse {
- return CreatePublicKeyCredentialResponse(
- PublicKeyCredentialControllerUtility.toCreatePasskeyResponseJson(response)
- )
+ try {
+ return CreatePublicKeyCredentialResponse(response.toJson())
+ } catch (t: Throwable) {
+ throw CreateCredentialUnknownException("The PublicKeyCredential response json " +
+ "had an unexpected exception when parsing: ${t.message}")
+ }
}
private fun JSONExceptionToPKCError(exception: JSONException):
diff --git a/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/CreatePublicKeyCredential/PublicKeyCredentialControllerUtility.kt b/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/CreatePublicKeyCredential/PublicKeyCredentialControllerUtility.kt
index 4b38772..e85b985 100644
--- a/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/CreatePublicKeyCredential/PublicKeyCredentialControllerUtility.kt
+++ b/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/CreatePublicKeyCredential/PublicKeyCredentialControllerUtility.kt
@@ -24,6 +24,7 @@
import androidx.credentials.exceptions.CreateCredentialException
import androidx.credentials.exceptions.GetCredentialCancellationException
import androidx.credentials.exceptions.GetCredentialException
+import androidx.credentials.exceptions.GetCredentialUnknownException
import androidx.credentials.exceptions.domerrors.AbortError
import androidx.credentials.exceptions.domerrors.ConstraintError
import androidx.credentials.exceptions.domerrors.DataError
@@ -136,39 +137,6 @@
return builder.build()
}
- /** Converts the response from fido back to json so it can be passed into CredentialManager. */
- fun toCreatePasskeyResponseJson(cred: PublicKeyCredential): String {
- val json = JSONObject()
- val authenticatorResponse = cred.response
- if (authenticatorResponse is AuthenticatorAttestationResponse) {
- val transportArray = convertToProperNamingScheme(authenticatorResponse)
- addAuthenticatorAttestationResponse(
- authenticatorResponse.clientDataJSON,
- authenticatorResponse.attestationObject,
- transportArray,
- json
- )
- } else {
- Log.e(
- TAG,
- "Authenticator response expected registration response but " +
- "got: ${authenticatorResponse.javaClass.name}"
- )
- }
-
- addOptionalAuthenticatorAttachmentAndRequiredExtensions(
- cred.authenticatorAttachment,
- cred.clientExtensionResults != null,
- cred.clientExtensionResults?.credProps?.isDiscoverableCredential,
- json
- )
-
- json.put(JSON_KEY_ID, cred.id)
- json.put(JSON_KEY_RAW_ID, b64Encode(cred.rawId))
- json.put(JSON_KEY_TYPE, cred.type)
- return json.toString()
- }
-
internal fun addAuthenticatorAttestationResponse(
clientDataJSON: ByteArray,
attestationObject: ByteArray,
@@ -240,19 +208,12 @@
)
}
is AuthenticatorAssertionResponse -> {
- beginSignInAssertionResponse(
- authenticatorResponse.clientDataJSON,
- authenticatorResponse.authenticatorData,
- authenticatorResponse.signature,
- authenticatorResponse.userHandle,
- json,
- publicKeyCred.id,
- publicKeyCred.rawId,
- publicKeyCred.type,
- publicKeyCred.authenticatorAttachment,
- publicKeyCred.clientExtensionResults != null,
- publicKeyCred.clientExtensionResults?.credProps?.isDiscoverableCredential
- )
+ try {
+ return publicKeyCred.toJson()
+ } catch (t: Throwable) {
+ throw GetCredentialUnknownException("The PublicKeyCredential response json had " +
+ "an unexpected exception when parsing: ${t.message}")
+ }
}
else -> {
Log.e(
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index db17c37..be67fa2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -230,11 +230,11 @@
opentest4j = { module = "org.opentest4j:opentest4j", version = "1.2.0" }
playFeatureDelivery = { module = "com.google.android.play:feature-delivery", version = "2.0.1" }
playCore = { module = "com.google.android.play:core", version = "1.10.3" }
-playServicesAuth = {module = "com.google.android.gms:play-services-auth", version = "20.5.0"}
+playServicesAuth = {module = "com.google.android.gms:play-services-auth", version = "20.7.0"}
playServicesBase = { module = "com.google.android.gms:play-services-base", version = "17.0.0" }
playServicesBasement = { module = "com.google.android.gms:play-services-basement", version = "17.0.0" }
playServicesDevicePerformance = { module = "com.google.android.gms:play-services-deviceperformance", version = "16.0.0" }
-playServicesFido = {module = "com.google.android.gms:play-services-fido", version = "20.0.1"}
+playServicesFido = {module = "com.google.android.gms:play-services-fido", version = "20.1.0"}
playServicesWearable = { module = "com.google.android.gms:play-services-wearable", version = "17.1.0" }
paparazzi = { module = "app.cash.paparazzi:paparazzi", version.ref = "paparazzi" }
paparazziNativeJvm = { module = "app.cash.paparazzi:layoutlib-native-jdk11", version.ref = "paparazziNative" }
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 18337be..0b3b82b 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -511,6 +511,11 @@
<sha256 value="32001db2443b339dd21f5b79ff29d1ade722d1ba080c214bde819f0f72d1604d" origin="Generated by Gradle"/>
</artifact>
</component>
+ <component group="com.github.johnrengelman.shadow" name="com.github.johnrengelman.shadow.gradle.plugin" version="8.1.1">
+ <artifact name="com.github.johnrengelman.shadow.gradle.plugin-8.1.1.pom">
+ <sha256 value="3cb3886b97df6e066f108c316b219f262c97c3cb2df6da78927e645deb643cb0" origin="Generated by Gradle" reason="Artifact is not signed"/>
+ </artifact>
+ </component>
<component group="com.google" name="google" version="1">
<artifact name="google-1.pom">
<sha256 value="cd6db17a11a31ede794ccbd1df0e4d9750f640234731f21cff885a9997277e81" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -678,11 +683,6 @@
</sha256>
</artifact>
</component>
- <component group="com.github.johnrengelman.shadow" name="com.github.johnrengelman.shadow.gradle.plugin" version="8.1.1">
- <artifact name="com.github.johnrengelman.shadow.gradle.plugin-8.1.1.pom">
- <sha256 value="3cb3886b97df6e066f108c316b219f262c97c3cb2df6da78927e645deb643cb0" origin="Generated by Gradle" reason="Artifact is not signed"/>
- </artifact>
- </component>
<component group="javax.annotation" name="jsr250-api" version="1.0">
<artifact name="jsr250-api-1.0.jar">
<sha256 value="a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f" origin="Generated by Gradle"/>
