load permissions fix

src/luticateauth.js

@@ -3,5 +3,9 @@
  */
 
 (function() {
-    angular.module("luticateAuth", []);
+    angular.module("luticateAuth", []).run(['luticateAuthUsers',
+        function(luticateAuthUsers)
+    {
+        luticateAuthUsers.loadPermissions(null);
+    }]);
 })();

src/users.js

@@ -16,10 +16,10 @@
                     luticateRequest.post("/api/luticate/users/login", data, null, promise)
                         .then(function(user)
                         {
-                            luticateAuthUsers.loadPermissions(user, promise)
+                            luticateAuthCache.setUser(user);
+                            luticateAuthUsers.loadPermissions(promise)
                                 .then(function(permissions)
                                 {
-                                    luticateAuthCache.setUser(user);
                                     defer.resolve(user);
                                 }, function(error)
                                 {
@@ -40,7 +40,12 @@
                     luticateAuthPermissions.getAllEffectiveMe(promise)
                         .then(function(permissions)
                         {
-                            luticateAuthCache.setEffectivePermissions(permissions);
+                            var perms = {};
+                            for (var i = 0; i < permissions.length; ++i) {
+                                var p = permissions[i];
+                                perms[p.Name] = p.Value;
+                            }
+                            luticateAuthCache.setEffectivePermissions(perms);
                             defer.resolve(permissions);
                         }, defer.reject);
                     return defer.promise;
@@ -50,14 +55,11 @@
                 {
                     var defer = $q.defer();
                     luticateRequest.post("/api/luticate/users/logout", null, null, promise)
-                        .then(function(data)
+                        .finally(function()
                         {
                             luticateAuthCache.removeUser();
-                            defer.resolve(null);
-                        }, function(error)
-                        {
-                            luticateAuthCache.removeUser();
-                            defer.resolve(null);
+                            luticateAuthUsers.loadPermissions(promise)
+                                .finally(defer.resolve);
                         });
                     return defer.promise;
                 };