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

fix: 修复不同页签之间认证共享问题 (#561)

Browse Source
This commit is contained in:
shaohuzhang1 2024-05-28 09:32:55 +08:00 committed by GitHub
parent c77b20c079
commit e3ba88f8ff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ui/src/stores/modules/application.ts
View File

@ -65,14 +65,8 @@ const useApplicationStore = defineStore({
applicationApi applicationApi
.postAppAuthentication(token, loading) .postAppAuthentication(token, loading)
.then((res) => { .then((res) => {
const accessTokenObjStr = localStorage.getItem('accessTokenObj') localStorage.setItem('accessToken', res.data)
if (accessTokenObjStr) { sessionStorage.setItem('accessToken', res.data)
const accessTokenObj = JSON.parse(accessTokenObjStr)
accessTokenObj[token] = res.data
localStorage.setItem('accessTokenObj', JSON.stringify(accessTokenObj))
} else {
localStorage.setItem('accessTokenObj', JSON.stringify({ [token]: res.data }))
}
resolve(res) resolve(res)
}) })
.catch((error) => { .catch((error) => {

16
ui/src/stores/modules/user.ts
View File

@ -16,8 +16,7 @@ const useUserStore = defineStore({
userType: 1, userType: 1,
userInfo: null, userInfo: null,
token: '', token: '',
version: '', version: ''
accessToken: ''
}), }),
actions: { actions: {
getToken(): String | null { getToken(): String | null {
@ -27,13 +26,9 @@ const useUserStore = defineStore({
return this.userType === 1 ? localStorage.getItem('token') : this.getAccessToken() return this.userType === 1 ? localStorage.getItem('token') : this.getAccessToken()
}, },
getAccessToken() { getAccessToken() {
const accessTokenObjStr = localStorage.getItem('accessTokenObj') const accessToken = sessionStorage.getItem('accessToken')
if (accessTokenObjStr && this.accessToken) { if (accessToken) {
const accessTokenObj = JSON.parse(accessTokenObjStr) return accessToken
const result = accessTokenObj[this.accessToken]
if (result) {
return result
}
} }
return localStorage.getItem('accessToken') return localStorage.getItem('accessToken')
}, },
@ -55,9 +50,6 @@ const useUserStore = defineStore({
changeUserType(num: number) { changeUserType(num: number) {
this.userType = num this.userType = num
}, },
setAccessToken(accessToken: string) {
this.accessToken = accessToken
},
async asyncGetVersion() { async asyncGetVersion() {
return UserApi.getVersion().then((ok) => { return UserApi.getVersion().then((ok) => {

1
ui/src/views/chat/base/index.vue
View File

@ -54,7 +54,6 @@ function getProfile() {
onMounted(() => { onMounted(() => {
user.changeUserType(2) user.changeUserType(2)
user.setAccessToken(accessToken)
getAccessToken(accessToken) getAccessToken(accessToken)
}) })
</script> </script>

1
ui/src/views/chat/embed/index.vue
View File

@ -199,7 +199,6 @@ function refresh(id: string) {
onMounted(() => { onMounted(() => {
user.changeUserType(2) user.changeUserType(2)
user.setAccessToken(accessToken)
getAccessToken(accessToken) getAccessToken(accessToken)
}) })
</script> </script>

1
ui/src/views/chat/pc/index.vue
View File

@ -286,7 +286,6 @@ async function exportHTML(): Promise<void> {
onMounted(() => { onMounted(() => {
user.changeUserType(2) user.changeUserType(2)
user.setAccessToken(accessToken)
getAccessToken(accessToken) getAccessToken(accessToken)
}) })
</script> </script>