ecrs-auth-core 1.0.80 → 1.0.81

package/dist/auth.controller.d.ts

@@ -27,12 +27,23 @@ export declare class AuthController {
                 departmentId: any;
                 designationId: any;
                 lastLoginTime: any;
-                is_otp_verified: number | boolean;
+                is_reset_password: number;
                 profile_photo_url: string;
             };
         };
         access_token: string;
     }>;
+    logout(request: any): Promise<{
+        status: boolean;
+        message: string;
+        data: {
+            user: {
+                id: any;
+                email: any;
+                logoutTime: string;
+            };
+        };
+    }>;
     /**
      * Extract additional client data from request and user-agent
      */

package/dist/auth.controller.js

@@ -72,6 +72,41 @@ let AuthController = class AuthController {
         }); // Log errors for debugging
         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');
+        }
+        console.log(`🚪 Logout request for user ${user.id} (${user.email})`);
+        try {
+            // Update logout details in both tables
+            await Promise.all([
+                this.authService.updateLastLoginLogout(user.id).catch((err) => {
+                    console.error('❌ Error updating logout in tbl_user_last_login:', err.message);
+                }),
+                this.authService.updateLoginLogoutDetailsJson(user.id).catch((err) => {
+                    console.error('❌ Error updating logout in tbl_user_login_details:', err.message);
+                })
+            ]);
+            console.log(`✅ User ${user.id} logged out successfully`);
+            return {
+                status: true,
+                message: 'Logout successful',
+                data: {
+                    user: {
+                        id: user.id,
+                        email: user.email,
+                        logoutTime: new Date().toISOString()
+                    }
+                }
+            };
+        }
+        catch (error) {
+            console.error('❌ Error during logout:', error?.message || error);
+            throw new common_1.UnauthorizedException('Logout failed');
+        }
+    }
     /**
      * Extract additional client data from request and user-agent
      */
@@ -139,11 +174,6 @@ let AuthController = class AuthController {
     getClientIp(request) {
         let ip = '';
         // Check X-Forwarded-For header (most common with proxies)
-        // console.log('Headers:', request.headers);
-        console.log('Request IP:', request.headers['x-forwarded-for']);
-        console.log('Real IP:', request.headers['x-real-ip']);
-        console.log('CF IP:', request.headers['cf-connecting-ip']);
-        console.log('socket Address IP:', request.socket.remoteAddress);
         const xForwardedFor = request.headers['x-forwarded-for'];
         if (xForwardedFor) {
             const ips = Array.isArray(xForwardedFor)
@@ -225,6 +255,26 @@ __decorate([
     __metadata("design:paramtypes", [Object, login_dto_1.LoginDto]),
     __metadata("design:returntype", Promise)
 ], AuthController.prototype, "login", null);
+__decorate([
+    (0, common_1.Post)('logout'),
+    (0, common_1.HttpCode)(200),
+    (0, swagger_1.ApiOperation)({
+        summary: 'User logout',
+        description: 'Logout user and update session end time'
+    }),
+    (0, swagger_1.ApiOkResponse)({
+        description: 'Logout successful',
+        example: {
+            status: true,
+            message: 'Logout successful'
+        }
+    }),
+    (0, swagger_1.ApiUnauthorizedResponse)({ description: 'Unauthorized' }),
+    __param(0, (0, common_1.Req)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], AuthController.prototype, "logout", null);
 exports.AuthController = AuthController = __decorate([
     (0, swagger_1.ApiTags)('auth'),
     (0, swagger_1.ApiBearerAuth)(),

package/dist/auth.service.d.ts

@@ -107,7 +107,7 @@ export declare class AuthService {
                 departmentId: any;
                 designationId: any;
                 lastLoginTime: any;
-                is_otp_verified: number | boolean;
+                is_reset_password: number;
                 profile_photo_url: string;
             };
         };

package/dist/auth.service.js

@@ -54,7 +54,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;
@@ -433,6 +433,13 @@ let AuthService = class AuthService {
                 // Continue with null values if fetch fails
             }
         }
+        let is_reset_password = 0;
+        if (user.isOtpVerified === 0 || user.isOtpVerified == 0) {
+            is_reset_password = 1;
+        }
+        else {
+            is_reset_password = 0;
+        }
         const payload = {
             id: user.id,
             email: user.email,
@@ -453,7 +460,7 @@ let AuthService = class AuthService {
             departmentId,
             designationId,
             lastLoginTime: lastLoginTime,
-            is_otp_verified: user.isOtpVerified || false,
+            is_reset_password: is_reset_password,
         };
         return {
             status: true,
@@ -478,8 +485,8 @@ let AuthService = class AuthService {
                     departmentId,
                     designationId,
                     lastLoginTime: lastLoginTime,
-                    is_otp_verified: user.isOtpVerified || false,
-                    profile_photo_url: `${this.uploadPhotoDir}`,
+                    is_reset_password: is_reset_password,
+                    profile_photo_url: `${this.uploadPhotoDir}/${user.userImage}`,
                 },
             },
             access_token: this.jwtService.sign(payload),

package/package.json

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