fix: maxAge unit from ms to s

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

@@ -26,7 +26,17 @@ const authPlugin: FastifyPluginAsync = async (fastify) => {
       if (!accessToken && !refreshToken) return
 
       if (accessToken && refreshToken) {
-        const accessTokenData = await jwt.decodeToken<AccessTokenData>(accessToken)
+        const accessTokenData = await jwt
+          .decodeToken<AccessTokenData>(accessToken)
+          .catch(async () => {
+            if (refreshToken) {
+              const tokens = await userService.restoreToken({ request, reply })
+              return await jwt.decodeToken<AccessTokenData>(tokens.accessToken)
+            }
+          })
+
+        if (!accessTokenData) return
+
         const diff = accessTokenData.exp * 1000 - new Date().getTime()
         // refresh token when life < 30mins
         if (diff < Time.ONE_MINUTE_IN_MS * 30 && refreshToken) {

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