@@ -14,6 +14,7 @@ import id.passage.android.exceptions.*
14
14
import id.passage.android.exceptions.CredentialParsingException.Companion.CHALLENGE_MISSING
15
15
import id.passage.android.exceptions.CredentialParsingException.Companion.CHALLENGE_PARSING_FAILED
16
16
import id.passage.android.exceptions.CredentialParsingException.Companion.CREDENTIAL_PARSING_FAILED
17
+ import id.passage.android.model.CredentialAssertionChallenge
17
18
import id.passage.android.model.CredentialAssertionChallenge1
18
19
import id.passage.android.model.CredentialAssertionResponse
19
20
import id.passage.android.model.CredentialAssertionResponseJsonAdapter
@@ -23,6 +24,8 @@ import id.passage.android.model.CredentialCreationResponse
23
24
import id.passage.android.model.CredentialCreationResponseJsonAdapter
24
25
import id.passage.android.model.ProtocolCredentialAssertion1PublicKey
25
26
import id.passage.android.model.ProtocolCredentialAssertion1PublicKeyJsonAdapter
27
+ import id.passage.android.model.ProtocolCredentialAssertionPublicKey
28
+ import id.passage.android.model.ProtocolCredentialAssertionPublicKeyJsonAdapter
26
29
27
30
class PasskeyUtils {
28
31
companion object {
@@ -113,15 +116,15 @@ class PasskeyUtils {
113
116
* @return String
114
117
* @throws CredentialParsingException
115
118
*/
116
- internal fun getCredentialOptionsJson (challenge : CredentialAssertionChallenge1 ): String {
119
+ internal fun getCredentialOptionsJson (challenge : CredentialAssertionChallenge ): String {
117
120
val credOptions = challenge.challenge.publicKey
118
121
val moshi = Moshi .Builder ().build()
119
- val credOptionsAdapter = ProtocolCredentialAssertion1PublicKeyJsonAdapter (moshi)
122
+ val credOptionsAdapter = ProtocolCredentialAssertionPublicKeyJsonAdapter (moshi)
120
123
// Passage API bug: Login API frequently returns challenge with non-url-safe characters
121
124
// "+" and "/" that cause "Bad Base 64" exception to be thrown by the credential manager.
122
125
val modifiedChallenge = credOptions.challenge.replace(' +' , ' -' ).replace(' /' , ' _' )
123
126
val modifiedCredOptions =
124
- ProtocolCredentialAssertion1PublicKey (
127
+ ProtocolCredentialAssertionPublicKey (
125
128
allowCredentials = credOptions.allowCredentials,
126
129
challenge = modifiedChallenge,
127
130
extensions = credOptions.extensions,
0 commit comments