updates

TBD54566975 · Oct 24, 2023 · ee8dbb5 · ee8dbb5
1 parent 909caf0
commit ee8dbb5
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 12 deletions.
diff --git a/openapi.yaml b/openapi.yaml
@@ -282,7 +282,7 @@ components:
           items:
             type: string
         issuer:
-          $ref: "#/components/schemas/CredentialIssuer"
+          type: string
         issuanceDate:
           type: string
         expirationDate:

diff --git a/openapi/openapi.go b/openapi/openapi.go
diff --git a/sdks/web5-js/openapi.d.ts b/sdks/web5-js/openapi.d.ts
@@ -127,7 +127,7 @@ export interface components {
       "@context": string[];
       id: string;
       type: string[];
-      issuer: components["schemas"]["CredentialIssuer"];
+      issuer: string;
       issuanceDate: string;
       expirationDate: string;
       credentialSubject: components["schemas"]["CredentialSubject"];

diff --git a/sdks/web5-kt/src/main/kotlin/com/web5/models/CredentialIssuanceRequestCredential.kt b/sdks/web5-kt/src/main/kotlin/com/web5/models/CredentialIssuanceRequestCredential.kt
@@ -28,7 +28,7 @@ data class CredentialIssuanceRequestCredential(
     val `@context`: List<String>?,
     val id: kotlin.String,
     val type: kotlin.collections.List<kotlin.String>,
-    val issuer: CredentialIssuer,
+    val issuer: kotlin.String,
     val issuanceDate: kotlin.String?,
     val expirationDate: kotlin.String?,
     val credentialSubject: kotlin.collections.Map<kotlin.String, kotlin.Any>

diff --git a/sdks/web5-kt/src/main/kotlin/com/web5/models/VerifiableCredential.kt b/sdks/web5-kt/src/main/kotlin/com/web5/models/VerifiableCredential.kt
@@ -30,7 +30,7 @@ data class VerifiableCredential(
     val `@context`: List<String>,
     val id: kotlin.String,
     val type: kotlin.collections.List<kotlin.String>,
-    val issuer: CredentialIssuer,
+    val issuer: kotlin.String,
     val issuanceDate: kotlin.String,
     val expirationDate: kotlin.String,
     val credentialSubject: kotlin.collections.Map<kotlin.String, kotlin.Any>,

diff --git a/sdks/web5-kt/src/main/kotlin/com/web5/plugins/routes/IssueCred.kt b/sdks/web5-kt/src/main/kotlin/com/web5/plugins/routes/IssueCred.kt
@@ -29,7 +29,7 @@ suspend fun ApplicationCall.credentialIssue() {
 
     val vcDataModel = VcDataModel.builder()
         .id(URI.create(reqVc.id))
-        .issuer(URI.create(reqVc.issuer.id))
+        .issuer(URI.create(reqVc.issuer))
         .issuanceDate(Date())
         .credentialSubject(credentialSubject)
         .build()

diff --git a/tests/credentials.go b/tests/credentials.go
@@ -49,7 +49,7 @@ func vcCreate(ctx context.Context, serverURL string) []error {
 			// ExpirationDate: ,
 			Id: expectedID,
 			// IssuanceDate: ,
-			Issuer: openapi.CredentialIssuer{Id: expectedIssuer},
+			Issuer: expectedIssuer,
 			Type:   expectedType,
 		},
 	})
@@ -104,6 +104,10 @@ func vcCreate(ctx context.Context, serverURL string) []error {
 		errs = append(errs, err)
 	}
 
+	if err := compareStrings(payload.Vc.Issuer, expectedIssuer, "issuer"); err != nil {
+		errs = append(errs, err)
+	}
+
 	//switch issuer := payload.Vc.Issuer.(type) {
 	//case string:
 	//	if err := compareStrings(issuer, expectedIssuer, "issuer"); err != nil {