X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/856192df2e78cb7182122a77592044f5e51b1888..b545b17633d2d37242a39a2d1b474e3206d44e41:/src/services/collection-service/collection-service.ts

diff --git a/src/services/collection-service/collection-service.ts b/src/services/collection-service/collection-service.ts
index b0d5cb1445..86b1aded7c 100644
--- a/src/services/collection-service/collection-service.ts
+++ b/src/services/collection-service/collection-service.ts
@@ -32,7 +32,12 @@ export class CollectionService extends TrashableResourceService<CollectionResour
 
     async deleteFiles(collectionUuid: string, filePaths: string[]) {
         for (const path of filePaths) {
-            await this.webdavClient.delete(`c=${collectionUuid}${path}`);
+            const splittedPath = path.split('/');
+            if (collectionUuid) {
+                await this.webdavClient.delete(`c=${collectionUuid}/${splittedPath[1]}`);
+            } else {
+                await this.webdavClient.delete(`c=${collectionUuid}${path}`);
+            }
         }
     }
 
@@ -54,9 +59,14 @@ export class CollectionService extends TrashableResourceService<CollectionResour
         const baseUrl = this.webdavClient.defaults.baseURL.endsWith('/')
             ? this.webdavClient.defaults.baseURL.slice(0, -1)
             : this.webdavClient.defaults.baseURL;
+        const apiToken = this.authService.getApiToken();
+        const splittedApiToken = apiToken ? apiToken.split('/') : [];
+        const userApiToken = `/t=${splittedApiToken[2]}/`;
+        const splittedPrevFileUrl = file.url.split('/');
+        const url = `${baseUrl}/${splittedPrevFileUrl[1]}${userApiToken}${splittedPrevFileUrl[2]}`;
         return {
             ...file,
-            url: baseUrl + file.url + '?api_token=' + this.authService.getApiToken()
+            url
         };
     }
 
@@ -70,7 +80,7 @@ export class CollectionService extends TrashableResourceService<CollectionResour
                 onProgress(fileId, e.loaded, e.total, Date.now());
             }
         };
-        return this.webdavClient.upload(fileURL, '', [file], requestConfig);
+        return this.webdavClient.upload(fileURL, [file], requestConfig);
     }
 
     update(uuid: string, data: Partial<CollectionResource>) {