feat(console): grpc web interceptors, cleanup services (#631)

* managementservice, authservice, change all refs

* refactor grpc auth

* fix references

* interceptor logic

* new interceptor

* appinitializers, environment loader, interceptors

* remove circular dep

* init authconfig in grpc service

* authconfig

* lint

* update mgmt service

* fix references

* update clientid, fix interceptor

* rm unused authconfig

* todo auth interceptor
This commit is contained in:
Max Peintner
2020-08-29 10:43:35 +02:00
committed by GitHub
parent 40b8faaddd
commit eeea1f1c4b
81 changed files with 1877 additions and 2639 deletions
@@ -9,8 +9,8 @@ import { lowerCaseValidator, numberValidator, symbolValidator, upperCaseValidato
import { CreateOrgRequest, CreateUserRequest, Gender, OrgSetUpResponse } from 'src/app/proto/generated/admin_pb';
import { PasswordComplexityPolicy } from 'src/app/proto/generated/auth_pb';
import { AdminService } from 'src/app/services/admin.service';
import { AuthService } from 'src/app/services/auth.service';
import { OrgService } from 'src/app/services/org.service';
import { GrpcAuthService } from 'src/app/services/grpc-auth.service';
import { ManagementService } from 'src/app/services/mgmt.service';
import { ToastService } from 'src/app/services/toast.service';
function passwordConfirmValidator(c: AbstractControl): any {
@@ -67,8 +67,8 @@ export class OrgCreateComponent {
private adminService: AdminService,
private _location: Location,
private fb: FormBuilder,
private orgService: OrgService,
private authService: AuthService,
private mgmtService: ManagementService,
private authService: GrpcAuthService,
) {
this.authService.isAllowed(['iam.write']).pipe(take(1)).subscribe((allowed) => {
if (allowed) {
@@ -139,7 +139,7 @@ export class OrgCreateComponent {
const validators: Validators[] = [Validators.required];
if (this.usePassword) {
this.orgService.GetDefaultPasswordComplexityPolicy().then(data => {
this.mgmtService.GetDefaultPasswordComplexityPolicy().then(data => {
this.policy = data.toObject();
if (this.policy.minLength) {
@@ -194,7 +194,7 @@ export class OrgCreateComponent {
public createOrgForSelf(): void {
if (this.name && this.name.value) {
this.orgService.CreateOrg(this.name.value).then((org) => {
this.mgmtService.CreateOrg(this.name.value).then((org) => {
this.router.navigate(['orgs', org.toObject().id]);
}).catch(error => {
this.toast.showError(error);
@@ -2,7 +2,7 @@ import { Component, Inject } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { saveAs } from 'file-saver';
import { OrgDomainValidationResponse, OrgDomainValidationType, OrgDomainView } from 'src/app/proto/generated/management_pb';
import { OrgService } from 'src/app/services/org.service';
import { ManagementService } from 'src/app/services/mgmt.service';
import { ToastService } from 'src/app/services/toast.service';
@Component({
@@ -23,19 +23,19 @@ export class DomainVerificationComponent {
private toast: ToastService,
public dialogRef: MatDialogRef<DomainVerificationComponent>,
@Inject(MAT_DIALOG_DATA) public data: any,
private orgService: OrgService,
private mgmtService: ManagementService,
) {
this.domain = data.domain;
}
async loadHttpToken(): Promise<void> {
this.http = (await this.orgService.GenerateMyOrgDomainValidation(
this.http = (await this.mgmtService.GenerateMyOrgDomainValidation(
this.domain.domain,
OrgDomainValidationType.ORGDOMAINVALIDATIONTYPE_HTTP)).toObject();
}
async loadDnsToken(): Promise<void> {
this.dns = (await this.orgService.GenerateMyOrgDomainValidation(
this.dns = (await this.mgmtService.GenerateMyOrgDomainValidation(
this.domain.domain,
OrgDomainValidationType.ORGDOMAINVALIDATIONTYPE_DNS)).toObject();
}
@@ -45,7 +45,7 @@ export class DomainVerificationComponent {
}
public validate(): void {
this.orgService.ValidateMyOrgDomain(this.domain.domain).then(() => {
this.mgmtService.ValidateMyOrgDomain(this.domain.domain).then(() => {
this.dialogRef.close(false);
}).catch((error) => {
this.toast.showError(error);
@@ -19,7 +19,7 @@ import {
OrgState,
User,
} from 'src/app/proto/generated/management_pb';
import { OrgService } from 'src/app/services/org.service';
import { ManagementService } from 'src/app/services/mgmt.service';
import { ToastService } from 'src/app/services/toast.service';
import { AddDomainDialogComponent } from './add-domain-dialog/add-domain-dialog.component';
@@ -56,7 +56,7 @@ export class OrgDetailComponent implements OnInit, OnDestroy {
constructor(
private dialog: MatDialog,
public translate: TranslateService,
private orgService: OrgService,
private mgmtService: ManagementService,
private toast: ToastService,
private router: Router,
) { }
@@ -70,14 +70,14 @@ export class OrgDetailComponent implements OnInit, OnDestroy {
}
private async getData(): Promise<void> {
this.orgService.GetMyOrg().then((org: Org) => {
this.mgmtService.GetMyOrg().then((org: Org) => {
this.org = org.toObject();
}).catch(error => {
this.toast.showError(error);
});
this.loadingSubject.next(true);
from(this.orgService.SearchMyOrgMembers(100, 0)).pipe(
from(this.mgmtService.SearchMyOrgMembers(100, 0)).pipe(
map(resp => {
this.totalMemberResult = resp.toObject().totalResult;
return resp.toObject().resultList;
@@ -88,7 +88,7 @@ export class OrgDetailComponent implements OnInit, OnDestroy {
this.membersSubject.next(members);
});
this.orgService.SearchMyOrgDomains(0, 100).then(result => {
this.mgmtService.SearchMyOrgDomains(0, 100).then(result => {
this.domains = result.toObject().resultList;
this.primaryDomain = this.domains.find(domain => domain.primary)?.domain ?? '';
});
@@ -96,13 +96,13 @@ export class OrgDetailComponent implements OnInit, OnDestroy {
public changeState(event: MatButtonToggleChange | any): void {
if (event.value === OrgState.ORGSTATE_ACTIVE) {
this.orgService.ReactivateMyOrg().then(() => {
this.mgmtService.ReactivateMyOrg().then(() => {
this.toast.showInfo('ORG.TOAST.REACTIVATED', true);
}).catch((error) => {
this.toast.showError(error);
});
} else if (event.value === OrgState.ORGSTATE_INACTIVE) {
this.orgService.DeactivateMyOrg().then(() => {
this.mgmtService.DeactivateMyOrg().then(() => {
this.toast.showInfo('ORG.TOAST.DEACTIVATED', true);
}).catch((error) => {
this.toast.showError(error);
@@ -118,7 +118,7 @@ export class OrgDetailComponent implements OnInit, OnDestroy {
dialogRef.afterClosed().subscribe(resp => {
if (resp) {
this.orgService.AddMyOrgDomain(resp).then(domain => {
this.mgmtService.AddMyOrgDomain(resp).then(domain => {
const newDomain = domain;
const newDomainView = new OrgDomainView();
@@ -150,7 +150,7 @@ export class OrgDetailComponent implements OnInit, OnDestroy {
dialogRef.afterClosed().subscribe(resp => {
if (resp) {
this.orgService.RemoveMyOrgDomain(domain).then(() => {
this.mgmtService.RemoveMyOrgDomain(domain).then(() => {
this.toast.showInfo('ORG.TOAST.DOMAINREMOVED', true);
const index = this.domains.findIndex(d => d.domain === domain);
if (index > -1) {
@@ -178,7 +178,7 @@ export class OrgDetailComponent implements OnInit, OnDestroy {
if (users && users.length && roles && roles.length) {
Promise.all(users.map(user => {
return this.orgService.AddMyOrgMember(user.id, roles);
return this.mgmtService.AddMyOrgMember(user.id, roles);
})).then(() => {
this.toast.showInfo('ORG.TOAST.MEMBERADDED', true);
}).catch(error => {
@@ -4,8 +4,7 @@ import { Router } from '@angular/router';
import { Observable, of } from 'rxjs';
import { switchMap, take } from 'rxjs/operators';
import { Org } from 'src/app/proto/generated/auth_pb';
import { AuthUserService } from 'src/app/services/auth-user.service';
import { AuthService } from 'src/app/services/auth.service';
import { GrpcAuthService } from 'src/app/services/grpc-auth.service';
import { ToastService } from 'src/app/services/toast.service';
@Component({
@@ -24,15 +23,14 @@ export class OrgGridComponent {
public notPinned: Array<Org.AsObject> = [];
constructor(
public authService: AuthService,
private userService: AuthUserService,
private userService: GrpcAuthService,
private toast: ToastService,
private router: Router,
) {
this.loading = true;
this.getData(10, 0);
this.authService.GetActiveOrg().then(org => this.activeOrg = org);
this.userService.GetActiveOrg().then(org => this.activeOrg = org);
this.selection.changed.subscribe(selection => {
this.setPrefixedItem('pinned-orgs', JSON.stringify(
@@ -71,7 +69,7 @@ export class OrgGridComponent {
}
private getPrefixedItem(key: string): Observable<string | null> {
return this.authService.user.pipe(
return this.userService.user.pipe(
take(1),
switchMap(user => {
return of(localStorage.getItem(`${user.id}:${key}`));
@@ -80,7 +78,7 @@ export class OrgGridComponent {
}
private setPrefixedItem(key: string, value: any): Observable<void> {
return this.authService.user.pipe(
return this.userService.user.pipe(
take(1),
switchMap(user => {
return of(localStorage.setItem(`${user.id}:${key}`, value));
@@ -103,7 +101,7 @@ export class OrgGridComponent {
public selectOrg(item: Org.AsObject, event?: any): void {
if (event && !event.target.classList.contains('mat-icon')) {
this.authService.setActiveOrg(item);
this.userService.setActiveOrg(item);
this.routeToOrg(item);
}
}
@@ -1,7 +1,7 @@
import { Component, ElementRef, EventEmitter, Output, ViewChild } from '@angular/core';
import { FormControl } from '@angular/forms';
import { MatAutocomplete } from '@angular/material/autocomplete';
import { OrgService } from 'src/app/services/org.service';
import { ManagementService } from 'src/app/services/mgmt.service';
import { ToastService } from 'src/app/services/toast.service';
@Component({
@@ -18,8 +18,8 @@ export class OrgMemberRolesAutocompleteComponent {
@ViewChild('nameInput') public nameInput!: ElementRef<HTMLInputElement>;
@ViewChild('auto') public matAutocomplete!: MatAutocomplete;
@Output() public selectionChanged: EventEmitter<string[]> = new EventEmitter();
constructor(private orgService: OrgService, private toast: ToastService) {
this.orgService.GetOrgMemberRoles().then(resp => {
constructor(private mgmtService: ManagementService, private toast: ToastService) {
this.mgmtService.GetOrgMemberRoles().then(resp => {
this.allRoles = resp.toObject().rolesList;
}).catch(error => {
this.toast.showError(error);
@@ -3,7 +3,7 @@ import { Timestamp } from 'google-protobuf/google/protobuf/timestamp_pb';
import { BehaviorSubject, from, Observable, of } from 'rxjs';
import { catchError, finalize, map } from 'rxjs/operators';
import { OrgMemberView } from 'src/app/proto/generated/management_pb';
import { OrgService } from 'src/app/services/org.service';
import { ManagementService } from 'src/app/services/mgmt.service';
export class OrgMembersDataSource extends DataSource<OrgMemberView.AsObject> {
public totalResult: number = 0;
@@ -12,7 +12,7 @@ export class OrgMembersDataSource extends DataSource<OrgMemberView.AsObject> {
private loadingSubject: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
public loading$: Observable<boolean> = this.loadingSubject.asObservable();
constructor(private orgService: OrgService) {
constructor(private mgmtService: ManagementService) {
super();
}
@@ -20,7 +20,7 @@ export class OrgMembersDataSource extends DataSource<OrgMemberView.AsObject> {
const offset = pageIndex * pageSize;
this.loadingSubject.next(true);
from(this.orgService.SearchMyOrgMembers(pageSize, offset)).pipe(
from(this.mgmtService.SearchMyOrgMembers(pageSize, offset)).pipe(
map(resp => {
const response = resp.toObject();
this.totalResult = response.totalResult;
@@ -6,7 +6,7 @@ import { MatSelectChange } from '@angular/material/select';
import { tap } from 'rxjs/operators';
import { CreationType, MemberCreateDialogComponent } from 'src/app/modules/add-member-dialog/member-create-dialog.component';
import { Org, OrgMemberView, ProjectType, User } from 'src/app/proto/generated/management_pb';
import { OrgService } from 'src/app/services/org.service';
import { ManagementService } from 'src/app/services/mgmt.service';
import { ToastService } from 'src/app/services/toast.service';
import { OrgMembersDataSource } from './org-members-datasource';
@@ -30,13 +30,13 @@ export class OrgMembersComponent implements AfterViewInit {
public displayedColumns: string[] = ['select', 'firstname', 'lastname', 'username', 'email', 'roles'];
constructor(
private orgService: OrgService,
private mgmtService: ManagementService,
private dialog: MatDialog,
private toast: ToastService,
) {
this.orgService.GetMyOrg().then(org => {
this.mgmtService.GetMyOrg().then(org => {
this.org = org.toObject();
this.dataSource = new OrgMembersDataSource(this.orgService);
this.dataSource = new OrgMembersDataSource(this.mgmtService);
this.dataSource.loadMembers(0, 25);
});
@@ -52,7 +52,7 @@ export class OrgMembersComponent implements AfterViewInit {
}
public getRoleOptions(): void {
this.orgService.GetOrgMemberRoles().then(resp => {
this.mgmtService.GetOrgMemberRoles().then(resp => {
this.memberRoleOptions = resp.toObject().rolesList;
}).catch(error => {
this.toast.showError(error);
@@ -60,7 +60,7 @@ export class OrgMembersComponent implements AfterViewInit {
}
updateRoles(member: OrgMemberView.AsObject, selectionChange: MatSelectChange): void {
this.orgService.ChangeMyOrgMember(member.userId, selectionChange.value)
this.mgmtService.ChangeMyOrgMember(member.userId, selectionChange.value)
.then(() => {
this.toast.showInfo('ORG.TOAST.MEMBERCHANGED', true);
}).catch(error => {
@@ -77,7 +77,7 @@ export class OrgMembersComponent implements AfterViewInit {
public removeProjectMemberSelection(): void {
Promise.all(this.selection.selected.map(member => {
return this.orgService.RemoveMyOrgMember(member.userId).then(() => {
return this.mgmtService.RemoveMyOrgMember(member.userId).then(() => {
this.toast.showInfo('ORG.TOAST.MEMBERREMOVED', true);
}).catch(error => {
this.toast.showError(error);
@@ -112,7 +112,7 @@ export class OrgMembersComponent implements AfterViewInit {
if (users && users.length && roles && roles.length) {
Promise.all(users.map(user => {
return this.orgService.AddMyOrgMember(user.id, roles);
return this.mgmtService.AddMyOrgMember(user.id, roles);
})).then(() => {
this.toast.showInfo('ORG.TOAST.MEMBERADDED', true);
}).catch(error => {
@@ -10,7 +10,7 @@ import {
PasswordLockoutPolicy,
} from 'src/app/proto/generated/management_pb';
import { AdminService } from 'src/app/services/admin.service';
import { OrgService } from 'src/app/services/org.service';
import { ManagementService } from 'src/app/services/mgmt.service';
import { StorageService } from 'src/app/services/storage.service';
import { ToastService } from 'src/app/services/toast.service';
@@ -55,7 +55,7 @@ export class PasswordPolicyComponent implements OnInit, OnDestroy {
constructor(
private route: ActivatedRoute,
private adminService: AdminService,
private orgService: OrgService,
private mgmtService: ManagementService,
private router: Router,
private toast: ToastService,
private sessionStorage: StorageService,
@@ -121,40 +121,40 @@ export class PasswordPolicyComponent implements OnInit, OnDestroy {
case PolicyComponentType.LOCKOUT:
this.title = 'ORG.POLICY.PWD_LOCKOUT.TITLE';
this.desc = 'ORG.POLICY.PWD_LOCKOUT.DESCRIPTION';
return this.orgService.GetPasswordLockoutPolicy();
return this.mgmtService.GetPasswordLockoutPolicy();
case PolicyComponentType.AGE:
this.title = 'ORG.POLICY.PWD_AGE.TITLE';
this.desc = 'ORG.POLICY.PWD_AGE.DESCRIPTION';
return this.orgService.GetPasswordAgePolicy();
return this.mgmtService.GetPasswordAgePolicy();
case PolicyComponentType.COMPLEXITY:
this.title = 'ORG.POLICY.PWD_COMPLEXITY.TITLE';
this.desc = 'ORG.POLICY.PWD_COMPLEXITY.DESCRIPTION';
return this.orgService.GetPasswordComplexityPolicy();
return this.mgmtService.GetPasswordComplexityPolicy();
case PolicyComponentType.IAM_POLICY:
this.title = 'ORG.POLICY.IAM_POLICY.TITLECREATE';
this.desc = 'ORG.POLICY.IAM_POLICY.DESCRIPTIONCREATE';
return this.orgService.GetMyOrgIamPolicy();
return this.mgmtService.GetMyOrgIamPolicy();
}
}
public deletePolicy(): void {
switch (this.policyType) {
case PolicyComponentType.LOCKOUT:
this.orgService.DeletePasswordLockoutPolicy(this.lockoutData.id).then(() => {
this.mgmtService.DeletePasswordLockoutPolicy(this.lockoutData.id).then(() => {
this.toast.showInfo('Successfully deleted');
}).catch(error => {
this.toast.showError(error);
});
break;
case PolicyComponentType.AGE:
this.orgService.DeletePasswordAgePolicy(this.ageData.id).then(() => {
this.mgmtService.DeletePasswordAgePolicy(this.ageData.id).then(() => {
this.toast.showInfo('Successfully deleted');
}).catch(error => {
this.toast.showError(error);
});
break;
case PolicyComponentType.COMPLEXITY:
this.orgService.DeletePasswordComplexityPolicy(this.complexityData.id).then(() => {
this.mgmtService.DeletePasswordComplexityPolicy(this.complexityData.id).then(() => {
this.toast.showInfo('Successfully deleted');
}).catch(error => {
this.toast.showError(error);
@@ -215,7 +215,7 @@ export class PasswordPolicyComponent implements OnInit, OnDestroy {
if (this.componentAction === PolicyComponentAction.CREATE) {
switch (this.policyType) {
case PolicyComponentType.LOCKOUT:
this.orgService.CreatePasswordLockoutPolicy(
this.mgmtService.CreatePasswordLockoutPolicy(
this.lockoutData.description,
this.lockoutData.maxAttempts,
this.lockoutData.showLockOutFailures,
@@ -227,7 +227,7 @@ export class PasswordPolicyComponent implements OnInit, OnDestroy {
break;
case PolicyComponentType.AGE:
this.orgService.CreatePasswordAgePolicy(
this.mgmtService.CreatePasswordAgePolicy(
this.ageData.description,
this.ageData.maxAgeDays,
this.ageData.expireWarnDays,
@@ -239,7 +239,7 @@ export class PasswordPolicyComponent implements OnInit, OnDestroy {
break;
case PolicyComponentType.COMPLEXITY:
this.orgService.CreatePasswordComplexityPolicy(
this.mgmtService.CreatePasswordComplexityPolicy(
this.complexityData.description,
this.complexityData.hasLowercase,
this.complexityData.hasUppercase,
@@ -271,7 +271,7 @@ export class PasswordPolicyComponent implements OnInit, OnDestroy {
} else if (this.componentAction === PolicyComponentAction.MODIFY) {
switch (this.policyType) {
case PolicyComponentType.LOCKOUT:
this.orgService.UpdatePasswordLockoutPolicy(
this.mgmtService.UpdatePasswordLockoutPolicy(
this.lockoutData.description,
this.lockoutData.maxAttempts,
this.lockoutData.showLockOutFailures,
@@ -283,7 +283,7 @@ export class PasswordPolicyComponent implements OnInit, OnDestroy {
break;
case PolicyComponentType.AGE:
this.orgService.UpdatePasswordAgePolicy(
this.mgmtService.UpdatePasswordAgePolicy(
this.ageData.description,
this.ageData.maxAgeDays,
this.ageData.expireWarnDays,
@@ -295,7 +295,7 @@ export class PasswordPolicyComponent implements OnInit, OnDestroy {
break;
case PolicyComponentType.COMPLEXITY:
this.orgService.UpdatePasswordComplexityPolicy(
this.mgmtService.UpdatePasswordComplexityPolicy(
this.complexityData.description,
this.complexityData.hasLowercase,
this.complexityData.hasUppercase,
@@ -6,8 +6,8 @@ import {
PasswordLockoutPolicy,
PolicyState,
} from 'src/app/proto/generated/management_pb';
import { AuthUserService } from 'src/app/services/auth-user.service';
import { OrgService } from 'src/app/services/org.service';
import { GrpcAuthService } from 'src/app/services/grpc-auth.service';
import { ManagementService } from 'src/app/services/mgmt.service';
import { PolicyComponentType } from '../password-policy/password-policy.component';
@@ -26,14 +26,14 @@ export class PolicyGridComponent {
public PolicyComponentType: any = PolicyComponentType;
constructor(
private orgService: OrgService,
public authUserService: AuthUserService,
private mgmtService: ManagementService,
public authUserService: GrpcAuthService,
) {
this.getData();
}
private getData(): void {
this.orgService.GetPasswordComplexityPolicy().then(data => this.complexityPolicy = data.toObject());
this.orgService.GetMyOrgIamPolicy().then(data => this.iamPolicy = data.toObject());
this.mgmtService.GetPasswordComplexityPolicy().then(data => this.complexityPolicy = data.toObject());
this.mgmtService.GetMyOrgIamPolicy().then(data => this.iamPolicy = data.toObject());
}
}
@@ -5,7 +5,7 @@ import { MatAutocomplete, MatAutocompleteSelectedEvent } from '@angular/material
import { MatChipInputEvent } from '@angular/material/chips';
import { debounceTime, tap } from 'rxjs/operators';
import { Org } from 'src/app/proto/generated/management_pb';
import { OrgService } from 'src/app/services/org.service';
import { ManagementService } from 'src/app/services/mgmt.service';
import { ToastService } from 'src/app/services/toast.service';
@Component({
@@ -27,9 +27,9 @@ export class SearchOrgAutocompleteComponent {
@ViewChild('auto') public matAutocomplete!: MatAutocomplete;
@Input() public singleOutput: boolean = false;
@Output() public selectionChanged: EventEmitter<Org.AsObject | Org.AsObject[]> = new EventEmitter();
constructor(private orgService: OrgService, private toast: ToastService) {
constructor(private mgmtService: ManagementService, private toast: ToastService) {
this.myControl.valueChanges.pipe(debounceTime(200), tap(() => this.isLoading = true)).subscribe(value => {
return this.orgService.getOrgByDomainGlobal(value).then((org) => {
return this.mgmtService.getOrgByDomainGlobal(value).then((org) => {
this.isLoading = false;
if (org) {
this.filteredOrgs = [org.toObject()];