grid

api/src/model/entitites/user.entity.ts

@@ -41,7 +41,7 @@ export class User implements IUser {
   @Column({ default: true })
   isActive: boolean;
 
-  @ManyToOne(() => Role, (role) => role.user, { cascade: true })
+  @ManyToOne(() => Role, (role) => role.user, { cascade: true, eager: true })
   @JoinColumn()
   @Transform(({ value }) => value.name)
   role: Role;

api/src/modules/auth/auth.service.ts

@@ -56,7 +56,10 @@ export class AuthService {
           username: payload.username,
           externalId: payload.id,
         });
+      } else {
+        user.lastLogin = new Date();
       }
+
       if (!user.isActive) {
         return resolve(null);
       }
@@ -87,6 +90,8 @@ export class AuthService {
     };
 
     user.refreshToken = this.jwt.sign(rPay, { expiresIn: '1w' });
+    user.lastLogin = new Date();
+    this.userRepo.save(user);
   }
 
   private createAuthCodeFormData(