Move tokenLength configuration from passwordless to login for future proof

Author: hajinsuha1

packages/pwa-kit-create-app/CHANGELOG.md

@@ -1,7 +1,7 @@
 
 ## v3.15.0-dev (Nov 05, 2025)
 - Update `default.js` and `/_app-config/index.jsx` template to use email mode by default for passwordless login and password reset. [#3526] (https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3526) [#3547](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3547)
-- Add `tokenLength` to passwordless login configuration [#3554](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3554)
+- Add `tokenLength` to login configuration [#3554](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3554)
 
 ## v3.15.0 (Dec 17, 2025)
 - Add new Google Cloud API configuration and Bonus Product configuration [#3523](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3523)

packages/pwa-kit-create-app/assets/bootstrap/js/config/default.js.hbs

@@ -57,6 +57,9 @@ module.exports = {
             interpretPlusSignAsSpace: false
         },
         login: {
+            // The length of the token for OTP authentication. Used by passwordless login and reset password.
+            // Valid values include 6 or 8. Defaults to: 8
+            tokenLength: 8,
             passwordless: {
                 // Enables or disables passwordless login for the site. Defaults to: false
                 {{#if answers.project.demo.enableDemoSettings}}
@@ -71,9 +74,7 @@ module.exports = {
                 // callbackURI:
                 //     process.env.PASSWORDLESS_LOGIN_CALLBACK_URI || '/passwordless-login-callback',
                 // The landing path for passwordless login
-                landingPath: '/passwordless-login-landing',
-                // The length of the token for passwordless login. Valid values include 6 or 8. Defaults to: 8
-                tokenLength: 8
+                landingPath: '/passwordless-login-landing'
             },
             social: {
                 // Enables or disables social login for the site. Defaults to: false

packages/pwa-kit-create-app/assets/templates/@salesforce/retail-react-app/config/default.js.hbs

@@ -57,6 +57,9 @@ module.exports = {
             interpretPlusSignAsSpace: false
         },
         login: {
+            // The length of the token for OTP authentication. Used by passwordless login and reset password.
+            // Valid values include 6 or 8. Defaults to: 8
+            tokenLength: 8,
             passwordless: {
                 // Enables or disables passwordless login for the site. Defaults to: false
                 {{#if answers.project.demo.enableDemoSettings}}
@@ -71,9 +74,7 @@ module.exports = {
                 // callbackURI:
                 //     process.env.PASSWORDLESS_LOGIN_CALLBACK_URI || '/passwordless-login-callback',
                 // The landing path for passwordless login
-                landingPath: '/passwordless-login-landing',
-                // The length of the token for passwordless login. Valid values include 6 or 8. Defaults to: 8
-                tokenLength: 8
+                landingPath: '/passwordless-login-landing'
             },
             social: {
                 // Enables or disables social login for the site. Defaults to: false

packages/template-retail-react-app/app/components/otp-auth/index.jsx

@@ -39,7 +39,7 @@ const OtpAuth = ({
     isGuestRegistration = false,
     hideCheckoutAsGuestButton = false
 }) => {
-    const OTP_LENGTH = getConfig().app.login.passwordless.tokenLength || 8
+    const OTP_LENGTH = getConfig().app.login.tokenLength || 8
     const [isVerifying, setIsVerifying] = useState(false)
     const [error, setError] = useState('')
     const [resendTimer, setResendTimer] = useCountdown(0)

packages/template-retail-react-app/app/components/otp-auth/index.test.js

@@ -127,10 +127,7 @@ describe('OtpAuth', () => {
                     ...mockConfig.app,
                     login: {
                         ...mockConfig.app.login,
-                        passwordless: {
-                            ...mockConfig.app.login.passwordless,
-                            tokenLength: tokenLength
-                        }
+                        tokenLength
                     }
                 }
             }))

packages/template-retail-react-app/config/default.js

@@ -30,11 +30,11 @@ module.exports = {
             interpretPlusSignAsSpace: false
         },
         login: {
+            tokenLength: 8,
             passwordless: {
                 enabled: false,
                 mode: 'email',
-                landingPath: '/passwordless-login-landing',
-                tokenLength: 8
+                landingPath: '/passwordless-login-landing'
             },
             social: {
                 enabled: false,

packages/template-retail-react-app/config/mocks/default.js

@@ -33,10 +33,10 @@ module.exports = {
             showDefaults: true
         },
         login: {
+            tokenLength: 8,
             passwordless: {
                 enabled: false,
-                mode: 'email',
-                tokenLength: 8
+                mode: 'email'
             },
             social: {
                 enabled: false,