Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

redirect archived user to /export page when login

Browse Source
This commit is contained in:
Hongbo Wu
2024-08-29 12:29:47 +08:00
parent b22af65f93
commit 18a58ac99b
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/api/src/routers/auth/auth_router.ts
View File

@ -378,9 +378,11 @@ export function authRouter() {
} }
} }
redirectUri = redirectUri if (user.status === StatusType.Archived) {
? redirectUri redirectUri = `${env.client.url}/export`
: `${env.client.url}${DEFAULT_HOME_PATH}` }
redirectUri = redirectUri ?? `${env.client.url}${DEFAULT_HOME_PATH}`
const message = res.get('Message') const message = res.get('Message')
if (message) { if (message) {

18
packages/api/src/routers/auth/google_auth.ts
View File

@ -6,10 +6,10 @@ import { env, homePageURL } from '../../env'
import { LoginErrorCode } from '../../generated/graphql' import { LoginErrorCode } from '../../generated/graphql'
import { userRepository } from '../../repository/user' import { userRepository } from '../../repository/user'
import { logger } from '../../utils/logger' import { logger } from '../../utils/logger'
import { DEFAULT_HOME_PATH } from '../../utils/navigation'
import { createSsoToken, ssoRedirectURL } from '../../utils/sso' import { createSsoToken, ssoRedirectURL } from '../../utils/sso'
import { DecodeTokenResult } from './auth_types' import { DecodeTokenResult } from './auth_types'
import { createPendingUserToken, createWebAuthToken } from './jwt_helpers' import { createPendingUserToken, createWebAuthToken } from './jwt_helpers'
import { DEFAULT_HOME_PATH } from '../../utils/navigation'
export const googleAuthMobile = (): OAuth2Client => export const googleAuthMobile = (): OAuth2Client =>
new google.auth.OAuth2(env.google.auth.clientId, env.google.auth.secret) 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({ const user = await userRepository.findOneBy({
email, email,
source: 'GOOGLE', source: 'GOOGLE',
status: StatusType.Active,
}) })
const userId = user?.id 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) const authToken = await createWebAuthToken(userId)
if (authToken) { if (authToken) {
const ssoToken = createSsoToken( if (isVercel) {
authToken, const ssoToken = createSsoToken(authToken, redirectURL)
`${baseURL()}${DEFAULT_HOME_PATH}` redirectURL = ssoRedirectURL(ssoToken)
) }
const redirectURL = isVercel
? ssoRedirectURL(ssoToken)
: `${baseURL()}${DEFAULT_HOME_PATH}`
return { return {
authToken, authToken,