Merge branch 'refactor-store-clearing' into 'main'

Refactor store clearing on logout See merge request reportcreator/reportcreator!724
Syslifters · Oct 2, 2024 · 38acc46 · 38acc46
2 parents 0c00200 + 7a66f68
commit 38acc46
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 27 deletions.
diff --git a/frontend/src/composables/auth.ts b/frontend/src/composables/auth.ts
@@ -45,7 +45,7 @@ export const useAuthStore = defineStore('auth', {
   },
   persist: {
     storage: persistedState.sessionStorage,
-    paths: ['authRedirect'],
+    pick: ['authRedirect'],
   }
 })
 

diff --git a/frontend/src/plugins/auth.ts b/frontend/src/plugins/auth.ts
@@ -36,11 +36,11 @@ export default defineNuxtPlugin(async (nuxtApp) => {
     const userNoteStore = useUserNotesStore();
     const shareInfoStore = useShareInfoStore();
     watch(auth.loggedIn, () => {
-      projectStore.clear();
-      projectTypeStore.clear();
-      templateStore.clear();
-      userNoteStore.clear();
-      shareInfoStore.clear();
+      projectStore.$reset();
+      projectTypeStore.$reset();
+      templateStore.$reset();
+      userNoteStore.$reset();
+      shareInfoStore.$reset();
     });
   }
 

diff --git a/frontend/src/stores/project.ts b/frontend/src/stores/project.ts
@@ -152,9 +152,6 @@ export const useProjectStore = defineStore('project', {
     },
   },
   actions: {
-    clear() {
-      this.data = {};
-    },
     ensureExists(projectId: string, initialStoreData?: object) {
       if (!(projectId in this.data)) {
         this.data[projectId] = {

diff --git a/frontend/src/stores/projecttype.ts b/frontend/src/stores/projecttype.ts
@@ -13,9 +13,6 @@ export const useProjectTypeStore = defineStore('projecttype', {
     },
   },
   actions: {
-    clear() {
-      this.data = {};
-    },
     async fetchById(id: string) {
       this.data[id] = await $fetch<ProjectType>(`/api/v1/projecttypes/${id}/`, { method: 'GET' });
       return this.data[id]!;

diff --git a/frontend/src/stores/shareinfos.ts b/frontend/src/stores/shareinfos.ts
@@ -18,9 +18,6 @@ export const useShareInfoStore = defineStore('shareinfo', {
     },
   },
   actions: {
-    clear() {
-      this.data = null;
-    },
     async fetchById(shareId: string) {
       const shareInfo = await $fetch<ShareInfoPublic>(`/api/public/shareinfos/${shareId}/`);
       if (this.data?.shareInfo.id !== shareId) {

diff --git a/frontend/src/stores/template.ts b/frontend/src/stores/template.ts
@@ -31,9 +31,6 @@ export const useTemplateStore = defineStore('templates', {
     },
   },
   actions: {
-    clear() {
-      // Nothing to clear
-    },
     async create(template: Partial<Omit<FindingTemplate, 'translations'> & { translations: Partial<FindingTemplateTranslation>[] }>) {
       return await $fetch<FindingTemplate>(`/api/v1/findingtemplates/`, {
         method: 'POST',

diff --git a/frontend/src/stores/usernotes.ts b/frontend/src/stores/usernotes.ts
@@ -62,15 +62,6 @@ export const useUserNotesStore = defineStore('usernotes', {
     },
   },
   actions: {
-    clear() {
-      this.useNotesCollab().disconnect();
-      this.notesCollabState.data = { notes: {} };
-      this.notesCollabState.awareness = {
-        self: { path: null },
-        other: {},
-        clients: []
-      };
-    },
     async createNote(note: Partial<UserNote>) {
       const newNote = await $fetch<UserNote>(`/api/v1/pentestusers/self/notes/`, {
         method: 'POST',