From 8568c07d9f2c93c01508d049ccc9c6447c81f67a Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 22 Jun 2026 17:20:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=99=BB=E9=99=86=E5=92=8Cgo?= =?UTF-8?q?ogle=E7=99=BB=E9=99=86=E5=8F=82=E6=95=B0=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/login.ts | 17 +++++++++++++---- src/pages/login/index.vue | 3 +-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/api/login.ts b/src/api/login.ts index 6a5d441..7d0c0bb 100644 --- a/src/api/login.ts +++ b/src/api/login.ts @@ -1,11 +1,11 @@ import { storeAuthTokens } from "@/constants/token"; import type { OAuthTokenResponse } from "@/constants/token"; -import { request, requestRaw } from "../utils/request"; +import { getRequestContext, request, requestRaw } from "../utils/request"; // 获取oauth token export interface OauthTokenRequest { grant_type?: string; - openIdCode?: string[]; + idToken?: string[]; scope?: string; mobile?: string; code?: string; @@ -34,7 +34,11 @@ export function buildFormUrlEncodedParams( export async function oauthToken( data: OauthTokenRequest, ): Promise { - const params = buildFormUrlEncodedParams(data as Record); + const params = buildFormUrlEncodedParams({ + ...data, + clientId: data.clientId ?? getRequestContext().clientId ?? "6", + clientConfigld: data.clientConfigld ?? getRequestContext().clientId ?? "6", + } as Record); const res = await requestRaw( { @@ -66,7 +70,12 @@ export function sendCode(mobile: string) { url: `/admin/platformUser/sendMobileCode/${encoded}`, method: "get", }, - { skipAuth: true }, + { + skipAuth: true, + headers: { + clientConfigId: getRequestContext().clientId ?? "", + }, + }, ); } diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index 61b7352..743266d 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -253,7 +253,6 @@ async function handlePhoneLogin() { mobile: `${selectedCountry.value.dialCode}${phoneDigits}`, code: codeValue, grant_type: "mobile", - clientConfigld: '6', }); emitter.emit(NOTICE_EVENT_LOGIN_SUCCESS); await navigateAfterLogin(); @@ -332,7 +331,7 @@ onMounted(() => { const idToken = response.credential; if (idToken) { - oauthToken({ openIdCode: [idToken], grant_type: 'google', clientConfigld: '6' }) + oauthToken({ idToken: [idToken], grant_type: 'google' }) .then(() => { emitter.emit(NOTICE_EVENT_LOGIN_SUCCESS); return navigateAfterLogin()