diff --git a/frontend/src/utils/google.js b/frontend/src/utils/google.js index d042cbae8..533d6c808 100644 --- a/frontend/src/utils/google.js +++ b/frontend/src/utils/google.js @@ -12,23 +12,7 @@ export async function googleGetIdToken() { window.google.accounts.id.initialize({ client_id: GOOGLE_CLIENT_ID, callback: ({ credential }) => resolve(credential), - use_fedcm: true - }) - window.google.accounts.id.prompt() - }) -} - -export async function googleGetIdTokenWithPop() { - return new Promise((resolve, reject) => { - if (!window.google || !GOOGLE_CLIENT_ID) { - toast.error('Google 登录不可用, 请检查网络设置与VPN') - reject() - return - } - window.google.accounts.id.initialize({ - client_id: GOOGLE_CLIENT_ID, - callback: ({ credential }) => resolve(credential), - ux_mode: 'popup' + use_fedcm: true }) window.google.accounts.id.prompt() }) @@ -69,15 +53,6 @@ export async function googleSignIn(redirect_success, redirect_not_approved) { } } -export async function googleSignInWithPop(redirect_success, redirect_not_approved) { - try { - const token = await googleGetIdTokenWithPop() - await googleAuthWithToken(token, redirect_success, redirect_not_approved) - } catch { - /* ignore */ - } -} - import router from '../router' export function loginWithGoogle() { @@ -89,15 +64,4 @@ export function loginWithGoogle() { router.push('/signup-reason?token=' + token) } ) -} - -export function loginWithGoogleWithPop() { - googleSignInWithPop( - () => { - router.push('/') - }, - token => { - router.push('/signup-reason?token=' + token) - } - ) } \ No newline at end of file diff --git a/frontend/src/views/LoginPageView.vue b/frontend/src/views/LoginPageView.vue index 906c17f47..cba93fb48 100644 --- a/frontend/src/views/LoginPageView.vue +++ b/frontend/src/views/LoginPageView.vue @@ -31,7 +31,7 @@
-
+ @@ -54,7 +54,7 @@