Fix deserialization for app credential model (#68)

Author: chrisfisher

module/gradle.properties

@@ -2,4 +2,4 @@ pomGroup=com.authsignal
 pomPackaging=aar
 pomName=Authsignal SDK for Android
 pomArtifactId=authsignal-android
-versionName=3.0.0-alpha
+versionName=3.0.1

module/src/main/java/com/authsignal/inapp/api/InAppAPI.kt

@@ -40,9 +40,16 @@ class InAppAPI(tenantID: String, private val baseURL: String) {
       }
 
       if (response.status == HttpStatusCode.OK) {
-        val data = response.body<AppCredential>()
+        val data = response.body<AppCredentialResponse>()
 
-        AuthsignalResponse(data = data)
+        val credential = AppCredential(
+          userId = data.userId,
+          credentialId = data.userAuthenticatorId,
+          createdAt = data.verifiedAt,
+          lastAuthenticatedAt = data.lastVerifiedAt,
+        )
+
+        AuthsignalResponse(data = credential)
       } else {
         APIError.mapToErrorResponse(response)
       }
@@ -73,9 +80,16 @@ class InAppAPI(tenantID: String, private val baseURL: String) {
       }
 
       if (response.status == HttpStatusCode.OK) {
-        val data = response.body<AppCredential>()
+        val data = response.body<AppCredentialResponse>()
 
-        AuthsignalResponse(data = data)
+        val credential = AppCredential(
+          userId = data.userId,
+          credentialId = data.userAuthenticatorId,
+          createdAt = data.verifiedAt,
+          lastAuthenticatedAt = data.lastVerifiedAt,
+        )
+
+        AuthsignalResponse(data = credential)
       } else {
         APIError.mapToErrorResponse(response)
       }

module/src/main/java/com/authsignal/models/api/AppCredentialResponse.kt

@@ -0,0 +1,11 @@
+package com.authsignal.models.api
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class AppCredentialResponse(
+  val userAuthenticatorId: String,
+  val userId: String,
+  val verifiedAt: String,
+  val lastVerifiedAt: String? = null,
+)

module/src/main/java/com/authsignal/push/api/PushAPI.kt

@@ -37,9 +37,16 @@ class PushAPI(tenantID: String, private val baseURL: String) {
       }
 
       if (response.status == HttpStatusCode.OK) {
-        val data = response.body<AppCredential>()
+        val data = response.body<AppCredentialResponse>()
 
-        AuthsignalResponse(data = data)
+        val credential = AppCredential(
+          userId = data.userId,
+          credentialId = data.userAuthenticatorId,
+          createdAt = data.verifiedAt,
+          lastAuthenticatedAt = data.lastVerifiedAt,
+        )
+
+        AuthsignalResponse(data = credential)
       } else {
         APIError.mapToErrorResponse(response)
       }
@@ -70,9 +77,16 @@ class PushAPI(tenantID: String, private val baseURL: String) {
       }
 
       if (response.status == HttpStatusCode.OK) {
-        val data = response.body<AppCredential>()
+        val data = response.body<AppCredentialResponse>()
+
+        val credential = AppCredential(
+          userId = data.userId,
+          credentialId = data.userAuthenticatorId,
+          createdAt = data.verifiedAt,
+          lastAuthenticatedAt = data.lastVerifiedAt,
+        )
 
-        AuthsignalResponse(data = data)
+        AuthsignalResponse(data = credential)
       } else {
         APIError.mapToErrorResponse(response)
       }

module/src/main/java/com/authsignal/qr/api/QRCodeAPI.kt

@@ -40,9 +40,16 @@ class QRCodeAPI(tenantID: String, private val baseURL: String) {
       }
 
       if (response.status == HttpStatusCode.OK) {
-        val data = response.body<AppCredential>()
+        val data = response.body<AppCredentialResponse>()
 
-        AuthsignalResponse(data = data)
+        val credential = AppCredential(
+          userId = data.userId,
+          credentialId = data.userAuthenticatorId,
+          createdAt = data.verifiedAt,
+          lastAuthenticatedAt = data.lastVerifiedAt,
+        )
+
+        AuthsignalResponse(data = credential)
       } else {
         APIError.mapToErrorResponse(response)
       }
@@ -73,9 +80,16 @@ class QRCodeAPI(tenantID: String, private val baseURL: String) {
       }
 
       if (response.status == HttpStatusCode.OK) {
-        val data = response.body<AppCredential>()
+        val data = response.body<AppCredentialResponse>()
 
-        AuthsignalResponse(data = data)
+        val credential = AppCredential(
+          userId = data.userId,
+          credentialId = data.userAuthenticatorId,
+          createdAt = data.verifiedAt,
+          lastAuthenticatedAt = data.lastVerifiedAt,
+        )
+
+        AuthsignalResponse(data = credential)
       } else {
         APIError.mapToErrorResponse(response)
       }