fix: tests

Signed-off-by: Jan <60812202+janrtvld@users.noreply.github.com>
openwallet-foundation · Sep 2, 2022 · e70aa01 · e70aa01
1 parent f26f848
commit e70aa01
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 21 deletions.
diff --git a/packages/rest/src/controllers/types.ts b/packages/rest/src/controllers/types.ts
@@ -53,7 +53,6 @@ export interface ProposeCredentialOptions {
       issuerDid: string
       attributes: {
         name: string
-        mimeType: string
         value: string
       }[]
     }
@@ -66,10 +65,14 @@ export interface ProposeCredentialOptions {
 export interface AcceptCredentialProposalOptions {
   credentialFormats?: {
     indy: {
+      schemaIssuerDid: string
+      schemaId: string
+      schemaName: string
+      schemaVersion: string
       credentialDefinitionId: string
+      issuerDid: string
       attributes: {
         name: string
-        mimeType: string
         value: string
       }[]
     }
@@ -85,7 +88,6 @@ export interface OfferCredentialOptions {
       credentialDefinitionId: string
       attributes: {
         name: string
-        mimeType: string
         value: string
       }[]
     }

diff --git a/packages/rest/src/routes/routes.ts b/packages/rest/src/routes/routes.ts
@@ -76,7 +76,7 @@ const models: TsoaRoute.Models = {
         "dataType": "refObject",
         "properties": {
             "protocolVersion": {"ref":"ProtocolVersionType_CredentialServices_","required":true},
-            "credentialFormats": {"dataType":"nestedObjectLiteral","nestedProperties":{"indy":{"dataType":"nestedObjectLiteral","nestedProperties":{"attributes":{"dataType":"array","array":{"dataType":"nestedObjectLiteral","nestedProperties":{"value":{"dataType":"string","required":true},"mimeType":{"dataType":"string","required":true},"name":{"dataType":"string","required":true}}},"required":true},"issuerDid":{"dataType":"string","required":true},"credentialDefinitionId":{"dataType":"string","required":true},"schemaVersion":{"dataType":"string","required":true},"schemaName":{"dataType":"string","required":true},"schemaId":{"dataType":"string","required":true},"schemaIssuerDid":{"dataType":"string","required":true}},"required":true}},"required":true},
+            "credentialFormats": {"dataType":"nestedObjectLiteral","nestedProperties":{"indy":{"dataType":"nestedObjectLiteral","nestedProperties":{"attributes":{"dataType":"array","array":{"dataType":"nestedObjectLiteral","nestedProperties":{"value":{"dataType":"string","required":true},"name":{"dataType":"string","required":true}}},"required":true},"issuerDid":{"dataType":"string","required":true},"credentialDefinitionId":{"dataType":"string","required":true},"schemaVersion":{"dataType":"string","required":true},"schemaName":{"dataType":"string","required":true},"schemaId":{"dataType":"string","required":true},"schemaIssuerDid":{"dataType":"string","required":true}},"required":true}},"required":true},
             "autoAcceptCredential": {"ref":"AutoAcceptCredential"},
             "comment": {"dataType":"string"},
             "connectionId": {"dataType":"string","required":true},
@@ -87,7 +87,7 @@ const models: TsoaRoute.Models = {
     "AcceptCredentialProposalOptions": {
         "dataType": "refObject",
         "properties": {
-            "credentialFormats": {"dataType":"nestedObjectLiteral","nestedProperties":{"indy":{"dataType":"nestedObjectLiteral","nestedProperties":{"attributes":{"dataType":"array","array":{"dataType":"nestedObjectLiteral","nestedProperties":{"value":{"dataType":"string","required":true},"mimeType":{"dataType":"string","required":true},"name":{"dataType":"string","required":true}}},"required":true},"credentialDefinitionId":{"dataType":"string","required":true}},"required":true}}},
+            "credentialFormats": {"dataType":"nestedObjectLiteral","nestedProperties":{"indy":{"dataType":"nestedObjectLiteral","nestedProperties":{"attributes":{"dataType":"array","array":{"dataType":"nestedObjectLiteral","nestedProperties":{"value":{"dataType":"string","required":true},"name":{"dataType":"string","required":true}}},"required":true},"issuerDid":{"dataType":"string","required":true},"credentialDefinitionId":{"dataType":"string","required":true},"schemaVersion":{"dataType":"string","required":true},"schemaName":{"dataType":"string","required":true},"schemaId":{"dataType":"string","required":true},"schemaIssuerDid":{"dataType":"string","required":true}},"required":true}}},
             "autoAcceptCredential": {"ref":"AutoAcceptCredential"},
             "comment": {"dataType":"string"},
         },
@@ -98,7 +98,7 @@ const models: TsoaRoute.Models = {
         "dataType": "refObject",
         "properties": {
             "protocolVersion": {"ref":"ProtocolVersionType_CredentialServices_","required":true},
-            "credentialFormats": {"dataType":"nestedObjectLiteral","nestedProperties":{"indy":{"dataType":"nestedObjectLiteral","nestedProperties":{"attributes":{"dataType":"array","array":{"dataType":"nestedObjectLiteral","nestedProperties":{"value":{"dataType":"string","required":true},"mimeType":{"dataType":"string","required":true},"name":{"dataType":"string","required":true}}},"required":true},"credentialDefinitionId":{"dataType":"string","required":true}},"required":true}},"required":true},
+            "credentialFormats": {"dataType":"nestedObjectLiteral","nestedProperties":{"indy":{"dataType":"nestedObjectLiteral","nestedProperties":{"attributes":{"dataType":"array","array":{"dataType":"nestedObjectLiteral","nestedProperties":{"value":{"dataType":"string","required":true},"name":{"dataType":"string","required":true}}},"required":true},"credentialDefinitionId":{"dataType":"string","required":true}},"required":true}},"required":true},
             "autoAcceptCredential": {"ref":"AutoAcceptCredential"},
             "comment": {"dataType":"string"},
             "connectionId": {"dataType":"string","required":true},

diff --git a/packages/rest/src/routes/swagger.json b/packages/rest/src/routes/swagger.json
@@ -98,16 +98,12 @@
 												"value": {
 													"type": "string"
 												},
-												"mimeType": {
-													"type": "string"
-												},
 												"name": {
 													"type": "string"
 												}
 											},
 											"required": [
 												"value",
-												"mimeType",
 												"name"
 											],
 											"type": "object"
@@ -180,29 +176,45 @@
 												"value": {
 													"type": "string"
 												},
-												"mimeType": {
-													"type": "string"
-												},
 												"name": {
 													"type": "string"
 												}
 											},
 											"required": [
 												"value",
-												"mimeType",
 												"name"
 											],
 											"type": "object"
 										},
 										"type": "array"
 									},
+									"issuerDid": {
+										"type": "string"
+									},
 									"credentialDefinitionId": {
 										"type": "string"
+									},
+									"schemaVersion": {
+										"type": "string"
+									},
+									"schemaName": {
+										"type": "string"
+									},
+									"schemaId": {
+										"type": "string"
+									},
+									"schemaIssuerDid": {
+										"type": "string"
 									}
 								},
 								"required": [
 									"attributes",
-									"credentialDefinitionId"
+									"issuerDid",
+									"credentialDefinitionId",
+									"schemaVersion",
+									"schemaName",
+									"schemaId",
+									"schemaIssuerDid"
 								],
 								"type": "object"
 							}
@@ -237,16 +249,12 @@
 												"value": {
 													"type": "string"
 												},
-												"mimeType": {
-													"type": "string"
-												},
 												"name": {
 													"type": "string"
 												}
 											},
 											"required": [
 												"value",
-												"mimeType",
 												"name"
 											],
 											"type": "object"

diff --git a/packages/rest/tests/credential.test.ts b/packages/rest/tests/credential.test.ts
@@ -117,6 +117,17 @@ describe('CredentialController', () => {
         credentialFormats: {
           indy: {
             credentialDefinitionId: 'WghBqNdoFjaYh6F5N9eBF:3:CL:3210:test',
+            issuerDid: 'WghBqNdoFjaYh6F5N9eBF',
+            schemaId: 'WgWxqztrNooG92RXvxSTWv:2:test:1.0',
+            schemaIssuerDid: 'WghBqNdoFjaYh6F5N9eBF',
+            schemaName: 'test',
+            schemaVersion: '1.0',
+            attributes: [
+              {
+                name: 'name',
+                value: 'test',
+              },
+            ],
           },
         },
         autoAcceptCredential: 'always',

diff --git a/packages/rest/tests/proof.test.ts b/packages/rest/tests/proof.test.ts
@@ -164,12 +164,11 @@ describe('ProofController', () => {
                 name: 'string',
               },
             },
-            requestedPredicates: {},
           },
         })
 
       expect(response.statusCode).toBe(200)
-      expect(response.body.message).toBeDefined()
+      expect(response.body.proofUrl).toBeDefined()
       expect(response.body.proofRecord).toBeDefined()
     })
   })