ecrs-auth-core 1.0.102 → 1.0.103

package/dist/auth.controller.js

@@ -32,7 +32,7 @@ let AuthController = class AuthController {
         const additionalData = this.extractClientData(request, userAgent);
         console.log(`📍 Login attempt from IP: ${clientIp}, User-Agent: ${userAgent}`);
         // Validate user with IP restriction check
-        const user = await this.authService.validateUser(body.email, body.password, clientIp);
+        const user = await this.authService.validateUser(body.email, body.password, clientIp, Number(body.moduleId));
         if (!user) {
             // Save failed login attempt to both tables
             await this.authService.saveLastLogin({ email: body.email }, clientIp, 'failed', 'Invalid credentials or IP not allowed', additionalData).catch((err) => {

package/dist/auth.service.d.ts

@@ -25,7 +25,7 @@ export declare class AuthService {
     private readonly employeeWorkProfileRepo;
     private uploadPhotoDir;
     constructor(jwtService: JwtService, options: AuthCoreOptions);
-    validateUser(email: string, password: string, clientIp?: string): Promise<User>;
+    validateUser(email: string, password: string, clientIp?: string, moduleId?: number): Promise<User>;
     /**
      * Validate IP restriction for a user
      *

package/dist/auth.service.js

@@ -49,6 +49,7 @@ exports.AuthService = void 0;
 const common_1 = require("@nestjs/common");
 const jwt_1 = require("@nestjs/jwt");
 const bcrypt = __importStar(require("bcrypt"));
+const typeorm_1 = require("typeorm");
 const constants_1 = require("./constants/constants");
 let AuthService = class AuthService {
     constructor(jwtService, options) {
@@ -70,8 +71,25 @@ let AuthService = class AuthService {
         this.loginDetailsRepo = repositories.loginDetailsRepo || null;
         this.employeeWorkProfileRepo = repositories.employeeWorkProfileRepo || null;
     }
-    async validateUser(email, password, clientIp) {
-        const user = await this.userRepo.findOne({ where: { email } });
+    async validateUser(email, password, clientIp, moduleId) {
+        const whereClause = { email, deletedBy: null, deletedAt: null };
+        //role-id
+        //1-"Superadmin" 2-"Admin" 3-"Employee" 5-"CUSTOMER_BOOKER" 6-"SECURITY" 7-"SUPPLIER"
+        //module-id
+        // 1	"HR" , 2	"ETS" ,3	"Spot",4	"Account",5	"Superadmin",6	"Vendor",7	"Customer"
+        const modulearray = [1, 2, 3, 4, 5];
+        if (moduleId === 7) {
+            // Customer module: allow CUSTOMER_BOOKER(5), SECURITY(6), SUPPLIER(7)
+            whereClause.roleId = (0, typeorm_1.In)([5, 1, 2]);
+        }
+        else if (moduleId === 6) {
+            // vendor module: allow CUSTOMER_BOOKER(5), SECURITY(6), SUPPLIER(7)
+            whereClause.roleId = (0, typeorm_1.In)([7, 1, 2]);
+        }
+        else if (moduleId !== undefined && modulearray.includes(moduleId)) {
+            whereClause.roleId = (0, typeorm_1.In)([1, 2, 3]);
+        }
+        const user = await this.userRepo.findOne({ where: whereClause });
         if (!user) {
             throw new common_1.UnauthorizedException('Invalid email');
         }

package/package.json

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