Refactor/expand SolidHost.parseTargetUrl()

dmitrizagidulin · dmitrizagidulin · commit 0f7bfc801155 · 2018-10-04T21:01:27.000-04:00
diff --git a/lib/models/solid-host.js b/lib/models/solid-host.js
@@ -31,6 +31,7 @@ class SolidHost {
     this.live = options.live
     this.root = options.root
     this.multiuser = options.multiuser
+    this.webid = options.webid
   }
 
   /**
@@ -117,18 +118,36 @@ class SolidHost {
     return cookieDomain
   }
 
+  /**
+   * Returns the protocol for an incoming request ('http' or 'https')
+   * @returns {string}
+   */
+  protocol (req) {
+    // Obtain the protocol from the configured server URI
+    // (in case the server is running behind a reverse proxy)
+    const protocol = this.serverUri.replace(/:.*/, '')
+    return protocol || req.protocol
+  }
+
   /**
    * Taken from utils.getBaseUri()
    *
    * @param req {IncomingRequest}
    *
    * @returns {string}
    */
-  parseTargetUrl (req) {
-    const protocol = this.serverUri.replace(/:.*/, '')
+  getBaseUri (req) {
+    return this.protocol(req) + '://' + req.get('host')
+  }
 
+  /**
+   * @param req {IncomingRequest}
+   *
+   * @returns {string}
+   */
+  parseTargetUrl (req) {
     return url.format({
-      protocol: protocol || req.protocol,
+      protocol: this.protocol(req),
       host: req.get('host'),
       pathname: url.resolve(req.baseUrl, req.path),
       query: req.query
diff --git a/lib/server-config.js b/lib/server-config.js
@@ -28,7 +28,8 @@ function hostConfigFor (argv) {
     serverUri: argv.serverUri,
     live: argv.live,
     root: argv.root,
-    multiuser: argv.multiuser
+    multiuser: argv.multiuser,
+    webid: argv.webid
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,8 @@ function hostConfigFor (argv) {`
`28`	`28`	`serverUri: argv.serverUri,`
`29`	`29`	`live: argv.live,`
`30`	`30`	`root: argv.root,`
`31`		`- multiuser: argv.multiuser`
	`31`	`+ multiuser: argv.multiuser,`
	`32`	`+ webid: argv.webid`
`32`	`33`	`}`
`33`	`34`	`}`
`34`	`35`