Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-06 09:20:43 +01:00
Code Issues Projects Releases Wiki Activity

org route guards

Browse Source
This commit is contained in:
Kyle Spearrin 2018-07-05 15:27:23 -04:00
parent ba3b2fbed1
commit 7baf72d3db
6 changed files with 80 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

@ -1 +1 @@
Subproject commit 87e273252be42dab90d9a33857fe7755f378338b
Subproject commit 91081d92327da22ab3be88a60f8b71be26933370

45
src/app/app-routing.module.ts
View File

@ -37,10 +37,14 @@ import { ToolsComponent } from './tools/tools.component';
import { VaultComponent } from './vault/vault.component';
import { OrganizationGuardService } from './services/organization-guard.service';
import { OrganizationTypeGuardService } from './services/organization-type-guard.service';
import { UnauthGuardService } from './services/unauth-guard.service';
import { AuthGuardService } from 'jslib/angular/services/auth-guard.service';
import { OrganizationUserType } from 'jslib/enums/organizationUserType';
const routes: Routes = [
{
path: '',
@ -56,36 +60,34 @@ const routes: Routes = [
{
path: '',
component: UserLayoutComponent,
canActivate: [AuthGuardService],
children: [
{ path: 'vault', component: VaultComponent, canActivate: [AuthGuardService] },
{ path: 'vault', component: VaultComponent },
{
path: 'settings',
component: SettingsComponent,
children: [
{ path: '', pathMatch: 'full', redirectTo: 'account' },
{ path: 'account', component: AccountComponent, canActivate: [AuthGuardService] },
{ path: 'options', component: OptionsComponent, canActivate: [AuthGuardService] },
{ path: 'domain-rules', component: DomainRulesComponent, canActivate: [AuthGuardService] },
{ path: 'two-factor', component: TwoFactorSetupComponent, canActivate: [AuthGuardService] },
{ path: 'premium', component: PremiumComponent, canActivate: [AuthGuardService] },
{ path: 'billing', component: UserBillingComponent, canActivate: [AuthGuardService] },
{ path: 'organizations', component: OrganizationsComponent, canActivate: [AuthGuardService] },
{
path: 'create-organization',
component: CreateOrganizationComponent,
canActivate: [AuthGuardService],
},
{ path: 'account', component: AccountComponent },
{ path: 'options', component: OptionsComponent },
{ path: 'domain-rules', component: DomainRulesComponent },
{ path: 'two-factor', component: TwoFactorSetupComponent },
{ path: 'premium', component: PremiumComponent },
{ path: 'billing', component: UserBillingComponent },
{ path: 'organizations', component: OrganizationsComponent },
{ path: 'create-organization', component: CreateOrganizationComponent },
],
},
{
path: 'tools',
component: ToolsComponent,
canActivate: [AuthGuardService],
children: [
{ path: '', pathMatch: 'full', redirectTo: 'generator' },
{ path: 'import', component: ImportComponent, canActivate: [AuthGuardService] },
{ path: 'export', component: ExportComponent, canActivate: [AuthGuardService] },
{ path: 'generator', component: PasswordGeneratorComponent, canActivate: [AuthGuardService] },
{ path: 'breach-report', component: BreachReportComponent, canActivate: [AuthGuardService] },
{ path: 'import', component: ImportComponent },
{ path: 'export', component: ExportComponent },
{ path: 'generator', component: PasswordGeneratorComponent },
{ path: 'breach-report', component: BreachReportComponent },
],
},
],
@ -93,16 +95,19 @@ const routes: Routes = [
{
path: 'organizations/:organizationId',
component: OrganizationLayoutComponent,
canActivate: [AuthGuardService, OrganizationGuardService],
children: [
{ path: '', pathMatch: 'full', redirectTo: 'vault' },
{ path: 'vault', component: OrgVaultComponent, canActivate: [AuthGuardService] },
{ path: 'vault', component: OrgVaultComponent },
{
path: 'tools',
component: OrgToolsComponent,
canActivate: [OrganizationTypeGuardService],
data: { allowedTypes: [OrganizationUserType.Owner, OrganizationUserType.Admin] },
children: [
{ path: '', pathMatch: 'full', redirectTo: 'export' },
// { path: 'import', component: ImportComponent, canActivate: [AuthGuardService] },
{ path: 'export', component: OrgExportComponent, canActivate: [AuthGuardService] },
// { path: 'import', component: ImportComponent },
{ path: 'export', component: OrgExportComponent },
],
},
],

23
src/app/services/organization-guard.service.ts Normal file
View File

@ -0,0 +1,23 @@
import { Injectable } from '@angular/core';
import {
ActivatedRouteSnapshot,
CanActivate,
Router,
} from '@angular/router';
import { UserService } from 'jslib/abstractions/user.service';
@Injectable()
export class OrganizationGuardService implements CanActivate {
constructor(private userService: UserService, private router: Router) { }
async canActivate(route: ActivatedRouteSnapshot) {
const org = await this.userService.getOrganization(route.params.organizationId);
if (org == null) {
this.router.navigate(['/']);
return false;
}
return true;
}
}

26
src/app/services/organization-type-guard.service.ts Normal file
View File

@ -0,0 +1,26 @@
import { Injectable } from '@angular/core';
import {
ActivatedRouteSnapshot,
CanActivate,
Router,
} from '@angular/router';
import { UserService } from 'jslib/abstractions/user.service';
import { OrganizationUserType } from 'jslib/enums/organizationUserType';
@Injectable()
export class OrganizationTypeGuardService implements CanActivate {
constructor(private userService: UserService, private router: Router) { }
async canActivate(route: ActivatedRouteSnapshot) {
const org = await this.userService.getOrganization(route.parent.params.organizationId);
const allowedTypes = route.data['allowedTypes'] as OrganizationUserType[];
if (allowedTypes == null || allowedTypes.indexOf(org.type) === -1) {
this.router.navigate(['/organizations', org.id]);
return false;
}
return true;
}
}

4
src/app/services/services.module.ts
View File

@ -11,6 +11,8 @@ import { I18nService } from '../../services/i18n.service';
import { MemoryStorageService } from '../../services/memoryStorage.service';
import { WebPlatformUtilsService } from '../../services/webPlatformUtils.service';
import { OrganizationGuardService } from './organization-guard.service';
import { OrganizationTypeGuardService } from './organization-type-guard.service';
import { RouterService } from './router.service';
import { UnauthGuardService } from './unauth-guard.service';
@ -142,6 +144,8 @@ export function initFactory(): Function {
providers: [
ValidationService,
AuthGuardService,
OrganizationGuardService,
OrganizationTypeGuardService,
UnauthGuardService,
RouterService,
{ provide: AuditServiceAbstraction, useValue: auditService },

2
src/scss/styles.scss
View File

@ -595,7 +595,7 @@ app-user-billing {
a {
color: $body-color;
&:hover:not(.active) {
&:not(.active) {
border-color: transparent;
}