Merge pull request #57 from gjsjohnmurray/fix-56

Support `pathPrefix` for shared webservers (fix #56)

Author: gjsjohnmurray

connection.schema.json

@@ -57,17 +57,23 @@
               "enum": ["Server and Port"]
             },
             "server": {
-              "title": "Server Address",
+              "title": "Webserver address",
               "type": "string",
               "minLength": 1,
               "default": "localhost"
             },
             "port": {
-              "title": "WebServer Port",
+              "title": "Webserver port",
               "minimum": 1,
               "default": 52773,
               "type": "integer"
             },
+            "pathPrefix": {
+              "title": "Path prefix (for shared webserver)",
+              "type": "string",
+              "pattern": "^(|\/.*[^\/])$",
+              "default": ""
+            },
             "https": {
               "title": "Use HTTPS",
               "default": false,

package-lock.json

@@ -63,7 +63,7 @@
     "@types/request-promise": "^4.1.47",
     "request": "^2.88.2",
     "request-promise": "^4.2.6",
-    "uuid": "^7.0.2"
+    "uuid": "^8.3.2"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.14.2",

package.json

@@ -56,7 +56,7 @@ export default class IRISdb {
     params?: any,
     headers?: any
   ): Promise<any> {
-    const { https, host, port, username, password } = this.config;
+    const { https, host, port, pathPrefix, username, password } = this.config;
     if (minVersion > this.apiVersion) {
       return Promise.reject(`${path} not supported by API version ${this.apiVersion}`);
     }
@@ -95,7 +95,7 @@ export default class IRISdb {
       maxSockets: 10,
       rejectUnauthorized: https,
     });
-    path = encodeURI(`/api/atelier/${path || ""}${buildParams()}`);
+    path = encodeURI(`${pathPrefix || ""}/api/atelier/${path || ""}${buildParams()}`);
 
     const cookies = this.cookies;
     let auth;