fix: Add data reset before each check (#326)

* Add data reset before each check * Review comments
cheqd · Aug 9, 2023 · 659a120 · 659a120
1 parent 17d0aa8
commit 659a120
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/src/controllers/credentials.ts b/src/controllers/credentials.ts
@@ -160,7 +160,8 @@ export class CredentialController {
             {
                 verifyStatus,
                 policies
-            }
+            },
+            response.locals.customerId
         )
         if (result.error) {
             return response.status(StatusCodes.BAD_REQUEST).json({
@@ -394,7 +395,8 @@ export class CredentialController {
                 verifyStatus,
                 policies,
                 domain: verifierDid
-            }
+            },
+            response.locals.customerId
         )
         if (result.error) {
             return response.status(StatusCodes.BAD_REQUEST).json({

diff --git a/src/middleware/auth/base-auth.ts b/src/middleware/auth/base-auth.ts
@@ -20,11 +20,11 @@ export abstract class AbstractAuthHandler implements IAuthResourceHandler
 
     private routeToScoupe: MethodToScope[] = []
     private static pathSkip = [
-        '/swagger', 
-        '/user', 
+        '/swagger',  
         '/static', 
-        '/logto', 
-        '/account/set-default-role']
+        '/logto',
+        '/account/set-default-role',
+        '/auth/user-info']
 
     constructor () {
         this.nextHandler = {} as IAuthResourceHandler
@@ -35,7 +35,16 @@ export abstract class AbstractAuthHandler implements IAuthResourceHandler
         this.logToHelper = new LogToHelper()
     }
 
+    private reset() {
+        this.namespace = '' as Namespaces
+        this.token = '' as string
+        this.scopes = []
+        this.customerId = '' as string
+    }
+
     public async commonPermissionCheck(request: Request): Promise<IAuthResponse> {
+        // Reset all variables
+        this.reset()
         // Firstly - try to find the rule for the request
         const rule = this.findRule(request.path, request.method, this.getNamespace())
 

diff --git a/src/services/identity/unauthorized.ts b/src/services/identity/unauthorized.ts
@@ -68,11 +68,11 @@ export class Unauthorized extends LocalIdentity {
         return Veramo.instance.getDid(this.initAgent(), did)
     }
 
-    async verifyCredential(credential: VerifiableCredential | string,  verificationOptions: VerificationOptions): Promise<IVerifyResult> {
+    async verifyCredential(credential: VerifiableCredential | string,  verificationOptions: VerificationOptions, agentId?: string): Promise<IVerifyResult> {
         return await Veramo.instance.verifyCredential(this.initAgent(), credential, verificationOptions)
     }
 
-    async verifyPresentation(presentation: VerifiablePresentation | string, verificationOptions: VerificationOptions): Promise<IVerifyResult> {
+    async verifyPresentation(presentation: VerifiablePresentation | string, verificationOptions: VerificationOptions, agentId?: string): Promise<IVerifyResult> {
         return await Veramo.instance.verifyPresentation(this.initAgent(), presentation, verificationOptions)
     }