convert auth service profile methods to promises

src/app/directives/masterPasswordDirective.js

@@ -6,11 +6,7 @@ angular
             require: 'ngModel',
             restrict: 'A',
             link: function (scope, elem, attr, ngModel) {
-                var profile = authService.getUserProfile();
+                authService.getUserProfile().then(function (profile) {
-                if (!profile) {
-                    return;
-                }
-
                     // For DOM -> model validation
                     ngModel.$parsers.unshift(function (value) {
                         if (!value) {
@@ -35,6 +31,7 @@ angular
                         ngModel.$setValidity('masterPassword', valid);
                         return value;
                     });
+                });
             }
         };
     });

src/app/global/mainController.js

@@ -10,7 +10,9 @@ angular
         $scope.currentYear = new Date().getFullYear();
 
         $scope.$on('$viewContentLoaded', function () {
-            vm.userProfile = authService.getUserProfile();
+            authService.getUserProfile().then(function (profile) {
+                vm.userProfile = profile;
+            });
 
             if ($.AdminLTE) {
                 if ($.AdminLTE.layout) {

src/app/global/sideNavController.js

@@ -6,7 +6,7 @@ angular
         $scope.params = $state.params;
 
         if ($state.includes('backend.org')) {
-            var userProfile = authService.getUserProfile();
+            authService.getUserProfile().then(function (userProfile) {
                 if (!userProfile.organizations || !userProfile.organizations.length) {
                     return;
                 }
@@ -17,5 +17,6 @@ angular
                         break;
                     }
                 }
+            });
         }
     });

src/app/services/authService.js

@@ -58,16 +58,21 @@ angular
 
         _service.getUserProfile = function () {
             if (!_userProfile) {
-                _service.setUserProfile();
+                return _service.setUserProfile();
             }
 
-            return _userProfile;
+            var deferred = $q.defer();
+            deferred.resolve(_userProfile);
+            return deferred.promise;
         };
 
         _service.setUserProfile = function () {
+            var deferred = $q.defer();
+
             var token = tokenService.getToken();
             if (!token) {
-                return;
+                deferred.reject();
+                return deferred.promise;
             }
 
             var decodedToken = jwtHelper.decodeToken(token);
@@ -77,30 +82,7 @@ angular
                 email: decodedToken.email
             };
 
-            apiService.accounts.getProfile({}, loadProfile);
+            apiService.accounts.getProfile({}, function (profile) {
-        };
-
-        _service.addProfileOrganization = function (org) {
-            var profile = _service.getUserProfile();
-            if (profile) {
-                if (!profile.Organizations) {
-                    profile.Organizations = [];
-                }
-
-                var o = {
-                    id: org.Id,
-                    name: org.Name,
-                    key: org.Key,
-                    status: org.Status
-                };
-                profile.organizations.push(o);
-
-                _userProfile = profile;
-                cryptoService.addOrgKey(o);
-            }
-        };
-
-        function loadProfile(profile) {
                 _userProfile.extended = {
                     name: profile.Name,
                     twoFactorEnabled: profile.TwoFactorEnabled,
@@ -120,9 +102,36 @@ angular
 
                     _userProfile.organizations = orgs;
                     cryptoService.setOrgKeys(orgs);
+                    deferred.resolve(_userProfile);
                 }
+            }, function () {
+                deferred.reject();
+            });
+
+            return deferred.promise;
+        };
+
+        _service.addProfileOrganization = function (org) {
+            return _service.getUserProfile().then(function (profile) {
+                if (profile) {
+                    if (!profile.Organizations) {
+                        profile.Organizations = [];
                     }
 
+                    var o = {
+                        id: org.Id,
+                        name: org.Name,
+                        key: org.Key,
+                        status: org.Status
+                    };
+                    profile.organizations.push(o);
+
+                    _userProfile = profile;
+                    cryptoService.addOrgKey(o);
+                }
+            });
+        };
+
         _service.isAuthenticated = function () {
             return tokenService.getToken() !== null;
         };

src/app/settings/settingsChangePasswordController.js

@@ -24,9 +24,9 @@
 
             $scope.processing = true;
 
-            var profile = authService.getUserProfile();
+            authService.getUserProfile().then(function (profile) {
-            var newKey = cryptoService.makeKey(model.newMasterPassword, profile.email.toLowerCase());
+                return cryptoService.makeKey(model.newMasterPassword, profile.email.toLowerCase());
-
+            }).then(function (newKey) {
                 var reencryptedLogins = [];
                 var loginsPromise = apiService.logins.list({ dirty: false }, function (encryptedLogins) {
                     var unencryptedLogins = cipherService.decryptLogins(encryptedLogins.Data);
@@ -59,6 +59,8 @@
                         toastr.error('Something went wrong.', 'Oh No!');
                     }).$promise;
                 });
+
+            });
         };
 
         $scope.close = function () {

src/app/settings/settingsController.js

@@ -36,15 +36,17 @@
 
         $scope.generalSave = function () {
             $scope.generalPromise = apiService.accounts.putProfile({}, $scope.model.profile, function (profile) {
-                authService.setUserProfile(profile);
+                authService.setUserProfile(profile).then(function (updatedProfile) {
                     toastr.success('Account has been updated.', 'Success!');
+                });
             }).$promise;
         };
 
         $scope.passwordHintSave = function () {
             $scope.passwordHintPromise = apiService.accounts.putProfile({}, $scope.model.profile, function (profile) {
-                authService.setUserProfile(profile);
+                authService.setUserProfile(profile).then(function (updatedProfile) {
                     toastr.success('Account has been updated.', 'Success!');
+                });
             }).$promise;
         };
 

src/app/settings/settingsTwoFactorController.js

@@ -4,13 +4,16 @@
     .controller('settingsTwoFactorController', function ($scope, apiService, $uibModalInstance, cryptoService, authService, $q, toastr, $analytics) {
         $analytics.eventTrack('settingsTwoFactorController', { category: 'Modal' });
         var _issuer = 'bitwarden',
-            _profile = authService.getUserProfile(),
+            _profile = null,
             _masterPasswordHash;
 
+        authService.getUserProfile().then(function (profile) {
+            _profile = profile;
             $scope.account = _profile.email;
             $scope.enabled = function () {
                 return _profile.extended && _profile.extended.twoFactorEnabled;
             };
+        });
 
         $scope.auth = function (model) {
             _masterPasswordHash = cryptoService.hashPassword(model.masterPassword);

src/app/vault/vaultShareController.js

@@ -12,7 +12,7 @@
             $scope.login = cipherService.decryptLogin(login);
         });
 
-        var profile = authService.getUserProfile();
+        authService.getUserProfile().then(function (profile) {
             if (profile && profile.organizations) {
                 var orgs = [];
                 for (var i = 0; i < profile.organizations.length; i++) {
@@ -39,6 +39,7 @@
                     $scope.subvaults = subvaults;
                 });
             }
+        });
 
         $scope.submitPromise = null;
         $scope.submit = function (model) {