Revert "Add popup-based Google login function"

This reverts commit 1b39289dad.
This commit is contained in:
tim
2025-08-03 20:07:59 +08:00
parent 5aeedb07fe
commit 3a0cea8cd4
3 changed files with 7 additions and 43 deletions
-36
View File
@@ -18,22 +18,6 @@ export async function googleGetIdToken() {
}) })
} }
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'
})
window.google.accounts.id.prompt()
})
}
export async function googleAuthWithToken(idToken, redirect_success, redirect_not_approved) { export async function googleAuthWithToken(idToken, redirect_success, redirect_not_approved) {
try { try {
const res = await fetch(`${API_BASE_URL}/api/auth/google`, { const res = await fetch(`${API_BASE_URL}/api/auth/google`, {
@@ -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' import router from '../router'
export function loginWithGoogle() { export function loginWithGoogle() {
@@ -90,14 +65,3 @@ export function loginWithGoogle() {
} }
) )
} }
export function loginWithGoogleWithPop() {
googleSignInWithPop(
() => {
router.push('/')
},
token => {
router.push('/signup-reason?token=' + token)
}
)
}
+3 -3
View File
@@ -31,7 +31,7 @@
</div> </div>
<div class="other-login-page-content"> <div class="other-login-page-content">
<div class="login-page-button" @click="loginWithGoogleWithPop"> <div class="login-page-button" @click="loginWithGoogle">
<img class="login-page-button-icon" src="../assets/icons/google.svg" alt="Google Logo" /> <img class="login-page-button-icon" src="../assets/icons/google.svg" alt="Google Logo" />
<div class="login-page-button-text">Google 登录</div> <div class="login-page-button-text">Google 登录</div>
</div> </div>
@@ -54,7 +54,7 @@
<script> <script>
import { API_BASE_URL, toast } from '../main' import { API_BASE_URL, toast } from '../main'
import { setToken, loadCurrentUser } from '../utils/auth' import { setToken, loadCurrentUser } from '../utils/auth'
import { loginWithGoogleWithPop } from '../utils/google' import { loginWithGoogle } from '../utils/google'
import { githubAuthorize } from '../utils/github' import { githubAuthorize } from '../utils/github'
import { discordAuthorize } from '../utils/discord' import { discordAuthorize } from '../utils/discord'
import { twitterAuthorize } from '../utils/twitter' import { twitterAuthorize } from '../utils/twitter'
@@ -64,7 +64,7 @@ export default {
name: 'LoginPageView', name: 'LoginPageView',
components: { BaseInput }, components: { BaseInput },
setup() { setup() {
return { loginWithGoogleWithPop } return { loginWithGoogle }
}, },
data() { data() {
return { return {
+3 -3
View File
@@ -67,7 +67,7 @@
</div> </div>
<div class="other-signup-page-content"> <div class="other-signup-page-content">
<div class="signup-page-button" @click="loginWithGoogleWithPop"> <div class="signup-page-button" @click="loginWithGoogle">
<img class="signup-page-button-icon" src="../assets/icons/google.svg" alt="Google Logo" /> <img class="signup-page-button-icon" src="../assets/icons/google.svg" alt="Google Logo" />
<div class="signup-page-button-text">Google 注册</div> <div class="signup-page-button-text">Google 注册</div>
</div> </div>
@@ -89,7 +89,7 @@
<script> <script>
import { API_BASE_URL, toast } from '../main' import { API_BASE_URL, toast } from '../main'
import { loginWithGoogleWithPop } from '../utils/google' import { loginWithGoogle } from '../utils/google'
import { githubAuthorize } from '../utils/github' import { githubAuthorize } from '../utils/github'
import { discordAuthorize } from '../utils/discord' import { discordAuthorize } from '../utils/discord'
import { twitterAuthorize } from '../utils/twitter' import { twitterAuthorize } from '../utils/twitter'
@@ -98,7 +98,7 @@ export default {
name: 'SignupPageView', name: 'SignupPageView',
components: { BaseInput }, components: { BaseInput },
setup() { setup() {
return { loginWithGoogleWithPop } return { loginWithGoogle }
}, },
data() { data() {
return { return {