diff --git a/src/controllers/api/accreditation.ts b/src/controllers/api/accreditation.ts index 848860b2..bf4bc9d1 100644 --- a/src/controllers/api/accreditation.ts +++ b/src/controllers/api/accreditation.ts @@ -59,8 +59,8 @@ export class AccreditationController { ]; public static verifyValidator = [ - body('accreditation').exists().bail(), - body('subjectDid').exists().bail(), + body('accreditation').exists().withMessage('accreditation should be a DID Url').bail(), + body('subjectDid').exists().isDID().bail(), query('verifyStatus') .optional() .isBoolean() @@ -121,11 +121,9 @@ export class AccreditationController { public async issue(request: Request, response: Response) { const result = validationResult(request); if (!result.isEmpty()) { - return response - .json({ - message: result.array(), - }) - .status(400); + return response.status(400).json({ + message: result.array(), + }); } // Get strategy e.g. postgres or local @@ -333,11 +331,9 @@ export class AccreditationController { public async verify(request: Request, response: Response) { const result = validationResult(request); if (!result.isEmpty()) { - return response - .json({ - message: result.array(), - }) - .status(400); + return response.status(400).json({ + message: result.array(), + }); } // Extract did from params diff --git a/src/middleware/auth/routes/api/accreditation-auth.ts b/src/middleware/auth/routes/api/accreditation-auth.ts index bb2643ec..c83cded4 100644 --- a/src/middleware/auth/routes/api/accreditation-auth.ts +++ b/src/middleware/auth/routes/api/accreditation-auth.ts @@ -4,6 +4,6 @@ export class AccreditationAuthRuleProvider extends AuthRuleProvider { constructor() { super(); this.registerRule('/accreditation/issue', 'POST', 'issue:accreditation:testnet'); - this.registerRule('/accreditation/verify', 'POST', 'verify:accreditation:testnet'); + this.registerRule('/accreditation/verify', 'POST', 'verify:accreditation:testnet', { skipNamespace: true }); } } diff --git a/tests/e2e/payloads/accreditation/attest-jwt.json b/tests/e2e/payloads/accreditation/attest-jwt.json index c8c0164e..e745b407 100644 --- a/tests/e2e/payloads/accreditation/attest-jwt.json +++ b/tests/e2e/payloads/accreditation/attest-jwt.json @@ -1,6 +1,6 @@ { "issuerDid": "did:cheqd:testnet:BjS4Nv8bVdxm2WW28MCfXA", - "subjectDid": "did:cheqd:testnet:33c96aca-9c65-4ebf-8807-b40b0fa928f4", + "subjectDid": "did:cheqd:testnet:GEMXDEg5EhL3YdG2qpbspB", "schemas": [ { "url": "https://schema.org/Person", @@ -8,7 +8,7 @@ } ], "format": "jwt", - "accreditationName": "accreditAccreditation", - "parentAccreditation": "did:cheqd:testnet:BjS4Nv8bVdxm2WW28MCfXA?resourceName=accreditAuthorization&resoourceType=", + "accreditationName": "attestAccreditation", + "parentAccreditation": "did:cheqd:testnet:15b74787-6e48-4fd5-8020-eab24e990578?resourceName=accreditAccreditation&resourceType=VerifiableAccreditationToAccredit", "rootAuthorization": "did:cheqd:testnet:5RpEg66jhhbmASWPXJRWrA?resourceName=authorizeAccreditation&resourceType=VerifiableAuthorisationForTrustChain" } diff --git a/tests/e2e/sequential/accreditation/issue-verify-flow.spec.ts b/tests/e2e/sequential/accreditation/issue-verify-flow.spec.ts index 2c39fc9e..cfdaffa2 100644 --- a/tests/e2e/sequential/accreditation/issue-verify-flow.spec.ts +++ b/tests/e2e/sequential/accreditation/issue-verify-flow.spec.ts @@ -110,7 +110,7 @@ test(' Issue and verify a accredit accreditation', async ({ request }) => { }); test(' Issue and verify a attest accreditation', async ({ request }) => { - const credentialData = JSON.parse(fs.readFileSync(`${PAYLOADS_PATH.ACCREDITATION}/accredit-jwt.json`, 'utf-8')); + const credentialData = JSON.parse(fs.readFileSync(`${PAYLOADS_PATH.ACCREDITATION}/attest-jwt.json`, 'utf-8')); const issueResponse = await request.post(`/accreditation/issue?accreditationType=attest`, { data: JSON.stringify(credentialData), headers: {