From 731b36ef70865d1945f48d77e771d0264799aa7b Mon Sep 17 00:00:00 2001
From: Ardeman <are.theman@gmail.com>
Date: Thu, 20 Mar 2025 12:36:28 +0800
Subject: [PATCH] feat: replace jose with @edgefirst-dev/jwt for token decoding
 in cookie generation

---
 app/utils/token.ts | 10 +++++-----
 package.json       |  1 -
 pnpm-lock.yaml     |  3 ---
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/utils/token.ts b/app/utils/token.ts
index 7303a72..4f666e9 100644
--- a/app/utils/token.ts
+++ b/app/utils/token.ts
@@ -1,4 +1,4 @@
-import { decodeJwt } from 'jose'
+import { JWT } from '@edgefirst-dev/jwt'
 
 import {
   staffTokenCookieConfig,
@@ -12,10 +12,10 @@ type TTokenCookie = {
 export const generateUserTokenCookie = (parameters: TTokenCookie) => {
   const { accessToken } = parameters
 
-  const decodedToken = decodeJwt(accessToken)
+  const decodedToken = JWT.decode(accessToken)
   const decodedTokenExp = decodedToken.exp
   const expirationDate = decodedTokenExp
-    ? new Date(decodedTokenExp * 1000)
+    ? new Date(Number(decodedTokenExp) * 1000)
     : undefined
 
   return userTokenCookieConfig.serialize(accessToken, {
@@ -26,10 +26,10 @@ export const generateUserTokenCookie = (parameters: TTokenCookie) => {
 export const generateStaffTokenCookie = (parameters: TTokenCookie) => {
   const { accessToken } = parameters
 
-  const decodedToken = decodeJwt(accessToken)
+  const decodedToken = JWT.decode(accessToken)
   const decodedTokenExp = decodedToken.exp
   const expirationDate = decodedTokenExp
-    ? new Date(decodedTokenExp * 1000)
+    ? new Date(Number(decodedTokenExp) * 1000)
     : undefined
 
   return staffTokenCookieConfig.serialize(accessToken, {
diff --git a/package.json b/package.json
index 63efb0c..bce92e4 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,6 @@
     "intl-parse-accept-language": "^1.0.0",
     "is-ip": "^5.0.1",
     "isbot": "^5.1.17",
-    "jose": "^6.0.8",
     "react": "^19.0.0",
     "react-chartjs-2": "^5.3.0",
     "react-colorful": "^5.6.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8b2135e..5c1e58a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -101,9 +101,6 @@ importers:
       isbot:
         specifier: ^5.1.17
         version: 5.1.22
-      jose:
-        specifier: ^6.0.8
-        version: 6.0.8
       react:
         specifier: ^19.0.0
         version: 19.0.0