bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-18 17:23:37 +00:00
Code Issues Releases Wiki Activity

[AC-1139] Reverted change that introduced ConfigService as a parameter to canAccessVaultTab

Browse Source
This commit is contained in:
Rui Tome
2023-11-27 13:13:35 +00:00
parent ed9e03570c
commit 975d38ba27
12 changed files with 37 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
apps/web/src/app/admin-console/components/organization-switcher.component.ts
View File

@@ -1,12 +1,11 @@
import { Component, Input, OnInit } from "@angular/core";
import { Observable, switchMap } from "rxjs";
import { map, Observable } from "rxjs";
import {
canAccessAdmin,
OrganizationService,
} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
import { ConfigServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config.service.abstraction";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { Utils } from "@bitwarden/common/platform/misc/utils";
@@ -15,11 +14,7 @@ import { Utils } from "@bitwarden/common/platform/misc/utils";
templateUrl: "organization-switcher.component.html",
})
export class OrganizationSwitcherComponent implements OnInit {
constructor(
private organizationService: OrganizationService,
private i18nService: I18nService,
private configService: ConfigServiceAbstraction
) {}
constructor(private organizationService: OrganizationService, private i18nService: I18nService) {}
@Input() activeOrganization: Organization = null;
organizations$: Observable<Organization[]>;
@@ -28,10 +23,8 @@ export class OrganizationSwitcherComponent implements OnInit {
async ngOnInit() {
this.organizations$ = this.organizationService.memberOrganizations$.pipe(
switchMap(async (orgs) => {
const canAccess = await canAccessAdmin(this.i18nService, this.configService);
return canAccess ? orgs.sort(Utils.getSortFunction(this.i18nService, "name")) : orgs;
})
canAccessAdmin(this.i18nService),
map((orgs) => orgs.sort(Utils.getSortFunction(this.i18nService, "name")))
);
this.loaded = true;

4
apps/web/src/app/admin-console/organizations/guards/org-permissions.guard.spec.ts
View File

@@ -9,7 +9,6 @@ import { mock, MockProxy } from "jest-mock-extended";
import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
import { OrganizationUserType } from "@bitwarden/common/admin-console/enums";
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
import { ConfigServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config.service.abstraction";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
@@ -53,8 +52,7 @@ describe("Organization Permissions Guard", () => {
organizationService,
mock<PlatformUtilsService>(),
mock<I18nService>(),
mock<SyncService>(),
mock<ConfigServiceAbstraction>()
mock<SyncService>()
);
});

15
apps/web/src/app/admin-console/organizations/guards/org-permissions.guard.ts
View File

@@ -6,7 +6,6 @@ import {
OrganizationService,
} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
import { ConfigServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config.service.abstraction";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
@@ -20,8 +19,7 @@ export class OrganizationPermissionsGuard implements CanActivate {
private organizationService: OrganizationService,
private platformUtilsService: PlatformUtilsService,
private i18nService: I18nService,
private syncService: SyncService,
private configService: ConfigServiceAbstraction
private syncService: SyncService
) {}
async canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) {
@@ -44,12 +42,9 @@ export class OrganizationPermissionsGuard implements CanActivate {
return this.router.createUrlTree(["/"]);
}
const permissionsCallback: (
organization: Organization,
configService: ConfigServiceAbstraction
) => Promise<boolean> = route.data?.organizationPermissions;
const hasPermissions =
permissionsCallback == null || (await permissionsCallback(org, this.configService));
const permissionsCallback: (organization: Organization) => boolean =
route.data?.organizationPermissions;
const hasPermissions = permissionsCallback == null || permissionsCallback(org);
if (!hasPermissions) {
// Handle linkable ciphers for organizations the user only has view access to
@@ -65,7 +60,7 @@ export class OrganizationPermissionsGuard implements CanActivate {
}
this.platformUtilsService.showToast("error", null, this.i18nService.t("accessDenied"));
return (await canAccessOrgAdmin(org, this.configService))
return canAccessOrgAdmin(org)
? this.router.createUrlTree(["/organizations", org.id])
: this.router.createUrlTree(["/"]);
}

11
apps/web/src/app/admin-console/organizations/guards/org-redirect.guard.ts
View File

@@ -5,31 +5,26 @@ import {
canAccessOrgAdmin,
OrganizationService,
} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
import { ConfigServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config.service.abstraction";
@Injectable({
providedIn: "root",
})
export class OrganizationRedirectGuard implements CanActivate {
constructor(
private router: Router,
private organizationService: OrganizationService,
private configService: ConfigServiceAbstraction
) {}
constructor(private router: Router, private organizationService: OrganizationService) {}
async canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) {
const org = this.organizationService.get(route.params.organizationId);
const customRedirect = route.data?.autoRedirectCallback;
if (customRedirect) {
let redirectPath = await customRedirect(org, this.configService);
let redirectPath = customRedirect(org);
if (typeof redirectPath === "string") {
redirectPath = [redirectPath];
}
return this.router.createUrlTree([state.url, ...redirectPath]);
}
if (await canAccessOrgAdmin(org, this.configService)) {
if (canAccessOrgAdmin(org)) {
return this.router.createUrlTree(["/organizations", org.id]);
}
return this.router.createUrlTree(["/"]);

2
apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.html
View File

@@ -7,7 +7,7 @@
[activeOrganization]="organization"
></app-organization-switcher>
<bit-tab-nav-bar class="-tw-mb-px">
<bit-tab-link *ngIf="canShowVaultTab(organization) | async" route="vault">{{
<bit-tab-link *ngIf="canShowVaultTab(organization)" route="vault">{{
"vault" | i18n
}}</bit-tab-link>
<bit-tab-link *ngIf="canShowMembersTab(organization)" route="members">{{

19
apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts
View File

@@ -13,8 +13,6 @@ import {
OrganizationService,
} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
import { ConfigServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config.service.abstraction";
@Component({
selector: "app-organization-layout",
@@ -24,21 +22,12 @@ export class OrganizationLayoutComponent implements OnInit, OnDestroy {
organization$: Observable<Organization>;
private _destroy = new Subject<void>();
private flexibleCollectionsEnabled: boolean;
constructor(
private route: ActivatedRoute,
private organizationService: OrganizationService,
private configService: ConfigServiceAbstraction
) {}
constructor(private route: ActivatedRoute, private organizationService: OrganizationService) {}
async ngOnInit() {
ngOnInit() {
document.body.classList.remove("layout_frontend");
this.flexibleCollectionsEnabled = await this.configService.getFeatureFlag(
FeatureFlag.FlexibleCollections
);
this.organization$ = this.route.params
.pipe(takeUntil(this._destroy))
.pipe<string>(map((p) => p.organizationId))
@@ -56,8 +45,8 @@ export class OrganizationLayoutComponent implements OnInit, OnDestroy {
this._destroy.complete();
}
async canShowVaultTab(organization: Organization): Promise<boolean> {
return await canAccessVaultTab(organization, this.configService);
canShowVaultTab(organization: Organization): boolean {
return canAccessVaultTab(organization);
}
canShowSettingsTab(organization: Organization): boolean {

8
apps/web/src/app/admin-console/organizations/organization-routing.module.ts
View File

@@ -11,7 +11,6 @@ import {
canAccessSettingsTab,
} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
import { ConfigServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config.service.abstraction";
import { OrganizationPermissionsGuard } from "../../admin-console/organizations/guards/org-permissions.guard";
import { OrganizationRedirectGuard } from "../../admin-console/organizations/guards/org-redirect.guard";
@@ -80,11 +79,8 @@ const routes: Routes = [
},
];
async function getOrganizationRoute(
organization: Organization,
configService: ConfigServiceAbstraction
): Promise<string> {
if (await canAccessVaultTab(organization, configService)) {
function getOrganizationRoute(organization: Organization): string {
if (canAccessVaultTab(organization)) {
return "vault";
}
if (canAccessMembersTab(organization)) {

12
apps/web/src/app/layouts/navbar.component.html
View File

@@ -22,15 +22,9 @@
class="nav-item"
routerLinkActive="active"
>
<ng-container *ngIf="{ orgs: organizations$ | async } as data">
<a
*ngIf="data.orgs?.length > 0"
class="nav-link"
[routerLink]="['/organizations', data.orgs[0].id]"
>
{{ "organizations" | i18n }}
</a>
</ng-container>
<a class="nav-link" [routerLink]="['/organizations', (organizations$ | async)[0].id]">{{
"organizations" | i18n
}}</a>
</li>
<ng-container *ngIf="providers.length >= 1">
<li class="nav-item" routerLinkActive="active" *ngIf="providers.length == 1">

11
apps/web/src/app/layouts/navbar.component.ts
View File

@@ -1,5 +1,5 @@
import { Component, OnInit } from "@angular/core";
import { map, Observable, switchMap } from "rxjs";
import { map, Observable } from "rxjs";
import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout-settings.service";
import {
@@ -11,7 +11,6 @@ import { Organization } from "@bitwarden/common/admin-console/models/domain/orga
import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
import { VaultTimeoutAction } from "@bitwarden/common/enums/vault-timeout-action.enum";
import { Provider } from "@bitwarden/common/models/domain/provider";
import { ConfigServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config.service.abstraction";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
@@ -39,8 +38,7 @@ export class NavbarComponent implements OnInit {
private syncService: SyncService,
private organizationService: OrganizationService,
private vaultTimeoutSettingsService: VaultTimeoutSettingsService,
private i18nService: I18nService,
private configService: ConfigServiceAbstraction
private i18nService: I18nService
) {
this.selfHosted = this.platformUtilsService.isSelfHost();
}
@@ -60,10 +58,7 @@ export class NavbarComponent implements OnInit {
this.providers = await this.providerService.getAll();
this.organizations$ = this.organizationService.memberOrganizations$.pipe(
switchMap(async (orgs) => {
const isAdmin = await canAccessAdmin(this.i18nService, this.configService);
return isAdmin ? orgs : [];
})
canAccessAdmin(this.i18nService)
);
this.canLock$ = this.vaultTimeoutSettingsService
.availableVaultTimeoutActions$()

6
apps/web/src/app/tools/import/import-web.component.ts
View File

@@ -6,7 +6,6 @@ import {
OrganizationService,
canAccessVaultTab,
} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
import { ConfigServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config.service.abstraction";
import { ImportComponent } from "@bitwarden/importer/ui";
import { SharedModule } from "../../shared";
@@ -24,8 +23,7 @@ export class ImportWebComponent implements OnInit {
constructor(
private route: ActivatedRoute,
private organizationService: OrganizationService,
private router: Router,
private configService: ConfigServiceAbstraction
private router: Router
) {}
ngOnInit(): void {
@@ -46,7 +44,7 @@ export class ImportWebComponent implements OnInit {
return;
}
if (await canAccessVaultTab(organization, this.configService)) {
if (canAccessVaultTab(organization)) {
await this.router.navigate(["organizations", organizationId, "vault"]);
}
}

2
apps/web/src/app/vault/core/views/collection-admin.view.ts
View File

@@ -33,7 +33,7 @@ export class CollectionAdminView extends CollectionView {
override canEdit(org: Organization, flexibleCollectionsEnabled: boolean): boolean {
if (flexibleCollectionsEnabled) {
return org?.canEditAnyCollection || this.assigned;
return org?.canEditAnyCollection;
} else {
return org?.canEditAnyCollection || (org?.canEditAssignedCollections && this.assigned);
}