fixed wrong state of force SSL on dashboard

caprover · Dec 31, 2017 · efc4384 · efc4384
1 parent ee629f7
commit efc4384
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/app-backend/dist/templates/dashboard.html b/app-backend/dist/templates/dashboard.html
@@ -38,7 +38,7 @@
 							</div>
 							<div class="row">
 								<div class="pull-right col-md-4">
-									<button type="button" class="btn btn-block btn-primary" uib-tooltip="Redirects all regular HTTP requests to HTTPS" ng-click="onForceSslClicked()" ng-disabled="!captaininfo.hasRootSsl">Force HTTPS</button>
+									<button type="button" class="btn btn-block btn-primary" uib-tooltip="Redirects all regular HTTP requests to HTTPS" ng-click="onForceSslClicked()" ng-disabled="!captaininfo.hasRootSsl || captaininfo.forceSsl">Force HTTPS</button>
 								</div>
 							</div>
 					</div>

diff --git a/app-backend/src/routes/SystemRouter.js b/app-backend/src/routes/SystemRouter.js
@@ -218,6 +218,7 @@ router.get('/info/', function (req, res, next) {
             return {
                 dockerRegistryDomain: dockerRegistryAuthObj ? dockerRegistryAuthObj.serveraddress : '',
                 hasRootSsl: hasRootSsl,
+                forceSsl: CaptainManager.get().getForceSslValue(),
                 rootDomain: dataStore.hasCustomDomain() ? dataStore.getRootDomain() : ''
             };
 

diff --git a/app-backend/src/user/CaptainManager.js b/app-backend/src/user/CaptainManager.js
@@ -24,6 +24,7 @@ class CaptainManager {
 
         let dockerApi = DockerApi.get();
 
+        this.hasForceSsl = false;
         this.dataStore = DataStoreProvider.getDataStore(CaptainConstants.rootNameSpace);
         this.dockerApi = dockerApi;
         this.certbotManager = new CertbotManager(dockerApi);
@@ -760,7 +761,7 @@ class CaptainManager {
     }
 
     getForceSslValue() {
-        return this.hasForceSsl;
+        return !!this.hasForceSsl;
     }
 
     /**
@@ -841,7 +842,7 @@ class CaptainManager {
                 return self.dataStore.setNginxConfig(baseConfig, captainConfig);
             })
             .then(function () {
-               self.resetSelf();
+                self.resetSelf();
             });
     }
 

diff --git a/app-frontend/src/templates/dashboard.html b/app-frontend/src/templates/dashboard.html
@@ -43,7 +43,7 @@
 							<div class="row">
 								<div class="pull-right col-md-4">
 									<button type="button" class="btn btn-block btn-primary" uib-tooltip="Redirects all regular HTTP requests to HTTPS"
-									ng-click="onForceSslClicked()" ng-disabled="!captaininfo.hasRootSsl">Force HTTPS</button>
+									ng-click="onForceSslClicked()" ng-disabled="!captaininfo.hasRootSsl || captaininfo.forceSsl">Force HTTPS</button>
 								</div>
 							</div>
 					</div>