fix: DID update in chunks

cheqd · Jul 3, 2023 · 24ee606 · 24ee606
1 parent d2949b7
commit 24ee606
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 33 deletions.
diff --git a/src/controllers/issuer.ts b/src/controllers/issuer.ts
@@ -134,7 +134,7 @@ export class IssuerController {
 
     try {
 
-      const { did, service, verificationMethod, authentication } = request.body as { did: string, service: Service, verificationMethod: VerificationMethod, authentication: string }
+      const { did, service, verificationMethod, authentication } = request.body as { did: string, service: Service[], verificationMethod: VerificationMethod[], authentication: string[] }
       let updatedDocument: DIDDocument
       if (request.body.didDocument) {
         updatedDocument = request.body.didDocument
@@ -146,14 +146,14 @@ export class IssuerController {
           })
         }
         const resolvedDocument = resolvedResult.didDocument
-        if (service && isValidService(service)) {
-            resolvedDocument.service = resolvedDocument.service ? resolvedDocument.service.concat(service) : [service]
+        if (service) {
+            resolvedDocument.service = Array.isArray(service) ? service : [service]
         }
-        if (verificationMethod && isValidVerificationMethod(verificationMethod)) {
-            resolvedDocument.verificationMethod?.push(verificationMethod)
+        if (verificationMethod) {
+            resolvedDocument.verificationMethod = Array.isArray(verificationMethod) ? verificationMethod : [verificationMethod]
         }
         if (authentication) {
-            resolvedDocument.authentication = resolvedDocument.authentication ? resolvedDocument.authentication.concat(authentication) : [authentication]
+            resolvedDocument.authentication = Array.isArray(authentication) ? authentication : [authentication]
         }
 
         updatedDocument = resolvedDocument

diff --git a/src/controllers/revocation.ts b/src/controllers/revocation.ts
@@ -25,8 +25,13 @@ export class RevocationController {
 
     static updateValidator = [
         check('index').optional().isNumeric().withMessage('index should be a number'),
-        check('indices').custom((value, {req})=>!(value && req.body.index))
-        .withMessage('Either an index or list of indices should be provided'),
+        check('indices').custom((value, {req})=>{
+            if(value) {
+                return Array.isArray(value)
+            } else {
+                return req.body.index
+            }
+        }).withMessage('Either an index or an array of indices should be provided'),
         check('statusListName').exists().withMessage('StatusListName is required').isString(),
         check('statusListVerion').optional().isString().withMessage('Invalid statusListVersion'),
         query('statusAction').exists().withMessage('StatusAction is required')

diff --git a/src/middleware/middleware.ts b/src/middleware/middleware.ts
@@ -10,12 +10,11 @@ export class Middleware {
                   if (request.body[key] === '') {
                     request.body[key] = undefined
                   } else {
-                    request.body[key] = JSON.parse(request.body[key])
-
                     if (typeof request.body[key] === 'string' && request.body[key].includes(',')) {
                         // Check if the value contains commas
                         request.body[key] = request.body[key].split(',')
                     }
+                    request.body[key] = JSON.parse(request.body[key])
                   }    
               } catch (error) {
                 // Failed to parse the value as JSON, leave it as is

diff --git a/src/services/identity/agent.ts b/src/services/identity/agent.ts
@@ -5,8 +5,6 @@ import {
   IAgentPlugin,
   ICreateVerifiableCredentialArgs,
   IDIDManager,
-  IDIDManagerDeleteArgs,
-  IDIDManagerUpdateArgs,
   IIdentifier,
   IKeyManager,
   IResolver,
@@ -332,7 +330,8 @@ export class Veramo {
                     statusListVersion: statusOptions.statusListVersion
                 },
                 fetchList: true,
-                publish
+                publish,
+                returnUpdatedStatusList: !publish
             })
         case 'suspend':
             return await agent.cheqdSuspendCredentials({
@@ -343,7 +342,8 @@ export class Veramo {
                     statusListVersion: statusOptions.statusListVersion
                 },
                 fetchList: true,
-                publish
+                publish,
+                returnUpdatedStatusList: !publish
             })
         case 'reinstate':
             return await agent.cheqdUnsuspendCredentials({
@@ -354,7 +354,8 @@ export class Veramo {
                     statusListVersion: statusOptions.statusListVersion
                 },
                 fetchList: true,
-                publish
+                publish,
+                returnUpdatedStatusList: !publish
             })           
     }
  }

diff --git a/src/static/swagger.json b/src/static/swagger.json
@@ -2234,28 +2234,25 @@
                         "type": "string"
                     },
                     "service": {
-                        "allOf": [
-                            {
-                                "description": "This input field appends a service Object to the didDocument"
-                            },
-                            {
-                                "$ref": "#/components/schemas/Service"
-                            }
-                        ]
+                        "type": "array",
+                        "description": "This input field assigns the provided service array to the didDocument",
+                        "items": {
+                            "$ref": "#/components/schemas/Service"
+                        }
                     },
                     "verificationMethod": {
-                        "allOf": [
-                            {
-                                "description": "This input field appends a verificationMethod to the didDocument"
-                            },
-                            {
-                                "$ref": "#/components/schemas/VerificationMethod"
-                            }
-                        ]
+                        "type": "array",
+                        "description": "This input field assigns the provided verificationMethod array to the didDocument",
+                        "items": {
+                            "$ref": "#/components/schemas/VerificationMethod"
+                        }
                     },
                     "authentication": {
-                        "description": "This input field appends a authenticationMethod to the didDocument",
-                        "type": "string"
+                        "description": "This input field assigns the provided authentication array to the didDocument",
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        }
                     },
                     "didDocument": {
                         "$ref": "#/components/schemas/DidDocument"