Merge branch 'master' into 16812-token-appears-in-the-download-URL

[arvados-workbench2.git] / src / common / webdav.ts

diff --git a/src/common/webdav.ts b/src/common/webdav.ts
index b2f43348a8d95105a62bc7c20ea520d59907c95d..17032768fd00436ef92cb4b63d156d0456ddc442 100644 (file)
--- a/src/common/webdav.ts
+++ b/src/common/webdav.ts
@@ -42,14 +42,24 @@ export class WebDAV {
         this.request({
             ...config, url,
             method: 'COPY',
-            headers: { ...config.headers, Destination: this.defaults.baseURL + destination }
+            headers: {
+                ...config.headers,
+                Destination: this.defaults.baseURL
+                    ? this.defaults.baseURL.replace(/\/+$/, '') + '/' + destination.replace(/^\/+/, '')
+                    : destination
+            }
         })
 
     move = (url: string, destination: string, config: WebDAVRequestConfig = {}) =>
         this.request({
             ...config, url,
             method: 'MOVE',
-            headers: { ...config.headers, Destination: this.defaults.baseURL + destination }
+            headers: {
+                ...config.headers,
+                Destination: this.defaults.baseURL
+                    ? this.defaults.baseURL.replace(/\/+$/, '') + '/' + destination.replace(/^\/+/, '')
+                    : destination
+            }
         })
 
     delete = (url: string, config: WebDAVRequestConfig = {}) =>