chore: fix lockfile

Author: winverse

packages/velog-server/src/common/constants/TimeConstants.ts

@@ -2,16 +2,16 @@ const ONE_MINUTE_IN_MS = 1000 * 60
 const ONE_HOUR_IN_MS = ONE_MINUTE_IN_MS * 60
 const ONE_DAY_IN_MS = ONE_HOUR_IN_MS * 24
 
-const ONE_MINUTE_S = 60
-const ONE_HOUR_S = ONE_MINUTE_S * 60
-const ONE_DAY_S = ONE_HOUR_S * 24
+const ONE_MINUTE_IN_S = 60
+const ONE_HOUR_IN_S = ONE_MINUTE_IN_S * 60
+const ONE_DAY_IN_S = ONE_HOUR_IN_S * 24
 
 export const Time = {
   ONE_MINUTE_IN_MS,
   ONE_HOUR_IN_MS,
   ONE_DAY_IN_MS,
 
-  ONE_MINUTE_S,
-  ONE_HOUR_S,
-  ONE_DAY_S,
+  ONE_MINUTE_IN_S,
+  ONE_HOUR_IN_S,
+  ONE_DAY_IN_S,
 }

packages/velog-server/src/common/plugins/global/authPlugin.ts

@@ -12,6 +12,8 @@ const authPlugin: FastifyPluginAsync = async (fastify) => {
     if (request.url.includes('/auth/logout')) return
 
     const userService = container.resolve(UserService)
+    const jwt = container.resolve(JwtService)
+
     let accessToken: string | undefined = request.cookies['access_token']
     const refreshToken: string | undefined = request.cookies['refresh_token']
     const authorization = request.headers['authorization']
@@ -21,12 +23,11 @@ const authPlugin: FastifyPluginAsync = async (fastify) => {
         accessToken = authorization.split('Bearer ')[1]
       }
 
-      const jwt = container.resolve(JwtService)
-
       if (!accessToken && !refreshToken) return
 
       if (accessToken && refreshToken) {
         const accessTokenData = await jwt.decodeToken<AccessTokenData>(accessToken)
+
         const diff = accessTokenData.exp * 1000 - new Date().getTime()
         // refresh token when life < 30mins
         if (diff < Time.ONE_MINUTE_IN_MS * 30 && refreshToken) {
@@ -46,9 +47,22 @@ const authPlugin: FastifyPluginAsync = async (fastify) => {
     } catch (e) {
       console.log('accessToken', accessToken)
       console.log('authPlugin error', e)
-      const cookie = container.resolve(CookieService)
-      cookie.clearCookie(reply, 'access_token')
-      cookie.clearCookie(reply, 'refresh_token')
+
+      try {
+        if (refreshToken) {
+          const tokens = await userService.restoreToken({ request, reply })
+          accessToken = tokens.accessToken
+
+          const accessTokenData = await jwt.decodeToken<AccessTokenData>(accessToken)
+          request.user = { id: accessTokenData.user_id }
+        } else {
+          throw new Error()
+        }
+      } catch (error) {
+        const cookie = container.resolve(CookieService)
+        cookie.clearCookie(reply, 'access_token')
+        cookie.clearCookie(reply, 'refresh_token')
+      }
     }
   })
 }

packages/velog-server/src/lib/jwt/JwtService.ts

@@ -63,7 +63,7 @@ export class JwtService {
       },
       {
         subject: 'access_token',
-        expiresIn: '24h',
+        expiresIn: '1',
       },
     )
 

packages/velog-server/src/routes/auth/v3/social/SocialController.ts

@@ -130,11 +130,12 @@ export class SocialController implements Controller {
 
       if (user) {
         const tokens = await this.jwt.generateUserToken(user.id)
+
         this.cookie.setCookie(reply, 'access_token', tokens.accessToken, {
-          maxAge: Time.ONE_HOUR_IN_MS * 24,
+          maxAge: Time.ONE_DAY_IN_S,
         })
         this.cookie.setCookie(reply, 'refresh_token', tokens.refreshToken, {
-          maxAge: Time.ONE_DAY_IN_MS * 30,
+          maxAge: Time.ONE_DAY_IN_S * 30,
         })
 
         const redirectUrl = ENV.clientV3Host
@@ -255,10 +256,10 @@ export class SocialController implements Controller {
 
     const tokens = await this.jwt.generateUserToken(user.id)
     this.cookie.setCookie(reply, 'access_token', tokens.accessToken, {
-      maxAge: Time.ONE_HOUR_IN_MS * 24,
+      maxAge: Time.ONE_DAY_IN_S,
     })
     this.cookie.setCookie(reply, 'refresh_token', tokens.refreshToken, {
-      maxAge: Time.ONE_DAY_IN_MS * 30,
+      maxAge: Time.ONE_DAY_IN_S * 30,
     })
 
     const profile = await this.db.userProfile.findFirst({

packages/velog-server/src/services/PostService/index.ts

@@ -463,7 +463,7 @@ export class PostService implements Service {
           postIds = [...postIds, ...randomPostIds]
         }
 
-        this.redis.set(cacheKey, postIds.join(','), 'EX', Time.ONE_DAY_S)
+        this.redis.set(cacheKey, postIds.join(','), 'EX', Time.ONE_DAY_IN_S)
       }
       const posts = await this.findPostsByIds(postIds)
       const normalized = this.utils.normalize(posts)

packages/velog-server/src/services/UserService/index.ts

@@ -144,10 +144,10 @@ export class UserService implements Service {
     )
 
     this.cookie.setCookie(ctx.reply, 'access_token', tokens.accessToken, {
-      maxAge: Time.ONE_HOUR_IN_MS * 24,
+      maxAge: Time.ONE_DAY_IN_S,
     })
     this.cookie.setCookie(ctx.reply, 'refresh_token', tokens.refreshToken, {
-      maxAge: Time.ONE_DAY_IN_MS * 30,
+      maxAge: Time.ONE_DAY_IN_S * 30,
     })
 
     return tokens
@@ -254,7 +254,7 @@ export class UserService implements Service {
       throw error
     }
 
-    this.redis.set(key, data, 'EX', Time.ONE_MINUTE_S * 30)
+    this.redis.set(key, data, 'EX', Time.ONE_MINUTE_IN_S * 30)
   }
   public async confirmChangeEmail(code: string, signedUserId?: string): Promise<void> {
     if (!signedUserId) {