fix

velocitycareerlabs · Jan 22, 2024 · afcf24f · afcf24f
1 parent 2b04207
commit afcf24f
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 18 deletions.
diff --git a/VCL/src/main/java/io/velocitycareerlabs/api/entities/VCLDidJwk.kt b/VCL/src/main/java/io/velocitycareerlabs/api/entities/VCLDidJwk.kt
@@ -13,7 +13,7 @@ import io.velocitycareerlabs.impl.extensions.encodeToBase64URL
 
 data class VCLDidJwk(
     /**
-     * The did in jwk format encoded to Base64 format
+     * The did in jwk format encoded to Base64 format - the holder did
      */
     val did: String,
     /**

diff --git a/VCL/src/main/java/io/velocitycareerlabs/api/entities/VCLExchangeDescriptor.kt b/VCL/src/main/java/io/velocitycareerlabs/api/entities/VCLExchangeDescriptor.kt
@@ -13,7 +13,6 @@ data class VCLExchangeDescriptor(
     ) {
 
     val processUri: String get() = presentationSubmission.progressUri
-    val did: String get() = presentationSubmission.iss
     val exchangeId: String get() = submissionResult.exchange.id
     val sessionToken: VCLToken get() = submissionResult.sessionToken
 

diff --git a/VCL/src/main/java/io/velocitycareerlabs/api/entities/VCLIdentificationSubmission.kt b/VCL/src/main/java/io/velocitycareerlabs/api/entities/VCLIdentificationSubmission.kt
@@ -9,11 +9,9 @@ package io.velocitycareerlabs.api.entities
 
 class VCLIdentificationSubmission(
     credentialManifest: VCLCredentialManifest,
-    verifiableCredentials: List<VCLVerifiableCredential>? = null,
-    iss: String? = null
+    verifiableCredentials: List<VCLVerifiableCredential>? = null
 ) : VCLSubmission(
     submitUri = credentialManifest.submitPresentationUri,
-    iss = iss ?: "",
     exchangeId = credentialManifest.exchangeId,
     presentationDefinitionId = credentialManifest.presentationDefinitionId,
     verifiableCredentials = verifiableCredentials,

diff --git a/VCL/src/main/java/io/velocitycareerlabs/api/entities/VCLPresentationSubmission.kt b/VCL/src/main/java/io/velocitycareerlabs/api/entities/VCLPresentationSubmission.kt
@@ -10,10 +10,8 @@ package io.velocitycareerlabs.api.entities
 class VCLPresentationSubmission(
     presentationRequest: VCLPresentationRequest,
     verifiableCredentials: List<VCLVerifiableCredential>,
-    iss: String? = null
 ) : VCLSubmission(
     submitUri = presentationRequest.submitPresentationUri,
-    iss = iss ?: "",
     exchangeId = presentationRequest.exchangeId,
     presentationDefinitionId = presentationRequest.presentationDefinitionId,
     verifiableCredentials = verifiableCredentials,

diff --git a/VCL/src/main/java/io/velocitycareerlabs/api/entities/VCLSubmission.kt b/VCL/src/main/java/io/velocitycareerlabs/api/entities/VCLSubmission.kt
@@ -14,7 +14,6 @@ import java.util.*
 
 abstract class VCLSubmission(
     val submitUri: String,
-    val iss: String,
     val exchangeId: String,
     val presentationDefinitionId: String,
     val verifiableCredentials: List<VCLVerifiableCredential>? = null,
@@ -24,9 +23,7 @@ abstract class VCLSubmission(
     val jti = UUID.randomUUID().toString()
     val submissionId = UUID.randomUUID().toString()
 
-    val payload get() = generatePayload()
-
-    private fun generatePayload(): JSONObject {
+    internal fun generatePayload(iss: String?): JSONObject {
         val retVal = JSONObject()
         retVal.putOpt(VCLSubmission.KeyJti, jti)
             .putOpt(VCLSubmission.KeyIss, iss)
@@ -49,7 +46,7 @@ abstract class VCLSubmission(
         return retVal
     }
 
-    fun generateRequestBody(jwt: VCLJwt) = JSONObject()
+    fun generateRequestBody(jwt: VCLJwt): JSONObject = JSONObject()
         .putOpt(VCLSubmission.KeyExchangeId, exchangeId)
         .putOpt(VCLSubmission.KeyJwtVp, jwt.encodedJwt)
         .putOpt(VCLSubmission.KeyPushDelegate, pushDelegate?.toJsonObject())

diff --git a/VCL/src/main/java/io/velocitycareerlabs/impl/VCLImpl.kt b/VCL/src/main/java/io/velocitycareerlabs/impl/VCLImpl.kt
@@ -370,8 +370,7 @@ internal class VCLImpl: VCL {
     ) {
         val identificationSubmission = VCLIdentificationSubmission(
             credentialManifest = generateOffersDescriptor.credentialManifest,
-            verifiableCredentials = generateOffersDescriptor.identificationVerifiableCredentials,
-            iss = didJwk?.did
+            verifiableCredentials = generateOffersDescriptor.identificationVerifiableCredentials
         )
         identificationSubmissionUseCase.submit(
             submission = identificationSubmission,

diff --git a/VCL/src/main/java/io/velocitycareerlabs/impl/data/usecases/SubmissionUseCaseImpl.kt b/VCL/src/main/java/io/velocitycareerlabs/impl/data/usecases/SubmissionUseCaseImpl.kt
@@ -29,9 +29,9 @@ internal class SubmissionUseCaseImpl(
                 kid = didJwk?.kid,
                 jwtDescriptor = VCLJwtDescriptor(
                     keyId = didJwk?.keyId,
-                    payload = submission.payload,
+                    payload = submission.generatePayload(didJwk?.did),
                     jti = submission.jti,
-                    iss = submission.iss
+                    iss = didJwk?.did ?: ""
                 ),
                 remoteCryptoServicesToken = remoteCryptoServicesToken,
                 completionBlock = { signedJwtResult ->

diff --git a/app/src/main/java/com/vcl/wallet/MainActivity.kt b/app/src/main/java/com/vcl/wallet/MainActivity.kt
@@ -146,8 +146,7 @@ class MainActivity : AppCompatActivity() {
     private fun submitPresentation(presentationRequest: VCLPresentationRequest) {
         val presentationSubmission = VCLPresentationSubmission(
             presentationRequest = presentationRequest,
-            verifiableCredentials = Constants.PresentationSelectionsList,
-            iss = didJwk?.did
+            verifiableCredentials = Constants.PresentationSelectionsList
         )
         submitPresentation(presentationSubmission)
     }