bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-18 09:13:33 +00:00
Code Issues Releases Wiki Activity

persist user profile information

Browse Source
This commit is contained in:
Kyle Spearrin
2016-09-20 23:30:16 -04:00
parent 34c2340a4d
commit 8b76668f1f
5 changed files with 139 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/popup/app/accounts/accountsLoginController.js
View File

@@ -20,11 +20,13 @@
$scope.loginPromise = loginService.logIn(model.email, model.masterPassword);
$scope.loginPromise.then(function () {
userService.getUserProfile(function (profile) {
if (false && profile.twoFactor) {
userService.isTwoFactorAuthenticated(function (isTwoFactorAuthenticated) {
if (isTwoFactorAuthenticated) {
$state.go('login.twoFactor');
}
else {
// TODO: do full sync
$state.go('tabs.current', { animation: 'in-slide-left' });
}
});

39
src/popup/app/services/loginService.js
View File

@@ -5,6 +5,7 @@
var _service = {};
_service.logIn = function (email, masterPassword) {
email = email.toLowerCase();
var key = cryptoService.makeKey(masterPassword, email);
var deferred = $q.defer();
cryptoService.hashPassword(masterPassword, key, function (hashedPassword) {
@@ -17,9 +18,16 @@
tokenService.setToken(response.token, function () {
cryptoService.setKey(key, function () {
userService.setUserProfile(response.profile, function () {
if (response.profile) {
userService.setUserId(response.profile.id, function () {
userService.setEmail(response.profile.email, function () {
deferred.resolve(response);
});
});
}
else {
deferred.resolve(response);
});
}
});
});
}, function (error) {
@@ -29,21 +37,21 @@
return deferred.promise;
};
_service.logInTwoFactor = function (code, provider) {
var request = {
code: code,
provider: provider
};
_service.logInTwoFactor = function (code) {
var request = new TokenTwoFactorRequest(code);
var deferred = $q.defer();
apiService.auth.tokenTwoFactor(request, function (response) {
if (!response || !response.Token) {
apiService.auth.postTokenTwoFactor(request, function (response) {
if (!response || !response.token) {
deferred.reject();
return;
}
tokenService.setToken(response.Token, function () {
userService.setUserProfile(response.Profile, function () {
deferred.resolve(response);
tokenService.setToken(response.token, function () {
userService.setUserId(response.profile.id, function () {
userService.setEmail(response.profile.email, function () {
deferred.resolve(response);
});
});
});
}, function (error) {
@@ -56,8 +64,11 @@
_service.logOut = function (callback) {
tokenService.clearToken(function () {
cryptoService.clearKey(function () {
userService.clearUserProfile();
callback();
userService.clearUserId(function () {
userService.clearEmail(function () {
callback();
});
});
});
});
};