mirror of
https://github.com/bitwarden/browser
synced 2024-12-24 17:11:55 +01:00
[SM-749] Redirect to SA list if SA isn't found (#5511)
* redirect if SA isn't found * refactor to use getByServiceAccountId * add error toasts
This commit is contained in:
parent
a3110f89fc
commit
f913d8b6be
@ -6828,7 +6828,16 @@
|
||||
},
|
||||
"memberDecryptionTdeDescriptionEnd": {
|
||||
"message": "with automatic enrollment will turn on when this option is used.",
|
||||
"description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Once authenticated, members will decrypt vault data using a key stored on their device. The account recovery administration policy with automatic enrollment will turn on when this option is used.'"
|
||||
"description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Once authenticated, members will decrypt vault data using a key stored on their device. The master password reset policy with automatic enrollment will turn on when this option is used.'"
|
||||
},
|
||||
"notFound":{
|
||||
"message": "$RESOURCE$ not found",
|
||||
"placeholders": {
|
||||
"resource": {
|
||||
"content": "$1",
|
||||
"example": "Service Account"
|
||||
}
|
||||
}
|
||||
},
|
||||
"recoverAccount": {
|
||||
"message": "Recover account"
|
||||
|
@ -3,6 +3,7 @@ import { ActivatedRoute, Router } from "@angular/router";
|
||||
import {
|
||||
catchError,
|
||||
combineLatest,
|
||||
EMPTY,
|
||||
filter,
|
||||
Observable,
|
||||
startWith,
|
||||
@ -12,6 +13,8 @@ import {
|
||||
} from "rxjs";
|
||||
|
||||
import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog";
|
||||
import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
|
||||
import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
|
||||
|
||||
import { ProjectView } from "../../models/view/project.view";
|
||||
import {
|
||||
@ -37,7 +40,9 @@ export class ProjectComponent implements OnInit, OnDestroy {
|
||||
private route: ActivatedRoute,
|
||||
private projectService: ProjectService,
|
||||
private router: Router,
|
||||
private dialogService: DialogServiceAbstraction
|
||||
private dialogService: DialogServiceAbstraction,
|
||||
private platformUtilsService: PlatformUtilsService,
|
||||
private i18nService: I18nService
|
||||
) {}
|
||||
|
||||
ngOnInit(): void {
|
||||
@ -48,10 +53,17 @@ export class ProjectComponent implements OnInit, OnDestroy {
|
||||
);
|
||||
|
||||
this.project$ = combineLatest([this.route.params, currentProjectEdited]).pipe(
|
||||
switchMap(([params, _]) => {
|
||||
return this.projectService.getByProjectId(params.projectId);
|
||||
}),
|
||||
catchError(async () => this.handleError())
|
||||
switchMap(([params, _]) => this.projectService.getByProjectId(params.projectId)),
|
||||
catchError(() => {
|
||||
this.router.navigate(["/sm", this.organizationId, "projects"]).then(() => {
|
||||
this.platformUtilsService.showToast(
|
||||
"error",
|
||||
null,
|
||||
this.i18nService.t("notFound", this.i18nService.t("project"))
|
||||
);
|
||||
});
|
||||
return EMPTY;
|
||||
})
|
||||
);
|
||||
|
||||
this.route.params.pipe(takeUntil(this.destroy$)).subscribe((params) => {
|
||||
@ -60,12 +72,6 @@ export class ProjectComponent implements OnInit, OnDestroy {
|
||||
});
|
||||
}
|
||||
|
||||
handleError = () => {
|
||||
const projectsListUrl = `/sm/${this.organizationId}/projects/`;
|
||||
this.router.navigate([projectsListUrl]);
|
||||
return new ProjectView();
|
||||
};
|
||||
|
||||
ngOnDestroy(): void {
|
||||
this.destroy$.next();
|
||||
this.destroy$.complete();
|
||||
|
@ -1,8 +1,19 @@
|
||||
import { Component } from "@angular/core";
|
||||
import { ActivatedRoute } from "@angular/router";
|
||||
import { switchMap } from "rxjs";
|
||||
import { Component, OnDestroy, OnInit } from "@angular/core";
|
||||
import { ActivatedRoute, Router } from "@angular/router";
|
||||
import {
|
||||
EMPTY,
|
||||
Subject,
|
||||
catchError,
|
||||
combineLatest,
|
||||
filter,
|
||||
startWith,
|
||||
switchMap,
|
||||
takeUntil,
|
||||
} from "rxjs";
|
||||
|
||||
import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog";
|
||||
import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
|
||||
import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
|
||||
|
||||
import { AccessTokenCreateDialogComponent } from "./access/dialogs/access-token-create-dialog.component";
|
||||
import { ServiceAccountService } from "./service-account.service";
|
||||
@ -11,30 +22,56 @@ import { ServiceAccountService } from "./service-account.service";
|
||||
selector: "sm-service-account",
|
||||
templateUrl: "./service-account.component.html",
|
||||
})
|
||||
export class ServiceAccountComponent {
|
||||
export class ServiceAccountComponent implements OnInit, OnDestroy {
|
||||
private destroy$ = new Subject<void>();
|
||||
private organizationId: string;
|
||||
private serviceAccountId: string;
|
||||
|
||||
/**
|
||||
* TODO: remove when a server method is available that fetches a service account by ID
|
||||
*/
|
||||
protected serviceAccount$ = this.route.params.pipe(
|
||||
switchMap((params) => {
|
||||
this.serviceAccountId = params.serviceAccountId;
|
||||
this.organizationId = params.organizationId;
|
||||
private onChange$ = this.serviceAccountService.serviceAccount$.pipe(
|
||||
filter((sa) => sa?.id === this.serviceAccountId),
|
||||
startWith(null)
|
||||
);
|
||||
|
||||
return this.serviceAccountService
|
||||
.getServiceAccounts(params.organizationId)
|
||||
.then((saList) => saList.find((sa) => sa.id === params.serviceAccountId));
|
||||
protected serviceAccount$ = combineLatest([this.route.params, this.onChange$]).pipe(
|
||||
switchMap(([params, _]) =>
|
||||
this.serviceAccountService.getByServiceAccountId(
|
||||
params.serviceAccountId,
|
||||
params.organizationId
|
||||
)
|
||||
),
|
||||
catchError(() => {
|
||||
this.router.navigate(["/sm", this.organizationId, "service-accounts"]).then(() => {
|
||||
this.platformUtilsService.showToast(
|
||||
"error",
|
||||
null,
|
||||
this.i18nService.t("notFound", this.i18nService.t("serviceAccount"))
|
||||
);
|
||||
});
|
||||
return EMPTY;
|
||||
})
|
||||
);
|
||||
|
||||
constructor(
|
||||
private route: ActivatedRoute,
|
||||
private serviceAccountService: ServiceAccountService,
|
||||
private dialogService: DialogServiceAbstraction
|
||||
private dialogService: DialogServiceAbstraction,
|
||||
private router: Router,
|
||||
private platformUtilsService: PlatformUtilsService,
|
||||
private i18nService: I18nService
|
||||
) {}
|
||||
|
||||
ngOnInit(): void {
|
||||
this.route.params.pipe(takeUntil(this.destroy$)).subscribe((params) => {
|
||||
this.serviceAccountId = params.serviceAccountId;
|
||||
this.organizationId = params.organizationId;
|
||||
});
|
||||
}
|
||||
|
||||
ngOnDestroy(): void {
|
||||
this.destroy$.next();
|
||||
this.destroy$.complete();
|
||||
}
|
||||
|
||||
protected openNewAccessTokenDialog() {
|
||||
AccessTokenCreateDialogComponent.openNewAccessTokenDialog(
|
||||
this.dialogService,
|
||||
|
Loading…
Reference in New Issue
Block a user