ecrs-auth-core 1.0.94 → 1.0.96

package/dist/auth.controller.js

@@ -48,19 +48,19 @@ let AuthController = class AuthController {
         else {
             console.log(`✅ User ${body.email} authenticated successfully`);
         }
-        console.log('📊 User details:', user);
+        // console.log('📊 User details:', user);
         const requestedModuleId = Number(body.moduleId);
         console.log(`📍 User ${body.email} requested access to module ID: ${requestedModuleId}`);
         if (!Number.isFinite(requestedModuleId)) {
             console.warn(`⚠️ Invalid module ID provided by user ${body.email}: ${body.moduleId}`);
             throw new common_1.UnauthorizedException('You are not authorized to access this module');
         }
-        // console.log(`🔍 Checking module access for user ID ${user.id} and module ID ${requestedModuleId}...`);
-        // const allowedDb = await this.authService.hasModuleAccess(user.id, requestedModuleId);
-        // console.log(`📊 Module access check result for user ID ${user.id} and module ID ${requestedModuleId}: ${allowedDb ? 'Allowed' : 'Denied'}`);
-        // if (!allowedDb) {
-        //   throw new UnauthorizedException('You are not authorized to access this module');
-        // }
+        console.log(`🔍 Checking module access for user ID ${user.id} and module ID ${requestedModuleId}...`);
+        const allowedDb = await this.authService.hasModuleAccess(user.id, requestedModuleId);
+        console.log(`📊 Module access check result for user ID ${user.id} and module ID ${requestedModuleId}: ${allowedDb ? 'Allowed' : 'Denied'}`);
+        if (!allowedDb) {
+            throw new common_1.UnauthorizedException('You are not authorized to access this module');
+        }
         // const perms = await this.authService.getPermissions(user.id);
         // console.log(`📊 User permissions for ${body.email}:`, perms);
         // if (!Array.isArray(perms.modules) || !perms.modules.includes(requestedModuleId)) {

package/dist/auth.service.js

@@ -164,26 +164,23 @@ let AuthService = class AuthService {
         if (!Number.isFinite(moduleId))
             return false;
         console.log(`🔍 Checking module access for user ID ${userId} and module ID ${moduleId}...`);
-        const access1 = await this.moduleAccessRepo
-            .createQueryBuilder("ma")
-            .where("ma.userId = :userId", { userId })
-            .andWhere("ma.moduleId = :moduleId", { moduleId })
-            .andWhere("ma.status = 1")
-            .andWhere("ma.isDeleted = 0")
-            .getOne();
-        console.log(access1);
-        let access;
         try {
-            access = await this.moduleAccessRepo.findOne({
-                where: { userId, moduleId, isDeleted: 0, status: 1 },
-            });
-            console.log(access);
+            const result = await this.moduleAccessRepo.query(`SELECT 1
+       FROM user_module_access
+       WHERE user_id = $1
+       AND module_id = $2
+       AND status = 1
+       AND is_deleted = 0
+       LIMIT 1`, [userId, moduleId]);
+            console.log('Raw Query Result:', result);
+            const allowed = result.length > 0;
+            console.log(`📊 Module access check result for user ID ${userId} and module ID ${moduleId}: ${allowed ? 'Allowed' : 'Denied'}`);
+            return allowed;
         }
         catch (error) {
-            console.error(error);
+            console.error('❌ Error checking module access:', error);
+            return false;
         }
-        console.log(`📊 Module access check result for user ID ${userId} and module ID ${moduleId}: ${access ? 'Allowed' : 'Denied'}`);
-        return !!access;
     }
     async getPermissions(userId) {
         console.log(`🔍 Loading permissions for user ID ${userId}...`);

package/dist/entities/user-module-access.entity.js

@@ -64,5 +64,5 @@ __decorate([
     __metadata("design:type", Number)
 ], UserModuleAccess.prototype, "isDeleted", void 0);
 exports.UserModuleAccess = UserModuleAccess = __decorate([
-    (0, typeorm_1.Entity)({ name: 'tbl_c_user_module_access' })
+    (0, typeorm_1.Entity)({ name: 'tbl_c_user_module_access_new' })
 ], UserModuleAccess);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ecrs-auth-core",
-  "version": "1.0.94",
+  "version": "1.0.96",
   "description": "Centralized authentication and authorization module for ECRS apps",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",