Fix: Send correct path (coscine/issues#1004)

src/basic/api-connection-basic.ts

@@ -14,6 +14,20 @@ export default {
     }
     return hostName;
   },
+  preparePath(path: string) {
+    let resultString = '';
+    if (path.charAt(0) === '/') {
+      path = path.substring(1);
+    }
+    let array = path.split('/');
+    for (let i = 0; i < array.length; i++) {
+      resultString += encodeURIComponent(array[i]);
+      if(i !== array.length - 1) {
+        resultString += '/';
+      }
+    }
+    return resultString;
+  },
   setHeader() {
     axios.defaults.headers.common[authHeaderKey] =
       'Bearer ' + (coscine as any).authorization.bearer;

src/requests/blob-api.ts

@@ -37,7 +37,7 @@ export class BlobApi {
   ) {
     apiConnectionBasic.setHeader();
     return axios
-      .get(getBlobApiUrl() + resourceId + '/' + encodeURIComponent(path), {
+      .get(getBlobApiUrl() + resourceId + '/' + apiConnectionBasic.preparePath(path), {
         responseType: 'blob'
       })
       .then(thenHandler)
@@ -52,7 +52,7 @@ export class BlobApi {
   ) {
     apiConnectionBasic.setHeader();
     return axios
-      .delete(getBlobApiUrl() + resourceId + '/' + encodeURIComponent(path))
+      .delete(getBlobApiUrl() + resourceId + '/' + apiConnectionBasic.preparePath(path))
       .then(thenHandler)
       .catch(catchHandler);
   }
@@ -68,7 +68,7 @@ export class BlobApi {
     apiConnectionBasic.setHeader();
     return axios({
       method: 'PUT',
-      url: getBlobApiUrl() + resourceId + '/' + encodeURIComponent(path),
+      url: getBlobApiUrl() + resourceId + '/' + apiConnectionBasic.preparePath(path),
       headers: {
         'Content-Type': mimetype
       },

src/requests/tree-api.ts

@@ -8,21 +8,6 @@ function getTreeApiUrl() {
   );
 }
 
-function preparePath(path: string){
-  let resultString = '';
-  if (path.charAt(0) === '/') {
-    path = path.substring(1);
-  }
-  let array = path.split('/');
-  for (let i = 0; i < array.length; i++) {
-    resultString += encodeURIComponent(array[i]);
-    if(i !== array.length - 1) {
-      resultString += '/';
-    }
-  }
-  return resultString;
-}
-
 export class TreeApi {
   public static getMetadata(
     resourceId: string,
@@ -32,7 +17,7 @@ export class TreeApi {
   ) {
     apiConnectionBasic.setHeader();
     return axios
-      .get(getTreeApiUrl() + resourceId + '/' + preparePath(path))
+      .get(getTreeApiUrl() + resourceId + '/' + apiConnectionBasic.preparePath(path))
       .then(thenHandler)
       .catch(catchHandler);
   }
@@ -60,7 +45,7 @@ export class TreeApi {
     }
     
     return axios
-      .put(getTreeApiUrl() + resourceId + '/' + preparePath(path), body)
+      .put(getTreeApiUrl() + resourceId + '/' + apiConnectionBasic.preparePath(path), body)
       .then(thenHandler)
       .catch(catchHandler);
   }