Skip to content

@W-17458080 - Use env vars to configure redirect and callback uris for social/passwordless login & reset password #2198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yunakim714 merged 4 commits into from
Jan 14, 2025
Merged

@W-17458080 - Use env vars to configure redirect and callback uris for social/passwordless login & reset password #2198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ba4c8b2
use env vars to configure redirect and callback uris
yunakim714 Jan 13, 2025
fdd972e
read environment variable from config file
yunakim714 Jan 13, 2025
b5b6390
lint
yunakim714 Jan 13, 2025
e3a448f
revert config changes
yunakim714 Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion packages/template-retail-react-app/app/components/_app-config/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ const AppConfig = ({children, locals = {}}) => {

const appOrigin = useAppOrigin()

const passwordlessCallback = locals.appConfig.login?.passwordless?.callbackURI

return (
<CommerceApiProvider
shortCode={commerceApiConfig.parameters.shortCode}
Expand All @@ -63,7 +65,7 @@ const AppConfig = ({children, locals = {}}) => {
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.
Expand Down
2 changes: 1 addition & 1 deletion packages/template-retail-react-app/app/ssr.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Copy link
Collaborator Author

@yunakim714 yunakim714 Jan 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The current client ID in the config is a public client, do we want to change this back to false?

applySLASPrivateClientToEndpoints:
/oauth2\/(token|passwordless|password\/(login|token|reset|action))/,

Expand Down
6 changes: 3 additions & 3 deletions packages/template-retail-react-app/config/default.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down