fix: trailing tilde in credential jwts in presentation (#351)

walt-id · Oct 3, 2023 · d256546 · d256546
2 parents 4dcf272 + b2bcba4
commit d256546
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/kotlin/id/walt/credentials/w3c/VerifiablePresentation.kt b/src/main/kotlin/id/walt/credentials/w3c/VerifiablePresentation.kt
@@ -62,7 +62,7 @@ data class PresentableCredential(
             } else {
                 verifiableCredential.sdJwt!!.present(selectiveDisclosure?.let { SDMapBuilder().addField(claimKey, false, it).build() })
             }
-            JsonPrimitive(presentedJwt.toString(formatForPresentation = true))
+            JsonPrimitive(presentedJwt.toString(formatForPresentation = false))
         } else verifiableCredential.toJsonElement()
 
     val isJwt

diff --git a/src/main/kotlin/id/walt/signatory/WaltIdSignatory.kt b/src/main/kotlin/id/walt/signatory/WaltIdSignatory.kt
@@ -101,7 +101,9 @@ class WaltIdSignatory(configurationPath: String) : Signatory() {
         val fullProofConfig = fillProofConfig(config)
         val vcRequest = credentialBuilder.apply {
             issuer?.let { setIssuer(it) }
-            setIssuerId(fullProofConfig.issuerDid)
+            if(issuer?.id.isNullOrEmpty()) {
+                setIssuerId(fullProofConfig.issuerDid)
+            }
             setIssuanceDate(fullProofConfig.issueDate ?: Instant.now())
             setIssued(fullProofConfig.issueDate ?: Instant.now())
             fullProofConfig.subjectDid?.let { setSubjectId(it) }