fixing authentication login /logout

Author: daniwebdev

src/apps/auth/auth.controller.spec.ts

@@ -21,7 +21,7 @@ export class AuthController {
         @Req() req: Request,
         @Body() data: LoginDTO
     ) {
-        const loginResponse = await this.authService.login(data);
+        const loginResponse = await this.authService.login(data, req);
 
         return Response.success({
             message: i18n.t('response.login.success'),
@@ -32,13 +32,14 @@ export class AuthController {
     @Post('/register')
     @HttpCode(HttpStatus.CREATED)
     async register(
+        @I18n() i18n: I18nContext,
         @Req() req: Request,
         @Body() data: RegisterDTO,
     ) {
         const registerResponse = await this.authService.register(data, req);
 
         return Response.success({
-            message: "Your account has been created.",
+            message: i18n.t('response.register.success'),
             data: registerResponse,
         });
     }
@@ -47,14 +48,17 @@ export class AuthController {
     @HttpCode(HttpStatus.OK)
     @UseJwtGuard()
     async logout(
+        @I18n() i18n: I18nContext,
         @Req() req: Request,
-        @Body() data: RegisterDTO,
     ) {
-        // const registerResponse = await this.authService.logout();
-        console.log(req.user)
-        // return Response.success({
-        //     message: "Your account has been created.",
-        //     data: registerResponse,
-        // });
+        try {
+            await this.authService.logout(req.user);
+
+            return Response.success({
+                message: i18n.t('response.logout.success'),
+            });
+        } catch (error) {
+            
+        }
     }
 }

src/apps/auth/auth.controller.ts

@@ -24,10 +24,26 @@ export class AuthService {
     ) {}
 
     async logout(userAuth: UserInAuth) {
-        // 
+
+        try {
+            this.userDevicesRepository.update({
+                id: userAuth.id
+            }, {
+                access_token: null,
+                refresh_token: null,
+            })
+
+            this.redisService.del(`user-data:${userAuth.id}`);
+
+            return true;
+        } catch (error) {
+            return false;
+        } finally {
+            
+        }
     }
 
-    async login(data: LoginDTO) {
+    async login(data: LoginDTO,  req: Request) {
         const user = await this.getUser([
             {username: data.identity,},
             {email: data.identity,},
@@ -40,6 +56,32 @@ export class AuthService {
 
         const tokens = await this.getTokens(user, data.device);
 
+        const userDevice = this.userDevicesRepository.create({
+            user_id: user.id, // Associate with the newly created user
+            unique_id: data.device.id,
+            name: data.device.name,
+            brand: data.device.brand,
+            os: data.device.os,
+            platform: req.header('x-app-platform') ?? 'unknown',
+            access_token: await this.makeHash(tokens.access_token),
+            refresh_token: await this.makeHash(tokens.refresh_token),
+            status: 'allowed',
+            last_login: {
+                ip: req.ip,
+                app_version: req.header('x-app-version'),
+                timestamp: new Date().getTime(),
+                coordinate: data.coordinate,
+            },
+        });
+        try {
+            await this.userDevicesRepository.save(userDevice);
+        } catch (error) {
+            await this.userDevicesRepository.update({
+                user_id: userDevice.user_id,
+                unique_id: userDevice.unique_id,
+            }, userDevice);
+        }
+
         delete user.password;
 
         return { 

src/apps/auth/auth.service.spec.ts

@@ -1,21 +1,20 @@
 import { CurrentLoginType } from "src/apps/auth/types";
 import { strRandom } from "src/utils";
-import { Column, Entity, PrimaryColumn } from "typeorm";
+import { Column, CreateDateColumn, Entity, PrimaryColumn, Unique, UpdateDateColumn } from "typeorm";
 
 @Entity({
     name: 'user_devices'
 })
+@Unique(['user_id', 'unique_id']) // Add a unique constraint on user_id and unique_id columns
 export class UserDevice {
     @PrimaryColumn()
-    id: string;
+    id: number;
 
     @Column()
     user_id: number;
-    // userId: string;
 
     @Column({name: 'unique_id'})
     unique_id:string;
-    // uniqueId: string;
 
     @Column()
     name: string;
@@ -31,23 +30,18 @@ export class UserDevice {
 
     @Column('json', {name: 'last_login'})
     last_login:CurrentLoginType;
-    // lastLogin: CurrentLoginType;
 
     @Column('json', {name: 'current_login'})
     current_login:CurrentLoginType;
-    // currentLogin: CurrentLoginType;
 
     @Column({name: 'access_token'})
     access_token:string;
-    // accessToken: string;
 
     @Column({name: 'refresh_token'})
     refresh_token:string;
-    // refreshToken: string;
 
     @Column({name: 'fcm_token'})
     fcm_token:string;
-    // fcmToken: string;
 
     @Column()
     preference: string;
@@ -57,6 +51,11 @@ export class UserDevice {
 
     @Column({name: 'status_reason'})
     status_reason:string;
-    // statusReason: string;
+
+    @UpdateDateColumn()
+    updated_at:Date;
+
+    @CreateDateColumn()
+    created_at: Date;
 
 }

src/apps/auth/auth.service.ts

@@ -1,5 +1,12 @@
 {
     "login": {
         "success": "Your identity accepted, login successful."
+    },
+    "register": {
+        "success": "Your account has been created."
+    },
+    "logout": {
+        "success": "Logout successful."
     }
+    
 }