Merge pull request #68 from velocitycareerlabs/dev-to-rc

Dev to rc
velocitycareerlabs · Dec 24, 2023 · 6efa94c · 6efa94c
2 parents 3fc3502 + 5619e64
commit 6efa94c
Show file tree

Hide file tree

Showing 47 changed files with 843 additions and 236 deletions.
diff --git a/VCL/build.gradle b/VCL/build.gradle
@@ -13,9 +13,8 @@ android {
     defaultConfig {
         minSdk 24
         targetSdk 33
-        // Increase version for release
-        versionName "1.20.1"
-        versionCode 116
+        versionName "1.21.5"
+        versionCode 117
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }
@@ -151,14 +150,6 @@ afterEvaluate {
                         url = 'https://github.com/velocitycareerlabs/WalletAndroid'
                     }
                 }
-                signing {
-                        useInMemoryPgpKeys(
-                            rootProject.ext.signingKeyId,
-                            rootProject.ext.signingPrivateKey,
-                            rootProject.ext.signingPassword,
-                        )
-                        // sign publishing.publications
-                }
             }
             release(MavenPublication) {
                 groupId getGroupId()
@@ -203,17 +194,17 @@ afterEvaluate {
                         url = 'https://github.com/velocitycareerlabs/WalletAndroid'
                     }
                 }
-                signing {
-                        useInMemoryPgpKeys(
-                            rootProject.ext.signingKeyId,
-                            rootProject.ext.signingPrivateKey,
-                            rootProject.ext.signingPassword,
-                        )
-                        // sign publishing.publications
-                }
             }
         }
     }
+    signing {
+        useInMemoryPgpKeys(
+                rootProject.ext.signingKeyId,
+                rootProject.ext.signingPrivateKey,
+                rootProject.ext.signingPassword,
+        )
+        sign publishing.publications
+    }
 }
 
 repositories {

diff --git a/VCL/src/main/java/io/velocitycareerlabs/api/entities/VCLCredentialManifest.kt b/VCL/src/main/java/io/velocitycareerlabs/api/entities/VCLCredentialManifest.kt
@@ -7,40 +7,47 @@
 
 package io.velocitycareerlabs.api.entities
 
-import io.velocitycareerlabs.impl.extensions.getUrlSubPath
-import kotlin.io.path.ExperimentalPathApi
-
 data class VCLCredentialManifest(
     val jwt: VCLJwt,
     val vendorOriginContext: String? = null,
-    val verifiedProfile: VCLVerifiedProfile
+    val verifiedProfile: VCLVerifiedProfile,
+    val deepLink: VCLDeepLink? = null
 ) {
     val iss: String get() = jwt.payload?.toJSONObject()?.get(KeyIss) as? String ?: ""
     val did: String get() = iss
-    val issuerId: String get() = retrieveIssuerId()
+    val aud: String get() = retrieveAud()
+    val issuerId: String get() = jwt.payload?.toJSONObject()?.get(CodingKeys.KeyIssuer) as? String
+        ?: (jwt.payload?.toJSONObject()?.get(CodingKeys.KeyIssuer) as? Map<*, *>)?.get(CodingKeys.KeyId) as? String
+        ?: ""
     val exchangeId: String get() = jwt.payload?.toJSONObject()?.get(KeyExchangeId) as? String ?: ""
-    val presentationDefinitionId: String get() = (jwt.payload?.toJSONObject()?.get(KeyPresentationDefinitionId) as? Map<*, *>)?.get(
-        KeyId) as? String ?: ""
-
-    val finalizeOffersUri: String get() =
-        (jwt.payload?.toJSONObject()?.get(VCLCredentialManifest.KeyMetadata) as? Map<*, *>)?.get(
-            VCLCredentialManifest.KeyFinalizeOffersUri
-        )?.toString() ?: ""
-
-    val checkOffersUri: String get() =
-        (jwt.payload?.toJSONObject()?.get(VCLCredentialManifest.KeyMetadata) as? Map<*, *>)?.get(
-            VCLCredentialManifest.KeyCheckOffersUri
-        )?.toString() ?: ""
-
-    val submitPresentationUri: String get() =
-        (jwt.payload?.toJSONObject()?.get(VCLCredentialManifest.KeyMetadata) as? Map<*, *>)?.get(
-            VCLCredentialManifest.KeySubmitIdentificationUri
-        )?.toString() ?: ""
-
-    @OptIn(ExperimentalStdlibApi::class)
-    private fun retrieveIssuerId() =
-        ((jwt.payload?.toJSONObject()?.getOrDefault(CodingKeys.KeyMetadata, HashMap<String, Any>()) as? Map<String, Any> )?.getOrDefault(CodingKeys.KeyFinalizeOffersUri, "") as? String ?: "").substringBefore("/issue/")
+    val presentationDefinitionId: String
+        get() = (jwt.payload?.toJSONObject()?.get(KeyPresentationDefinitionId) as? Map<*, *>)?.get(
+            KeyId
+        ) as? String ?: ""
+
+    val finalizeOffersUri: String
+        get() =
+            (jwt.payload?.toJSONObject()
+                ?.get(VCLCredentialManifest.KeyMetadata) as? Map<*, *>)?.get(
+                VCLCredentialManifest.KeyFinalizeOffersUri
+            )?.toString() ?: ""
 
+    val checkOffersUri: String
+        get() =
+            (jwt.payload?.toJSONObject()
+                ?.get(VCLCredentialManifest.KeyMetadata) as? Map<*, *>)?.get(
+                VCLCredentialManifest.KeyCheckOffersUri
+            )?.toString() ?: ""
+
+    val submitPresentationUri: String
+        get() =
+            (jwt.payload?.toJSONObject()
+                ?.get(VCLCredentialManifest.KeyMetadata) as? Map<*, *>)?.get(
+                VCLCredentialManifest.KeySubmitIdentificationUri
+            )?.toString() ?: ""
+
+    private fun retrieveAud() =
+        ((jwt.payload?.toJSONObject()?.getOrDefault(CodingKeys.KeyMetadata, HashMap<String, Any>()) as? Map<String, Any> )?.getOrDefault(CodingKeys.KeyFinalizeOffersUri, "") as? String ?: "").substringBefore("/issue/")
     companion object CodingKeys {
         const val KeyIssuingRequest = "issuing_request"
 

diff --git a/VCL/src/main/java/io/velocitycareerlabs/api/entities/VCLCredentialManifestDescriptor.kt b/VCL/src/main/java/io/velocitycareerlabs/api/entities/VCLCredentialManifestDescriptor.kt
@@ -14,7 +14,8 @@ open class VCLCredentialManifestDescriptor(
     val issuingType: VCLIssuingType = VCLIssuingType.Career,
     val credentialTypes: List<String>? = null,
     val pushDelegate: VCLPushDelegate? = null,
-    val vendorOriginContext: String? = null
+    val vendorOriginContext: String? = null,
+    val deepLink: VCLDeepLink? = null
 ) {
     val did = uri?.getUrlSubPath(KeyDidPrefix)
 

diff --git a/...main/java/io/velocitycareerlabs/api/entities/VCLCredentialManifestDescriptorByDeepLink.kt b/...main/java/io/velocitycareerlabs/api/entities/VCLCredentialManifestDescriptorByDeepLink.kt
@@ -13,5 +13,6 @@ class VCLCredentialManifestDescriptorByDeepLink(
 ): VCLCredentialManifestDescriptor(
     uri = deepLink.requestUri,
     issuingType = issuingType,
-    vendorOriginContext = deepLink.vendorOriginContext
+    vendorOriginContext = deepLink.vendorOriginContext,
+    deepLink = deepLink
 )
diff --git a/VCL/src/main/java/io/velocitycareerlabs/api/entities/VCLFinalizeOffersDescriptor.kt b/VCL/src/main/java/io/velocitycareerlabs/api/entities/VCLFinalizeOffersDescriptor.kt
@@ -4,7 +4,6 @@
  * Copyright 2022 Velocity Career Labs inc.
  * SPDX-License-Identifier: Apache-2.0
  */
-
 package io.velocitycareerlabs.api.entities
 
 import io.velocitycareerlabs.impl.extensions.toJsonArray
@@ -22,8 +21,8 @@ data class VCLFinalizeOffersDescriptor(
             .putOpt(KeyApprovedOfferIds, approvedOfferIds.toJsonArray())
             .putOpt(KeyRejectedOfferIds, rejectedOfferIds.toJsonArray())
 
-    val did: String get() = credentialManifest.did
     val issuerId: String get() = credentialManifest.issuerId
+    val aud: String get() = credentialManifest.aud
     val exchangeId: String get() = credentialManifest.exchangeId
     val finalizeOffersUri: String get() = credentialManifest.finalizeOffersUri
     val serviceTypes: VCLServiceTypes get() = credentialManifest.verifiedProfile.serviceTypes

diff --git a/VCL/src/main/java/io/velocitycareerlabs/api/entities/VCLGenerateOffersDescriptor.kt b/VCL/src/main/java/io/velocitycareerlabs/api/entities/VCLGenerateOffersDescriptor.kt
@@ -22,9 +22,8 @@ data class VCLGenerateOffersDescriptor(
             .putOpt(KeyTypes,types?.toJsonArray())
             .putOpt(KeyOfferHashes,offerHashes?.toJsonArray())
 
-    val did: String get() = credentialManifest.did
+    val issuerId: String get() = credentialManifest.issuerId
     val exchangeId: String get() = credentialManifest.exchangeId
-
     val checkOffersUri: String get() = credentialManifest.checkOffersUri
 
     companion object CodingKeys {

diff --git a/VCL/src/main/java/io/velocitycareerlabs/api/entities/VCLOffer.kt b/VCL/src/main/java/io/velocitycareerlabs/api/entities/VCLOffer.kt
@@ -0,0 +1,22 @@
+/**
+ * Created by Michael Avoyan on 10/12/2023.
+ *
+ * Copyright 2022 Velocity Career Labs inc.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package io.velocitycareerlabs.api.entities
+
+import org.json.JSONObject
+
+data class VCLOffer(val payload: JSONObject) {
+    val issuerId: String get() = payload.optJSONObject(CodingKeys.KeyIssuer)?.optString(KeyId)
+        ?: payload.optString(CodingKeys.KeyIssuer)
+        ?: ""
+    val id: String get() = payload.optString(CodingKeys.KeyId) ?: ""
+
+    companion object CodingKeys {
+        const val KeyId = "id"
+        const val KeyDid = "did"
+        const val KeyIssuer = "issuer"
+    }
+}
diff --git a/VCL/src/main/java/io/velocitycareerlabs/api/entities/VCLOffers.kt b/VCL/src/main/java/io/velocitycareerlabs/api/entities/VCLOffers.kt
@@ -12,7 +12,7 @@ import org.json.JSONObject
 
 data class VCLOffers (
     val payload: JSONObject,
-    val all: JSONArray,
+    val all: List<VCLOffer>,
     val responseCode: Int,
     val sessionToken: VCLToken,
     val challenge: String,

diff --git a/VCL/src/main/java/io/velocitycareerlabs/api/entities/error/VCLErrorCode.kt b/VCL/src/main/java/io/velocitycareerlabs/api/entities/error/VCLErrorCode.kt
@@ -17,5 +17,10 @@ internal enum class VCLErrorCode(val value: String) {
     IssuerRequiresNotaryPermission("issuer_requires_notary_permission"),
     InvalidCredentialSubjectType("invalid_credential_subject_type"),
     InvalidCredentialSubjectContext("invalid_credential_subject_context"),
-    IssuerUnexpectedPermissionFailure("issuer_unexpected_permission_failure")
+    IssuerUnexpectedPermissionFailure("issuer_unexpected_permission_failure"),
+    // DID consistent with the Deep Link
+    MismatchedRequestIssuerDid("mismatched_request_issuer_did"),
+    MismatchedOfferIssuerDid("mismatched_offer_issuer_did"),
+    MismatchedCredentialIssuerDid("mismatched_credential_issuer_did"),
+    MismatchedPresentationRequestInspectorDid("mismatched_presentation_request_inspector_did")
 }
diff --git a/VCL/src/main/java/io/velocitycareerlabs/impl/VclBlocksProvider.kt b/VCL/src/main/java/io/velocitycareerlabs/impl/VclBlocksProvider.kt
@@ -13,7 +13,7 @@ import io.velocitycareerlabs.api.entities.VCLCredentialTypes
 import io.velocitycareerlabs.api.entities.error.VCLError
 import io.velocitycareerlabs.api.entities.error.VCLErrorCode
 import io.velocitycareerlabs.api.entities.initialization.VCLCryptoServicesDescriptor
-import io.velocitycareerlabs.impl.data.utils.CredentialDidVerifierImpl
+import io.velocitycareerlabs.impl.data.verifiers.CredentialDidVerifierImpl
 import io.velocitycareerlabs.impl.data.infrastructure.db.CacheServiceImpl
 import io.velocitycareerlabs.impl.data.infrastructure.db.SecretStoreServiceImpl
 import io.velocitycareerlabs.impl.data.infrastructure.network.NetworkServiceImpl
@@ -25,11 +25,16 @@ import io.velocitycareerlabs.impl.data.usecases.*
 import io.velocitycareerlabs.api.jwt.VCLJwtSignService
 import io.velocitycareerlabs.api.jwt.VCLJwtVerifyService
 import io.velocitycareerlabs.api.keys.VCLKeyService
-import io.velocitycareerlabs.impl.data.utils.CredentialIssuerVerifierEmptyImpl
-import io.velocitycareerlabs.impl.data.utils.CredentialIssuerVerifierImpl
+import io.velocitycareerlabs.impl.data.verifiers.CredentialIssuerVerifierEmptyImpl
+import io.velocitycareerlabs.impl.data.verifiers.CredentialIssuerVerifierImpl
+import io.velocitycareerlabs.impl.data.verifiers.CredentialManifestByDeepLinkVerifierImpl
+import io.velocitycareerlabs.impl.data.verifiers.CredentialsByDeepLinkVerifierImpl
+import io.velocitycareerlabs.impl.data.verifiers.OffersByDeepLinkVerifierImpl
+import io.velocitycareerlabs.impl.data.verifiers.PresentationRequestByDeepLinkVerifierImpl
 import io.velocitycareerlabs.impl.domain.models.*
 import io.velocitycareerlabs.impl.domain.usecases.*
-import io.velocitycareerlabs.impl.domain.utils.CredentialIssuerVerifier
+import io.velocitycareerlabs.impl.domain.verifiers.CredentialIssuerVerifier
+import io.velocitycareerlabs.impl.domain.verifiers.PresentationRequestByDeepLinkVerifier
 import io.velocitycareerlabs.impl.jwt.local.VCLJwtSignServiceLocalImpl
 import io.velocitycareerlabs.impl.jwt.local.VCLJwtVerifyServiceLocalImpl
 import io.velocitycareerlabs.impl.jwt.remote.VCLJwtSignServiceRemoteImpl
@@ -169,6 +174,7 @@ internal object VclBlocksProvider {
                                 chooseJwtSignService(context, cryptoServicesDescriptor),
                                 chooseJwtVerifyService(cryptoServicesDescriptor)
                         ),
+                        PresentationRequestByDeepLinkVerifierImpl(),
                         ExecutorImpl()
                 )
 
@@ -212,6 +218,7 @@ internal object VclBlocksProvider {
                                 chooseJwtSignService(context, cryptoServicesDescriptor),
                                 chooseJwtVerifyService(cryptoServicesDescriptor)
                         ),
+                        CredentialManifestByDeepLinkVerifierImpl(),
                         ExecutorImpl()
                 )
 
@@ -244,6 +251,7 @@ internal object VclBlocksProvider {
                         GenerateOffersRepositoryImpl(
                                 NetworkServiceImpl()
                         ),
+                        OffersByDeepLinkVerifierImpl(),
                         ExecutorImpl()
                 )
 
@@ -272,6 +280,7 @@ internal object VclBlocksProvider {
                         ),
                         credentialIssuerVerifier,
                         CredentialDidVerifierImpl(),
+                        CredentialsByDeepLinkVerifierImpl(),
                         ExecutorImpl()
                 )
         }

diff --git a/...rc/main/java/io/velocitycareerlabs/impl/data/repositories/FinalizeOffersRepositoryImpl.kt b/...rc/main/java/io/velocitycareerlabs/impl/data/repositories/FinalizeOffersRepositoryImpl.kt
@@ -12,9 +12,12 @@ import io.velocitycareerlabs.api.entities.error.VCLError
 import io.velocitycareerlabs.impl.data.infrastructure.network.Request
 import io.velocitycareerlabs.impl.domain.infrastructure.network.NetworkService
 import io.velocitycareerlabs.impl.domain.repositories.FinalizeOffersRepository
+import io.velocitycareerlabs.impl.extensions.toJsonArray
+import io.velocitycareerlabs.impl.extensions.toJwtList
 import io.velocitycareerlabs.impl.extensions.toList
 import org.json.JSONArray
 import java.lang.Exception
+import java.util.concurrent.CompletableFuture
 
 internal class FinalizeOffersRepositoryImpl(
     private val networkService: NetworkService
@@ -25,7 +28,7 @@ internal class FinalizeOffersRepositoryImpl(
         finalizeOffersDescriptor: VCLFinalizeOffersDescriptor,
         sessionToken: VCLToken,
         proof: VCLJwt,
-        completionBlock: (VCLResult<List<String>>) -> Unit
+        completionBlock: (VCLResult<List<VCLJwt>>) -> Unit
     ) {
         networkService.sendRequest(
             endpoint = finalizeOffersDescriptor.finalizeOffersUri,
@@ -40,14 +43,12 @@ internal class FinalizeOffersRepositoryImpl(
                 result.handleResult(
                     { finalizedOffersResponse ->
                         try {
-                            val encodedJwts =
-                                JSONArray(finalizedOffersResponse.payload).toList() as? List<String>
-                            encodedJwts?.let {
+                            finalizedOffersResponse.payload.toJwtList()?.let {
                                 completionBlock(VCLResult.Success(it))
                             } ?: run {
                                 completionBlock(
                                     VCLResult.Failure(
-                                        VCLError("Failed to parse: $finalizedOffersResponse.payload")
+                                        VCLError("Failed to parse: ${finalizedOffersResponse.payload}")
                                     )
                                 )
                             }

diff --git a/...rc/main/java/io/velocitycareerlabs/impl/data/repositories/GenerateOffersRepositoryImpl.kt b/...rc/main/java/io/velocitycareerlabs/impl/data/repositories/GenerateOffersRepositoryImpl.kt
@@ -11,6 +11,7 @@ import io.velocitycareerlabs.api.entities.*
 import io.velocitycareerlabs.api.entities.error.VCLError
 import io.velocitycareerlabs.impl.data.infrastructure.network.Request
 import io.velocitycareerlabs.impl.data.infrastructure.network.Response
+import io.velocitycareerlabs.impl.data.utils.Utils
 import io.velocitycareerlabs.impl.domain.infrastructure.network.NetworkService
 import io.velocitycareerlabs.impl.domain.repositories.GenerateOffersRepository
 import io.velocitycareerlabs.impl.extensions.toJsonArray
@@ -42,9 +43,11 @@ internal class GenerateOffersRepositoryImpl(
                 result.handleResult(
                     { offersResponse ->
                         try {
-                            completionBlock(VCLResult.Success(
-                                parse(offersResponse, sessionToken)
-                            ))
+                            completionBlock(
+                                VCLResult.Success(
+                                    parse(offersResponse, sessionToken)
+                                )
+                            )
                         } catch (ex: Exception) {
                             completionBlock(VCLResult.Failure(VCLError(ex)))
                         }
@@ -62,17 +65,19 @@ internal class GenerateOffersRepositoryImpl(
         offersResponse.payload.toJsonObject()?.let { payload ->
             return VCLOffers(
                 payload = payload,
-                all = payload.optJSONArray(VCLOffers.CodingKeys.KeyOffers) ?: JSONArray(),
+                all = Utils.offersFromJsonArray(
+                    payload.optJSONArray(VCLOffers.CodingKeys.KeyOffers) ?: JSONArray()
+                ),
                 responseCode = offersResponse.code,
                 sessionToken = sessionToken,
                 challenge = payload.optString(VCLOffers.CodingKeys.KeyChallenge) ?: ""
             )
         } ?: run {
 //            VCLXVnfProtocolVersion.XVnfProtocolVersion1
-            offersResponse.payload.toJsonArray()?.let { allOffers ->
+            offersResponse.payload.toJsonArray()?.let { offersJsonArray ->
                 return VCLOffers(
                     payload = JSONObject(),
-                    all = allOffers,
+                    all = Utils.offersFromJsonArray(offersJsonArray),
                     responseCode = offersResponse.code,
                     sessionToken = sessionToken,
                     challenge = ""
@@ -81,7 +86,7 @@ internal class GenerateOffersRepositoryImpl(
 //                No offers
                 return VCLOffers(
                     payload = JSONObject(),
-                    all = JSONArray(),
+                    all = listOf(),
                     responseCode = offersResponse.code,
                     sessionToken = sessionToken,
                     challenge = ""