Merge pull request #89 from arati-tekdi/main

Change in regex
tekdi · Feb 25, 2025 · 1ca9d57 · 1ca9d57
2 parents 3e7a3b7 + cbd578b
commit 1ca9d57
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 38 deletions.
diff --git a/src/common/guards/jwt.strategy.ts b/src/common/guards/jwt.strategy.ts
@@ -33,43 +33,6 @@ export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') {
 
   async validate(request: any, payload: any) {
     let userPrivileges;
-    // const ttl = this.configService.get('TTL');
-    // //try {
-    // const tenantId = request.headers['tenantid'];
-    // if (!tenantId?.trim()) {
-    //   throw new BadRequestException('Tenant id not found');
-    // }
-    // request.userId = payload.sub;
-    // const requiredPermissions = request.requiredPermissions;
-
-    // const cachedData: UserPrivilegeRoleDto = await this.cacheService.get(
-    //   payload.sub,
-    // );
-    // if (!cachedData) {
-    //   const userPrivilegesAndRoles: any =
-    //     await this.permissionService.getUserPrivilegesAndRoles(
-    //       payload.sub,
-    //       tenantId,
-    //     );
-    //   if (userPrivilegesAndRoles.length == 0) {
-    //     throw new UnauthorizedException(
-    //       'User does not have any privileges in the Tenant',
-    //     );
-    //   }
-    //   userPrivileges = userPrivilegesAndRoles['privileges'][tenantId]
-    //     ? userPrivilegesAndRoles['privileges'][tenantId]
-    //     : [];
-    //   this.cacheService.set(payload.sub, userPrivilegesAndRoles, ttl);
-    // } else {
-    //   userPrivileges = cachedData.privileges[tenantId]
-    //     ? cachedData.privileges[tenantId]
-    //     : [];
-    // }
-    // if (!userPrivileges && userPrivileges.length == 0) {
-    //   throw new UnauthorizedException(
-    //     'User does not have any privileges in the Tenant',
-    //   );
-    // }
     this.middlewareLogger.log(
       `user : ${payload.sub - payload.username} userPrivileges: ${userPrivileges}`,
     );

diff --git a/src/common/middleware/apiConfig.ts b/src/common/middleware/apiConfig.ts
@@ -1646,7 +1646,7 @@ export const apiListForAcademicYear = [
 ];
 
 function convertToRegex(pattern) {
-  const regexString = pattern.replace(/:[^\s/]+/g, '([\\w:-]+)');
+  const regexString = pattern.replace(/:[^\s/]+/g, '([\\w:-_]+)');
   return new RegExp(`^${regexString}$`);
 }