Skip to content

fix: default login #7426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wangdan-fit2cloud merged 1 commit into from
Oct 22, 2026
Merged

fix: default login #7426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions ui/src/views/login/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,21 @@ const accountLoginMethods = computed(() =>
const accountLoginConfig = computed<LoginConfig>(() => ({
...loginConfig.value,
default_value: qrCodeLoginMethods.includes(loginConfig.value.default_value as QrCodeProvider)
? LOGIN_METHOD.LOCAL
? (accountLoginMethods.value[0] ?? LOGIN_METHOD.LOCAL)
: loginConfig.value.default_value,
login_methods: accountLoginMethods.value,
}))
const qrCodeLoginConfig = computed<LoginConfig>(() => ({
...loginConfig.value,
default_value: qrCodeLoginMethods.includes(loginConfig.value.default_value as QrCodeProvider)
? loginConfig.value.default_value
: LOGIN_METHOD.WECOM,
: (qrCodeProviders.value[0] ?? LOGIN_METHOD.WECOM),
login_methods: qrCodeProviders.value,
}))
const showLoginModeSwitch = computed(() => accountLoginMethods.value.length > 0 && qrCodeProviders.value.length > 0)

onBeforeMount(() => {
// TODO 根据默认跳转
// 登录配置加载完成后，按默认登录方式挂载对应模式。
isLoading.value = true
auth
.loadPlatformProfile()
Expand All @@ -54,6 +54,9 @@ onBeforeMount(() => {
}
loginConfig.value = { max_attempts: 1, default_value: LOGIN_METHOD.LOCAL, login_methods: [LOGIN_METHOD.LOCAL] }
})
.then(() => {
loginMode.value = qrCodeLoginMethods.includes(loginConfig.value.default_value as QrCodeProvider) ? 'qr-code' : 'account'
})
.finally(() => {
isLoading.value = false
})
Expand Down
21 changes: 6 additions & 15 deletions ui/src/views/login/modes/AccountLogin.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { LOGIN_METHOD_LABELS } from '@/constants'
import { useStore } from '@/stores'
import { LOGIN_METHOD } from '@/api/enums'
import type { LoginConfig, LoginMethod } from '@/api/types'
import { MsgConfirm } from '@/utils/message'
import { v4 as uuidv4 } from 'uuid'

interface AccountLoginForm {
Expand Down Expand Up @@ -100,7 +99,7 @@ const refreshCaptcha = () => {
const selectLoginMethod = (method: LoginMethod) => {
if (props.preview) return
if (method !== LOGIN_METHOD.LOCAL && method !== LOGIN_METHOD.LDAP) {
void redirectExternalLogin(method, true)
void redirectExternalLogin(method)
return
}
loginMethod.value = method
Expand All @@ -109,16 +108,9 @@ const selectLoginMethod = (method: LoginMethod) => {
accountLoginFormRef.value?.clearValidate()
}

const redirectExternalLogin = async (method: LoginMethod, needConfirm: boolean) => {
const redirectExternalLogin = async (method: LoginMethod) => {
const redirectUrl = await getExternalLoginUrl(method)
if (!redirectUrl) return
if (needConfirm) {
return MsgConfirm('跳转提示', '即将跳转至外部认证页面，是否继续？', { confirmButtonText: '跳转', confirmButtonType: 'primary' })
.then(() => {
window.location.href = redirectUrl
})
.catch(() => {})
}
window.location.href = redirectUrl
}

Expand Down Expand Up @@ -154,11 +146,10 @@ const getExternalLoginUrl = (authType: LoginMethod): Promise<string> => {

onMounted(() => {
if (props.preview) return
const loginMethods = accountLoginMethods.value
if (route.query.login_mode !== 'manual') {
const loginMethod = loginMethods[0]
if (loginMethod && [LOGIN_METHOD.CAS, LOGIN_METHOD.OIDC, LOGIN_METHOD.OAUTH2, LOGIN_METHOD.SAML2].some((authType) => authType === loginMethod)) {
void redirectExternalLogin(loginMethod, false)
const defaultLoginMethod = loginMethod.value
if ([LOGIN_METHOD.CAS, LOGIN_METHOD.OIDC, LOGIN_METHOD.OAUTH2, LOGIN_METHOD.SAML2].some((authType) => authType === defaultLoginMethod)) {
void redirectExternalLogin(defaultLoginMethod)
}
}
})
Expand Down Expand Up @@ -211,7 +202,7 @@ onMounted(() => {
<el-button :loading="isSubmitting" native-type="submit" type="primary" class="w-full">登录</el-button>
</el-form-item>
</el-form>
<el-button size="default" class="mt-3" link type="primary" @click="router.push({ name: 'forgot-password' })"> 忘记密码？ </el-button>
<el-button size="default" class="mt-3" link type="primary" @click="router.push({ name: 'forgot-password' })">忘记密码？</el-button>
</div>
<div v-if="accountLoginMethods.length" class="third-login flex-col-center gap-4">
<el-divider>其他登录方式</el-divider>
Expand Down
Loading