Skip to content

Commit

Permalink
fix: wipe local storages on log out
Browse files Browse the repository at this point in the history
Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
  • Loading branch information
Antreesy committed Feb 24, 2025
1 parent c1204c0 commit afd27f4
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 7 deletions.
20 changes: 20 additions & 0 deletions core/src/utils/xhr-request.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import { getCurrentUser } from '@nextcloud/auth'
import { generateUrl, getRootUrl } from '@nextcloud/router'
import logger from '../logger.js'

/**
*
Expand Down Expand Up @@ -51,6 +52,7 @@ async function checkLoginStatus() {
const { status } = await window.fetch(generateUrl('/apps/files'))
if (status === 401) {
console.warn('User session was terminated, forwarding to login page.')
await wipeBrowserStorages()
window.location = generateUrl('/login?redirect_url={url}', {
url: window.location.pathname + window.location.search + window.location.hash,
})
Expand All @@ -62,6 +64,24 @@ async function checkLoginStatus() {
}
}

/**
* Clear all Browser storages connected to current origin.
* @returns {Promise<void>}
*/
export async function wipeBrowserStorages() {
try {
window.localStorage.clear()
window.sessionStorage.clear()
const indexedDBList = await window.indexedDB.databases()
for (const indexedDB of indexedDBList) {
await window.indexedDB.deleteDatabase(indexedDB.name)
}
logger.debug('Browser storages cleared')
} catch (error) {
logger.error('Could not clear browser storages', { error })
}
}

/**
* Intercept XMLHttpRequest and fetch API calls to add X-Requested-With header
*
Expand Down
9 changes: 2 additions & 7 deletions core/src/views/Login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -113,16 +113,11 @@ import ResetPassword from '../components/login/ResetPassword.vue'
import UpdatePassword from '../components/login/UpdatePassword.vue'
import NcButton from '@nextcloud/vue/components/NcButton'
import NcNoteCard from '@nextcloud/vue/components/NcNoteCard'
import { wipeBrowserStorages } from '../utils/xhr-request.js'

const query = queryString.parse(location.search)
if (query.clear === '1') {
try {
window.localStorage.clear()
window.sessionStorage.clear()
console.debug('Browser storage cleared')
} catch (e) {
console.error('Could not clear browser storage', e)
}
wipeBrowserStorages()
}

export default {
Expand Down

0 comments on commit afd27f4

Please sign in to comment.