@akinon/next 1.14.0 → 1.14.1

package/.eslintrc.js

@@ -1,40 +1,40 @@
-module.exports = {
-  env: {
-    browser: true,
-    node: true,
-    es2021: true
-  },
-  extends: [
-    'eslint:recommended',
-    'next/core-web-vitals',
-    'eslint:recommended',
-    'plugin:@typescript-eslint/recommended',
-    'prettier',
-    'plugin:@akinon/projectzero/core', // DO NOT remove this config for stability
-    'plugin:@akinon/projectzero/recommended'
-  ],
-  overrides: [
-    {
-      env: {
-        node: true
-      },
-      files: ['.eslintrc.{js,cjs}', 'middlewares/default.ts'],
-      rules: {
-        '@akinon/projectzero/check-middleware-order': 'error'
-      },
-      parserOptions: {
-        sourceType: 'script'
-      }
-    }
-  ],
-  parser: '@typescript-eslint/parser',
-  parserOptions: {
-    ecmaVersion: '2021',
-    sourceType: 'module'
-  },
-  plugins: ['@typescript-eslint', '@akinon/projectzero'],
-  rules: {
-    '@typescript-eslint/no-unused-vars': 'warn',
-    '@typescript-eslint/no-explicit-any': 'warn'
-  }
-};
+module.exports = {
+  env: {
+    browser: true,
+    node: true,
+    es2021: true
+  },
+  extends: [
+    'eslint:recommended',
+    'next/core-web-vitals',
+    'eslint:recommended',
+    'plugin:@typescript-eslint/recommended',
+    'prettier',
+    'plugin:@akinon/projectzero/core', // DO NOT remove this config for stability
+    'plugin:@akinon/projectzero/recommended'
+  ],
+  overrides: [
+    {
+      env: {
+        node: true
+      },
+      files: ['.eslintrc.{js,cjs}', 'middlewares/default.ts'],
+      rules: {
+        '@akinon/projectzero/check-middleware-order': 'error'
+      },
+      parserOptions: {
+        sourceType: 'script'
+      }
+    }
+  ],
+  parser: '@typescript-eslint/parser',
+  parserOptions: {
+    ecmaVersion: '2021',
+    sourceType: 'module'
+  },
+  plugins: ['@typescript-eslint', '@akinon/projectzero'],
+  rules: {
+    '@typescript-eslint/no-unused-vars': 'warn',
+    '@typescript-eslint/no-explicit-any': 'warn'
+  }
+};

package/.prettierrc

@@ -1,13 +1,13 @@
-{
-  "bracketSameLine": false,
-  "tabWidth": 2,
-  "singleQuote": true,
-  "jsxSingleQuote": false,
-  "bracketSpacing": true,
-  "semi": true,
-  "useTabs": false,
-  "arrowParens": "always",
-  "endOfLine": "lf",
-  "proseWrap": "never",
-  "trailingComma": "none"
-}
+{
+  "bracketSameLine": false,
+  "tabWidth": 2,
+  "singleQuote": true,
+  "jsxSingleQuote": false,
+  "bracketSpacing": true,
+  "semi": true,
+  "useTabs": false,
+  "arrowParens": "always",
+  "endOfLine": "lf",
+  "proseWrap": "never",
+  "trailingComma": "none"
+}

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @akinon/next
 
+## 1.14.1
+
+### Patch Changes
+
+- Change EOL
+
 ## 1.14.0
 
 ### Minor Changes

package/api/auth.ts

@@ -1,231 +1,231 @@
-import { NextApiRequest, NextApiResponse } from 'next';
-import NextAuth, { Session } from 'next-auth';
-import CredentialProvider 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';
-
-async function getCurrentUser(sessionId: string, currency = '') {
-  const headers = {
-    'Content-Type': 'application/json',
-    Cookie: `osessionid=${sessionId}`,
-    'x-currency': currency
-  };
-
-  const currentUser = await (
-    await fetch(URLS.user.currentUser, {
-      headers
-    })
-  ).json();
-
-  logger.debug('Successfully fetched current user data', { currentUser });
-
-  return {
-    pk: currentUser.pk,
-    firstName: currentUser.first_name,
-    lastName: currentUser.last_name,
-    email: currentUser.email,
-    phone: currentUser.phone,
-    emailAllowed: currentUser.email_allowed,
-    smsAllowed: currentUser.sms_allowed,
-    dateJoined: currentUser.date_joined,
-    lastLogin: currentUser.last_login,
-    dateOfBirth: currentUser.date_of_birth,
-    hashedEmail: currentUser.hashed_email,
-    gender: currentUser.gender,
-    token: ''
-  };
-}
-
-const nextAuthOptions = (req: NextApiRequest, res: NextApiResponse) => {
-  return {
-    providers: [
-      CredentialProvider({
-        id: 'oauth',
-        name: 'credentials',
-        credentials: {},
-        authorize: async (credentials) => {
-          const sessionId = req.cookies['osessionid'];
-
-          if (!sessionId) {
-            return null;
-          }
-
-          const currentUser = await getCurrentUser(
-            sessionId,
-            req.cookies['pz-currency'] ?? ''
-          );
-          return currentUser;
-        }
-      }),
-      CredentialProvider({
-        id: 'default',
-        name: 'credentials',
-        credentials: {
-          email: { label: 'Email', type: 'email', placeholder: 'Email' },
-          password: {
-            label: 'Password',
-            type: 'password',
-            placeholder: 'Password'
-          },
-          formType: {},
-          locale: {},
-          captchaValidated: {}
-        },
-        authorize: async (credentials) => {
-          const headers: HeadersInit = new Headers();
-          const language = Settings.localization.locales.find(
-            (item) => item.value === credentials.locale
-          ).apiValue;
-
-          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'] ?? '');
-
-          logger.debug('Trying to login/register', {
-            formType: credentials.formType
-          });
-
-          const apiRequest = await fetch(
-            `${Settings.commerceUrl}${user[credentials.formType]}`,
-            {
-              method: 'POST',
-              headers,
-              body: JSON.stringify(credentials)
-            }
-          );
-
-          logger.info(`Login/Register request result: ${apiRequest.status}`);
-
-          const response = (await apiRequest.json()) as {
-            key: string;
-            non_field_errors: string[];
-            redirect_url: string;
-          };
-
-          logger.debug(`Login/Register response: ${JSON.stringify(response)}`);
-
-          let sessionId = '';
-          const setCookieHeader = apiRequest.headers.get('set-cookie');
-          if (setCookieHeader) {
-            sessionId =
-              setCookieHeader
-                .match(/osessionid=\w+/)?.[0]
-                .replace(/osessionid=/, '') || '';
-
-            logger.debug(`Login/Register session id: ${sessionId}`);
-          } else {
-            logger.warn('No set-cookie header found in response');
-          }
-
-          if (sessionId) {
-            res.setHeader('Set-Cookie', [
-              `osessionid=${sessionId}; Path=/; HttpOnly; Secure;`,
-              `sessionid=${sessionId}; Path=/; HttpOnly; Secure;` // required to get 3D redirection form
-            ]);
-          }
-
-          if (!response.key) {
-            const errors = [] as AuthError[];
-
-            const fieldErrors = Object.keys(response ?? {})
-              .filter((key) => key !== 'non_field_errors')
-              .map((key) => {
-                return {
-                  name: key,
-                  value: response[key]
-                };
-              });
-
-            if (response.redirect_url?.includes('captcha')) {
-              errors.push({
-                type: 'captcha'
-              });
-
-              logger.debug('Captcha required', {
-                email: credentials.email,
-                formType: credentials.formType
-              });
-            } else if (apiRequest.status === 202) {
-              errors.push({
-                type: 'otp'
-              });
-            } else if (fieldErrors.length) {
-              errors.push({
-                type: 'field_errors',
-                data: fieldErrors
-              });
-            } else if (response.non_field_errors) {
-              errors.push({
-                type: 'non_field_errors',
-                data: response.non_field_errors
-              });
-            }
-
-            if (errors.length) {
-              throw new Error(JSON.stringify(errors));
-            }
-          }
-
-          const currentUser = await getCurrentUser(
-            sessionId,
-            req.cookies['pz-currency'] ?? ''
-          );
-          return currentUser;
-        }
-      })
-    ],
-    callbacks: {
-      jwt: async ({ token, user }) => {
-        if (user) {
-          token.user = user;
-        }
-
-        return token;
-      },
-      async session({ session, user, token }) {
-        session.user = token.user as Session['user'];
-        return session;
-      },
-      async redirect({ url, baseUrl }: { url: string; baseUrl: string }) {
-        const pathname = url.startsWith('/') ? url : url.replace(baseUrl, '');
-        const pathnameWithoutLocale = pathname.replace(
-          urlLocaleMatcherRegex,
-          ''
-        );
-
-        const localeResults = req.headers.referer
-          .replace(baseUrl, '')
-          .match(urlLocaleMatcherRegex);
-
-        return `${baseUrl}${localeResults?.[0] || ''}${pathnameWithoutLocale}`;
-      }
-    },
-    events: {
-      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`
-        ]);
-        logger.debug('Successfully signed out');
-      }
-    },
-    pages: {
-      signIn: ROUTES.AUTH,
-      error: ROUTES.AUTH
-    }
-  };
-};
-
-const Auth = (req, res) => {
-  return NextAuth(req, res, nextAuthOptions(req, res));
-};
-
-export default Auth;
+import { NextApiRequest, NextApiResponse } from 'next';
+import NextAuth, { Session } from 'next-auth';
+import CredentialProvider 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';
+
+async function getCurrentUser(sessionId: string, currency = '') {
+  const headers = {
+    'Content-Type': 'application/json',
+    Cookie: `osessionid=${sessionId}`,
+    'x-currency': currency
+  };
+
+  const currentUser = await (
+    await fetch(URLS.user.currentUser, {
+      headers
+    })
+  ).json();
+
+  logger.debug('Successfully fetched current user data', { currentUser });
+
+  return {
+    pk: currentUser.pk,
+    firstName: currentUser.first_name,
+    lastName: currentUser.last_name,
+    email: currentUser.email,
+    phone: currentUser.phone,
+    emailAllowed: currentUser.email_allowed,
+    smsAllowed: currentUser.sms_allowed,
+    dateJoined: currentUser.date_joined,
+    lastLogin: currentUser.last_login,
+    dateOfBirth: currentUser.date_of_birth,
+    hashedEmail: currentUser.hashed_email,
+    gender: currentUser.gender,
+    token: ''
+  };
+}
+
+const nextAuthOptions = (req: NextApiRequest, res: NextApiResponse) => {
+  return {
+    providers: [
+      CredentialProvider({
+        id: 'oauth',
+        name: 'credentials',
+        credentials: {},
+        authorize: async (credentials) => {
+          const sessionId = req.cookies['osessionid'];
+
+          if (!sessionId) {
+            return null;
+          }
+
+          const currentUser = await getCurrentUser(
+            sessionId,
+            req.cookies['pz-currency'] ?? ''
+          );
+          return currentUser;
+        }
+      }),
+      CredentialProvider({
+        id: 'default',
+        name: 'credentials',
+        credentials: {
+          email: { label: 'Email', type: 'email', placeholder: 'Email' },
+          password: {
+            label: 'Password',
+            type: 'password',
+            placeholder: 'Password'
+          },
+          formType: {},
+          locale: {},
+          captchaValidated: {}
+        },
+        authorize: async (credentials) => {
+          const headers: HeadersInit = new Headers();
+          const language = Settings.localization.locales.find(
+            (item) => item.value === credentials.locale
+          ).apiValue;
+
+          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'] ?? '');
+
+          logger.debug('Trying to login/register', {
+            formType: credentials.formType
+          });
+
+          const apiRequest = await fetch(
+            `${Settings.commerceUrl}${user[credentials.formType]}`,
+            {
+              method: 'POST',
+              headers,
+              body: JSON.stringify(credentials)
+            }
+          );
+
+          logger.info(`Login/Register request result: ${apiRequest.status}`);
+
+          const response = (await apiRequest.json()) as {
+            key: string;
+            non_field_errors: string[];
+            redirect_url: string;
+          };
+
+          logger.debug(`Login/Register response: ${JSON.stringify(response)}`);
+
+          let sessionId = '';
+          const setCookieHeader = apiRequest.headers.get('set-cookie');
+          if (setCookieHeader) {
+            sessionId =
+              setCookieHeader
+                .match(/osessionid=\w+/)?.[0]
+                .replace(/osessionid=/, '') || '';
+
+            logger.debug(`Login/Register session id: ${sessionId}`);
+          } else {
+            logger.warn('No set-cookie header found in response');
+          }
+
+          if (sessionId) {
+            res.setHeader('Set-Cookie', [
+              `osessionid=${sessionId}; Path=/; HttpOnly; Secure;`,
+              `sessionid=${sessionId}; Path=/; HttpOnly; Secure;` // required to get 3D redirection form
+            ]);
+          }
+
+          if (!response.key) {
+            const errors = [] as AuthError[];
+
+            const fieldErrors = Object.keys(response ?? {})
+              .filter((key) => key !== 'non_field_errors')
+              .map((key) => {
+                return {
+                  name: key,
+                  value: response[key]
+                };
+              });
+
+            if (response.redirect_url?.includes('captcha')) {
+              errors.push({
+                type: 'captcha'
+              });
+
+              logger.debug('Captcha required', {
+                email: credentials.email,
+                formType: credentials.formType
+              });
+            } else if (apiRequest.status === 202) {
+              errors.push({
+                type: 'otp'
+              });
+            } else if (fieldErrors.length) {
+              errors.push({
+                type: 'field_errors',
+                data: fieldErrors
+              });
+            } else if (response.non_field_errors) {
+              errors.push({
+                type: 'non_field_errors',
+                data: response.non_field_errors
+              });
+            }
+
+            if (errors.length) {
+              throw new Error(JSON.stringify(errors));
+            }
+          }
+
+          const currentUser = await getCurrentUser(
+            sessionId,
+            req.cookies['pz-currency'] ?? ''
+          );
+          return currentUser;
+        }
+      })
+    ],
+    callbacks: {
+      jwt: async ({ token, user }) => {
+        if (user) {
+          token.user = user;
+        }
+
+        return token;
+      },
+      async session({ session, user, token }) {
+        session.user = token.user as Session['user'];
+        return session;
+      },
+      async redirect({ url, baseUrl }: { url: string; baseUrl: string }) {
+        const pathname = url.startsWith('/') ? url : url.replace(baseUrl, '');
+        const pathnameWithoutLocale = pathname.replace(
+          urlLocaleMatcherRegex,
+          ''
+        );
+
+        const localeResults = req.headers.referer
+          .replace(baseUrl, '')
+          .match(urlLocaleMatcherRegex);
+
+        return `${baseUrl}${localeResults?.[0] || ''}${pathnameWithoutLocale}`;
+      }
+    },
+    events: {
+      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`
+        ]);
+        logger.debug('Successfully signed out');
+      }
+    },
+    pages: {
+      signIn: ROUTES.AUTH,
+      error: ROUTES.AUTH
+    }
+  };
+};
+
+const Auth = (req, res) => {
+  return NextAuth(req, res, nextAuthOptions(req, res));
+};
+
+export default Auth;

package/api/cache.ts

@@ -1,44 +1,44 @@
-import { Cache } from '../lib/cache';
-import { NextResponse } from 'next/server';
-import logger from '@akinon/next/utils/log';
-
-export async function POST(...args) {
-  return handleRequest(...args);
-}
-
-export async function PUT(...args) {
-  return handleRequest(...args);
-}
-
-async function handleRequest(...args) {
-  const [req] = args as [req: Request];
-
-  if (
-    !req.headers.get('authorization') ||
-    req.headers.get('authorization') !== process.env.CACHE_SECRET
-  ) {
-    return NextResponse.next({ status: 403 });
-  }
-
-  const formData = await req.formData();
-  const body = {} as { key: string; value?: string; expire?: number };
-
-  formData.forEach((value, key) => {
-    body[key] = value;
-  });
-
-  const { key, value, expire } = body;
-  let response: string | boolean;
-
-  try {
-    if (req.method === 'POST') {
-      response = await Cache.get(key);
-    } else if (req.method === 'PUT') {
-      response = await Cache.set(key, value, expire);
-    }
-  } catch (error) {
-    logger.error(error);
-  }
-
-  return NextResponse.json(response);
-}
+import { Cache } from '../lib/cache';
+import { NextResponse } from 'next/server';
+import logger from '@akinon/next/utils/log';
+
+export async function POST(...args) {
+  return handleRequest(...args);
+}
+
+export async function PUT(...args) {
+  return handleRequest(...args);
+}
+
+async function handleRequest(...args) {
+  const [req] = args as [req: Request];
+
+  if (
+    !req.headers.get('authorization') ||
+    req.headers.get('authorization') !== process.env.CACHE_SECRET
+  ) {
+    return NextResponse.next({ status: 403 });
+  }
+
+  const formData = await req.formData();
+  const body = {} as { key: string; value?: string; expire?: number };
+
+  formData.forEach((value, key) => {
+    body[key] = value;
+  });
+
+  const { key, value, expire } = body;
+  let response: string | boolean;
+
+  try {
+    if (req.method === 'POST') {
+      response = await Cache.get(key);
+    } else if (req.method === 'PUT') {
+      response = await Cache.set(key, value, expire);
+    }
+  } catch (error) {
+    logger.error(error);
+  }
+
+  return NextResponse.json(response);
+}