@reldens/cms 0.30.0 → 0.32.0

package/lib/frontend/request-processor.js

@@ -18,6 +18,10 @@ class RequestProcessor
 
     getDomainFromRequest(req)
     {
+        let forwardedHost = req.get('x-forwarded-host');
+        if(forwardedHost){
+            return forwardedHost.split(':')[0];
+        }
         let host = req.get('host');
         if(!host){
             return false;

package/lib/manager.js

@@ -75,6 +75,7 @@ class Manager
         this.frontend = sc.get(props, 'frontend', false);
         this.renderEngine = sc.get(props, 'renderEngine', mustache);
         this.prismaClient = sc.get(props, 'prismaClient', false);
+        this.domains = sc.get(props, 'domains', []);
         this.developmentPatterns = sc.get(props, 'developmentPatterns', []);
         this.developmentEnvironments = sc.get(props, 'developmentEnvironments', []);
         this.developmentPorts = sc.get(props, 'developmentPorts', []);
@@ -236,7 +237,7 @@ class Manager
         }
         let baseConfig = {
             port: this.config.port,
-            useHttps: this.determineHttpsUsage(),
+            useHttps: this.config.host.startsWith('https://'),
             useHelmet,
             domainMapping: this.domainMapping || {},
             defaultDomain: this.defaultDomain,
@@ -254,15 +255,12 @@ class Manager
             }
             this.appServerFactory.setDomainMapping(this.domainMapping);
         }
-        return appServerConfig;
-    }
-
-    determineHttpsUsage()
-    {
-        if(this.config.publicUrl && this.config.publicUrl.startsWith('https://')){
-            return true;
+        if(sc.isArray(this.domains) && 0 < this.domains.length){
+            for(let domain of this.domains){
+                this.appServerFactory.addDomain(domain);
+            }
         }
-        return this.config.host.startsWith('https://');
+        return appServerConfig;
     }
 
     async initializeCmsAfterInstall(props)

package/lib/template-engine/system-variables-provider.js

@@ -49,6 +49,10 @@ class SystemVariablesProvider
         if(!customPublicUrl && domain && sc.hasOwn(this.domainPublicUrlMapping, domain)){
             publicUrl = this.domainPublicUrlMapping[domain];
         }
+        let forwardedHost = req.get('x-forwarded-host');
+        if(forwardedHost && sc.hasOwn(this.domainPublicUrlMapping, forwardedHost)){
+            publicUrl = this.domainPublicUrlMapping[forwardedHost];
+        }
         if(publicUrl === baseUrl && '' !== this.defaultPublicUrl){
             publicUrl = this.defaultPublicUrl;
         }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@reldens/cms",
     "scope": "@reldens",
-    "version": "0.30.0",
+    "version": "0.32.0",
     "description": "Reldens - CMS",
     "author": "Damian A. Pastorini",
     "license": "MIT",
@@ -33,8 +33,8 @@
         "url": "https://github.com/damian-pastorini/reldens-cms/issues"
     },
     "dependencies": {
-        "@reldens/server-utils": "^0.30.0",
-        "@reldens/storage": "^0.72.0",
+        "@reldens/server-utils": "^0.32.0",
+        "@reldens/storage": "^0.73.0",
         "@reldens/utils": "^0.53.0",
         "dotenv": "17.2.2",
         "mustache": "4.2.0"