@akinon/next 2.0.0-beta.2 → 2.0.0-beta.20

package/api/auth.ts

@@ -1,15 +1,27 @@
-import { NextApiRequest, NextApiResponse } from 'next';
-import NextAuth, { Session } from 'next-auth';
-import CredentialProvider from 'next-auth/providers/credentials';
+import NextAuth, { Session, CredentialsSignin } from 'next-auth';
+import Credentials from 'next-auth/providers/credentials';
 import { ROUTES } from 'routes';
 import { URLS, user } from '../data/urls';
 import Settings from 'settings';
 import { urlLocaleMatcherRegex } from '../utils';
 import logger from '@akinon/next/utils/log';
 import { AuthError } from '../types';
+import getRootHostname from '../utils/get-root-hostname';
+import { LocaleUrlStrategy } from '../localization';
+import { cookies, headers } from 'next/headers';
+
+import type { NextAuthConfig } from 'next-auth';
+
+class PzCredentialsError extends CredentialsSignin {
+  code = 'credentials';
+  constructor(errors: AuthError[]) {
+    super();
+    this.code = JSON.stringify(errors);
+  }
+}
 
 async function getCurrentUser(sessionId: string, currency = '') {
-  const headers = {
+  const reqHeaders = {
     'Content-Type': 'application/json',
     Cookie: `osessionid=${sessionId}`,
     'x-currency': currency
@@ -17,7 +29,7 @@ async function getCurrentUser(sessionId: string, currency = '') {
 
   const currentUser = await (
     await fetch(URLS.user.currentUser, {
-      headers
+      headers: reqHeaders
     })
   ).json();
 
@@ -40,15 +52,18 @@ async function getCurrentUser(sessionId: string, currency = '') {
   };
 }
 
-const nextAuthOptions = (req: NextApiRequest, res: NextApiResponse) => {
+type CustomNextAuthOptions = () => Partial<NextAuthConfig>;
+
+const getDefaultAuthConfig = (): NextAuthConfig => {
   return {
     providers: [
-      CredentialProvider({
+      Credentials({
         id: 'oauth',
         name: 'credentials',
         credentials: {},
         authorize: async (credentials) => {
-          const sessionId = req.cookies['osessionid'];
+          const cookieStore = await cookies();
+          const sessionId = cookieStore.get('osessionid')?.value;
 
           if (!sessionId) {
             return null;
@@ -56,12 +71,12 @@ const nextAuthOptions = (req: NextApiRequest, res: NextApiResponse) => {
 
           const currentUser = await getCurrentUser(
             sessionId,
-            req.cookies['pz-currency'] ?? ''
+            cookieStore.get('pz-currency')?.value ?? ''
           );
           return currentUser;
         }
       }),
-      CredentialProvider({
+      Credentials({
         id: 'default',
         name: 'credentials',
         credentials: {
@@ -76,32 +91,58 @@ const nextAuthOptions = (req: NextApiRequest, res: NextApiResponse) => {
           captchaValidated: {}
         },
         authorize: async (credentials) => {
-          const headers: HeadersInit = new Headers();
+          const cookieStore = await cookies();
+          const headerStore = await headers();
+
+          const reqHeaders: HeadersInit = new Headers();
           const language = Settings.localization.locales.find(
-            (item) => item.value === credentials.locale
+            (item) => item.value === (credentials as any).locale
           ).apiValue;
-          const userIp = req.headers['x-forwarded-for']?.toString() ?? '';
-
-          headers.set('Content-Type', 'application/json');
-          headers.set('cookie', `${req.headers.cookie}`);
-          headers.set('Accept-Language', `${language}`);
-          headers.set('x-currency', req.cookies['pz-currency'] ?? '');
-          headers.set('x-forwarded-for', userIp);
-          headers.set(
+          const userIp = headerStore.get('x-forwarded-for') ?? '';
+
+          reqHeaders.set('Content-Type', 'application/json');
+          reqHeaders.set('cookie', headerStore.get('cookie') ?? '');
+          reqHeaders.set('Accept-Language', `${language}`);
+          reqHeaders.set(
+            'x-currency',
+            cookieStore.get('pz-currency')?.value ?? ''
+          );
+          reqHeaders.set('x-forwarded-for', userIp);
+          reqHeaders.set(
             'x-app-device',
-            req.headers['x-app-device']?.toString() ?? ''
+            headerStore.get('x-app-device') ?? ''
+          );
+
+          reqHeaders.set(
+            'x-frontend-id',
+            cookieStore.get('pz-frontend-id')?.value || ''
           );
 
           logger.debug('Trying to login/register', {
-            formType: credentials.formType,
+            formType: (credentials as any).formType,
             userIp
           });
 
+          const checkCurrentUser = await getCurrentUser(
+            cookieStore.get('osessionid')?.value ?? '',
+            cookieStore.get('pz-currency')?.value ?? ''
+          );
+
+          if (checkCurrentUser?.pk) {
+            const sessionCookie = reqHeaders
+              .get('cookie')
+              ?.match(/osessionid=\w+/)?.[0]
+              .replace(/osessionid=/, '');
+            if (sessionCookie) {
+              reqHeaders.set('cookie', sessionCookie);
+            }
+          }
+
           const apiRequest = await fetch(
-            `${Settings.commerceUrl}${user[credentials.formType]}`,
+            `${Settings.commerceUrl}${user[(credentials as any).formType]}`,
             {
               method: 'POST',
-              headers,
+              headers: reqHeaders,
               body: JSON.stringify(credentials)
             }
           );
@@ -133,12 +174,28 @@ const nextAuthOptions = (req: NextApiRequest, res: NextApiResponse) => {
 
           if (sessionId) {
             const maxAge = 30 * 24 * 60 * 60; // 30 days in seconds
-            const cookieOptions = `Path=/; HttpOnly; Secure; Max-Age=${maxAge}`;
+            const { localeUrlStrategy } = Settings.localization;
 
-            res.setHeader('Set-Cookie', [
-              `osessionid=${sessionId}; ${cookieOptions}`,
-              `sessionid=${sessionId}; ${cookieOptions}` // required to get 3D redirection form
-            ]);
+            const fallbackHost =
+              headerStore.get('x-forwarded-host') ||
+              headerStore.get('host');
+            const hostname =
+              process.env.NEXT_PUBLIC_URL || `https://${fallbackHost}`;
+            const rootHostname =
+              localeUrlStrategy === LocaleUrlStrategy.Subdomain
+                ? getRootHostname(hostname)
+                : null;
+
+            const cookieOptions = {
+              path: '/',
+              httpOnly: true,
+              secure: true,
+              maxAge,
+              ...(rootHostname ? { domain: rootHostname } : {})
+            };
+
+            cookieStore.set('osessionid', sessionId, cookieOptions);
+            cookieStore.set('sessionid', sessionId, cookieOptions);
           }
 
           if (!response.key) {
@@ -159,8 +216,8 @@ const nextAuthOptions = (req: NextApiRequest, res: NextApiResponse) => {
               });
 
               logger.debug('Captcha required', {
-                email: credentials.email,
-                formType: credentials.formType
+                email: (credentials as any).email,
+                formType: (credentials as any).formType
               });
             } else if (apiRequest.status === 202) {
               errors.push({
@@ -179,13 +236,13 @@ const nextAuthOptions = (req: NextApiRequest, res: NextApiResponse) => {
             }
 
             if (errors.length) {
-              throw new Error(JSON.stringify(errors));
+              throw new PzCredentialsError(errors);
             }
           }
 
           const currentUser = await getCurrentUser(
             sessionId,
-            req.cookies['pz-currency'] ?? ''
+            cookieStore.get('pz-currency')?.value ?? ''
           );
           return currentUser;
         }
@@ -199,18 +256,20 @@ const nextAuthOptions = (req: NextApiRequest, res: NextApiResponse) => {
 
         return token;
       },
-      async session({ session, user, token }) {
-        session.user = token.user as Session['user'];
+      async session({ session, token }) {
+        session.user = token.user as any;
         return session;
       },
       async redirect({ url, baseUrl }: { url: string; baseUrl: string }) {
+        const headerStore = await headers();
         const pathname = url.startsWith('/') ? url : url.replace(baseUrl, '');
         const pathnameWithoutLocale = pathname.replace(
           urlLocaleMatcherRegex,
           ''
         );
 
-        const localeResults = req.headers.referer
+        const localeResults = headerStore
+          .get('referer')
           ?.replace(baseUrl, '')
           ?.match(urlLocaleMatcherRegex);
 
@@ -221,11 +280,16 @@ const nextAuthOptions = (req: NextApiRequest, res: NextApiResponse) => {
       signIn: () => {
         logger.debug('Successfully signed in');
       },
-      signOut: () => {
-        res.setHeader('Set-Cookie', [
-          `osessionid=; Path=/; expires=Thu, 01 Jan 1970 00:00:00 GMT`,
-          `sessionid=; Path=/; expires=Thu, 01 Jan 1970 00:00:00 GMT`
-        ]);
+      signOut: async () => {
+        const cookieStore = await cookies();
+        cookieStore.set('osessionid', '', {
+          path: '/',
+          maxAge: 0
+        });
+        cookieStore.set('sessionid', '', {
+          path: '/',
+          maxAge: 0
+        });
         logger.debug('Successfully signed out');
       }
     },
@@ -236,8 +300,33 @@ const nextAuthOptions = (req: NextApiRequest, res: NextApiResponse) => {
   };
 };
 
-const Auth = (req, res) => {
-  return NextAuth(req, res, nextAuthOptions(req, res));
+export const createAuth = (customOptions?: CustomNextAuthOptions) => {
+  const baseConfig = getDefaultAuthConfig();
+  const customConfig = customOptions ? customOptions() : {};
+
+  const mergedConfig: NextAuthConfig = {
+    trustHost: true,
+    ...baseConfig,
+    ...customConfig,
+    providers: [
+      ...baseConfig.providers,
+      ...(customConfig.providers || [])
+    ],
+    callbacks: {
+      ...baseConfig.callbacks,
+      ...customConfig.callbacks
+    },
+    events: {
+      ...baseConfig.events,
+      ...customConfig.events
+    },
+    pages: {
+      ...baseConfig.pages,
+      ...customConfig.pages
+    }
+  };
+
+  return NextAuth(mergedConfig);
 };
 
-export default Auth;
+export default createAuth;

package/api/barcode-search.ts

@@ -0,0 +1,59 @@
+import { NextRequest, NextResponse } from 'next/server';
+import Settings from 'settings';
+
+export async function GET(request: NextRequest) {
+  try {
+    const { searchParams } = new URL(request.url);
+    const barcode = searchParams.get('search_text');
+
+    if (!barcode) {
+      return NextResponse.json(
+        { error: 'Missing search_text parameter (barcode)' },
+        { status: 400 }
+      );
+    }
+
+    if (Settings.commerceUrl === 'default') {
+      return NextResponse.json(
+        { error: 'Commerce URL is not configured' },
+        { status: 500 }
+      );
+    }
+
+    const queryParams = new URLSearchParams();
+    queryParams.append('search_text', barcode);
+
+    searchParams.forEach((value, key) => {
+      if (key !== 'search_text') {
+        queryParams.append(key, value);
+      }
+    });
+
+    const apiUrl = `${Settings.commerceUrl}/list/?${queryParams.toString()}`;
+
+    const headers: Record<string, string> = {
+      Accept: 'application/json',
+      'Content-Type': 'application/json'
+    };
+
+    const response = await fetch(apiUrl, {
+      method: 'GET',
+      headers
+    });
+
+    if (!response.ok) {
+      return NextResponse.json(
+        { error: `API request failed with status: ${response.status}` },
+        { status: response.status }
+      );
+    }
+
+    const data = await response.json();
+    return NextResponse.json(data);
+  } catch (error) {
+    return NextResponse.json(
+      { error: (error as Error).message },
+      { status: 500 }
+    );
+  }
+}

package/api/cache.ts

@@ -21,20 +21,56 @@ async function handleRequest(...args) {
   }
 
   const formData = await req.formData();
-  const body = {} as { key: string; value?: string; expire?: number };
+  const body = {} as {
+    key: string;
+    value?: string;
+    expire?: number;
+    keyValuePairs?: string;
+    compressed?: string;
+  };
 
   formData.forEach((value, key) => {
     body[key] = value;
   });
 
-  const { key, value, expire } = body;
-  let response: string | boolean;
+  const { key, value, expire, keyValuePairs, compressed } = body;
+  let response: any;
 
   try {
     if (req.method === 'POST') {
-      response = await Cache.get(key);
+      // GET request - check if compressed flag is set
+      if (compressed === 'true') {
+        response = await Cache.getCompressed(key);
+      } else {
+        response = await Cache.get(key);
+      }
     } else if (req.method === 'PUT') {
-      response = await Cache.set(key, value, expire);
+      if (keyValuePairs) {
+        try {
+          const parsedKeyValuePairs = JSON.parse(keyValuePairs);
+          if (
+            typeof parsedKeyValuePairs !== 'object' ||
+            parsedKeyValuePairs === null ||
+            Array.isArray(parsedKeyValuePairs)
+          ) {
+            throw new Error('Invalid keyValuePairs format - must be an object');
+          }
+          response = await Cache.mset(parsedKeyValuePairs, expire);
+        } catch (error) {
+          logger.error('Invalid keyValuePairs in mset request', { error });
+          return NextResponse.json(
+            { error: 'Invalid keyValuePairs format' },
+            { status: 400 }
+          );
+        }
+      } else {
+        // SET request - check if compressed flag is set
+        if (compressed === 'true') {
+          response = await Cache.setCompressed(key, value, expire);
+        } else {
+          response = await Cache.set(key, value, expire);
+        }
+      }
     }
   } catch (error) {
     logger.error(error);

package/api/client.ts

@@ -5,6 +5,8 @@ import logger from '../utils/log';
 import formatCookieString from '../utils/format-cookie-string';
 import cookieParser from 'set-cookie-parser';
 import { cookies } from 'next/headers';
+import getRootHostname from '../utils/get-root-hostname';
+import { LocaleUrlStrategy } from '../localization';
 
 interface RouteParams {
   params: {
@@ -13,8 +15,8 @@ interface RouteParams {
 }
 
 async function proxyRequest(...args) {
-  const [req, { params }] = args as [req: Request, params: RouteParams];
-  const resolvedParams = await params;
+  const [req, routeContext] = args as [req: Request, { params: Promise<RouteParams['params']> }];
+  const params = await routeContext.params;
   const { searchParams } = new URL(req.url);
   const commerceUrl = settings.commerceUrl;
 
@@ -33,7 +35,7 @@ async function proxyRequest(...args) {
     responseType: 'json'
   };
 
-  const slug = `${resolvedParams.slug.join('/')}/`;
+  const slug = `${params.slug.join('/')}/`;
   const options_ = JSON.parse(
     decodeURIComponent((searchParams.get('options') as string) ?? '{}')
   );
@@ -191,8 +193,23 @@ async function proxyRequest(...args) {
     const responseHeaders: any = {};
 
     if (filteredCookies.length > 0) {
+      const { localeUrlStrategy } = settings.localization;
+
+      const fallbackHost =
+        req.headers.get('x-forwarded-host') || req.headers.get('host');
+      const hostname = process.env.NEXT_PUBLIC_URL || `https://${fallbackHost}`;
+      const rootHostname =
+        localeUrlStrategy === LocaleUrlStrategy.Subdomain
+          ? getRootHostname(hostname)
+          : null;
+
       responseHeaders['set-cookie'] = filteredCookies
-        .map(formatCookieString)
+        .map((cookie) => {
+          if (!cookie.domain && rootHostname) {
+            cookie.domain = rootHostname;
+          }
+          return formatCookieString(cookie);
+        })
         .join(', ');
     }
 

package/api/form.ts

@@ -0,0 +1,85 @@
+import { NextRequest, NextResponse } from 'next/server';
+import { getFormData } from '@akinon/next/data/server';
+
+interface FormRouteParams {
+  params: Promise<{
+    id: string[];
+  }>;
+}
+
+interface FormConfig {
+  pk: number;
+  is_active: boolean;
+}
+
+type SubmissionData = Record<string, string | File>;
+
+export async function POST(request: NextRequest, { params }: FormRouteParams) {
+  try {
+    const { id } = await params;
+    const formId = id?.[0];
+
+    if (!formId || isNaN(Number(formId))) {
+      return NextResponse.json(
+        { error: 'Valid form ID is required' },
+        { status: 400 }
+      );
+    }
+
+    const formConfig: FormConfig | null = await getFormData({
+      pk: Number(formId)
+    });
+
+    if (!formConfig || !formConfig.is_active) {
+      return NextResponse.json(
+        { error: 'Form not found or inactive' },
+        { status: 404 }
+      );
+    }
+
+    const formData = await request.formData();
+    const submissionData: SubmissionData = Object.fromEntries(
+      formData.entries()
+    );
+
+    return await processFormSubmission(formConfig, submissionData);
+  } catch (error) {
+    console.error('Form submission error:', error);
+
+    return NextResponse.json(
+      { error: 'Internal server error' },
+      { status: 500 }
+    );
+  }
+}
+
+async function processFormSubmission(
+  formConfig: FormConfig,
+  data: SubmissionData
+) {
+  const backendUrl = process.env.SERVICE_BACKEND_URL;
+  if (!backendUrl) {
+    throw new Error('SERVICE_BACKEND_URL is not defined');
+  }
+
+  const url = `${backendUrl}/forms/${formConfig.pk}/generate`;
+
+  const submissionPayload = {
+    ...data
+  };
+
+  const response = await fetch(url, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify(submissionPayload)
+  });
+
+  const body = await response.text();
+
+  return new NextResponse(body, {
+    status: response.status,
+    headers: {
+      'Content-Type': response.headers.get('content-type') ?? 'application/json'
+    }
+  });
+}

package/api/image-proxy.ts

@@ -0,0 +1,75 @@
+import { NextRequest, NextResponse } from 'next/server';
+
+async function proxyImage(imageUrl: string) {
+  if (!imageUrl) {
+    return NextResponse.json(
+      { success: false, error: 'Missing url parameter' },
+      { status: 400 }
+    );
+  }
+
+  const imageResponse = await fetch(imageUrl);
+
+  if (!imageResponse.ok) {
+    return NextResponse.json(
+      { success: false, error: 'Failed to fetch image from URL' },
+      { status: 400 }
+    );
+  }
+
+  const imageBuffer = await imageResponse.arrayBuffer();
+  const base64Image = Buffer.from(imageBuffer).toString('base64');
+  const contentType = imageResponse.headers.get('content-type') || 'image/jpeg';
+
+  return { base64Image, contentType, imageBuffer };
+}
+
+export async function GET(request: NextRequest) {
+  try {
+    const { searchParams } = new URL(request.url);
+    const imageUrl = searchParams.get('url');
+
+    const result = await proxyImage(imageUrl!);
+    if (result instanceof NextResponse) {
+      return result;
+    }
+
+    return new NextResponse(result.imageBuffer, {
+      status: 200,
+      headers: {
+        'Content-Type': result.contentType,
+        'Access-Control-Allow-Origin': '*',
+        'Cache-Control': 'public, max-age=3600'
+      }
+    });
+  } catch (error) {
+    console.error('Image proxy error:', error);
+    return NextResponse.json(
+      { success: false, error: 'Internal server error' },
+      { status: 500 }
+    );
+  }
+}
+
+export async function POST(request: NextRequest) {
+  try {
+    const body = await request.json();
+    const imageUrl = body.imageUrl;
+
+    const result = await proxyImage(imageUrl);
+    if (result instanceof NextResponse) {
+      return result;
+    }
+
+    return NextResponse.json({
+      success: true,
+      base64Image: `data:${result.contentType};base64,${result.base64Image}`
+    });
+  } catch (error) {
+    console.error('Image proxy POST error:', error);
+    return NextResponse.json(
+      { success: false, error: 'Internal server error' },
+      { status: 500 }
+    );
+  }
+}

package/api/product-categories.ts

@@ -0,0 +1,53 @@
+import { NextRequest, NextResponse } from 'next/server';
+import { getProductData } from '@akinon/next/data/server';
+
+export async function GET(request: NextRequest) {
+  try {
+    const { searchParams } = new URL(request.url);
+    const pksParam = searchParams.get('pks');
+
+    if (!pksParam) {
+      return NextResponse.json(
+        { error: 'pks parameter required' },
+        { status: 400 }
+      );
+    }
+
+    const pks = pksParam.split(',').map(Number).filter(Boolean);
+
+    if (pks.length === 0) {
+      return NextResponse.json({ error: 'Invalid pks' }, { status: 400 });
+    }
+
+    const results = await Promise.all(
+      pks.map(async (pk) => {
+        try {
+          const { breadcrumbData } = await getProductData({ pk });
+
+          const categoryIds =
+            breadcrumbData
+              ?.map((item: any) => item.extra_context?.attributes?.category_id)
+              .filter(Boolean) || [];
+
+          return { pk, categoryIds };
+        } catch (error) {
+          console.error(`Error fetching product ${pk}:`, error);
+          return { pk, categoryIds: [] };
+        }
+      })
+    );
+
+    const mapping: Record<string, number[]> = {};
+    results.forEach(({ pk, categoryIds }) => {
+      mapping[String(pk)] = categoryIds;
+    });
+
+    return NextResponse.json(mapping);
+  } catch (error) {
+    console.error('Error in product-categories API:', error);
+    return NextResponse.json(
+      { error: 'Internal server error' },
+      { status: 500 }
+    );
+  }
+}