@akinon/next 1.28.0-rc.0 → 1.29.0-rc.2

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @akinon/next
 
+## 1.29.0-rc.2
+
+### Minor Changes
+
+- a7e432f: ZERO-2534: Fix for recapthca regex for replacing the special chars.
+- 495d155: ZERO-2505: findBaseDir function is united and move on to the utils
+- 495d155: ZERO-2524: Zero-cli dist checks for changes and renders it to the terminal.
+- f76f079: ZERO-2493: Add redirect util function
+
+## 1.28.0-rc.1
+
 ## 1.28.0-rc.0
 
 ### Minor Changes

package/data/client/user.ts

@@ -22,9 +22,9 @@ const userApi = api.injectEndpoints({
     getCaptcha: build.query<GetCaptchaResponse, void>({
       query: () => buildClientRequestUrl(user.captcha),
       transformResponse: (response: { html: string }) => {
-        const siteKeyMatch = response.html.match(/sitekey=["|']\w+/gi);
+        const siteKeyMatch = response.html.match(/sitekey=["|'][^"']+/gi);
         const csrfTokenMatch = response.html.match(
-          /name=['|"]csrfmiddlewaretoken['|"] value=['|"]\w+/gi
+          /name=['|"]csrfmiddlewaretoken['|"] value=['|"][^'"]+/gi
         );
         const siteKey = siteKeyMatch?.[0].replace(/sitekey=["|']/, '') || '';
         const csrfToken =

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.28.0-rc.0",
+  "version": "1.29.0-rc.2",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -32,7 +32,7 @@
     "@typescript-eslint/eslint-plugin": "6.7.4",
     "@typescript-eslint/parser": "6.7.4",
     "eslint": "^8.14.0",
-    "@akinon/eslint-plugin-projectzero": "1.24.0",
+    "@akinon/eslint-plugin-projectzero": "1.29.0-rc.2",
     "eslint-config-prettier": "8.5.0"
   }
 }

package/utils/redirect.ts

@@ -0,0 +1,30 @@
+import { redirect as nextRedirect, RedirectType } from 'next/navigation';
+import Settings from 'settings';
+import { headers } from 'next/headers';
+import { ServerVariables } from '@akinon/next/utils/server-variables';
+import { getUrlPathWithLocale } from '@akinon/next/utils/localization';
+
+export const redirect = (path: string, type?: RedirectType) => {
+  const nextHeaders = headers();
+  const pageUrl = new URL(
+    nextHeaders.get('pz-url') ?? process.env.NEXT_PUBLIC_URL
+  );
+
+  const currentLocale = Settings.localization.locales.find(
+    (locale) => locale.value === ServerVariables.locale
+  );
+
+  const callbackUrl = pageUrl.pathname;
+  const redirectUrlWithLocale = getUrlPathWithLocale(
+    path,
+    currentLocale.localePath ?? currentLocale.value
+  );
+
+  const redirectUrl = `${redirectUrlWithLocale}?callbackUrl=${callbackUrl}`;
+
+  if (type) {
+    return nextRedirect(redirectUrl, type);
+  } else {
+    return nextRedirect(redirectUrl);
+  }
+};