From 6266d60823e9e0d4560dd6b638707e9ec9a130ce Mon Sep 17 00:00:00 2001 From: Dovev Liberman Date: Sun, 11 Dec 2016 18:01:01 +0200 Subject: [PATCH] Fix hard coded port 8181 for HTTPS scenrio Change-Id: I7f4630cc234d912b25c03530befb4c6f3012b59d Signed-off-by: Dovev Liberman --- dlux-web/config/env.module.js | 7 ++++++- dlux-web/config/production.json | 5 +++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlux-web/config/env.module.js b/dlux-web/config/env.module.js index ae8301b5..e4504d59 100644 --- 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 02118692..3d77470b 100644 --- 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" +} -- 2.36.6