bitwarden/web
1
0
Fork 0
mirror of https://github.com/bitwarden/web synced 2025-12-15 15:53:18 +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

28
src/app/config.js
View File

@@ -149,6 +149,9 @@ angular
.state('frontend.login', {
templateUrl: 'app/accounts/views/accountsLogin.html',
controller: 'accountsLoginController',
params: {
returnState: null
},
data: {
bodyClass: 'login-page'
}
@@ -197,21 +200,38 @@ angular
url: '^/register',
templateUrl: 'app/accounts/views/accountsRegister.html',
controller: 'accountsRegisterController',
params: {
returnState: null
},
data: {
pageTitle: 'Register',
bodyClass: 'register-page'
}
})
.state('frontend.organizationAccept', {
url: '^/accept-organization?organizationId&organizationUserId&token',
templateUrl: 'app/accounts/views/accountsOrganizationAccept.html',
controller: 'accountsOrganizationAcceptController',
data: {
pageTitle: 'Accept Organization Invite',
bodyClass: 'login-page',
skipAuthorize: true
}
});
})
.run(function ($rootScope, authService, $state) {
$rootScope.$on('$stateChangeStart', function (event, toState, toParams) {
if (!toState.data || !toState.data.authorize) {
if (authService.isAuthenticated()) {
event.preventDefault();
$state.go('backend.user.vault');
if (toState.data && toState.data.skipAuthorize) {
return;
}
return;
if (!authService.isAuthenticated()) {
return;
}
event.preventDefault();
$state.go('backend.user.vault');
}
if (!authService.isAuthenticated()) {