@akinon/next 1.120.0-rc.3 → 1.120.0-rc.5

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @akinon/next
 
+## 1.120.0-rc.5
+
+### Minor Changes
+
+- e18836b: ZERO-4160: Restore scope in Sentry addon configuration in akinon.json
+
+## 1.120.0-rc.4
+
+### Minor Changes
+
+- bfafa3f4: ZERO-4160: Refactor oauth-login middleware to use fetchCommerce for API calls and improve cookie handling
+
 ## 1.120.0-rc.3
 
 ### Minor Changes

package/middlewares/oauth-login.ts

@@ -8,94 +8,112 @@ import Settings from 'settings';
 import { getUrlPathWithLocale } from '../utils/localization';
 import logger from '../utils/log';
 
-const withOauthLogin =
-  (middleware: NextMiddleware) =>
-  async (req: NextRequest, event: NextFetchEvent) => {
-    const url = req.nextUrl.clone();
-    const loginUrlMatcherRegex = new RegExp(/^\/(\w+)\/login\/?$/);
-    const loginCallbackUrlMatcherRegex = new RegExp(
-      /^\/(\w+)\/login\/callback\/?$/
-    );
-    const ip = req.headers.get('x-forwarded-for') ?? '';
-
-    const requestHeaders = {
+const LOGIN_URL_REGEX = /^\/(\w+)\/login\/?$/;
+const CALLBACK_URL_REGEX = /^\/(\w+)\/login\/callback\/?$/;
+
+function fetchCommerce(url: string, req: NextRequest): Promise<Response> {
+  return fetch(url, {
+    headers: {
       'x-forwarded-host':
         req.headers.get('x-forwarded-host') || req.headers.get('host') || '',
-      'x-forwarded-for': ip,
+      'x-forwarded-for': req.headers.get('x-forwarded-for') ?? '',
+      'x-forwarded-proto': req.headers.get('x-forwarded-proto') || 'https',
       'x-currency': req.cookies.get('pz-currency')?.value ?? '',
-      
-    };
+      cookie: req.headers.get('cookie') ?? ''
+    },
+    redirect: 'manual'
+  });
+}
+
+function forwardCookies(from: Response, to: NextResponse): void {
+  from.headers.getSetCookie().forEach((cookie) => {
+    to.headers.append('set-cookie', cookie);
+  });
+}
+
+function commerceRedirect(
+  commerceResponse: Response,
+  location: string,
+  origin: string
+): NextResponse {
+  const redirectUrl = new URL(location, origin);
+  const response = NextResponse.redirect(redirectUrl);
+  forwardCookies(commerceResponse, response);
+  return response;
+}
+
+function commercePassthrough(commerceResponse: Response): NextResponse {
+  return new NextResponse(commerceResponse.body, {
+    status: commerceResponse.status,
+    headers: commerceResponse.headers
+  });
+}
 
+const withOauthLogin =
+  (middleware: NextMiddleware) =>
+  async (req: NextRequest, event: NextFetchEvent) => {
+    const { pathname, search } = req.nextUrl;
 
-      logger.info('OAuth login redirect', {
-        host: req.headers.get('host'),
-        'x-forwarded-host': req.headers.get('x-forwarded-host'),
-        'x-forwarded-for': req.headers.get('x-forwarded-for')
-      });
-
+    logger.info('OAuth login redirect', {
+      host: req.headers.get('host'),
+      'x-forwarded-host': req.headers.get('x-forwarded-host'),
+      'x-forwarded-for': req.headers.get('x-forwarded-for')
+    });
 
-    if (loginUrlMatcherRegex.test(url.pathname)) {
+    const loginMatch = LOGIN_URL_REGEX.exec(pathname);
+    if (loginMatch) {
       try {
-        const provider = url.pathname.match(loginUrlMatcherRegex)[1];
-        const commerceResponse = await fetch(
+        const provider = loginMatch[1];
+        const commerceResponse = await fetchCommerce(
           `${Settings.commerceUrl}/${provider}/login/`,
-          {
-            headers: requestHeaders,
-            redirect: 'manual'
-          }
+          req
         );
 
         const location = commerceResponse.headers.get('location');
-        if (location) {
-          const response = NextResponse.redirect(location);
-
-          if (req.headers.get('referer')) {
-            response.cookies.set(
-              'pz-oauth-callback-url',
-              req.headers.get('referer')
-            );
-          }
-
-          return response;
-        }
-
-        return new NextResponse(commerceResponse.body, {
-          status: commerceResponse.status,
-          headers: commerceResponse.headers
-        });
+        if (!location) return commercePassthrough(commerceResponse);
+
+        const response = commerceRedirect(
+          commerceResponse,
+          location,
+          req.nextUrl.origin
+        );
+
+        response.headers.append(
+          'set-cookie',
+          `pz-oauth-callback-url=${encodeURIComponent(req.headers.get('referer') || '')}; Path=/`
+        );
+
+        return response;
       } catch (error) {
         console.error('OAuth login fetch failed:', error);
         return middleware(req, event);
       }
     }
 
-    if (loginCallbackUrlMatcherRegex.test(url.pathname)) {
+    const callbackMatch = CALLBACK_URL_REGEX.exec(pathname);
+    if (callbackMatch) {
       try {
-        const provider = url.pathname.match(loginCallbackUrlMatcherRegex)[1];
-        const commerceResponse = await fetch(
-          `${Settings.commerceUrl}/${provider}/login/callback/${url.search}`,
-          {
-            headers: requestHeaders,
-            redirect: 'manual'
-          }
+        const provider = callbackMatch[1];
+        const commerceResponse = await fetchCommerce(
+          `${Settings.commerceUrl}/${provider}/login/callback/${search}`,
+          req
         );
 
         const location = commerceResponse.headers.get('location');
-        if (location) {
-          return NextResponse.redirect(location);
-        }
-
-        return new NextResponse(commerceResponse.body, {
-          status: commerceResponse.status,
-          headers: commerceResponse.headers
-        });
+        if (!location) return commercePassthrough(commerceResponse);
+
+        return commerceRedirect(
+          commerceResponse,
+          location,
+          req.nextUrl.origin
+        );
       } catch (error) {
         console.error('OAuth callback fetch failed:', error);
         return middleware(req, event);
       }
     }
 
-    if (!url.pathname.startsWith('/baskets/basket')) {
+    if (!pathname.startsWith('/baskets/basket')) {
       return middleware(req, event);
     }
 
@@ -105,11 +123,12 @@ const withOauthLogin =
       req.cookies.get('messages')?.value.includes('Successfully signed in') ||
       (currentSessionId && req.cookies.get('messages'))
     ) {
-      let redirectUrlWithLocale = `${url.origin}${getUrlPathWithLocale(
+      let redirectUrlWithLocale = `${req.nextUrl.origin}${getUrlPathWithLocale(
         '/auth/oauth-login',
         req.cookies.get('pz-locale')?.value
       )}`;
-      let callbackUrl = req.cookies.get('pz-oauth-callback-url')?.value ?? '';
+      const callbackUrl =
+        req.cookies.get('pz-oauth-callback-url')?.value ?? '';
 
       if (callbackUrl.length) {
         redirectUrlWithLocale += `?next=${encodeURIComponent(callbackUrl)}`;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.120.0-rc.3",
+  "version": "1.120.0-rc.5",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -35,7 +35,7 @@
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.120.0-rc.3",
+    "@akinon/eslint-plugin-projectzero": "1.120.0-rc.5",
     "@babel/core": "7.26.10",
     "@babel/preset-env": "7.26.9",
     "@babel/preset-typescript": "7.27.0",