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

accept org invite. return state for login

Browse Source
This commit is contained in:
Kyle Spearrin
2017-03-23 16:57:47 -04:00
parent 0b875fc6f7
commit 9f1ab6f961
7 changed files with 118 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/app/accounts/accountsLoginController.js
View File

@@ -3,6 +3,7 @@ angular
.controller('accountsLoginController', function ($scope, $rootScope, $cookies, apiService, cryptoService, authService,
$state, appSettings, $analytics) {
var returnState = $state.params.returnState;
var rememberedEmail = $cookies.get(appSettings.rememberedEmailCookieName);
if (rememberedEmail) {
$scope.model = {
@@ -36,11 +37,11 @@ angular
masterPassword = model.masterPassword;
$analytics.eventTrack('Logged In To Two-step');
$state.go('frontend.login.twoFactor');
$state.go('frontend.login.twoFactor', { returnState: returnState });
}
else {
$analytics.eventTrack('Logged In');
$state.go('backend.user.vault');
loggedInGo();
}
});
};
@@ -51,7 +52,16 @@ angular
$scope.twoFactorPromise.then(function () {
$analytics.eventTrack('Logged In From Two-step');
$state.go('backend.user.vault');
loggedInGo();
});
};
function loggedInGo() {
if (returnState) {
$state.go(returnState.name, returnState.params);
}
else {
$state.go('backend.user.vault');
}
}
});