Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-12-30 17:47:44 +01:00
Code Issues Projects Releases Wiki Activity

[AC-1529] Update settings tab visibility to include device approvals (#5855)

Browse Source 
* fix: update show org settings function, add explicit canManageDeviceApprovals helper, refs AC-1529

* fix: add device approval in org-redirect guard and update passed permission, refs AC-1529
This commit is contained in:
Vincent Salucci 2023-08-04 09:18:48 -05:00 committed by GitHub
parent 7f4741f464
commit 15597fb4e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,6 +70,9 @@ function getSettingsRoute(organization: Organization) {
if (organization.canManageScim) {
return "scim";
}
if (organization.canManageDeviceApprovals) {
return "device-approvals";
}
return undefined;
}

2
apps/web/src/app/admin-console/organizations/settings/settings.component.html
View File

@ -65,7 +65,7 @@
routerLink="device-approvals"
class="list-group-item"
routerLinkActive="active"
*ngIf="org.canManageUsersPassword"
*ngIf="org.canManageDeviceApprovals"
>
{{ "deviceApprovals" | i18n }}
</a>

2
bitwarden_license/bit-web/src/app/admin-console/organizations/organizations-routing.module.ts
View File

@ -62,7 +62,7 @@ const routes: Routes = [
canAccessFeature(FeatureFlag.TrustedDeviceEncryption),
],
data: {
organizationPermissions: (org: Organization) => org.canManageUsersPassword,
organizationPermissions: (org: Organization) => org.canManageDeviceApprovals,
titleId: "deviceApprovals",
},
},

3
libs/common/src/admin-console/abstractions/organization/organization.service.abstraction.ts
View File

@ -15,7 +15,8 @@ export function canAccessSettingsTab(org: Organization): boolean {
org.canManagePolicies ||
org.canManageSso ||
org.canManageScim ||
org.canAccessImportExport
org.canAccessImportExport ||
org.canManageDeviceApprovals
);
}

4
libs/common/src/admin-console/models/domain/organization.ts
View File

@ -217,6 +217,10 @@ export class Organization {
return this.isAdmin || this.permissions.manageResetPassword;
}
get canManageDeviceApprovals() {
return (this.isAdmin || this.permissions.manageResetPassword) && this.useSso;
}
get isExemptFromPolicies() {
return this.canManagePolicies;
}