Browse Source

fix: handle if extra prop is missing in response

pull/6940/head
Pranav C 1 year ago
parent
commit
8154b05a95
  1. 4
      packages/nc-gui/middleware/auth.global.ts

4
packages/nc-gui/middleware/auth.global.ts

@ -137,7 +137,7 @@ async function tryGoogleAuth(api: Api<any>, signIn: Actions['signIn']) {
data: { token, extra }, data: { token, extra },
} = await api.instance.post(`/auth/${authProvider}/genTokenByCode${window.location.search}`) } = await api.instance.post(`/auth/${authProvider}/genTokenByCode${window.location.search}`)
extraProps = extra extraProps = extra || {}
signIn(token) signIn(token)
} catch (e: any) { } catch (e: any) {
@ -148,7 +148,7 @@ async function tryGoogleAuth(api: Api<any>, signIn: Actions['signIn']) {
window.history.pushState( window.history.pushState(
'object', 'object',
document.title, document.title,
`${extraProps.continueAfterSignIn ? `${newURL}#/?continueAfterSignIn=${extraProps.continueAfterSignIn}` : newURL}`, `${extraProps?.continueAfterSignIn ? `${newURL}#/?continueAfterSignIn=${extraProps.continueAfterSignIn}` : newURL}`,
) )
window.location.reload() window.location.reload()
} }

Loading…
Cancel
Save