redirect archived user to /export page when login
This commit is contained in:
@ -378,9 +378,11 @@ export function authRouter() {
|
||||
}
|
||||
}
|
||||
|
||||
redirectUri = redirectUri
|
||||
? redirectUri
|
||||
: `${env.client.url}${DEFAULT_HOME_PATH}`
|
||||
if (user.status === StatusType.Archived) {
|
||||
redirectUri = `${env.client.url}/export`
|
||||
}
|
||||
|
||||
redirectUri = redirectUri ?? `${env.client.url}${DEFAULT_HOME_PATH}`
|
||||
|
||||
const message = res.get('Message')
|
||||
if (message) {
|
||||
|
||||
@ -6,10 +6,10 @@ import { env, homePageURL } from '../../env'
|
||||
import { LoginErrorCode } from '../../generated/graphql'
|
||||
import { userRepository } from '../../repository/user'
|
||||
import { logger } from '../../utils/logger'
|
||||
import { DEFAULT_HOME_PATH } from '../../utils/navigation'
|
||||
import { createSsoToken, ssoRedirectURL } from '../../utils/sso'
|
||||
import { DecodeTokenResult } from './auth_types'
|
||||
import { createPendingUserToken, createWebAuthToken } from './jwt_helpers'
|
||||
import { DEFAULT_HOME_PATH } from '../../utils/navigation'
|
||||
|
||||
export const googleAuthMobile = (): OAuth2Client =>
|
||||
new google.auth.OAuth2(env.google.auth.clientId, env.google.auth.secret)
|
||||
@ -132,7 +132,6 @@ export async function handleGoogleWebAuth(
|
||||
const user = await userRepository.findOneBy({
|
||||
email,
|
||||
source: 'GOOGLE',
|
||||
status: StatusType.Active,
|
||||
})
|
||||
const userId = user?.id
|
||||
|
||||
@ -158,15 +157,16 @@ export async function handleGoogleWebAuth(
|
||||
}
|
||||
}
|
||||
|
||||
let redirectURL = `${baseURL()}${
|
||||
user.status === StatusType.Archived ? '/export' : DEFAULT_HOME_PATH
|
||||
}`
|
||||
|
||||
const authToken = await createWebAuthToken(userId)
|
||||
if (authToken) {
|
||||
const ssoToken = createSsoToken(
|
||||
authToken,
|
||||
`${baseURL()}${DEFAULT_HOME_PATH}`
|
||||
)
|
||||
const redirectURL = isVercel
|
||||
? ssoRedirectURL(ssoToken)
|
||||
: `${baseURL()}${DEFAULT_HOME_PATH}`
|
||||
if (isVercel) {
|
||||
const ssoToken = createSsoToken(authToken, redirectURL)
|
||||
redirectURL = ssoRedirectURL(ssoToken)
|
||||
}
|
||||
|
||||
return {
|
||||
authToken,
|
||||
|
||||
Reference in New Issue
Block a user