Merge pull request #291 from eve-bright/fix-rest-passowrd-change-bug

Check current saved credentials before checking for auth disabled
neo4j · Oct 18, 2016 · ed60619 · ed60619
2 parents 6942ce3 + 17e7eb5
commit ed60619
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 16 deletions.
diff --git a/app/scripts/controllers/Auth.coffee b/app/scripts/controllers/Auth.coffee
@@ -105,6 +105,6 @@ angular.module('neo4jApp.controllers')
         )
 
       setPolicyMessage()
-      connectIfNoAuthorizationRequired()
+      connectIfNoAuthorizationRequired() unless  ConnectionStatusService.isConnected()
       $scope.clusterRole = $rootScope.neo4j.clusterRole
   ]
diff --git a/app/scripts/services/Auth.coffee b/app/scripts/services/Auth.coffee
@@ -74,26 +74,31 @@ angular.module('neo4jApp.services')
       hasValidAuthorization: (retainConnection = no) ->
         that = @
         q = $q.defer()
-        req = @authorizationRequired()
-        req.then(
-          (r) ->
-            ConnectionStatusService.setConnected yes
-            q.resolve r
-          ,
-          (r) ->
-            if ConnectionStatusService.connectionAuthData().length > 0
-              that.isConnected(retainConnection).then(
+        if ConnectionStatusService.connectionAuthData().length > 0
+          that.isConnected(retainConnection).then(
+            (r) ->
+              ConnectionStatusService.setAuthorizationRequired no
+              q.resolve r
+            ,
+            (r) ->
+              that.authorizationRequired().then(
                 (r) ->
+                  ConnectionStatusService.setConnected yes
                   q.resolve r
-                ,
-                (r) ->
+              , (r) ->
                   ConnectionStatusService.setConnected no
                   q.reject r
               )
-            else
-              ConnectionStatusService.setConnected no
-              q.reject r
-        )
+          )
+        else
+          that.authorizationRequired().then(
+            (r) ->
+              ConnectionStatusService.setConnected yes
+              q.resolve r
+          , (r) ->
+            ConnectionStatusService.setConnected no
+            q.reject r
+          )
         q.promise
 
       isConnected: (retainConnection = no) ->