ecrs-auth-core 1.0.72 → 1.0.74

package/dist/auth.controller.d.ts

@@ -26,6 +26,8 @@ export declare class AuthController {
                 dispatchCenterId: any;
                 departmentId: any;
                 designationId: any;
+                lastLoginTime: any;
+                is_otp_verified: number | boolean;
                 profile_photo_url: string;
             };
         };

package/dist/auth.controller.js

@@ -124,6 +124,11 @@ let AuthController = class AuthController {
     getClientIp(request) {
         // Check X-Forwarded-For header (most common with proxies)
         const xForwardedFor = request.headers['x-forwarded-for'];
+        console.log('X-Forwarded-For header:', xForwardedFor);
+        console.log('Request IP:', request.ip);
+        console.log('Socket Remote Address:', request.socket.remoteAddress);
+        console.log('X-Real-IP header:', request.headers['x-real-ip']);
+        console.log('CF-Connecting-IP header:', request.headers['cf-connecting-ip']);
         if (xForwardedFor) {
             const ips = Array.isArray(xForwardedFor)
                 ? xForwardedFor

package/dist/auth.service.d.ts

@@ -81,6 +81,8 @@ export declare class AuthService {
                 dispatchCenterId: any;
                 departmentId: any;
                 designationId: any;
+                lastLoginTime: any;
+                is_otp_verified: number | boolean;
                 profile_photo_url: string;
             };
         };

package/dist/auth.service.js

@@ -213,7 +213,7 @@ let AuthService = class AuthService {
         let dispatchCenterId = null;
         let departmentId = null;
         let designationId = null;
-        if (this.employeeWorkProfileRepo) {
+        if (this.employeeWorkProfileRepo && user.referenceId != null) {
             try {
                 const workProfile = await this.employeeWorkProfileRepo.findOne({
                     where: { employee_id: user.referenceId },
@@ -230,6 +230,25 @@ let AuthService = class AuthService {
                 // Continue with null values if fetch fails
             }
         }
+        // Fetch last login details
+        let lastLoginTime = null;
+        let lastLoginStatus = null;
+        let lastLoginIpAddress = null;
+        if (this.userLastLoginRepo) {
+            try {
+                const lastLogin = await this.userLastLoginRepo.findOne({
+                    where: { user_id: user.id },
+                    order: { login_time: 'DESC' },
+                });
+                if (lastLogin) {
+                    lastLoginTime = lastLogin?.login_time || null;
+                }
+            }
+            catch (error) {
+                console.error('Error fetching last login details:', error);
+                // Continue with null values if fetch fails
+            }
+        }
         const payload = {
             id: user.id,
             email: user.email,
@@ -249,6 +268,8 @@ let AuthService = class AuthService {
             dispatchCenterId,
             departmentId,
             designationId,
+            lastLoginTime: lastLoginTime,
+            is_otp_verified: user.isOtpVerified || false,
         };
         return {
             status: true,
@@ -272,6 +293,8 @@ let AuthService = class AuthService {
                     dispatchCenterId,
                     departmentId,
                     designationId,
+                    lastLoginTime: lastLoginTime,
+                    is_otp_verified: user.isOtpVerified || false,
                     profile_photo_url: `${this.uploadPhotoDir}`,
                 },
             },

package/dist/entities/work-profile.entity.js

@@ -47,19 +47,19 @@ __decorate([
     __metadata("design:type", Number)
 ], EmployeeWorkProfileEntity.prototype, "id", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ name: 'employee_id', type: 'int' }),
+    (0, typeorm_1.Column)({ name: 'employee_id', type: 'int', nullable: true }),
     __metadata("design:type", Number)
 ], EmployeeWorkProfileEntity.prototype, "employee_id", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ name: 'department_id', type: 'int' }),
+    (0, typeorm_1.Column)({ name: 'department_id', type: 'int', nullable: true }),
     __metadata("design:type", Number)
 ], EmployeeWorkProfileEntity.prototype, "department_id", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ name: 'designation_id', type: 'int' }),
+    (0, typeorm_1.Column)({ name: 'designation_id', type: 'int', nullable: true }),
     __metadata("design:type", Number)
 ], EmployeeWorkProfileEntity.prototype, "designation_id", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'enum', enum: EmployeeType, nullable: false }),
+    (0, typeorm_1.Column)({ type: 'enum', enum: EmployeeType, nullable: true }),
     __metadata("design:type", String)
 ], EmployeeWorkProfileEntity.prototype, "employee_type", void 0);
 __decorate([
@@ -76,7 +76,7 @@ __decorate([
     __metadata("design:type", Number)
 ], EmployeeWorkProfileEntity.prototype, "shift_id", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ name: 'role_id', type: 'int' }),
+    (0, typeorm_1.Column)({ name: 'role_id', type: 'int', nullable: true }),
     __metadata("design:type", Number)
 ], EmployeeWorkProfileEntity.prototype, "role_id", void 0);
 __decorate([
@@ -92,7 +92,7 @@ __decorate([
     __metadata("design:type", Object)
 ], EmployeeWorkProfileEntity.prototype, "l2_manager_id", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'date', nullable: false }),
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
     __metadata("design:type", Date)
 ], EmployeeWorkProfileEntity.prototype, "joining_date", void 0);
 __decorate([
@@ -108,14 +108,14 @@ __decorate([
     __metadata("design:type", Number)
 ], EmployeeWorkProfileEntity.prototype, "dispatch_center_id", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ name: 'cost_center_id', type: 'int' }),
+    (0, typeorm_1.Column)({ name: 'cost_center_id', type: 'int', nullable: true }),
     __metadata("design:type", Number)
 ], EmployeeWorkProfileEntity.prototype, "cost_center_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({
         type: 'enum',
         enum: WeekOffType,
-        nullable: false,
+        nullable: true,
     }),
     __metadata("design:type", String)
 ], EmployeeWorkProfileEntity.prototype, "week_off_type", void 0);
@@ -123,7 +123,7 @@ __decorate([
     (0, typeorm_1.Column)({
         type: 'enum',
         enum: WeekOffBasedOn,
-        nullable: false,
+        nullable: true,
     }),
     __metadata("design:type", String)
 ], EmployeeWorkProfileEntity.prototype, "week_off_based_on", void 0);
@@ -136,7 +136,7 @@ __decorate([
     __metadata("design:type", String)
 ], EmployeeWorkProfileEntity.prototype, "linkedInProfile", void 0);
 __decorate([
-    (0, typeorm_1.CreateDateColumn)({ type: 'timestamp' }),
+    (0, typeorm_1.CreateDateColumn)({ type: 'timestamp', nullable: true }),
     __metadata("design:type", Date)
 ], EmployeeWorkProfileEntity.prototype, "created_at", void 0);
 __decorate([
@@ -144,7 +144,7 @@ __decorate([
     __metadata("design:type", Number)
 ], EmployeeWorkProfileEntity.prototype, "created_by", void 0);
 __decorate([
-    (0, typeorm_1.UpdateDateColumn)({ type: 'timestamp' }),
+    (0, typeorm_1.UpdateDateColumn)({ type: 'timestamp', nullable: true }),
     __metadata("design:type", Date)
 ], EmployeeWorkProfileEntity.prototype, "updated_at", void 0);
 __decorate([

package/package.json

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