@akinon/projectzero 1.117.0-rc.1 → 1.117.0-rc.3

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # @akinon/projectzero
 
+## 1.117.0-rc.3
+
+## 1.117.0-rc.2
+
 ## 1.117.0-rc.1
 
 ## 1.117.0-rc.0

package/app-template/CHANGELOG.md

@@ -1,5 +1,74 @@
 # projectzeronext
 
+## 1.117.0-rc.3
+
+### Minor Changes
+
+- b59fdd1c: ZERO-4009: Add password reset token validation
+- d76d3255: ZERO-4011: Refactor sitemap content generation to append locale suffix based on matched locale
+
+### Patch Changes
+
+- Updated dependencies [b59fdd1c]
+  - @akinon/next@1.117.0-rc.3
+  - @akinon/pz-virtual-try-on@1.117.0-rc.3
+  - @akinon/pz-akifast@1.117.0-rc.3
+  - @akinon/pz-apple-pay@1.117.0-rc.3
+  - @akinon/pz-b2b@1.117.0-rc.3
+  - @akinon/pz-basket-gift-pack@1.117.0-rc.3
+  - @akinon/pz-bkm@1.117.0-rc.3
+  - @akinon/pz-checkout-gift-pack@1.117.0-rc.3
+  - @akinon/pz-click-collect@1.117.0-rc.3
+  - @akinon/pz-credit-payment@1.117.0-rc.3
+  - @akinon/pz-cybersource-uc@1.117.0-rc.3
+  - @akinon/pz-flow-payment@1.117.0-rc.3
+  - @akinon/pz-google-pay@1.117.0-rc.3
+  - @akinon/pz-gpay@1.117.0-rc.3
+  - @akinon/pz-haso@1.117.0-rc.3
+  - @akinon/pz-hepsipay@1.117.0-rc.3
+  - @akinon/pz-masterpass@1.117.0-rc.3
+  - @akinon/pz-masterpass-rest@1.117.0-rc.3
+  - @akinon/pz-multi-basket@1.117.0-rc.3
+  - @akinon/pz-one-click-checkout@1.117.0-rc.3
+  - @akinon/pz-otp@1.117.0-rc.3
+  - @akinon/pz-pay-on-delivery@1.117.0-rc.3
+  - @akinon/pz-saved-card@1.117.0-rc.3
+  - @akinon/pz-similar-products@1.117.0-rc.3
+  - @akinon/pz-tabby-extension@1.117.0-rc.3
+  - @akinon/pz-tamara-extension@1.117.0-rc.3
+
+## 1.117.0-rc.2
+
+### Patch Changes
+
+- Updated dependencies [591e345e]
+  - @akinon/next@1.117.0-rc.2
+  - @akinon/pz-virtual-try-on@1.117.0-rc.2
+  - @akinon/pz-akifast@1.117.0-rc.2
+  - @akinon/pz-apple-pay@1.117.0-rc.2
+  - @akinon/pz-b2b@1.117.0-rc.2
+  - @akinon/pz-basket-gift-pack@1.117.0-rc.2
+  - @akinon/pz-bkm@1.117.0-rc.2
+  - @akinon/pz-checkout-gift-pack@1.117.0-rc.2
+  - @akinon/pz-click-collect@1.117.0-rc.2
+  - @akinon/pz-credit-payment@1.117.0-rc.2
+  - @akinon/pz-cybersource-uc@1.117.0-rc.2
+  - @akinon/pz-flow-payment@1.117.0-rc.2
+  - @akinon/pz-google-pay@1.117.0-rc.2
+  - @akinon/pz-gpay@1.117.0-rc.2
+  - @akinon/pz-haso@1.117.0-rc.2
+  - @akinon/pz-hepsipay@1.117.0-rc.2
+  - @akinon/pz-masterpass@1.117.0-rc.2
+  - @akinon/pz-masterpass-rest@1.117.0-rc.2
+  - @akinon/pz-multi-basket@1.117.0-rc.2
+  - @akinon/pz-one-click-checkout@1.117.0-rc.2
+  - @akinon/pz-otp@1.117.0-rc.2
+  - @akinon/pz-pay-on-delivery@1.117.0-rc.2
+  - @akinon/pz-saved-card@1.117.0-rc.2
+  - @akinon/pz-similar-products@1.117.0-rc.2
+  - @akinon/pz-tabby-extension@1.117.0-rc.2
+  - @akinon/pz-tamara-extension@1.117.0-rc.2
+
 ## 1.117.0-rc.1
 
 ### Minor Changes

package/app-template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "projectzeronext",
-  "version": "1.117.0-rc.1",
+  "version": "1.117.0-rc.3",
   "private": true,
   "license": "MIT",
   "scripts": {
@@ -24,32 +24,32 @@
     "test:middleware": "jest middleware-matcher.test.ts --bail"
   },
   "dependencies": {
-    "@akinon/next": "1.117.0-rc.1",
-    "@akinon/pz-akifast": "1.117.0-rc.1",
-    "@akinon/pz-apple-pay": "1.117.0-rc.1",
-    "@akinon/pz-b2b": "1.117.0-rc.1",
-    "@akinon/pz-basket-gift-pack": "1.117.0-rc.1",
-    "@akinon/pz-bkm": "1.117.0-rc.1",
-    "@akinon/pz-checkout-gift-pack": "1.117.0-rc.1",
-    "@akinon/pz-click-collect": "1.117.0-rc.1",
-    "@akinon/pz-credit-payment": "1.117.0-rc.1",
-    "@akinon/pz-cybersource-uc": "1.117.0-rc.1",
-    "@akinon/pz-flow-payment": "1.117.0-rc.1",
-    "@akinon/pz-google-pay": "1.117.0-rc.1",
-    "@akinon/pz-gpay": "1.117.0-rc.1",
-    "@akinon/pz-haso": "1.117.0-rc.1",
-    "@akinon/pz-hepsipay": "1.117.0-rc.1",
-    "@akinon/pz-masterpass": "1.117.0-rc.1",
-    "@akinon/pz-masterpass-rest": "1.117.0-rc.1",
-    "@akinon/pz-multi-basket": "1.117.0-rc.1",
-    "@akinon/pz-one-click-checkout": "1.117.0-rc.1",
-    "@akinon/pz-otp": "1.117.0-rc.1",
-    "@akinon/pz-pay-on-delivery": "1.117.0-rc.1",
-    "@akinon/pz-saved-card": "1.117.0-rc.1",
-    "@akinon/pz-similar-products": "1.117.0-rc.1",
-    "@akinon/pz-tabby-extension": "1.117.0-rc.1",
-    "@akinon/pz-tamara-extension": "1.117.0-rc.1",
-    "@akinon/pz-virtual-try-on": "1.117.0-rc.1",
+    "@akinon/next": "1.117.0-rc.3",
+    "@akinon/pz-akifast": "1.117.0-rc.3",
+    "@akinon/pz-apple-pay": "1.117.0-rc.3",
+    "@akinon/pz-b2b": "1.117.0-rc.3",
+    "@akinon/pz-basket-gift-pack": "1.117.0-rc.3",
+    "@akinon/pz-bkm": "1.117.0-rc.3",
+    "@akinon/pz-checkout-gift-pack": "1.117.0-rc.3",
+    "@akinon/pz-click-collect": "1.117.0-rc.3",
+    "@akinon/pz-credit-payment": "1.117.0-rc.3",
+    "@akinon/pz-cybersource-uc": "1.117.0-rc.3",
+    "@akinon/pz-flow-payment": "1.117.0-rc.3",
+    "@akinon/pz-google-pay": "1.117.0-rc.3",
+    "@akinon/pz-gpay": "1.117.0-rc.3",
+    "@akinon/pz-haso": "1.117.0-rc.3",
+    "@akinon/pz-hepsipay": "1.117.0-rc.3",
+    "@akinon/pz-masterpass": "1.117.0-rc.3",
+    "@akinon/pz-masterpass-rest": "1.117.0-rc.3",
+    "@akinon/pz-multi-basket": "1.117.0-rc.3",
+    "@akinon/pz-one-click-checkout": "1.117.0-rc.3",
+    "@akinon/pz-otp": "1.117.0-rc.3",
+    "@akinon/pz-pay-on-delivery": "1.117.0-rc.3",
+    "@akinon/pz-saved-card": "1.117.0-rc.3",
+    "@akinon/pz-similar-products": "1.117.0-rc.3",
+    "@akinon/pz-tabby-extension": "1.117.0-rc.3",
+    "@akinon/pz-tamara-extension": "1.117.0-rc.3",
+    "@akinon/pz-virtual-try-on": "1.117.0-rc.3",
     "@hookform/resolvers": "2.9.0",
     "@next/third-parties": "14.1.0",
     "@react-google-maps/api": "2.17.1",
@@ -72,7 +72,7 @@
     "yup": "0.32.11"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.117.0-rc.1",
+    "@akinon/eslint-plugin-projectzero": "1.117.0-rc.3",
     "@semantic-release/changelog": "6.0.2",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",

package/app-template/src/app/[commerce]/[locale]/[currency]/users/reset/[[...id]]/page.tsx

@@ -1,11 +1,12 @@
 'use client';
 
-import { Button, Input, Link } from '@theme/components';
+import { Button, Input, Link, LoaderSpinner } from '@theme/components';
 import { useForm, SubmitHandler } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import * as yup from 'yup';
 import {
   usePasswordResetMutation,
+  useGetValidatePasswordResetTokenQuery,
   PasswordResetType
 } from '@akinon/next/data/client/account';
 import { useLocalization } from '@akinon/next/hooks';
@@ -15,6 +16,16 @@ export default function NewPassword({ params: { id } }) {
   const { t } = useLocalization();
   const [newPassword, { isSuccess: formSuccess }] = usePasswordResetMutation();
 
+  const token = id?.join('/');
+
+  const {
+    data: validationData,
+    isLoading: isValidating,
+    error: validationError
+  } = useGetValidatePasswordResetTokenQuery(token, {
+    skip: !token
+  });
+
   const newPasswordFormSchema = (t) =>
     yup.object().shape({
       password: yup
@@ -24,7 +35,10 @@ export default function NewPassword({ params: { id } }) {
           /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^a-zA-Z\d]).{6,}$/,
           t('forgot_password.create_new_password.form.error.password_rule')
         )
-        .max(50, t('forgot_password.create_new_password.form.error.password_max')),
+        .max(
+          50,
+          t('forgot_password.create_new_password.form.error.password_max')
+        ),
       repeatPassword: yup
         .string()
         .required(t('forgot_password.create_new_password.form.error.required'))
@@ -45,6 +59,31 @@ export default function NewPassword({ params: { id } }) {
     newPassword(data);
   };
 
+  if (isValidating) {
+    return (
+      <div className="container my-12 flex flex-col items-center px-4">
+        <div className="w-full xl:w-5/12 text-center">
+          <LoaderSpinner />
+        </div>
+      </div>
+    );
+  }
+
+  if (validationError || !validationData?.validlink) {
+    return (
+      <div className="container my-12 flex flex-col items-center px-4">
+        <div className="w-full xl:w-5/12 text-center">
+          <div className="text-2xl mb-4 text-error">
+            {t('account.password_reset.expired_link_message')}
+          </div>
+          <Link href="/users/password/reset" className="underline text-primary">
+            {t('account.password_reset.continue_password_reset')}
+          </Link>
+        </div>
+      </div>
+    );
+  }
+
   return (
     <div className="container my-12 flex flex-col items-center px-4">
       <div className="w-full xl:w-5/12 text-center">
@@ -79,7 +118,10 @@ export default function NewPassword({ params: { id } }) {
                   required
                 />
 
-                <PasswordRulesFeedback password={passwordValue} isVisible={errors?.password ? true : false}/>
+                <PasswordRulesFeedback
+                  password={passwordValue}
+                  isVisible={errors?.password ? true : false}
+                />
               </div>
 
               <div className="mb-2 text-left">

package/app-template/src/app/[commerce]/[locale]/[currency]/xml-sitemap/[node]/route.ts

@@ -58,10 +58,12 @@ export async function GET(request: Request, context: { params }) {
 
   let sitemapContent = await sitemap.text();
 
-  sitemapContent = sitemapContent.replace(
-    /\.com/g,
-    `.com${matchedLocale?.[0] ?? ''}`
-  );
+  if (matchedLocale?.[0]) {
+    const localeSuffix = matchedLocale[0];
+    const domainRegex = /(?<=<loc>\s*)https?:\/\/[^/<\s]+/g;
+
+    sitemapContent = sitemapContent.replace(domainRegex, `$&${localeSuffix}`);
+  }
 
   return new Response(sitemapContent, {
     headers: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akinon/projectzero",
-  "version": "1.117.0-rc.1",
+  "version": "1.117.0-rc.3",
   "private": false,
   "description": "CLI tool to manage your Project Zero Next project",
   "bin": {