@thinkingcat/auth-utils 1.0.30 → 1.0.32

package/dist/index.js

@@ -214,16 +214,19 @@ async function encodeNextAuthToken(jwt, secret, maxAge = 30 * 24 * 60 * 60) {
     try {
         // next-auth/jwt의 encode 함수를 동적 import로 사용 (Edge Runtime 호환)
         const { encode } = await Promise.resolve().then(() => __importStar(require('next-auth/jwt')));
-        return await encode({
+        debugLog('encodeNextAuthToken', 'Using next-auth/jwt encode');
+        const encoded = await encode({
             token: jwt,
             secret: secret,
             maxAge: maxAge,
         });
+        debugLog('encodeNextAuthToken', 'Encode successful, length:', encoded.length);
+        return encoded;
     }
     catch (error) {
         // Edge Runtime에서 encode가 작동하지 않을 수 있으므로
         // jose의 EncryptJWT를 사용하여 JWE 토큰 생성 (NextAuth가 기대하는 형식)
-        debugLog('encodeNextAuthToken', 'encode failed, using EncryptJWT fallback');
+        debugLog('encodeNextAuthToken', 'encode failed, using EncryptJWT fallback', error);
         // NextAuth는 secret을 SHA-256 해시하여 32바이트 키로 사용
         // jose의 EncryptJWT는 'dir' 알고리즘에서 Uint8Array 키를 직접 사용
         const secretHash = await createHashSHA256(secret);
@@ -651,20 +654,48 @@ async function verifyAndRefreshToken(req, secret, options) {
                     catch {
                         // 토큰 검증 실패
                     }
-                    debugLog('verifyAndRefreshToken', 'Creating auth response...');
-                    // 현재 경로로 리다이렉트하여 새로운 쿠키로 다시 요청하도록 함
-                    const currentPath = req.nextUrl.pathname + req.nextUrl.search;
-                    const response = await createAuthResponse(refreshResult.accessToken, secret, {
-                        req,
-                        refreshToken: newRefreshToken,
-                        redirectPath: currentPath,
-                        text: text || serviceId,
-                        cookiePrefix,
-                        isProduction,
-                        cookieDomain,
-                        serviceId,
-                        licenseKey: options.licenseKey,
-                    });
+                    debugLog('verifyAndRefreshToken', 'Updating cookies without redirect...');
+                    // NextResponse.next()를 생성하고 쿠키만 설정
+                    const { NextResponse: NextResponseClass } = await getNextServer();
+                    const response = NextResponseClass.next();
+                    // NextAuth JWT 생성
+                    const jwt = createNextAuthJWT(payload, serviceId);
+                    if (newRefreshToken) {
+                        jwt.refreshToken = newRefreshToken;
+                    }
+                    jwt.accessTokenExpires = Date.now() + (15 * 60 * 1000);
+                    // NextAuth 세션 쿠키 설정
+                    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,
+                    };
+                    if (cookieDomain) {
+                        cookieOptions.domain = cookieDomain;
+                    }
+                    response.cookies.set(nextAuthCookieName, nextAuthToken, cookieOptions);
+                    // 커스텀 토큰 쿠키 설정
+                    if (newRefreshToken) {
+                        setCustomTokens(response, refreshResult.accessToken, newRefreshToken, {
+                            cookiePrefix,
+                            isProduction,
+                            cookieDomain,
+                        });
+                    }
+                    else {
+                        setCustomTokens(response, refreshResult.accessToken, {
+                            cookiePrefix,
+                            isProduction,
+                            cookieDomain,
+                        });
+                    }
+                    debugLog('verifyAndRefreshToken', 'Cookies updated, continuing with current request');
                     return { isValid: true, response, payload };
                 }
                 catch (error) {

package/package.json

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