From 804fd28f0c799e70e24a8f081f699282698916d1 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Fri, 23 Jan 2026 18:50:31 +0800 Subject: [PATCH] perf: Third-Party Authentication Code Optimization --- frontend/src/i18n/en.json | 3 +- frontend/src/i18n/ko-KR.json | 3 +- frontend/src/i18n/zh-CN.json | 3 +- frontend/src/views/login/index.vue | 4 +- frontend/src/views/login/xpack/DingtalkQr.vue | 19 +- frontend/src/views/login/xpack/Handler.vue | 489 +++--------------- .../src/views/login/xpack/LdapLoginForm.vue | 2 +- .../src/views/login/xpack/PlatformClient.ts | 12 + frontend/src/views/login/xpack/QrTab.vue | 34 +- 9 files changed, 131 insertions(+), 438 deletions(-) diff --git a/frontend/src/i18n/en.json b/frontend/src/i18n/en.json index d35d51514..23f68c900 100644 --- a/frontend/src/i18n/en.json +++ b/frontend/src/i18n/en.json @@ -820,7 +820,8 @@ "input_account": "Please enter account", "redirect_2_auth": "Redirecting to {0} authentication, {1} seconds...", "redirect_immediately": "Redirecting immediately", - "permission_invalid": "Authentication invalid [Current account has insufficient permissions]" + "permission_invalid": "Authentication invalid [Current account has insufficient permissions]", + "scan_qr_login": " Scan QR Code" }, "supplier": { "alibaba_cloud_bailian": "Alibaba Cloud Bailian", diff --git a/frontend/src/i18n/ko-KR.json b/frontend/src/i18n/ko-KR.json index 3b6f5e784..6305b5e54 100644 --- a/frontend/src/i18n/ko-KR.json +++ b/frontend/src/i18n/ko-KR.json @@ -820,7 +820,8 @@ "input_account": "계정을 입력해 주세요", "redirect_2_auth": "{0} 인증으로 리디렉션 중입니다, {1}초...", "redirect_immediately": "지금 이동", - "permission_invalid": "인증 무효 [현재 계정의 권한이 부족합니다]" + "permission_invalid": "인증 무효 [현재 계정의 권한이 부족합니다]", + "scan_qr_login": " QR 코드 스캔" }, "supplier": { "alibaba_cloud_bailian": "알리바바 클라우드 바이리엔", diff --git a/frontend/src/i18n/zh-CN.json b/frontend/src/i18n/zh-CN.json index 63a888b59..25dc2b41c 100644 --- a/frontend/src/i18n/zh-CN.json +++ b/frontend/src/i18n/zh-CN.json @@ -820,7 +820,8 @@ "input_account": "请输入账号", "redirect_2_auth": "正在跳转至 {0} 认证，{1} 秒...", "redirect_immediately": "立即跳转", - "permission_invalid": "认证无效【当前账号权限不够】" + "permission_invalid": "认证无效【当前账号权限不够】", + "scan_qr_login": "扫码登录" }, "supplier": { "alibaba_cloud_bailian": "阿里云百炼", diff --git a/frontend/src/views/login/index.vue b/frontend/src/views/login/index.vue index 989e0a482..b8d2f6267 100644 --- a/frontend/src/views/login/index.vue +++ b/frontend/src/views/login/index.vue @@ -63,7 +63,6 @@ (null) const loginForm = ref({ username: '', password: '', @@ -202,7 +200,7 @@ const switchTab = (name: string) => { .login-btn { width: 100%; - height: 45px; + height: 40px; font-size: 16px; border-radius: 4px; } diff --git a/frontend/src/views/login/xpack/DingtalkQr.vue b/frontend/src/views/login/xpack/DingtalkQr.vue index 9b1d3b987..335a6d354 100644 --- a/frontend/src/views/login/xpack/DingtalkQr.vue +++ b/frontend/src/views/login/xpack/DingtalkQr.vue @@ -1,5 +1,7 @@ diff --git a/frontend/src/views/login/xpack/Handler.vue b/frontend/src/views/login/xpack/Handler.vue index a8d7347f8..06f824d1b 100644 --- a/frontend/src/views/login/xpack/Handler.vue +++ b/frontend/src/views/login/xpack/Handler.vue @@ -9,27 +9,26 @@ /> - - + - { const platforms: { [key: string]: string } = { @@ -180,10 +170,6 @@ const closeHandler = () => { } const closeDialog = () => { loginDialogVisible.value = false - /* if (loginDialogVisible.value) { - clearInterval(dialogInterval.value) - dialogInterval.value = null - } */ } const redirectImmediately = () => { if (currentSureHandler.value) { @@ -195,8 +181,6 @@ const init = (cb?: () => void) => { .then((res) => { if (res) { const list: any[] = res as any[] - /* list.push({ name: 'qrcode', enable: true }) - list.push({ name: 'wecom', enable: true }) */ list.forEach((item: { name: keyof LoginCategory; enable: boolean }) => { loginCategory.value[item.name] = item.enable if (item.enable) { @@ -228,14 +212,7 @@ const qrStatusChange = (activeComponent: string) => { switcherCategory({ category: 'ldap', proxy: '' }) } } -/* const showMfa = ref(false) -const toMfa = (mfa) => { - state.mfaData = mfa - showMfa.value = true - if (document.getElementsByClassName('preheat-container')?.length) { - document.getElementsByClassName('preheat-container')[0].setAttribute('style', 'display: none;') - } -} */ + const ssoLogin = (category: any) => { const array = [ { category: 'cas', proxy: '/casbi/#' }, @@ -316,75 +293,28 @@ const getCurLocation = () => { } return queryRedirectPath } - -const casLogin = () => { - const urlParams = getUrlParams() - const ticket = getQueryString('ticket') - request - .post('/system/authentication/sso/1', urlParams) - .then((res: any) => { - const token = res.access_token - if (token && isPlatformClient()) { - wsCache.set('sqlbot-platform-client', true) - } - userStore.setToken(token) - userStore.setExp(res.exp) - userStore.setTime(Date.now()) - userStore.setPlatformInfo({ - flag: 'cas', - data: ticket, - origin: 1, - }) - const queryRedirectPath = getCurLocation() - router.push({ path: queryRedirectPath }) - }) - .catch((e: any) => { - userStore.setToken('') - setTimeout(() => { - // logoutHandler(true, true) - platformLoginMsg.value = e?.message || e - setTimeout(() => { - window.location.href = getSQLBotAddr() + window.location.hash - }, 2000) - }, 1500) - }) -} -const oauth2Login = () => { - const urlParams = getUrlParams() - request - .post('/system/authentication/sso/4', urlParams) - .then((res: any) => { - const token = res.access_token - const platform_info = res.platform_info - if (token && isPlatformClient()) { - wsCache.set('sqlbot-platform-client', true) - } - userStore.setToken(token) - userStore.setExp(res.exp) - userStore.setTime(Date.now()) - userStore.setPlatformInfo({ - flag: 'oauth2', - data: platform_info ? JSON.stringify(platform_info) : '', - origin: 4, - }) - const queryRedirectPath = getCurLocation() - router.push({ path: queryRedirectPath }) - }) - .catch((e: any) => { - userStore.setToken('') - setTimeout(() => { - // logoutHandler(true, true) - platformLoginMsg.value = e?.message || e - setTimeout(() => { - window.location.href = getSQLBotAddr() + window.location.hash - }, 2000) - }, 1500) - }) -} -const oidcLogin = () => { +const third_party_authentication = (state?: string) => { + if (!state) { + return null + } + const findKey = Object.keys(origin_mapping) + .reverse() + .find((key: any) => state.includes(origin_mapping[key])) as unknown as number | null + if (!findKey) { + return null + } + const originName = origin_mapping[findKey] + if (originName === 'saml2' || originName === 'ldap') { + return null + } const urlParams = getUrlParams() + const urlFlag = findKey && findKey > 6 ? 'platform' : 'authentication' + const ssoUrl = `/system/${urlFlag}/sso/${findKey}` + if (!urlParams?.redirect_uri) { + urlParams['redirect_uri'] = encodeURIComponent(getSQLBotAddr()) + } request - .post('/system/authentication/sso/2', urlParams) + .post(ssoUrl, urlParams) .then((res: any) => { const token = res.access_token const platform_info = res.platform_info @@ -394,279 +324,38 @@ const oidcLogin = () => { userStore.setToken(token) userStore.setExp(res.exp) userStore.setTime(Date.now()) - userStore.setPlatformInfo({ - flag: 'oidc', - data: platform_info ? JSON.stringify(platform_info) : '', - origin: 2, - }) - const queryRedirectPath = getCurLocation() - router.push({ path: queryRedirectPath }) - }) - .catch((e: any) => { - userStore.setToken('') - setTimeout(() => { - // logoutHandler(true, true) - platformLoginMsg.value = e?.message || e - setTimeout(() => { - window.location.href = getSQLBotAddr() + window.location.hash - }, 2000) - }, 1500) - }) -} -const wecomLogin = () => { - const urlParams = getUrlParams() - request - .post('/system/platform/sso/6', urlParams) - .then((res: any) => { - const token = res.access_token - // const platform_info = res.platform_info - if (token && isPlatformClient()) { - wsCache.set('sqlbot-platform-client', true) - } - userStore.setToken(token) - userStore.setExp(res.exp) - userStore.setTime(Date.now()) - userStore.setPlatformInfo({ - flag: 'wecom', - // data: platform_info ? JSON.stringify(platform_info) : '', - origin: 6, - }) - const queryRedirectPath = getCurLocation() - router.push({ path: queryRedirectPath }) - }) - .catch((e: any) => { - userStore.setToken('') - setTimeout(() => { - // logoutHandler(true, true) - platformLoginMsg.value = e?.message || e - setTimeout(() => { - window.location.href = getSQLBotAddr() + window.location.hash - }, 2000) - }, 1500) - }) -} -const larksuiteLogin = () => { - const urlParams = getUrlParams() - urlParams['redirect_uri'] = encodeURIComponent(getSQLBotAddr()) - request - .post('/system/platform/sso/9', urlParams) - .then((res: any) => { - const token = res.access_token - // const platform_info = res.platform_info - if (token && isPlatformClient()) { - wsCache.set('sqlbot-platform-client', true) - } - userStore.setToken(token) - userStore.setExp(res.exp) - userStore.setTime(Date.now()) - userStore.setPlatformInfo({ - flag: 'larksuite', - // data: platform_info ? JSON.stringify(platform_info) : '', - origin: 9, - }) - const queryRedirectPath = getCurLocation() - router.push({ path: queryRedirectPath }) - }) - .catch((e: any) => { - userStore.setToken('') - setTimeout(() => { - // logoutHandler(true, true) - platformLoginMsg.value = e?.message || e - setTimeout(() => { - window.location.href = getSQLBotAddr() + window.location.hash - }, 2000) - }, 1500) - }) -} -const larkLogin = () => { - const urlParams = getUrlParams() - urlParams['redirect_uri'] = encodeURIComponent(getSQLBotAddr()) - request - .post('/system/platform/sso/8', urlParams) - .then((res: any) => { - const token = res.access_token - // const platform_info = res.platform_info - if (token && isPlatformClient()) { - wsCache.set('sqlbot-platform-client', true) + const platform_info_param = { + flag: originName, + origin: findKey, + } as any + if (platform_info) { + platform_info_param['data'] = JSON.stringify(platform_info) } - userStore.setToken(token) - userStore.setExp(res.exp) - userStore.setTime(Date.now()) - userStore.setPlatformInfo({ - flag: 'lark', - // data: platform_info ? JSON.stringify(platform_info) : '', - origin: 8, - }) - const queryRedirectPath = getCurLocation() - router.push({ path: queryRedirectPath }) - }) - .catch((e: any) => { - userStore.setToken('') - setTimeout(() => { - // logoutHandler(true, true) - platformLoginMsg.value = e?.message || e - setTimeout(() => { - window.location.href = getSQLBotAddr() + window.location.hash - }, 2000) - }, 1500) - }) -} -const dingtalkLogin = () => { - const urlParams = getUrlParams() - request - .post('/system/platform/sso/7', urlParams) - .then((res: any) => { - const token = res.access_token - // const platform_info = res.platform_info - if (token && isPlatformClient()) { - wsCache.set('sqlbot-platform-client', true) + if (originName === 'cas') { + const ticket = getQueryString('ticket') + platform_info_param['data'] = ticket } - userStore.setToken(token) - userStore.setExp(res.exp) - userStore.setTime(Date.now()) - userStore.setPlatformInfo({ - flag: 'dingtalk', - // data: platform_info ? JSON.stringify(platform_info) : '', - origin: 7, - }) + userStore.setPlatformInfo(platform_info_param) const queryRedirectPath = getCurLocation() router.push({ path: queryRedirectPath }) }) .catch((e: any) => { userStore.setToken('') setTimeout(() => { - // logoutHandler(true, true) platformLoginMsg.value = e?.message || e setTimeout(() => { window.location.href = getSQLBotAddr() + window.location.hash }, 2000) }, 1500) }) + return findKey } -/* const platformLogin = (origin: number) => { - const url = '/system/authentication/sso/cas' - request - .get(url) - .then((res: any) => { - const mfa = res?.mfa - if (mfa?.enabled) { - mfa['origin'] = origin - // toMfa(mfa) - return - } - const token = res.token - if (token && isPlatformClient()) { - wsCache.set('sqlbot-platform-client', true) - } - userStore.setToken(token) - userStore.setExp(res.exp) - userStore.setTime(Date.now()) - if (origin === 10 || isLarkPlatform()) { - window.location.href = - getSQLBotAddr() + window.location.hash - } else { - const queryRedirectPath = getCurLocation() - router.push({ path: queryRedirectPath }) - } - }) - .catch((e: any) => { - userStore.setToken('') - if (isLarkPlatform()) { - setTimeout(() => { - window.location.href = - getSQLBotAddr() + window.location.hash - }, 2000) - } else { - setTimeout(() => { - // logoutHandler(true, true) - platformLoginMsg.value = e?.message || e - }, 1500) - } - }) -} - */ + const queryCategoryStatus = () => { const url = `/system/authentication/platform/status` return request.get(url) } -/* const wecomToken = async () => { - const code = getQueryString('code') - const state = getQueryString('state') - if (!code || !state) { - return null - } - const res = await request.post({ url: '/wecom/token', data: { code, state } }) - userStore.setToken(res.data) - return res.data -} - -const larkToken = async () => { - const code = getQueryString('code') - const state = getQueryString('state') - if (!code || !state) { - return null - } - const res = await request.post({ url: '/lark/token', data: { code, state } }) - userStore.setToken(res.data) - return res.data -} - -const saml2Token = (cb) => { - const token = getQueryString('saml2Token') - if (!token) { - return - } - userStore.setToken(token) - // eslint-disable-next-line @typescript-eslint/no-unused-expressions - cb && cb() -} - -const oauth2Token = (cb) => { - const localCodeKey = localStorage.getItem('DE_OAUTH2_CODE_KEY') || 'code' - const code = getQueryString(localCodeKey) - const state = getQueryString('state') - if (!code || !state) { - throw Error('no code or state') - return null - } - request - .post({ url: '/oauth2/token', data: { code, state } }) - .then((res) => { - userStore.setToken(res.data.token) - // eslint-disable-next-line @typescript-eslint/no-unused-expressions - cb && cb() - }) - .catch(() => { - setTimeout(() => { - window.location.href = - getSQLBotAddr() + window.location.hash - }, 2000) - }) -} - -const larksuiteToken = async () => { - const code = getQueryString('code') - const state = getQueryString('state') - if (!code || !state) { - return null - } - const res = await request.post({ url: '/larksuite/token', data: { code, state } }) - userStore.setToken(res.data) - return res.data -} - -const dingtalkToken = async () => { - const code = getQueryString('code') - const state = getQueryString('state') - if (!code || !state) { - return null - } - const res = await request.post({ url: '/dingtalk/token', data: { code, state } }) - userStore.setToken(res.data) - return res.data -} */ - const callBackType = () => { return getQueryString('state') } @@ -711,61 +400,17 @@ onMounted(() => { wsCache.delete('sqlbot-platform-client') init(async () => { const state = callBackType() - if (state?.includes('cas') && getQueryString('ticket')) { - // platformLogin(1) - casLogin() - } else if (state?.includes('oauth2')) { - oauth2Login() - } else if (state?.includes('oidc')) { - oidcLogin() - } else if (state?.includes('wecom')) { - wecomLogin() - } else if (state?.includes('dingtalk')) { - dingtalkLogin() - } else if (state?.includes('larksuite')) { - larksuiteLogin() - } else if (state?.includes('lark')) { - larkLogin() - } else { + const originName = third_party_authentication(state as string) + if (!originName) { auto2Platform() + return } - /* else if (window.location.pathname.includes('/oidcbi/')) { - platformLogin(2) - } else if (state?.includes('dingtalk')) { - await dingtalkToken() - platformLogin(5) - } else if (state?.includes('larksuite')) { - await larksuiteToken() - platformLogin(7) - } else if (state?.includes('wecom')) { - await wecomToken() - platformLogin(6) - } else if (state?.includes('lark')) { - await larkToken() - platformLogin(4) - } else if (state?.includes('oauth2')) { - oauth2Token(() => { - platformLogin(9) - }) - } else if (state?.includes('saml2')) { - saml2Token(() => { - platformLogin(10) - }) - } else { - auto2Platform() - } */ }) }) - -/* defineExpose({ - ssoLogin, - toMfa, -}) */ diff --git a/frontend/src/views/login/xpack/LdapLoginForm.vue b/frontend/src/views/login/xpack/LdapLoginForm.vue index 9ad8a6c83..3212f6e8c 100644 --- a/frontend/src/views/login/xpack/LdapLoginForm.vue +++ b/frontend/src/views/login/xpack/LdapLoginForm.vue @@ -91,7 +91,7 @@ const submitForm = () => { .login-btn { width: 100%; - height: 45px; + height: 40px; font-size: 16px; border-radius: 4px; } diff --git a/frontend/src/views/login/xpack/PlatformClient.ts b/frontend/src/views/login/xpack/PlatformClient.ts index c0d51c6bc..79ea86349 100644 --- a/frontend/src/views/login/xpack/PlatformClient.ts +++ b/frontend/src/views/login/xpack/PlatformClient.ts @@ -177,3 +177,15 @@ const toUrl = (url: string) => { window.location.href = origin + pathname + url + (redirect?.includes('chatPreview') ? `#${redirect}` : '') } + +export const origin_mapping: { [key: number]: string } = { + 1: 'cas', + 2: 'oidc', + 3: 'ldap', + 4: 'oauth2', + 5: 'saml2', + 6: 'wecom', + 7: 'dingtalk', + 8: 'lark', + 9: 'larksuite', +} diff --git a/frontend/src/views/login/xpack/QrTab.vue b/frontend/src/views/login/xpack/QrTab.vue index bbffaae70..f95501300 100644 --- a/frontend/src/views/login/xpack/QrTab.vue +++ b/frontend/src/views/login/xpack/QrTab.vue @@ -1,5 +1,5 @@