bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-16 08:13:42 +00:00
Code Issues Releases Wiki Activity

Migrate OrganizationService to StateProvider (#7895)

Browse Source
This commit is contained in:
Addison Beck
2024-03-18 11:58:33 -05:00
committed by GitHub
parent 087d174194
commit c7abdb9879
47 changed files with 855 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/importer/src/components/import.component.ts
View File

@@ -207,7 +207,7 @@ export class ImportComponent implements OnInit, OnDestroy {
this.setImportOptions();
await this.initializeOrganizations();
if (this.organizationId && this.canAccessImportExport(this.organizationId)) {
if (this.organizationId && (await this.canAccessImportExport(this.organizationId))) {
this.handleOrganizationImportInit();
} else {
this.handleImportInit();
@@ -359,7 +359,7 @@ export class ImportComponent implements OnInit, OnDestroy {
importContents,
this.organizationId,
this.formGroup.controls.targetSelector.value,
this.canAccessImportExport(this.organizationId) && this._isFromAC,
(await this.canAccessImportExport(this.organizationId)) && this._isFromAC,
);
//No errors, display success message
@@ -379,11 +379,11 @@ export class ImportComponent implements OnInit, OnDestroy {
}
}
private canAccessImportExport(organizationId?: string): boolean {
private async canAccessImportExport(organizationId?: string): Promise<boolean> {
if (!organizationId) {
return false;
}
return this.organizationService.get(this.organizationId)?.canAccessImportExport;
return (await this.organizationService.get(this.organizationId))?.canAccessImportExport;
}
getFormatInstructionTitle() {