From eeb642fec0809971d00881c042c6a5ae0c8403bb Mon Sep 17 00:00:00 2001 From: Kasra Bigdeli Date: Sun, 24 Feb 2019 16:27:31 -0800 Subject: [PATCH] Disabling force SSL on custom domain change --- src/datastore/AppsDataStore.ts | 10 +++++++++- src/user/system/CaptainManager.ts | 8 +++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/datastore/AppsDataStore.ts b/src/datastore/AppsDataStore.ts index 6659c91..fcaae02 100644 --- a/src/datastore/AppsDataStore.ts +++ b/src/datastore/AppsDataStore.ts @@ -274,7 +274,15 @@ class AppsDataStore { Object.keys(appDefinitions).forEach(appName => { const APP_NAME = appName promises.push(function() { - return self.setSslForDefaultSubDomain(APP_NAME, false) + return self + .setSslForDefaultSubDomain(APP_NAME, false) + .then(function() { + return self.getAppDefinition(APP_NAME) + }) + .then(function(app) { + app.forceSsl = false + return self.saveApp(APP_NAME, app) + }) }) }) return Utils.runPromises(promises) diff --git a/src/user/system/CaptainManager.ts b/src/user/system/CaptainManager.ts index 98ff2bb..b3db351 100644 --- a/src/user/system/CaptainManager.ts +++ b/src/user/system/CaptainManager.ts @@ -837,13 +837,19 @@ class CaptainManager { ) } - return self.dataStore.setCustomDomain(requestedCustomDomain) + return self.forceSsl(false) + }) + .then(function() { + return self.dataStore.setHasRootSsl(false) }) .then(function() { return self.dataStore .getAppsDataStore() .ensureAllAppsSubDomainSslDisabled() }) + .then(function() { + return self.dataStore.setCustomDomain(requestedCustomDomain) + }) .then(function() { return self.reloadLoadBalancer(self.dataStore) })