verdnatura/salix-front
verdnatura
/
salix-front
1
2
Fork 1
Code Issues Pull Requests 59 Releases Wiki Activity

Merge branch 'dev' into features/ms_submodulos_worker
gitea/salix-front/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Carlos Fonseca 2024-03-18 13:50:06 +00:00
parent 844cd0e12b e4cbaf303e
commit 5867649d0c
2 changed files with 28 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/composables/useSession.js
View File

@ -2,9 +2,11 @@ import { useState } from './useState';
import { useRole } from './useRole';
import { useUserConfig } from './useUserConfig';
import axios from 'axios';
import useNotify from './useNotify';
export function useSession() {
const { notify } = useNotify();
function getToken() {
const localToken = localStorage.getItem('token');
const sessionToken = sessionStorage.getItem('token');
@ -27,38 +29,28 @@ export function useSession() {
sessionStorage.setItem('tokenMultimedia', data.tokenMultimedia);
}
}
async function destroyToken(url, storage, key) {
if (storage.getItem(key)) {
try {
await axios.post(url, null, {
headers: { Authorization: storage.getItem(key) },
});
} catch (error) {
notify('errors.statusUnauthorized', 'negative');
} finally {
storage.removeItem(key);
}
}
}
async function destroy() {
if (localStorage.getItem('tokenMultimedia')){
await axios.post('VnUsers/logoutMultimedia', null, {
headers: {Authorization: localStorage.getItem('tokenMultimedia') }
});
localStorage.removeItem('tokenMultimedia')
const tokens = {
tokenMultimedia: 'Accounts/logout',
token: 'VnUsers/logout',
};
for (const [key, url] of Object.entries(tokens)) {
await destroyToken(url, localStorage, key);
await destroyToken(url, sessionStorage, key);
}
if (localStorage.getItem('token')){
await axios.post('VnUsers/logout', null, {
headers: {Authorization: localStorage.getItem('token') }
});
localStorage.removeItem('token')
}
if (sessionStorage.getItem('tokenMultimedia')){
await axios.post('VnUsers/logoutMultimedia', null, {
headers: {Authorization: sessionStorage.getItem('tokenMultimedia') }
});
sessionStorage.removeItem('tokenMultimedia')
}
if (sessionStorage.getItem('token')){
await axios.post('VnUsers/logout', null, {
headers: {Authorization: sessionStorage.getItem('token') }
});
sessionStorage.removeItem('token')
}
const { setUser } = useState();

10
test/vitest/__tests__/components/Paginate.spec.js
View File

@ -2,7 +2,7 @@ import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
import { createWrapper, axios } from 'app/test/vitest/helper';
import VnPaginate from 'src/components/ui/VnPaginate.vue';
describe('VnPaginate', () => {
describe.skip('VnPaginate', () => {
const expectedUrl = '/api/customers';
let vm;
@ -57,13 +57,13 @@ describe('VnPaginate', () => {
await vm.paginate();
expect(vm.store.skip).toEqual(3);
expect(vm.store.data.length).toEqual(6);
expect(vm.store.skip).toEqual(6);
expect(vm.store.data.length).toEqual(9);
await vm.paginate();
expect(vm.store.skip).toEqual(6);
expect(vm.store.data.length).toEqual(9);
expect(vm.store.skip).toEqual(9);
expect(vm.store.data.length).toEqual(12);
});
});