update refresh token

Author: daniwebdev

public/openapi.yml

@@ -130,6 +130,10 @@ paths:
               $ref: '#/components/schemas/AuthSuccessResponse'
   /auth/refresh:
     post:
+      security:
+        - ApiKey: []
+        - RefreshToken: []
+      
       tags:
         - "Authentication"
       description: ""
@@ -243,6 +247,11 @@ components:
       type: http
       scheme: bearer
       bearerFormat: JWT    # optional, arbitrary value for documentation purposes
+    RefreshToken:
+      description: "Hanya dipakai di `/auth/refresh`"
+      type: http
+      scheme: bearer
+      bearerFormat: JWT    # optional, arbitrary value for documentation purposes
   schemas:
     LoginRequestBody:
       type: object

src/@types/index.d.ts

@@ -8,6 +8,6 @@ type UserInAuth = {
     id: number,
     name: string,
     email: string,
-    unique_id: string,
+    deviceUniqueId: string,
     fcm_token?: string,
 }

src/apps/auth/auth.controller.ts

@@ -1,6 +1,6 @@
 import { Body, Controller, Get, HttpCode, HttpStatus, Post, Req } from '@nestjs/common';
 import { Request } from 'express';
-import { UseJwtGuard } from 'src/filters/jwt.guard';
+import { UseJwtGuard, UseJwtRefreshGuard } from 'src/filters/jwt.guard';
 import { Response } from 'src/utils/response.utils';
 import { AuthService } from './auth.service';
 import { LoginDTO } from './dto/login.dto';
@@ -29,13 +29,30 @@ export class AuthController {
         });
     }
 
+    @UseJwtRefreshGuard()
+    @Post('/refresh')
+    @HttpCode(HttpStatus.OK)
+    async refresh(
+        @I18n() i18n: I18nContext,
+        @Req() req: Request,
+    ) {
+
+        const refreshResponse = await this.authService.refresh(req);
+
+        return Response.success({
+            message: i18n.t('auth.refresh.response-success'),
+            data: refreshResponse,
+        });
+    }
+
     @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({

src/apps/auth/auth.module.ts

@@ -15,4 +15,5 @@ import { RedisModule } from 'src/modules/redis/redis.module';
   providers: [AuthService, AccessTokenStrategy, RefreshTokenStrategy],
   controllers: [AuthController]
 })
+
 export class AuthModule {}

src/apps/auth/auth.service.ts

@@ -1,4 +1,4 @@
-import {  HttpException, HttpStatus, Injectable, UnauthorizedException } from '@nestjs/common';
+import { HttpException, HttpStatus, Injectable, UnauthorizedException } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
 import { InjectRepository } from '@nestjs/typeorm';
 import { User } from 'src/entities/user.entity';
@@ -11,13 +11,17 @@ import { Request } from 'express';
 import { UserDevice } from 'src/entities/user-device.entity';
 import { DeviceDTO } from './dto/device.dto';
 import { RedisService } from 'src/modules/redis/redis.service';
+import { I18nService } from 'nestjs-i18n';
 
 @Injectable()
 export class AuthService {
 
     constructor(
-        @InjectRepository(User) private usersRepository: Repository<User>,
-        @InjectRepository(UserDevice) private userDevicesRepository: Repository<UserDevice>,
+        @InjectRepository(User) 
+        private usersRepository: Repository<User>,
+        @InjectRepository(UserDevice) 
+        private userDevicesRepository: Repository<UserDevice>,
+        private readonly i18n: I18nService,
         private readonly redisService: RedisService,
         private readonly jwtService: JwtService,
         private readonly configService: ConfigService,
@@ -28,7 +32,7 @@ export class AuthService {
         try {
             this.userDevicesRepository.update({
                 user_id: userAuth.id,
-                unique_id: userAuth.unique_id
+                unique_id: userAuth.deviceUniqueId,
             }, {
                 access_token: null,
                 refresh_token: null,
@@ -44,6 +48,57 @@ export class AuthService {
         }
     }
 
+    async refresh(req: Request) {
+
+        const deviceUniqueId = req.user.deviceUniqueId;
+
+        const device: UserDevice = await this.userDevicesRepository.findOneBy({
+            user_id: req.user.id,
+            unique_id: deviceUniqueId,
+        });
+
+        const token = req.header('authorization').replace('Bearer ', '');
+        console.log(device.refresh_token)
+        if(!await this.checkPassword(token, device.refresh_token)) {
+            throw new HttpException(this.i18n.t('auth.refresh.invalid-token'), HttpStatus.BAD_REQUEST);
+        }
+
+        const user = await this.usersRepository.findOneBy({
+            id: req.user.id,
+        })
+
+        const deviceDTO = new DeviceDTO();
+        deviceDTO.brand = device.brand;
+        deviceDTO.id = device.unique_id;
+        deviceDTO.name = device.name;
+        deviceDTO.os = device.os;
+
+        const tokens = await this.getTokens(user, deviceDTO);
+
+       await this.userDevicesRepository.update({
+            id: device.id,
+        }, {
+            refresh_token: await this.makeHash(tokens.refresh_token),
+            access_token: await this.makeHash(tokens.access_token),
+        })
+
+        return {
+            tokens
+        };
+
+        // await this.userDevicesRepository.update({
+        //     id: device.id,
+        // }, {
+        //     refresh_token: null,
+        //     access_token: null,
+        // })
+
+        // return this.i18n.t('auth.refresh.response-success')
+        // console.log(device);
+
+        // this.checkPassword()
+    }
+
     async login(data: LoginDTO,  req: Request) {
         const user = await this.getUser([
             {username: data.identity,},
@@ -167,17 +222,19 @@ export class AuthService {
         return {
             access_token: await this.jwtService.signAsync({
                 username: user.name,
-                deviceId: device.id,
+                deviceUniqueId: device.id,
                 id: user.id,
             }, {
+                subject: new Date().getTime().toString() + ' | hi',
                 secret: this.configService.get("JWT_SECRET"),
                 expiresIn: eval(this.configService.get('JWT_EXP_AT')),
             }),
             refresh_token: await this.jwtService.signAsync({
                 username: user.name,
                 id: user.id,
-                deviceId: device.id
+                deviceUniqueId: device.id,
             }, {
+                subject: new Date().getTime().toString() + ' | hi',
                 secret: this.configService.get("JWT_SECRET_REFRESH"),
                 // expiresIn: 60 * 60 * 24 * 7,
                 expiresIn: eval(this.configService.get('JWT_REFRESH_EXP_AT')),

src/apps/auth/strategies/refresh-token.strategy.ts

@@ -1,7 +1,6 @@
 import { ConfigService } from '@nestjs/config'
 import { PassportStrategy } from '@nestjs/passport'
 import { ExtractJwt, Strategy } from 'passport-jwt'
-import { Request  } from 'express';
 import { Injectable } from '@nestjs/common';
 
 @Injectable()
@@ -18,7 +17,7 @@ export class RefreshTokenStrategy extends PassportStrategy(Strategy, 'jwt-refres
     }
 
 
-    validate(req: Request, payload: any) {
+    validate(payload: any) {
 
         return payload;
     }

src/i18n/en/auth.json

@@ -0,0 +1,9 @@
+{
+    "refresh": {
+        "response-success": "Refreshing token successfull",
+        "invalid-token": "Invalid refresh token."
+    }, 
+    "login": {
+        "response-success": "Refresh token successfull"
+    }
+}

src/i18n/id/auth.json

@@ -0,0 +1,9 @@
+{
+    "refresh": {
+        "response-success": "Refresh token successfull",
+        "invalid-token": "Invalid refresh token."
+    },
+    "login": {
+        "response-success": "Refresh token successfull"
+    }
+}