@thinkingcat/auth-utils 1.0.39 → 1.0.41

package/dist/index.js

@@ -448,44 +448,46 @@ async function createAuthResponse(accessToken, secret, options) {
     }
     // accessTokenExpires 추가 (15분)
     jwt.accessTokenExpires = Date.now() + (15 * 60 * 1000);
-    debugLog('createAuthResponse', 'JWT created:', {
+    debugLog('createAuthResponse', 'JWT prepared (NextAuth will create session from custom tokens):', {
         hasId: !!jwt.id,
         hasEmail: !!jwt.email,
         hasRole: !!jwt.role,
         hasRefreshToken: !!jwt.refreshToken,
     });
-    // 3. NextAuth 세션 쿠키 생성 (NextAuth encode() 우선 사용)
-    const nextAuthToken = await encodeNextAuthToken(jwt, secret);
-    debugLog('createAuthResponse', 'NextAuth session token encoded:', {
-        tokenLength: nextAuthToken.length,
-    });
-    // 4. Response 생성 (HTTP 302 리다이렉트 사용)
+    // 3. Response 생성 (HTTP 302 리다이렉트 사용)
     const { NextResponse: NextResponseClass } = await getNextServer();
     // redirectPath가 있으면 302 리다이렉트, 없으면 200 OK
     const response = redirectPath
         ? NextResponseClass.redirect(new URL(redirectPath, req.url), { status: 302 })
         : NextResponseClass.json({ success: true, message: text || 'Authentication successful' }, { status: 200 });
-    // 5. NextAuth 세션 쿠키 설정
-    const nextAuthCookieName = isProduction
-        ? '__Secure-next-auth.session-token'
-        : 'next-auth.session-token';
-    const cookieOptions = {
-        httpOnly: true,
-        secure: isProduction,
-        sameSite: isProduction ? 'none' : 'lax',
-        path: '/',
-        maxAge: 30 * 24 * 60 * 60, // 30일
-    };
-    if (cookieDomain) {
-        cookieOptions.domain = cookieDomain;
+    // 4. NextAuth 세션 쿠키 생성 (Edge Runtime에서도 작동하도록 encodeNextAuthToken 사용)
+    try {
+        const nextAuthToken = await encodeNextAuthToken(jwt, secret);
+        const nextAuthCookieName = isProduction
+            ? '__Secure-next-auth.session-token'
+            : 'next-auth.session-token';
+        const cookieOptions = {
+            httpOnly: true,
+            secure: isProduction,
+            sameSite: isProduction ? 'none' : 'lax',
+            path: '/',
+            maxAge: 30 * 24 * 60 * 60, // 30일
+        };
+        if (cookieDomain) {
+            cookieOptions.domain = cookieDomain;
+        }
+        response.cookies.set(nextAuthCookieName, nextAuthToken, cookieOptions);
+        debugLog('createAuthResponse', 'NextAuth session cookie set:', {
+            name: nextAuthCookieName,
+            valueLength: nextAuthToken.length,
+            hasRefreshToken: !!refreshToken,
+        });
     }
-    response.cookies.set(nextAuthCookieName, nextAuthToken, cookieOptions);
-    debugLog('createAuthResponse', 'NextAuth session cookie set:', {
-        name: nextAuthCookieName,
-        valueLength: nextAuthToken.length,
-        ...cookieOptions,
-    });
-    // 6. 커스텀 토큰 쿠키 설정
+    catch (error) {
+        debugError('createAuthResponse', 'Failed to set NextAuth cookie:', error);
+        // NextAuth 쿠키 실패해도 커스텀 토큰으로는 작동 가능
+    }
+    // 5. 커스텀 토큰 쿠키 설정
     if (refreshToken) {
         setCustomTokens(response, accessToken, refreshToken, {
             cookiePrefix,
@@ -1556,12 +1558,35 @@ async function handleMiddleware(req, config, options) {
                     const tokenRole = extractRoleFromPayload(payload, serviceId, defaultRole);
                     debugLog('handleMiddleware', `Extracted role: ${tokenRole}`);
                     // 3. Refresh token 가져오기 (서버 간 통신)
-                    const userId = payload.sub || payload.userId || '';
+                    const userId = payload.id || payload.sub || payload.userId || '';
                     const ssoBaseURL = options.ssoBaseURL;
                     const authServiceKey = options.authServiceKey;
-                    const refreshToken = authServiceKey
-                        ? await getRefreshTokenFromSSO(userId, tokenParam, { ssoBaseURL, authServiceKey }) || ''
-                        : '';
+                    debugLog('handleMiddleware', 'Getting refresh token from SSO:', {
+                        userId,
+                        hasSSO: !!ssoBaseURL,
+                        hasAuthKey: !!authServiceKey,
+                    });
+                    let refreshToken = '';
+                    if (authServiceKey && userId) {
+                        try {
+                            const refreshTokenResult = await getRefreshTokenFromSSO(userId, tokenParam, { ssoBaseURL, authServiceKey });
+                            refreshToken = refreshTokenResult || '';
+                            debugLog('handleMiddleware', 'Refresh token result:', {
+                                hasRefreshToken: !!refreshToken,
+                                length: refreshToken.length,
+                            });
+                        }
+                        catch (error) {
+                            debugError('handleMiddleware', 'Failed to get refresh token:', error);
+                            // refresh token이 없어도 access token으로는 로그인 가능
+                        }
+                    }
+                    else {
+                        debugLog('handleMiddleware', 'Skipping refresh token fetch:', {
+                            hasUserId: !!userId,
+                            hasAuthKey: !!authServiceKey,
+                        });
+                    }
                     // 4. 자체 토큰 생성 및 쿠키 설정
                     const redirectPath = config.rolePaths[tokenRole] || config.rolePaths[defaultRole] || '/admin';
                     debugLog('handleMiddleware', `Creating auth response, redirect to: ${redirectPath}`);

package/package.json

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