diff --git a/packages/template-retail-react-app/app/components/_app-config/index.jsx b/packages/template-retail-react-app/app/components/_app-config/index.jsx index dd12c53838..4ce4afd1c7 100644 --- a/packages/template-retail-react-app/app/components/_app-config/index.jsx +++ b/packages/template-retail-react-app/app/components/_app-config/index.jsx @@ -54,6 +54,8 @@ const AppConfig = ({children, locals = {}}) => { const appOrigin = useAppOrigin() + const passwordlessCallback = locals.appConfig.login?.passwordless?.callbackURI + return ( { locale={locals.locale?.id} currency={locals.locale?.preferredCurrency} redirectURI={`${appOrigin}/callback`} - passwordlessLoginCallbackURI={locals.appConfig.login?.passwordless?.callbackURI} + passwordlessLoginCallbackURI={passwordlessCallback} proxy={`${appOrigin}${commerceApiConfig.proxyPath}`} headers={headers} // Uncomment 'enablePWAKitPrivateClient' to use SLAS private client login flows. diff --git a/packages/template-retail-react-app/app/ssr.js b/packages/template-retail-react-app/app/ssr.js index af27810b86..f17efe80e6 100644 --- a/packages/template-retail-react-app/app/ssr.js +++ b/packages/template-retail-react-app/app/ssr.js @@ -54,7 +54,7 @@ const options = { // Set this to false if using a SLAS public client // When setting this to true, make sure to also set the PWA_KIT_SLAS_CLIENT_SECRET // environment variable as this endpoint will return HTTP 501 if it is not set - useSLASPrivateClient: true, + useSLASPrivateClient: false, applySLASPrivateClientToEndpoints: /oauth2\/(token|passwordless|password\/(login|token|reset|action))/, diff --git a/packages/template-retail-react-app/config/default.js b/packages/template-retail-react-app/config/default.js index 42aa6ae179..15b081aab1 100644 --- a/packages/template-retail-react-app/config/default.js +++ b/packages/template-retail-react-app/config/default.js @@ -18,15 +18,15 @@ module.exports = { login: { passwordless: { enabled: false, - callbackURI: '/passwordless-login-callback' + callbackURI: process.env.PASSWORDLESS_LOGIN_CALLBACK_URI || '/passwordless-login-callback' }, social: { enabled: false, idps: ['google', 'apple'], - redirectURI: '/social-callback' + redirectURI: process.env.SOCIAL_LOGIN_REDIRECT_URI || '/social-callback' }, resetPassword: { - callbackURI: '/reset-password-callback' + callbackURI: process.env.RESET_PASSWORD_CALLBACK_URI || '/reset-password-callback' } }, defaultSite: 'RefArchGlobal',