Skip to content

Commit 8d46da1

Browse files
committed
Merge branch 'feature/webauthn-login' into W-20224220-passkey-in-auth-modal
2 parents 8ba060c + 40bd7c6 commit 8d46da1

File tree

2 files changed

+20
-6
lines changed

2 files changed

+20
-6
lines changed

packages/template-retail-react-app/app/pages/checkout/partials/contact-info.jsx

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,10 @@ import {useCurrentCustomer} from '@salesforce/retail-react-app/app/hooks/use-cur
4343
import {useCurrentBasket} from '@salesforce/retail-react-app/app/hooks/use-current-basket'
4444
import {AuthHelpers, useAuthHelper, useShopperBasketsMutation} from '@salesforce/commerce-sdk-react'
4545
import {getConfig} from '@salesforce/pwa-kit-runtime/utils/ssr-config'
46-
import {getEnvBasePath} from '@salesforce/pwa-kit-runtime/utils/ssr-namespace-paths'
4746
import {usePasskeyLogin} from '@salesforce/retail-react-app/app/hooks/use-passkey-login'
47+
import {absoluteUrl} from '@salesforce/retail-react-app/app/utils/url'
48+
import useMultiSite from '@salesforce/retail-react-app/app/hooks/use-multi-site'
49+
import {getPasswordlessErrorMessage} from '@salesforce/retail-react-app/app/utils/auth-utils'
4850
import {
4951
API_ERROR_MESSAGE
5052
} from '@salesforce/retail-react-app/app/constants'
@@ -77,11 +79,10 @@ const ContactInfo = ({isSocialEnabled = false, isPasswordlessEnabled = false, id
7779

7880
const [authModalView, setAuthModalView] = useState(PASSWORD_VIEW)
7981
const authModal = useAuthModal(authModalView)
80-
const config = getConfig()
81-
const passwordlessConfigCallback = config.app.login?.passwordless?.callbackURI
82-
const callbackURL = isAbsoluteURL(passwordlessConfigCallback)
83-
? passwordlessConfigCallback
84-
: `${appOrigin}${getEnvBasePath()}${passwordlessConfigCallback}`
82+
const passwordlessConfig = getConfig().app.login?.passwordless
83+
const passwordlessConfigMode = passwordlessConfig?.mode
84+
const passwordlessConfigCallback = passwordlessConfig?.callbackURI
85+
const callbackURL = absoluteUrl(passwordlessConfigCallback)
8586

8687
const handlePasswordlessLogin = async (email) => {
8788
try {

packages/template-retail-react-app/app/pages/checkout/partials/contact-info.test.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,19 @@ jest.mock('../util/checkout-context', () => {
4949
}
5050
})
5151

52+
jest.mock('@salesforce/pwa-kit-runtime/utils/ssr-config', () => ({
53+
getConfig: jest.fn()
54+
}))
55+
56+
beforeEach(() => {
57+
getConfig.mockImplementation(() => mockConfig)
58+
global.server.use(
59+
rest.post('*/oauth2/login', (req, res, ctx) => {
60+
return res(ctx.delay(0), ctx.status(200), ctx.json(mockedRegisteredCustomer))
61+
})
62+
)
63+
})
64+
5265
jest.mock('@salesforce/retail-react-app/app/hooks/use-current-basket', () => {
5366
const defaultReturn = {data: {}, derivedData: {totalItems: 0}}
5467
return {

0 commit comments

Comments
 (0)