Fix hard coded port 8181 for HTTPS scenrio

Change-Id: I7f4630cc234d912b25c03530befb4c6f3012b59d
Signed-off-by: Dovev Liberman <dovev.liberman@hpe.com>

diff --git a/dlux-web/config/env.module.js b/dlux-web/config/env.module.js
index ae8301b53905db8ed6cf282a8c9d811caa2824b1..e4504d59bd76417fa28fee7b4e0d9bffea0019ac 100644 (file)
--- a/dlux-web/config/env.module.js
+++ b/dlux-web/config/env.module.js
@@ -7,6 +7,7 @@ define(['angular'], function (angular) {
       baseURL: '@@baseURL',
       adSalPort: '@@adSalPort',
       mdSalPort: '@@mdSalPort',
+      mdSalSecuredPort: '@@mdSalSecuredPort',
       configEnv: '@@configEnv',
       getBaseURL: function (salType) {
         if (salType !== undefined) {
@@ -20,7 +21,11 @@ define(['angular'], function (angular) {
           if (salType === 'AD_SAL') {
             return urlPrefix + this.adSalPort;
           } else if (salType === 'MD_SAL') {
-            return urlPrefix + this.mdSalPort;
+            var basePort = this.mdSalPort;
+            if (window.location.protocol === 'https:') {
+                basePort = this.mdSalSecuredPort;
+            }
+            return urlPrefix + basePort;
           }
         }
         //default behavior

diff --git a/dlux-web/config/production.json b/dlux-web/config/production.json
index 021186925bfbade00a0dc60733344c87664b8588..3d77470b08c684416bbcfdb9602dff2226245477 100644 (file)
--- a/dlux-web/config/production.json
+++ b/dlux-web/config/production.json
@@ -2,5 +2,6 @@
     "configEnv":"ENV_PROD",
     "baseURL": "",
     "adSalPort": "8080",
-    "mdSalPort" : "8181"
-}
\ No newline at end of file
+    "mdSalPort" : "8181",
+    "mdSalSecuredPort" : "8443"
+}