diff --git a/core/src/utils/xhr-request.js b/core/src/utils/xhr-request.js index 68641ebc0069d..c256313df314b 100644 --- a/core/src/utils/xhr-request.js +++ b/core/src/utils/xhr-request.js @@ -5,6 +5,7 @@ import { getCurrentUser } from '@nextcloud/auth' import { generateUrl, getRootUrl } from '@nextcloud/router' +import logger from '../logger.js' /** * @@ -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, }) @@ -62,6 +64,24 @@ async function checkLoginStatus() { } } +/** + * Clear all Browser storages connected to current origin. + * @returns {Promise} + */ +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 * diff --git a/core/src/views/Login.vue b/core/src/views/Login.vue index 318e72f89a898..7a35331b09062 100644 --- a/core/src/views/Login.vue +++ b/core/src/views/Login.vue @@ -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 {