ecrs-auth-core 1.0.89 → 1.0.91

package/dist/auth.controller.js

@@ -55,12 +55,12 @@ let AuthController = class AuthController {
             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 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');
+        // }
         // 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.d.ts

@@ -9,11 +9,6 @@ export type RoutePermissionSet = {
     import?: boolean;
     export?: boolean;
 };
-interface PermissionsTree {
-    features: Record<string, string[]>;
-    modules: number[];
-    routes: Record<string, string[]>;
-}
 export declare class AuthService {
     private readonly jwtService;
     private readonly options;
@@ -22,7 +17,6 @@ export declare class AuthService {
     private readonly moduleRepo;
     private readonly featureRepo;
     private readonly routeRepo;
-    private readonly featureAccessRepo;
     private readonly moduleAccessRepo;
     private readonly screenPermissionRepo;
     private readonly ipRestrictionsRepo;
@@ -45,7 +39,7 @@ export declare class AuthService {
     private normalizeIp;
     private validateIpRestriction;
     hasModuleAccess(userId: number, moduleId: number): Promise<boolean>;
-    getPermissions(userId: number): Promise<PermissionsTree>;
+    getPermissions(userId: number): Promise<void>;
     /**
      * Save user last login details
      * Updates the tbl_user_last_login table with latest login info
@@ -120,7 +114,5 @@ export declare class AuthService {
      */
     extractUserIpv4(clientIp: string | undefined): string;
     findUserById(id: number): Promise<User | null>;
-    private loadPermissions;
     private loadModulePermissions;
 }
-export {};

package/dist/auth.service.js

@@ -61,7 +61,7 @@ let AuthService = class AuthService {
         this.moduleRepo = repositories.moduleRepo;
         this.featureRepo = repositories.featureRepo;
         this.routeRepo = repositories.routeRepo;
-        this.featureAccessRepo = repositories.featureAccessRepo;
+        // this.featureAccessRepo = repositories.featureAccessRepo;
         this.moduleAccessRepo = repositories.moduleAccessRepo;
         this.screenPermissionRepo = repositories.screenPermissionRepo;
         // Optional repositories
@@ -164,10 +164,6 @@ let AuthService = class AuthService {
         if (!Number.isFinite(moduleId))
             return false;
         console.log(`🔍 Checking module access for user ID ${userId} and module ID ${moduleId}...`);
-        const access = await this.moduleAccessRepo.findOne({
-            where: { userId, moduleId, isDeleted: 0, status: 1 },
-        });
-        console.log(access);
         const access1 = await this.moduleAccessRepo
             .createQueryBuilder("ma")
             .where("ma.userId = :userId", { userId })
@@ -176,12 +172,22 @@ let AuthService = class AuthService {
             .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);
+        }
+        catch (error) {
+            console.error(error);
+        }
         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}...`);
-        return this.loadPermissions(userId);
+        // return this.loadPermissions(userId);
     }
     /**
      * Save user last login details
@@ -545,68 +551,60 @@ let AuthService = class AuthService {
     async findUserById(id) {
         return this.userRepo.findOne({ where: { id } });
     }
-    async loadPermissions(userId) {
-        // Feature Permissions
-        const featureAccessList = await this.featureAccessRepo.find({
-            where: { userId, isDeleted: 0 },
-        });
-        const featurePermissions = {};
-        const allFeatures = await this.featureRepo.find();
-        const featureMap = new Map(allFeatures.map((f) => [f.id, f]));
-        for (const access of featureAccessList) {
-            const feature = featureMap.get(access.featureId);
-            if (!feature)
-                continue;
-            const perms = [];
-            if (access.canView)
-                perms.push('view');
-            if (access.canCreate)
-                perms.push('create');
-            if (access.canModify)
-                perms.push('update');
-            if (access.canDelete)
-                perms.push('delete');
-            if (access.canImport)
-                perms.push('import');
-            if (access.canExport)
-                perms.push('export');
-            if (perms.length) {
-                featurePermissions[feature.featureName] = perms;
-            }
-        }
-        // Module Access - only count active (non-deleted, status=1) assignments
-        const moduleAccess = await this.moduleAccessRepo.find({
-            where: { userId, isDeleted: 0, status: 1 },
-        });
-        const moduleIds = moduleAccess.map((m) => m.moduleId);
-        // Route Permissions
-        const screenPermissionsList = await this.screenPermissionRepo.find({
-            where: { userId, isActive: true },
-        });
-        const routePermissions = {};
-        const allRoutes = await this.routeRepo.find();
-        const routeMap = new Map(allRoutes.map((r) => [r.id, r]));
-        for (const screen of screenPermissionsList) {
-            const route = routeMap.get(screen.moduleRouteId);
-            if (!route)
-                continue;
-            const perms = [];
-            const keys = ['view', 'create', 'update', 'delete', 'import', 'export'];
-            for (const key of keys) {
-                if (screen.permissions?.[key]) {
-                    perms.push(key);
-                }
-            }
-            if (perms.length) {
-                routePermissions[route.routeName] = perms;
-            }
-        }
-        return {
-            features: featurePermissions,
-            modules: moduleIds,
-            routes: routePermissions,
-        };
-    }
+    // private async loadPermissions(userId: number): Promise<PermissionsTree> {
+    //   // Feature Permissions
+    //   const featureAccessList = await this.featureAccessRepo.find({
+    //     where: { userId, isDeleted: 0 },
+    //   });
+    //   const featurePermissions: Record<string, string[]> = {};
+    //   const allFeatures = await this.featureRepo.find();
+    //   const featureMap = new Map(allFeatures.map((f) => [f.id, f]));
+    //   for (const access of featureAccessList) {
+    //     const feature = featureMap.get(access.featureId);
+    //     if (!feature) continue;
+    //     const perms: string[] = [];
+    //     if (access.canView) perms.push('view');
+    //     if (access.canCreate) perms.push('create');
+    //     if (access.canModify) perms.push('update');
+    //     if (access.canDelete) perms.push('delete');
+    //     if (access.canImport) perms.push('import');
+    //     if (access.canExport) perms.push('export');
+    //     if (perms.length) {
+    //       featurePermissions[feature.featureName] = perms;
+    //     }
+    //   }
+    //   // Module Access - only count active (non-deleted, status=1) assignments
+    //   const moduleAccess = await this.moduleAccessRepo.find({
+    //     where: { userId, isDeleted: 0, status: 1 },
+    //   });
+    //   const moduleIds = moduleAccess.map((m) => m.moduleId);
+    //   // Route Permissions
+    //   const screenPermissionsList = await this.screenPermissionRepo.find({
+    //     where: { userId, isActive: true },
+    //   });
+    //   const routePermissions: Record<string, string[]> = {};
+    //   const allRoutes = await this.routeRepo.find();
+    //   const routeMap = new Map(allRoutes.map((r) => [r.id, r]));
+    //   for (const screen of screenPermissionsList) {
+    //     const route = routeMap.get(screen.moduleRouteId);
+    //     if (!route) continue;
+    //     const perms: string[] = [];
+    //     const keys = ['view', 'create', 'update', 'delete', 'import', 'export'] as const;
+    //     for (const key of keys) {
+    //       if (screen.permissions?.[key]) {
+    //         perms.push(key);
+    //       }
+    //     }
+    //     if (perms.length) {
+    //       routePermissions[route.routeName] = perms;
+    //     }
+    //   }
+    //   return {
+    //     features: featurePermissions,
+    //     modules: moduleIds,
+    //     routes: routePermissions,
+    //   };
+    // }
     async loadModulePermissions(userId, moduleId) {
         if (!Number.isFinite(moduleId)) {
             return [];

package/dist/index.d.ts

@@ -22,7 +22,6 @@ export * from './entities/role.entity';
 export * from './entities/module.entity';
 export * from './entities/feature.entity';
 export * from './entities/module-route.entity';
-export * from './entities/user-feature-access.entity';
 export * from './entities/user-module-access.entity';
 export * from './entities/module-screen-permission.entity';
 export * from './entities/api-key.entity';

package/dist/index.js

@@ -45,7 +45,7 @@ __exportStar(require("./entities/role.entity"), exports);
 __exportStar(require("./entities/module.entity"), exports);
 __exportStar(require("./entities/feature.entity"), exports);
 __exportStar(require("./entities/module-route.entity"), exports);
-__exportStar(require("./entities/user-feature-access.entity"), exports);
+// export * from './entities/user-feature-access.entity';
 __exportStar(require("./entities/user-module-access.entity"), exports);
 __exportStar(require("./entities/module-screen-permission.entity"), exports);
 __exportStar(require("./entities/api-key.entity"), exports);

package/package.json

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