Move purge header into graph.ts for disable / delete space (#9534)

owncloud · Aug 3, 2023 · d73fd4a · d73fd4a
1 parent d2d5483
commit d73fd4a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/packages/web-client/src/graph.ts b/packages/web-client/src/graph.ts
@@ -42,7 +42,8 @@ export interface Graph {
     getDrive: (id: string) => AxiosPromise<Drive>
     createDrive: (drive: Drive, options: any) => AxiosPromise<Drive>
     updateDrive: (id: string, drive: Drive, options: any) => AxiosPromise<Drive>
-    deleteDrive: (id: string, ifMatch?: string, options?: any) => AxiosPromise<void>
+    disableDrive: (id: string) => AxiosPromise<void>
+    deleteDrive: (id: string) => AxiosPromise<void>
   }
   users: {
     getUser: (userId: string) => AxiosPromise<User>
@@ -120,8 +121,13 @@ export const graph = (baseURI: string, axiosClient: AxiosInstance): Graph => {
         drivesApiFactory.createDrive(drive, options),
       updateDrive: (id: string, drive: Drive, options: any): AxiosPromise<Drive> =>
         drivesApiFactory.updateDrive(id, drive, options),
-      deleteDrive: (id: string, ifMatch: string, options: any): AxiosPromise<void> =>
-        drivesApiFactory.deleteDrive(id, ifMatch, options)
+      disableDrive: (id: string): AxiosPromise<void> => drivesApiFactory.deleteDrive(id, '', {}),
+      deleteDrive: (id: string): AxiosPromise<void> =>
+        drivesApiFactory.deleteDrive(id, '', {
+          headers: {
+            Purge: 'T'
+          }
+        })
     },
     users: {
       getUser: (userId: string) =>

diff --git a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDelete.ts b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDelete.ts
@@ -23,17 +23,11 @@ export const useSpaceActionsDelete = ({ store }: { store?: Store<any> } = {}) =>
   const deleteSpaces = async (spaces: SpaceResource[]) => {
     const client = clientService.graphAuthenticated
     const promises = spaces.map((space) =>
-      client.drives
-        .deleteDrive(space.id.toString(), '', {
-          headers: {
-            Purge: 'T'
-          }
-        })
-        .then(() => {
-          store.commit('Files/REMOVE_FILES', [{ id: space.id }])
-          store.commit('runtime/spaces/REMOVE_SPACE', { id: space.id })
-          return true
-        })
+      client.drives.deleteDrive(space.id.toString()).then(() => {
+        store.commit('Files/REMOVE_FILES', [{ id: space.id }])
+        store.commit('runtime/spaces/REMOVE_SPACE', { id: space.id })
+        return true
+      })
     )
     const results = await loadingService.addTask(() => {
       return Promise.allSettled(promises)

diff --git a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDisable.ts b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDisable.ts
@@ -26,7 +26,7 @@ export const useSpaceActionsDisable = ({ store }: { store?: Store<any> } = {}) =
 
     const client = clientService.graphAuthenticated
     const promises = spaces.map((space) =>
-      client.drives.deleteDrive(space.id.toString()).then(() => {
+      client.drives.disableDrive(space.id.toString()).then(() => {
         if (currentRoute.name === 'files-spaces-generic') {
           router.push({ name: 'files-spaces-projects' })
         }

diff --git a/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsDisable.spec.ts b/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsDisable.spec.ts
@@ -91,7 +91,7 @@ describe('disable', () => {
     it('should hide the modal on success', async () => {
       const { wrapper, mocks } = getWrapper({
         setup: async ({ disableSpaces }, { storeOptions, clientService }) => {
-          clientService.graphAuthenticated.drives.deleteDrive.mockResolvedValue(mockAxiosResolve())
+          clientService.graphAuthenticated.drives.disableDrive.mockResolvedValue(mockAxiosResolve())
           await disableSpaces([mock<SpaceResource>({ id: 1, canDisable: () => true })])
 
           expect(storeOptions.actions.hideModal).toHaveBeenCalledTimes(1)
@@ -103,7 +103,7 @@ describe('disable', () => {
       jest.spyOn(console, 'error').mockImplementation(() => undefined)
       const { wrapper } = getWrapper({
         setup: async ({ actions, disableSpaces }, { storeOptions, clientService }) => {
-          clientService.graphAuthenticated.drives.deleteDrive.mockRejectedValue(new Error())
+          clientService.graphAuthenticated.drives.disableDrive.mockRejectedValue(new Error())
           await disableSpaces([mock<SpaceResource>({ id: 1, canDisable: () => true })])
 
           expect(storeOptions.actions.showErrorMessage).toHaveBeenCalledTimes(1)