From bdc819807de0595bfb949879bec377c4b2d487be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=B5=9C=EC=A4=80=ED=9D=A0?= <choi.jh@prime-idc.jp>
Date: Mon, 12 Sep 2022 20:24:55 +0900
Subject: [PATCH] nestjs_auth...

---
 .env                     |  2 +-
 src/auth/auth.service.ts | 23 +++++++++++++----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.env b/.env
index a81bb63..706f5a9 100644
--- a/.env
+++ b/.env
@@ -18,7 +18,7 @@ JWT_CONSTANTS_ACCESS_SECRET = "access_key"
 JWT_CONSTANTS_ACCESS_EXPIRESIN ="60s"
 
 JWT_CONSTANTS_REFRESH_SECRET = "refresh_key"
-JWT_CONSTANTS_REPRESH_EXPIRESIN ="14d"
+JWT_CONSTANTS_REPRESH_EXPIRESIN ="1d"
 JWT_CONSTANTS_REPRESH_SALTORROUNDS=10
 
 DEFAULT_TABLE_PERPAGE = 10
diff --git a/src/auth/auth.service.ts b/src/auth/auth.service.ts
index 4e3e6ed..7b40ab9 100644
--- a/src/auth/auth.service.ts
+++ b/src/auth/auth.service.ts
@@ -40,9 +40,7 @@ export class AuthService {
     }
   }
 
-  async login(
-    user: User
-  ): Promise<{ access_token: string; refresh_token: string }> {
+  async login(user: User): Promise<any> {
     return await this.getTokens(user)
   }
 
@@ -52,9 +50,7 @@ export class AuthService {
     return await this.userService.add(data)
   }
 
-  async refreshTokens(
-    user: User
-  ): Promise<{ access_token: string; refresh_token: string }> {
+  async refreshTokens(user: User): Promise<any> {
     const tokens = await this.getTokens(user)
     await this.userService.update({
       where: { id: user.id },
@@ -63,9 +59,7 @@ export class AuthService {
     return tokens
   }
 
-  async getTokens(
-    data: UserDTO
-  ): Promise<{ access_token: string; refresh_token: string }> {
+  async getTokens(data: UserDTO): Promise<any> {
     return await Promise.all([
       this.jwtService.sign(
         {
@@ -85,7 +79,16 @@ export class AuthService {
         }
       )
     ]).then((response) => {
-      return { access_token: response[0], refresh_token: response[1] }
+      return {
+        access_token: {
+          token: response[0],
+          expiresIn: jwtConstants.access_expiresIn
+        },
+        refresh_token: {
+          token: response[1],
+          expiresIn: jwtConstants.refresh_expiresIn
+        }
+      }
     })
   }
 }