@thinkingcat/auth-utils 2.0.10 → 2.0.12

package/dist/core/jwt.js

@@ -49,7 +49,7 @@ async function verifyToken(accessToken, secret) {
     try {
         const secretBytes = new TextEncoder().encode(secret);
         const { payload } = await (0, jose_1.jwtVerify)(accessToken, secretBytes);
-        if (payload && typeof payload === 'object' && payload.email) {
+        if (payload && typeof payload === 'object' && (payload.id || payload.sub)) {
             return { payload: payload };
         }
         return null;
@@ -174,7 +174,7 @@ function isValidToken(token) {
         return false;
     if (isTokenExpired(token))
         return false;
-    if (!token.email || !token.id)
+    if (!token.id)
         return false;
     return true;
 }

package/dist/core/verify.js

@@ -19,7 +19,7 @@ async function verifyAndRefreshToken(req, secret, options) {
         try {
             const secretBytes = new TextEncoder().encode(secret);
             const { payload } = await (0, jose_1.jwtVerify)(accessToken, secretBytes);
-            if (payload && typeof payload === 'object' && payload.email) {
+            if (payload && typeof payload === 'object' && (payload.id || payload.sub)) {
                 return { isValid: true, payload: payload };
             }
         }
@@ -37,6 +37,7 @@ async function verifyAndRefreshToken(req, secret, options) {
             const refreshResult = await (0, api_1.refreshSSOToken)(refreshToken, {
                 ssoBaseURL,
                 authServiceKey,
+                serviceId,
             });
             if (refreshResult.success && refreshResult.accessToken) {
                 const newRefreshToken = refreshResult.refreshToken || refreshToken;
@@ -44,7 +45,7 @@ async function verifyAndRefreshToken(req, secret, options) {
                     let payload;
                     const secretBytes = new TextEncoder().encode(secret);
                     const { payload: tokenPayload } = await (0, jose_1.jwtVerify)(refreshResult.accessToken, secretBytes);
-                    if (tokenPayload && typeof tokenPayload === 'object' && tokenPayload.email) {
+                    if (tokenPayload && typeof tokenPayload === 'object' && (tokenPayload.id || tokenPayload.sub)) {
                         payload = tokenPayload;
                     }
                     const { NextResponse: NextResponseClass } = await (0, server_1.getNextServer)();
@@ -117,7 +118,7 @@ async function verifyAndRefreshTokenWithNextAuth(req, nextAuthToken, secret, opt
         try {
             const secretBytes = new TextEncoder().encode(secret);
             const { payload } = await (0, jose_1.jwtVerify)(accessToken, secretBytes);
-            if (payload && typeof payload === 'object' && payload.email) {
+            if (payload && typeof payload === 'object' && (payload.id || payload.sub)) {
                 hasValidAccessToken = true;
             }
         }

package/dist/middleware/handler.js

@@ -198,7 +198,7 @@ async function handleMiddleware(req, config, options) {
             const ssoBaseURL = options.ssoBaseURL;
             return await (0, redirect_js_1.redirectToSSOLogin)(req, serviceId, ssoBaseURL);
         }
-        if (!finalToken.role || !finalToken.email) {
+        if (!finalToken.role || !finalToken.id) {
             const ssoBaseURL = options.ssoBaseURL;
             return await (0, redirect_js_1.redirectToSSOLogin)(req, serviceId, ssoBaseURL);
         }

package/dist/nextauth/callbacks.js

@@ -118,7 +118,10 @@ async function handleJWTCallback(token, user, account, options) {
                     'Content-Type': 'application/json',
                     'x-auth-service-key': authServiceKey,
                 },
-                body: JSON.stringify({ refreshToken }),
+                body: JSON.stringify({
+                    refreshToken,
+                    serviceId: serviceId || undefined
+                }),
             });
             if (response.ok) {
                 const result = await response.json();

package/dist/sso/api.d.ts

@@ -13,6 +13,7 @@ export declare function validateServiceSubscription(services: ServiceInfo[], ser
 export declare function refreshSSOToken(refreshToken: string, options: {
     ssoBaseURL: string;
     authServiceKey?: string;
+    serviceId?: string;
 }): Promise<SSORefreshTokenResponse>;
 /**
  * SSO 서버에서 사용자의 refresh token을 가져오는 함수

package/dist/sso/api.js

@@ -37,7 +37,7 @@ function validateServiceSubscription(services, serviceId, ssoBaseURL) {
  * SSO 서버에서 refresh token을 사용하여 새로운 access token을 발급받는 함수
  */
 async function refreshSSOToken(refreshToken, options) {
-    const { ssoBaseURL, authServiceKey } = options;
+    const { ssoBaseURL, authServiceKey, serviceId } = options;
     if (!authServiceKey) {
         throw new Error('AUTH_SERVICE_SECRET_KEY not configured');
     }
@@ -47,7 +47,10 @@ async function refreshSSOToken(refreshToken, options) {
             'Content-Type': 'application/json',
             'x-auth-service-key': authServiceKey,
         },
-        body: JSON.stringify({ refreshToken }),
+        body: JSON.stringify({
+            refreshToken,
+            serviceId
+        }),
     });
     return await refreshResponse.json();
 }

package/dist/types/index.d.ts

@@ -61,8 +61,8 @@ export interface SSORegisterResponse {
 export interface JWTPayload {
     sub?: string;
     id?: string;
-    email: string;
-    name: string;
+    email?: string | null;
+    name?: string | null;
     role?: string;
     iat?: number;
     exp?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thinkingcat/auth-utils",
-  "version": "2.0.10",
+  "version": "2.0.12",
   "description": "Authentication utilities for ThinkingCat SSO services with conditional logging",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",