Browse Source

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

* 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
feature/trust
Vincent Salucci 2 years ago committed by GitHub
parent
commit
15597fb4e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      apps/web/src/app/admin-console/organizations/settings/organization-settings-routing.module.ts
  2. 2
      apps/web/src/app/admin-console/organizations/settings/settings.component.html
  3. 2
      bitwarden_license/bit-web/src/app/admin-console/organizations/organizations-routing.module.ts
  4. 3
      libs/common/src/admin-console/abstractions/organization/organization.service.abstraction.ts
  5. 4
      libs/common/src/admin-console/models/domain/organization.ts

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

@ -70,6 +70,9 @@ function getSettingsRoute(organization: Organization) { @@ -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

@ -65,7 +65,7 @@ @@ -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

@ -62,7 +62,7 @@ const routes: Routes = [ @@ -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

@ -15,7 +15,8 @@ export function canAccessSettingsTab(org: Organization): boolean { @@ -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

@ -217,6 +217,10 @@ export class Organization { @@ -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;
}

Loading…
Cancel
Save