ecrs-auth-core 1.0.108 → 1.0.112

package/dist/auth.service.d.ts

@@ -1,6 +1,6 @@
-import { JwtService } from '@nestjs/jwt';
-import { AuthCoreOptions } from './interfaces/auth-core-options.interface';
-import { User } from './entities/user.entity';
+import { JwtService } from "@nestjs/jwt";
+import { AuthCoreOptions } from "./interfaces/auth-core-options.interface";
+import { User } from "./entities/user.entity";
 export type RoutePermissionSet = {
     view?: boolean;
     create?: boolean;
@@ -44,7 +44,7 @@ export declare class AuthService {
      * Save user last login details
      * Updates the tbl_user_last_login table with latest login info
      */
-    saveLastLogin(user: User, clientIp: string, loginStatus?: 'success' | 'failed' | 'blocked', failureReason?: string, additionalData?: {
+    saveLastLogin(user: User, clientIp: string, loginStatus?: "success" | "failed" | "blocked", failureReason?: string, additionalData?: {
         browser?: string;
         deviceType?: string;
         operatingSystem?: string;
@@ -59,7 +59,7 @@ export declare class AuthService {
      * If a record exists for the user on the same date, update it
      * Otherwise, create a new record
      */
-    saveLoginDetailsJson(user: User, clientIp: string, loginStatus?: 'success' | 'failed' | 'blocked', failureReason?: string, additionalData?: {
+    saveLoginDetailsJson(user: User, clientIp: string, loginStatus?: "success" | "failed" | "blocked", failureReason?: string, additionalData?: {
         browser?: string;
         deviceType?: string;
         operatingSystem?: string;

package/dist/auth.service.js

@@ -55,7 +55,7 @@ let AuthService = class AuthService {
     constructor(jwtService, options) {
         this.jwtService = jwtService;
         this.options = options;
-        this.uploadPhotoDir = 'uploads/organization/photos';
+        this.uploadPhotoDir = "uploads/organization/photos";
         const { repositories } = options;
         this.userRepo = repositories.userRepo;
         this.roleRepo = repositories.roleRepo;
@@ -75,12 +75,17 @@ let AuthService = class AuthService {
         // Guard: reject missing or oversized inputs before any DB/bcrypt work.
         // Oversized passwords cause bcrypt to hang (DoS); oversized emails are never valid.
         if (!email || !password || password.length > 72 || email.length > 254) {
-            throw new common_1.UnauthorizedException('Invalid credentials');
+            throw new common_1.UnauthorizedException("Invalid credentials");
         }
         // Normalize email for consistent comparison, then use ILike so the DB
         // matches regardless of how the email was originally stored (mixed/upper/lower).
         const normalizedEmail = email.trim().toLowerCase();
-        const whereClause = { email: (0, typeorm_1.ILike)(normalizedEmail), deletedBy: null, deletedAt: null, status: 1 };
+        const whereClause = {
+            email: (0, typeorm_1.ILike)(normalizedEmail),
+            deletedBy: (0, typeorm_1.IsNull)(),
+            deletedAt: (0, typeorm_1.IsNull)(),
+            status: 1,
+        };
         //role-id
         //1-"Superadmin" 2-"Admin" 3-"Employee" 5-"CUSTOMER_BOOKER" 6-"SECURITY" 7-"SUPPLIER"
         //module-id
@@ -102,15 +107,21 @@ let AuthService = class AuthService {
         // const DUMMY_HASH = '$2b$10$abcdefghijklmnopqrstuuABCDEFGHIJKLMNOPQRSTUVWXYZ012345';
         // const hashToCompare = user?.password ?? DUMMY_HASH;
         // const isValid = await bcrypt.compare(password, hashToCompare);
-        const isValid = user ? await bcrypt.compare(password, user.password) : false;
+        // console.log(`🔐 Comparing password for user ${user?.id}`);
+        // console.log(`🔐 Comparing password for user ${user?.password}`);
+        const isValid = user
+            ? await bcrypt.compare(password, user.password)
+            : false;
         // Single generic message — never reveal whether the email exists
         if (!user || !isValid) {
-            throw new common_1.UnauthorizedException('Invalid credentials');
+            console.log(`🔍 Validating user with email: ${normalizedEmail}, moduleId: ${moduleId}, whereClause:`, whereClause);
+            console.log(`🔐 Comparing password for user ${user?.id}`);
+            throw new common_1.UnauthorizedException("Invalid credentials");
         }
         if (clientIp && this.ipRestrictionsRepo) {
             const ipAllowed = await this.validateIpRestriction(user.id, clientIp);
             if (!ipAllowed) {
-                throw new common_1.UnauthorizedException('Login not allowed from this IP address');
+                throw new common_1.UnauthorizedException("Login not allowed from this IP address");
             }
         }
         return user;
@@ -128,17 +139,17 @@ let AuthService = class AuthService {
     normalizeIp(ip) {
         // Remove descriptive text if present (e.g., "IPv4 Address. . . . . . : 192.167.0.173")
         let cleanIp = ip.trim();
-        if (cleanIp.includes(':')) {
-            const parts = cleanIp.split(':');
+        if (cleanIp.includes(":")) {
+            const parts = cleanIp.split(":");
             cleanIp = parts[parts.length - 1].trim();
         }
         // Convert IPv6-mapped IPv4 addresses (::ffff:x.x.x.x) to plain IPv4 (x.x.x.x)
-        if (cleanIp.startsWith('::ffff:')) {
+        if (cleanIp.startsWith("::ffff:")) {
             return cleanIp.substring(7);
         }
         // Also handle other IPv6 prefixes
-        if (cleanIp.startsWith('::1')) {
-            return '127.0.0.1'; // IPv6 loopback to IPv4 loopback
+        if (cleanIp.startsWith("::1")) {
+            return "127.0.0.1"; // IPv6 loopback to IPv4 loopback
         }
         return cleanIp;
     }
@@ -151,11 +162,11 @@ let AuthService = class AuthService {
             // Normalize the incoming IP
             const normalizedRequestIp = this.normalizeIp(requestIp);
             // Get all active IP restrictions for this user
-            const restrictions = await this.ipRestrictionsRepo.find({
+            const restrictions = (await this.ipRestrictionsRepo.find({
                 where: {
                     user_id: userId,
                 },
-            });
+            }));
             // If no restrictions exist, allow login
             if (!restrictions || restrictions.length === 0) {
                 console.log(`✅ User ${userId}: No IP restrictions configured - Allow login`);
@@ -173,16 +184,18 @@ let AuthService = class AuthService {
                 return true;
             }
             // IP doesn't match any allowed IP
-            const allowedIps = restrictions.map((r) => {
+            const allowedIps = restrictions
+                .map((r) => {
                 const ip = r.allowed_ip_address || r.ip_address;
                 return this.normalizeIp(ip);
-            }).join(', ');
+            })
+                .join(", ");
             console.log(`❌ User ${userId}: IP ${requestIp} (normalized: ${normalizedRequestIp}) does not match allowed IPs - Deny login`);
             console.log(`   Allowed IPs: ${allowedIps}`);
             return false;
         }
         catch (error) {
-            console.error('Error validating IP restriction:', error);
+            console.error("Error validating IP restriction:", error);
             // On error, allow login (fail open)
             return true;
         }
@@ -199,13 +212,13 @@ let AuthService = class AuthService {
        AND status = 1
        AND is_deleted = 0
        LIMIT 1`, [userId, moduleId]);
-            console.log('Raw Query Result:', result);
+            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'}`);
+            console.log(`📊 Module access check result for user ID ${userId} and module ID ${moduleId}: ${allowed ? "Allowed" : "Denied"}`);
             return allowed;
         }
         catch (error) {
-            console.error('❌ Error checking module access:', error);
+            console.error("❌ Error checking module access:", error);
             return false;
         }
     }
@@ -217,10 +230,10 @@ let AuthService = class AuthService {
      * Save user last login details
      * Updates the tbl_user_last_login table with latest login info
      */
-    async saveLastLogin(user, clientIp, loginStatus = 'success', failureReason, additionalData) {
+    async saveLastLogin(user, clientIp, loginStatus = "success", failureReason, additionalData) {
         if (!this.userLastLoginRepo) {
             // Last login tracking not configured
-            console.warn('⚠️ userLastLoginRepo not configured. Add loginDetailsRepo to AuthCoreModule repositories.');
+            console.warn("⚠️ userLastLoginRepo not configured. Add loginDetailsRepo to AuthCoreModule repositories.");
             return;
         }
         try {
@@ -262,13 +275,13 @@ let AuthService = class AuthService {
             console.log(`📝 Last login details saved for user ${user.id} (${loginStatus})`);
         }
         catch (error) {
-            if (error?.message?.includes('No metadata')) {
-                console.error('❌ ERROR: UserLastLoginEntity is not registered in your TypeORM configuration.\n' +
-                    'Please see ENTITY_SETUP_GUIDE.md for setup instructions.\n' +
-                    'Entity must be added to TypeOrmModule.forRoot(entities: [...]) in your app.');
+            if (error?.message?.includes("No metadata")) {
+                console.error("❌ ERROR: UserLastLoginEntity is not registered in your TypeORM configuration.\n" +
+                    "Please see ENTITY_SETUP_GUIDE.md for setup instructions.\n" +
+                    "Entity must be added to TypeOrmModule.forRoot(entities: [...]) in your app.");
             }
             else {
-                console.error('Error saving last login details:', error);
+                console.error("Error saving last login details:", error);
             }
             // Don't throw error - this shouldn't block login
         }
@@ -278,10 +291,10 @@ let AuthService = class AuthService {
      * If a record exists for the user on the same date, update it
      * Otherwise, create a new record
      */
-    async saveLoginDetailsJson(user, clientIp, loginStatus = 'success', failureReason, additionalData) {
+    async saveLoginDetailsJson(user, clientIp, loginStatus = "success", failureReason, additionalData) {
         if (!this.loginDetailsRepo) {
             // Login details tracking not configured
-            console.warn('⚠️ loginDetailsRepo not configured. Add loginDetailsRepo to AuthCoreModule repositories.');
+            console.warn("⚠️ loginDetailsRepo not configured. Add loginDetailsRepo to AuthCoreModule repositories.");
             return;
         }
         try {
@@ -320,10 +333,10 @@ let AuthService = class AuthService {
                 // Append new login detail
                 loginData.push(loginDetailData);
                 // Update counters
-                if (loginStatus === 'success') {
+                if (loginStatus === "success") {
                     successCount++;
                 }
-                else if (loginStatus === 'failed' || loginStatus === 'blocked') {
+                else if (loginStatus === "failed" || loginStatus === "blocked") {
                     failedCount++;
                 }
                 await this.loginDetailsRepo.update({ id: existingRecord.id }, {
@@ -338,8 +351,9 @@ let AuthService = class AuthService {
             else {
                 // Create new record
                 loginData = [loginDetailData];
-                successCount = loginStatus === 'success' ? 1 : 0;
-                failedCount = loginStatus === 'failed' || loginStatus === 'blocked' ? 1 : 0;
+                successCount = loginStatus === "success" ? 1 : 0;
+                failedCount =
+                    loginStatus === "failed" || loginStatus === "blocked" ? 1 : 0;
                 const newLoginDetails = this.loginDetailsRepo.create({
                     user_id: user.id,
                     date: today,
@@ -356,13 +370,13 @@ let AuthService = class AuthService {
             }
         }
         catch (error) {
-            if (error?.message?.includes('No metadata')) {
-                console.error('❌ ERROR: LoginDetailsEntity is not registered in your TypeORM configuration.\n' +
-                    'Please see ENTITY_SETUP_GUIDE.md for setup instructions.\n' +
-                    'Entity must be added to TypeOrmModule.forRoot(entities: [...]) in your app.');
+            if (error?.message?.includes("No metadata")) {
+                console.error("❌ ERROR: LoginDetailsEntity is not registered in your TypeORM configuration.\n" +
+                    "Please see ENTITY_SETUP_GUIDE.md for setup instructions.\n" +
+                    "Entity must be added to TypeOrmModule.forRoot(entities: [...]) in your app.");
             }
             else {
-                console.error('Error saving login details JSON:', error);
+                console.error("Error saving login details JSON:", error);
             }
             // Don't throw error - this shouldn't block login
         }
@@ -412,12 +426,12 @@ let AuthService = class AuthService {
             console.log(`🚪 Logout details updated for user ${userId} on ${today.toDateString()}`);
         }
         catch (error) {
-            if (error?.message?.includes('No metadata')) {
-                console.error('❌ ERROR: LoginDetailsEntity is not registered in your TypeORM configuration.\n' +
-                    'Please see ENTITY_SETUP_GUIDE.md for setup instructions.');
+            if (error?.message?.includes("No metadata")) {
+                console.error("❌ ERROR: LoginDetailsEntity is not registered in your TypeORM configuration.\n" +
+                    "Please see ENTITY_SETUP_GUIDE.md for setup instructions.");
             }
             else {
-                console.error('Error updating logout details:', error);
+                console.error("Error updating logout details:", error);
             }
             // Don't throw error - this shouldn't block logout
         }
@@ -445,12 +459,12 @@ let AuthService = class AuthService {
             console.log(`🚪 Last login logout time updated for user ${userId}`);
         }
         catch (error) {
-            if (error?.message?.includes('No metadata')) {
-                console.error('❌ ERROR: UserLastLoginEntity is not registered in your TypeORM configuration.\n' +
-                    'Please see ENTITY_SETUP_GUIDE.md for setup instructions.');
+            if (error?.message?.includes("No metadata")) {
+                console.error("❌ ERROR: UserLastLoginEntity is not registered in your TypeORM configuration.\n" +
+                    "Please see ENTITY_SETUP_GUIDE.md for setup instructions.");
             }
             else {
-                console.error('Error updating last login logout time:', error);
+                console.error("Error updating last login logout time:", error);
             }
             // Don't throw error - this shouldn't block logout
         }
@@ -461,7 +475,9 @@ let AuthService = class AuthService {
         console.log(`📊 Loaded permissions for user ID ${user.id}:`, permissionTree);
         const role = await this.roleRepo.findOne({ where: { id: user.roleId } });
         const roleName = role?.roleName || null;
-        const effectiveModuleId = Number.isFinite(selectedModuleId) ? selectedModuleId : user.moduleId ?? null;
+        const effectiveModuleId = Number.isFinite(selectedModuleId)
+            ? selectedModuleId
+            : (user.moduleId ?? null);
         // Fetch workprofile/employee details from EmployeeWorkProfileEntity
         let branchId = null;
         let dispatchCenterId = null;
@@ -480,7 +496,7 @@ let AuthService = class AuthService {
                 }
             }
             catch (error) {
-                console.error('Error fetching work profile:', error);
+                console.error("Error fetching work profile:", error);
                 // Continue with null values if fetch fails
             }
         }
@@ -492,14 +508,14 @@ let AuthService = class AuthService {
             try {
                 const lastLogin = await this.userLastLoginRepo.findOne({
                     where: { user_id: user.id },
-                    order: { login_time: 'DESC' },
+                    order: { login_time: "DESC" },
                 });
                 if (lastLogin) {
                     lastLoginTime = lastLogin?.login_time || null;
                 }
             }
             catch (error) {
-                console.error('Error fetching last login details:', error);
+                console.error("Error fetching last login details:", error);
                 // Continue with null values if fetch fails
             }
         }
@@ -535,7 +551,7 @@ let AuthService = class AuthService {
         };
         return {
             status: true,
-            message: 'Login successful',
+            message: "Login successful",
             data: {
                 user: {
                     id: user.id,
@@ -571,7 +587,7 @@ let AuthService = class AuthService {
      */
     extractUserIpv4(clientIp) {
         if (!clientIp)
-            return '';
+            return "";
         return this.normalizeIp(clientIp);
     }
     async findUserById(id) {
@@ -582,11 +598,11 @@ let AuthService = class AuthService {
         if (this.userLastLoginRepo) {
             try {
                 const result = await this.userLastLoginRepo
-                    .createQueryBuilder('login')
-                    .select('login.login_time', 'login_time')
-                    .where('login.user_id = :userId', { userId })
-                    .andWhere('login.logout_time IS NULL')
-                    .orderBy('login.login_time', 'DESC')
+                    .createQueryBuilder("login")
+                    .select("login.login_time", "login_time")
+                    .where("login.user_id = :userId", { userId })
+                    .andWhere("login.logout_time IS NULL")
+                    .orderBy("login.login_time", "DESC")
                     .limit(1)
                     .getRawOne();
                 if (result) {
@@ -594,7 +610,7 @@ let AuthService = class AuthService {
                 }
             }
             catch (error) {
-                console.error('Error fetching last login details:', error);
+                console.error("Error fetching last login details:", error);
                 // Continue with null values if fetch fails
             }
         }
@@ -610,7 +626,7 @@ let AuthService = class AuthService {
             }
         }
         catch (error) {
-            console.error('Error updating last activity:', error);
+            console.error("Error updating last activity:", error);
         }
     }
     // private async loadPermissions(userId: number): Promise<PermissionsTree> {

package/dist/entities/user-customer.entity.js

@@ -54,7 +54,7 @@ __decorate([
     __metadata("design:type", String)
 ], UserCustomer.prototype, "userImage", void 0);
 __decorate([
-    (0, typeorm_1.Column)(),
+    (0, typeorm_1.Column)({ type: "int" }),
     __metadata("design:type", Number)
 ], UserCustomer.prototype, "roleId", void 0);
 __decorate([
@@ -115,15 +115,15 @@ __decorate([
     __metadata("design:type", Number)
 ], UserCustomer.prototype, "token_version", void 0);
 __decorate([
-    (0, typeorm_1.Column)(),
+    (0, typeorm_1.Column)({ type: "int" }),
     __metadata("design:type", Number)
 ], UserCustomer.prototype, "createdBy", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
+    (0, typeorm_1.Column)({ type: "int", nullable: true }),
     __metadata("design:type", Number)
 ], UserCustomer.prototype, "updatedBy", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
+    (0, typeorm_1.Column)({ type: "int", nullable: true }),
     __metadata("design:type", Object)
 ], UserCustomer.prototype, "deletedBy", void 0);
 __decorate([

package/package.json

@@ -1,52 +1,52 @@
-{
-  "name": "ecrs-auth-core",
-  "version": "1.0.108",
-  "description": "Centralized authentication and authorization module for ECRS apps",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "files": [
-    "dist"
-  ],
-  "scripts": {
-    "build": "tsc -p tsconfig.json"
-  },
-  "keywords": [
-    "nestjs",
-    "auth",
-    "jwt",
-    "module",
-    "ecrs"
-  ],
-  "author": "Chetan Yadnik",
-  "license": "MIT",
-  "peerDependencies": {
-    "@nestjs/common": "^10.2.7 || ^11.0.0",
-    "@nestjs/core": "^10.2.7 || ^11.0.0",
-    "@nestjs/passport": "^10.0.3 || ^11.0.0",
-    "bcrypt": "^5.1.1",
-    "passport": "^0.6.0",
-    "passport-jwt": "^4.0.1",
-    "typeorm": "^0.3.25"
-  },
-  "dependencies": {
-    "@nestjs/jwt": "^11.0.0",
-    "@nestjs/swagger": "^7.1.14",
-    "@nestjs/typeorm": "^11.0.0",
-    "axios": "^1.16.1",
-    "class-transformer": "^0.5.1",
-    "class-validator": "^0.14.3",
-    "jsonwebtoken": "^9.0.2",
-    "rxjs": "^7.8.1",
-    "swagger-ui-express": "^5.0.0"
-  },
-  "devDependencies": {
-    "@nestjs/common": "^10.2.7",
-    "@nestjs/core": "^10.2.7",
-    "@nestjs/passport": "^10.0.3",
-    "@types/bcrypt": "^6.0.0",
-    "@types/passport-jwt": "^4.0.1",
-    "reflect-metadata": "^0.1.13",
-    "typeorm": "^0.3.17",
-    "typescript": "^5.8.3"
-  }
-}
+{
+  "name": "ecrs-auth-core",
+  "version": "1.0.112",
+  "description": "Centralized authentication and authorization module for ECRS apps",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "build": "tsc -p tsconfig.json"
+  },
+  "keywords": [
+    "nestjs",
+    "auth",
+    "jwt",
+    "module",
+    "ecrs"
+  ],
+  "author": "Chetan Yadnik",
+  "license": "MIT",
+  "peerDependencies": {
+    "@nestjs/common": "^10.2.7 || ^11.0.0",
+    "@nestjs/core": "^10.2.7 || ^11.0.0",
+    "@nestjs/passport": "^10.0.3 || ^11.0.0",
+    "bcrypt": "^5.1.1",
+    "passport": "^0.6.0",
+    "passport-jwt": "^4.0.1",
+    "typeorm": "^0.3.25"
+  },
+  "dependencies": {
+    "@nestjs/jwt": "^11.0.0",
+    "@nestjs/swagger": "^7.1.14",
+    "@nestjs/typeorm": "^11.0.0",
+    "axios": "^1.16.1",
+    "class-transformer": "^0.5.1",
+    "class-validator": "^0.14.3",
+    "jsonwebtoken": "^9.0.2",
+    "rxjs": "^7.8.1",
+    "swagger-ui-express": "^5.0.0"
+  },
+  "devDependencies": {
+    "@nestjs/common": "^10.2.7",
+    "@nestjs/core": "^10.2.7",
+    "@nestjs/passport": "^10.0.3",
+    "@types/bcrypt": "^6.0.0",
+    "@types/passport-jwt": "^4.0.1",
+    "reflect-metadata": "^0.1.13",
+    "typeorm": "^0.3.17",
+    "typescript": "^5.8.3"
+  }
+}