Properly repackaged as 1.0.11

tentwentyfour · May 16, 2018 · 02cc91d · 02cc91d
1 parent 80b4b75
commit 02cc91d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 75 deletions.
diff --git a/compiled/client.js b/compiled/client.js
@@ -18933,7 +18933,7 @@ function clientFunction(λ) {
             parameters[_i] = arguments[_i];
         }
         return __awaiter(this, void 0, void 0, function () {
-            var path, error_2;
+            var path, error_2, thrownError;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -18945,15 +18945,16 @@ function clientFunction(λ) {
                     case 2: return [2 /*return*/, _a.sent()];
                     case 3:
                         error_2 = _a.sent();
+                        thrownError = error_2;
                         if (error_2.statusCode) {
                             if (error_2.statusCode === 404) {
-                                throw new errors_1.NotFoundError(path);
+                                thrownError = new errors_1.NotFoundError(path);
                             }
                             else if (error_2.statusCode === 403) {
-                                throw new errors_1.ForbiddenError(path);
+                                thrownError = new errors_1.ForbiddenError(path);
                             }
                         }
-                        throw error_2;
+                        throw thrownError;
                     case 4: return [2 /*return*/];
                 }
             });
@@ -18967,7 +18968,9 @@ function unnest(path) {
         .map(function (folder, position, folders) { return "/" + folders.slice(0, position + 1).join("/"); });
 }
 function nextcloudRoot(url, username) {
-    return url + "/remote.php/dav/files/" + username;
+    var lastUrlCharacterIsSlash = url.slice(-1)[0] === "/";
+    var terminatedUrl = lastUrlCharacterIsSlash ? url : url + "/";
+    return terminatedUrl + "remote.php/dav/files/" + username;
 }
 
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nextcloud-link",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "description": "Javascript API to talk to Nextcloud",
   "main": "compiled/client.js",
   "scripts": {
@@ -20,13 +20,12 @@
     "url": "https://github.com/tentwentyfour/nextcloud-link/issues"
   },
   "dependencies": {
-    "@types/node": "^9.6.7",
-    "axios": "^0.18.0",
     "helpbox": "^7.1.1",
     "webdav-client": "^1.4.1"
   },
   "types": "./compiled/source/client.d.ts",
   "devDependencies": {
+    "@types/node": "^9.6.7",
     "@types/jest": "^22.2.3",
     "jest": "^22.4.3",
     "ts-jest": "^22.4.4",