Skip to content

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

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
shaohuzhang1 merged 1 commit into from
May 28, 2024
Merged

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

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
10 changes: 2 additions & 8 deletions ui/src/stores/modules/application.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,8 @@ const useApplicationStore = defineStore({
applicationApi
.postAppAuthentication(token, loading)
.then((res) => {
const accessTokenObjStr = localStorage.getItem('accessTokenObj')
if (accessTokenObjStr) {
const accessTokenObj = JSON.parse(accessTokenObjStr)
accessTokenObj[token] = res.data
localStorage.setItem('accessTokenObj', JSON.stringify(accessTokenObj))
} else {
localStorage.setItem('accessTokenObj', JSON.stringify({ [token]: res.data }))
}
localStorage.setItem('accessToken', res.data)
sessionStorage.setItem('accessToken', res.data)
resolve(res)
})
.catch((error) => {
Expand Down
16 changes: 4 additions & 12 deletions ui/src/stores/modules/user.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ const useUserStore = defineStore({
userType: 1,
userInfo: null,
token: '',
version: '',
accessToken: ''
version: ''
}),
actions: {
getToken(): String | null {
Expand All @@ -27,13 +26,9 @@ const useUserStore = defineStore({
return this.userType === 1 ? localStorage.getItem('token') : this.getAccessToken()
},
getAccessToken() {
const accessTokenObjStr = localStorage.getItem('accessTokenObj')
if (accessTokenObjStr && this.accessToken) {
const accessTokenObj = JSON.parse(accessTokenObjStr)
const result = accessTokenObj[this.accessToken]
if (result) {
return result
}
const accessToken = sessionStorage.getItem('accessToken')
if (accessToken) {
return accessToken
}
return localStorage.getItem('accessToken')
},
Expand All @@ -55,9 +50,6 @@ const useUserStore = defineStore({
changeUserType(num: number) {
this.userType = num
},
setAccessToken(accessToken: string) {
this.accessToken = accessToken
},

async asyncGetVersion() {
return UserApi.getVersion().then((ok) => {
Expand Down
1 change: 0 additions & 1 deletion ui/src/views/chat/base/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ function getProfile() {

onMounted(() => {
user.changeUserType(2)
user.setAccessToken(accessToken)
getAccessToken(accessToken)
})
</script>
Expand Down
1 change: 0 additions & 1 deletion ui/src/views/chat/embed/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,6 @@ function refresh(id: string) {

onMounted(() => {
user.changeUserType(2)
user.setAccessToken(accessToken)
getAccessToken(accessToken)
})
</script>
Expand Down
1 change: 0 additions & 1 deletion ui/src/views/chat/pc/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,6 @@ async function exportHTML(): Promise<void> {

onMounted(() => {
user.changeUserType(2)
user.setAccessToken(accessToken)
getAccessToken(accessToken)
})
</script>
Expand Down