Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-09-28 04:08:47 +02:00
Code Issues Projects Releases Wiki Activity

[PM-7004] Add async/await to ngOnInit in verify-recover-delete-org.component.ts

Browse Source
This commit is contained in:
Rui Tome 2024-04-11 13:39:08 +01:00
parent d6f1c57559
commit 3abf204b0b
No known key found for this signature in database
GPG Key ID: 526239D96A8EC066
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
apps/web/src/app/admin-console/organizations/manage/verify-recover-delete-org.component.ts
View File

@ -7,6 +7,7 @@ import { OrganizationVerifyDeleteRecoverRequest } from "@bitwarden/common/admin-
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
import { firstValueFrom } from "rxjs";
@Component({
selector: "app-verify-recover-delete-org",
@ -28,19 +29,15 @@ export class VerifyRecoverDeleteOrgComponent implements OnInit {
private logService: LogService,
) {}
ngOnInit() {
// eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
this.route.queryParams.pipe(first()).subscribe(async (qParams) => {
if (qParams.orgId != null && qParams.token != null && qParams.name != null) {
this.orgId = qParams.orgId;
this.token = qParams.token;
this.name = qParams.name;
} else {
// FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
// eslint-disable-next-line @typescript-eslint/no-floating-promises
this.router.navigate(["/"]);
}
});
async ngOnInit() {
const qParams = await firstValueFrom(this.route.queryParams);
if (qParams.orgId != null && qParams.token != null && qParams.name != null) {
this.orgId = qParams.orgId;
this.token = qParams.token;
this.name = qParams.name;
} else {
await this.router.navigate(["/"]);
}
}
async submit() {
@ -53,9 +50,7 @@ export class VerifyRecoverDeleteOrgComponent implements OnInit {
this.i18nService.t("organizationDeleted"),
this.i18nService.t("organizationDeletedDesc"),
);
// FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
// eslint-disable-next-line @typescript-eslint/no-floating-promises
this.router.navigate(["/"]);
await this.router.navigate(["/"]);
} catch (e) {
this.logService.error(e);
}