alchemymvc 1.3.18 → 1.3.19

package/lib/class/conduit.js

@@ -550,11 +550,11 @@ Conduit.setMethod(async function parseRequest() {
 });
 
 /**
- * Parse the url if it hasn't been done already
+ * Parse the complete request URL if it hasn't been done yet
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.3.18
- * @version  1.3.18
+ * @version  1.3.19
  */
 Conduit.setMethod(function parseUrl() {
 
@@ -569,6 +569,8 @@ Conduit.setMethod(function parseUrl() {
 		protocol = 'https://';
 	} else if (this.headers['x-forwarded-proto']) {
 		protocol = this.headers['x-forwarded-proto'];
+	} else if (this.headers[':scheme']) {
+		protocol = this.headers[':scheme'];
 	} else if (this.protocol) {
 		protocol = this.protocol;
 	} else if (this.encrypted) {
@@ -583,21 +585,19 @@ Conduit.setMethod(function parseUrl() {
 	// Set the protocol
 	this.url.protocol = protocol;
 
+	// Get the host/domain/authority of the request
+	const host = this.headers[':authority'] || this.headers.host;
+
 	// Set the host
-	this.url.hostname = this.headers.host;
+	this.url.hostname = host;
 
 	// If no URL was set, use the first requests URL (without the path)
-	if (!alchemy.settings.url && this.headers.host) {
+	if (!alchemy.settings.url && host) {
 		alchemy.setUrl(this.url);
 	}
 
-	let path = this.original_path;
-
-	if (this.prefix) {
-		path = '/' + this.prefix + '/' + path;
-	}
-
-	this.url.path = path;
+	// Set the entire original path
+	this.url.path = this.original_path;
 
 	return true;
 });

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "alchemymvc",
 	"description": "MVC framework for Node.js",
-	"version": "1.3.18",
+	"version": "1.3.19",
 	"author": "Jelle De Loecker <jelle@elevenways.be>",
 	"keywords": [
 		"alchemy",