zhuchaowe/maxkb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: After entering the password for the public access link, the parameters carried by the URL address are missing (#3570)

Browse Source
This commit is contained in:
shaohuzhang1 2025-07-11 22:36:43 +08:00 committed by GitHub
parent 827c06c03f
commit 4c9d024b67
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/src/router/chat/index.ts
View File

@ -71,12 +71,13 @@ router.beforeEach(
params: { params: {
accessToken: to.params.accessToken, accessToken: to.params.accessToken,
}, },
query: to.query,
}) })
} }
return return
} }
if (p_token) { if (p_token) {
next({ ...to, query: {} }) next({ ...to, query: to.query })
} else { } else {
next() next()
} }

17
ui/src/views/chat/user-login/index.vue
View File

@ -209,11 +209,19 @@ const loginHandle = () => {
loginFormRef.value?.validate().then(() => { loginFormRef.value?.validate().then(() => {
if (loginMode.value === 'LDAP') { if (loginMode.value === 'LDAP') {
chatUser.ldapLogin(loginForm.value).then((ok) => { chatUser.ldapLogin(loginForm.value).then((ok) => {
router.push({name: 'chat', params: {accessToken: chatUser.accessToken}}) router.push({
name: 'chat',
params: { accessToken: chatUser.accessToken },
query: route.query,
})
}) })
} else { } else {
chatUser.login(loginForm.value).then((ok) => { chatUser.login(loginForm.value).then((ok) => {
router.push({name: 'chat', params: {accessToken: chatUser.accessToken}}) router.push({
name: 'chat',
params: { accessToken: chatUser.accessToken },
query: route.query,
})
}) })
} }
}) })
@ -292,8 +300,7 @@ function redirectAuth(authType: string, needMessage: boolean = false) {
.then(() => { .then(() => {
window.location.href = url window.location.href = url
}) })
.catch(() => { .catch(() => {})
})
} else { } else {
console.log('url', url) console.log('url', url)
window.location.href = url window.location.href = url
@ -328,7 +335,7 @@ onBeforeMount(() => {
} }
loginMode.value = modeList.value[0] || 'LOCAL' loginMode.value = modeList.value[0] || 'LOCAL'
if (!modeList.value.includes('LOCAL') && !modeList.value.includes('LDAP')) { if (!modeList.value.includes('LOCAL') && !modeList.value.includes('LDAP')) {
loginMode.value = ''; loginMode.value = ''
} }
if (modeList.value.length == 1 && ['CAS', 'OIDC', 'OAuth2'].includes(modeList.value[0])) { if (modeList.value.length == 1 && ['CAS', 'OIDC', 'OAuth2'].includes(modeList.value[0])) {
redirectAuth(modeList.value[0]) redirectAuth(modeList.value[0])