fix: add appCode to header X-App-Code

pull/20109/head
NFish 12 months ago
parent 7104ac09f4
commit 35fea50077

@ -59,7 +59,7 @@ export default function CheckCode() {
const ret = await webAppEmailLoginWithCode({ email, code, token }) const ret = await webAppEmailLoginWithCode({ email, code, token })
if (ret.result === 'success') { if (ret.result === 'success') {
localStorage.setItem('webAppAccessToken', ret.data.access_token) localStorage.setItem('webAppAccessToken', ret.data.access_token)
await checkOrSetAccessToken() await checkOrSetAccessToken(appCode)
router.replace(redirectUrl) router.replace(redirectUrl)
} }
} }

@ -84,7 +84,7 @@ export default function MailAndPasswordAuth({ isEmailSetup }: MailAndPasswordAut
}) })
if (res.result === 'success') { if (res.result === 'success') {
localStorage.setItem('webAppAccessToken', res.data.access_token) localStorage.setItem('webAppAccessToken', res.data.access_token)
await checkOrSetAccessToken() await checkOrSetAccessToken(appCode)
router.replace(redirectUrl) router.replace(redirectUrl)
} }
else { else {

@ -46,7 +46,7 @@ const WebSSOForm: FC = () => {
const appCode = getAppCodeFromRedirectUrl() const appCode = getAppCodeFromRedirectUrl()
if (appCode && tokenFromUrl && redirectUrl) { if (appCode && tokenFromUrl && redirectUrl) {
localStorage.setItem('webAppAccessToken', tokenFromUrl) localStorage.setItem('webAppAccessToken', tokenFromUrl)
await checkOrSetAccessToken() await checkOrSetAccessToken(appCode)
router.replace(redirectUrl) router.replace(redirectUrl)
} }
})() })()

@ -10,8 +10,8 @@ export const getInitialTokenV2 = (): Record<string, any> => ({
version: 2, version: 2,
}) })
export const checkOrSetAccessToken = async () => { export const checkOrSetAccessToken = async (appCode?: string) => {
const sharedToken = globalThis.location.pathname.split('/').slice(-1)[0] const sharedToken = appCode || globalThis.location.pathname.split('/').slice(-1)[0]
const userId = (await getProcessedSystemVariablesFromUrlParams()).user_id const userId = (await getProcessedSystemVariablesFromUrlParams()).user_id
const accessToken = localStorage.getItem('token') || JSON.stringify(getInitialTokenV2()) const accessToken = localStorage.getItem('token') || JSON.stringify(getInitialTokenV2())
let accessTokenJson = getInitialTokenV2() let accessTokenJson = getInitialTokenV2()

Loading…
Cancel
Save