ecrs-auth-core 1.0.81 → 1.0.83

package/dist/auth.controller.d.ts

@@ -1,9 +1,11 @@
 import { Request } from 'express';
+import { JwtService } from '@nestjs/jwt';
 import { AuthService } from './auth.service';
 import { LoginDto } from './dtos/login.dto';
 export declare class AuthController {
     private readonly authService;
-    constructor(authService: AuthService);
+    private readonly jwtService;
+    constructor(authService: AuthService, jwtService: JwtService);
     login(request: Request, body: LoginDto): Promise<{
         status: boolean;
         message: string;
@@ -39,7 +41,6 @@ export declare class AuthController {
         data: {
             user: {
                 id: any;
-                email: any;
                 logoutTime: string;
             };
         };

package/dist/auth.controller.js

@@ -14,13 +14,15 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthController = void 0;
 const common_1 = require("@nestjs/common");
+const jwt_1 = require("@nestjs/jwt");
 const auth_service_1 = require("./auth.service");
 const login_dto_1 = require("./dtos/login.dto");
 const login_response_dto_1 = require("./dtos/login-response.dto");
 const swagger_1 = require("@nestjs/swagger");
 let AuthController = class AuthController {
-    constructor(authService) {
+    constructor(authService, jwtService) {
         this.authService = authService;
+        this.jwtService = jwtService;
     }
     async login(request, body) {
         // Get client IP from socket/request
@@ -73,36 +75,48 @@ let AuthController = class AuthController {
         return loginResponse;
     }
     async logout(request) {
-        // Get user from JWT token (assuming JwtAuthGuard is applied)
-        const user = request.user;
-        if (!user || !user.id) {
-            throw new common_1.UnauthorizedException('User not authenticated');
+        // Extract JWT token from Authorization header
+        const authHeader = request.headers.authorization;
+        if (!authHeader || !authHeader.startsWith('Bearer ')) {
+            throw new common_1.UnauthorizedException('Missing or invalid Authorization header. Required format: Bearer <token>');
         }
-        console.log(`🚪 Logout request for user ${user.id} (${user.email})`);
+        const token = authHeader.substring(7); // Remove 'Bearer ' prefix
         try {
+            // Decode JWT token to get user ID
+            const payload = this.jwtService.verify(token);
+            const userId = payload.id;
+            if (!userId) {
+                throw new common_1.UnauthorizedException('Invalid token - no user ID found');
+            }
+            console.log(`🚪 Logout request for user ${userId}`);
             // Update logout details in both tables
             await Promise.all([
-                this.authService.updateLastLoginLogout(user.id).catch((err) => {
+                this.authService.updateLastLoginLogout(userId).catch((err) => {
                     console.error('❌ Error updating logout in tbl_user_last_login:', err.message);
                 }),
-                this.authService.updateLoginLogoutDetailsJson(user.id).catch((err) => {
+                this.authService.updateLoginLogoutDetailsJson(userId).catch((err) => {
                     console.error('❌ Error updating logout in tbl_user_login_details:', err.message);
                 })
             ]);
-            console.log(`✅ User ${user.id} logged out successfully`);
+            console.log(`✅ User ${userId} logged out successfully`);
             return {
                 status: true,
                 message: 'Logout successful',
                 data: {
                     user: {
-                        id: user.id,
-                        email: user.email,
+                        id: userId,
                         logoutTime: new Date().toISOString()
                     }
                 }
             };
         }
         catch (error) {
+            if (error.name === 'TokenExpiredError') {
+                throw new common_1.UnauthorizedException('JWT token has expired');
+            }
+            if (error.name === 'JsonWebTokenError') {
+                throw new common_1.UnauthorizedException('Invalid JWT token');
+            }
             console.error('❌ Error during logout:', error?.message || error);
             throw new common_1.UnauthorizedException('Logout failed');
         }
@@ -260,16 +274,22 @@ __decorate([
     (0, common_1.HttpCode)(200),
     (0, swagger_1.ApiOperation)({
         summary: 'User logout',
-        description: 'Logout user and update session end time'
+        description: 'Logout user and update session end time. Extracts user ID from JWT token in Authorization header.'
     }),
     (0, swagger_1.ApiOkResponse)({
         description: 'Logout successful',
         example: {
             status: true,
-            message: 'Logout successful'
+            message: 'Logout successful',
+            data: {
+                user: {
+                    id: 1,
+                    logoutTime: '2026-01-28T10:30:00.000Z'
+                }
+            }
         }
     }),
-    (0, swagger_1.ApiUnauthorizedResponse)({ description: 'Unauthorized' }),
+    (0, swagger_1.ApiUnauthorizedResponse)({ description: 'Unauthorized - Invalid or missing JWT token' }),
     __param(0, (0, common_1.Req)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
@@ -280,5 +300,6 @@ exports.AuthController = AuthController = __decorate([
     (0, swagger_1.ApiBearerAuth)(),
     (0, swagger_1.ApiExtraModels)(login_dto_1.LoginDto, login_response_dto_1.LoginResponseDto),
     (0, common_1.Controller)('auth'),
-    __metadata("design:paramtypes", [auth_service_1.AuthService])
+    __metadata("design:paramtypes", [auth_service_1.AuthService,
+        jwt_1.JwtService])
 ], AuthController);

package/dist/auth.service.js

@@ -72,18 +72,24 @@ let AuthService = class AuthService {
     }
     async validateUser(email, password, clientIp) {
         const user = await this.userRepo.findOne({ where: { email } });
-        if (!user)
-            return null;
+        if (!user) {
+            throw new common_1.UnauthorizedException('The email address is invalid or not registered.');
+        }
         const isValid = await bcrypt.compare(password, user.password);
-        if (!isValid)
-            return null;
+        if (!isValid) {
+            throw new common_1.UnauthorizedException('The password is incorrect. Please try again.');
+        }
+        ;
+        if (user.status !== 1) {
+            throw new common_1.UnauthorizedException('Your account is inactive. Please contact support.');
+        }
         // console.log(this.ipRestrictionsRepo);
         // Check IP restrictions if provided and repository is available
         if (clientIp && this.ipRestrictionsRepo) {
             const ipAllowed = await this.validateIpRestriction(user.id, clientIp);
             if (!ipAllowed) {
-                // IP restriction exists but doesn't match - return null to block login
-                return null;
+                // IP restriction exists but doesn't match - throw UnauthorizedException to block login
+                throw new common_1.UnauthorizedException('Login denied: Your IP address is not allowed.');
             }
         }
         return user;
@@ -220,7 +226,14 @@ let AuthService = class AuthService {
             console.log(`📝 Last login details saved for user ${user.id} (${loginStatus})`);
         }
         catch (error) {
-            console.error('Error saving last login details:', 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.');
+            }
+            else {
+                console.error('Error saving last login details:', error);
+            }
             // Don't throw error - this shouldn't block login
         }
     }
@@ -307,7 +320,14 @@ let AuthService = class AuthService {
             }
         }
         catch (error) {
-            console.error('Error saving login details JSON:', 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.');
+            }
+            else {
+                console.error('Error saving login details JSON:', error);
+            }
             // Don't throw error - this shouldn't block login
         }
     }
@@ -356,7 +376,13 @@ let AuthService = class AuthService {
             console.log(`🚪 Logout details updated for user ${userId} on ${today.toDateString()}`);
         }
         catch (error) {
-            console.error('Error updating logout details:', 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.');
+            }
+            else {
+                console.error('Error updating logout details:', error);
+            }
             // Don't throw error - this shouldn't block logout
         }
     }
@@ -383,7 +409,13 @@ let AuthService = class AuthService {
             console.log(`🚪 Last login logout time updated for user ${userId}`);
         }
         catch (error) {
-            console.error('Error updating last login logout time:', 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.');
+            }
+            else {
+                console.error('Error updating last login logout time:', error);
+            }
             // Don't throw error - this shouldn't block logout
         }
     }
@@ -462,6 +494,10 @@ let AuthService = class AuthService {
             lastLoginTime: lastLoginTime,
             is_reset_password: is_reset_password,
         };
+        // Generate JWT token
+        const accessToken = this.jwtService.sign(payload);
+        // Update user's apiToken in the database
+        await this.userRepo.update({ id: user.id }, { apiToken: accessToken });
         return {
             status: true,
             message: 'Login successful',
@@ -489,7 +525,7 @@ let AuthService = class AuthService {
                     profile_photo_url: `${this.uploadPhotoDir}/${user.userImage}`,
                 },
             },
-            access_token: this.jwtService.sign(payload),
+            access_token: accessToken,
         };
     }
     /**

package/dist/jwt/jwt.strategy.js

@@ -34,6 +34,10 @@ let JwtStrategy = class JwtStrategy extends (0, passport_1.PassportStrategy)(pas
             console.log(`✅ User ${user.id} has access to module ${payload.moduleId}`);
         }
         console.log(`✅ JWT validated for user ${user.id}`);
+        if (user.status !== 1) {
+            console.log(`❌ User ${user.id} is not active`);
+            throw new common_1.UnauthorizedException('Your account is inactive. Please contact support.');
+        }
         return {
             id: user.id,
             email: user.email,

package/package.json

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