Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-05 09:10:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1505 from bitwarden/Permissions

Browse Source 
Implemented Custom role and permissions
This commit is contained in:
Addison Beck 2021-01-13 10:00:13 -05:00 committed by GitHub
commit a4f26ff311
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

@ -1 +1 @@
Subproject commit cea09a22e533ef3598bb497ba0503c2fcd5b2dc1 Subproject commit 6ac6df75d7a9bd5ea58f5d8310f1b3e34abd2bde

2
src/background/runtime.background.ts
View File

@ -478,7 +478,7 @@ export default class RuntimeBackground {
for (const policy of personalOwnershipPolicies) { for (const policy of personalOwnershipPolicies) {
if (policy.enabled) { if (policy.enabled) {
const org = await this.userService.getOrganization(policy.organizationId); const org = await this.userService.getOrganization(policy.organizationId);
if (org != null && org.enabled && org.usePolicies && !org.isAdmin if (org != null && org.enabled && org.usePolicies && !org.canManagePolicies
&& org.status === OrganizationUserStatusType.Confirmed) { && org.status === OrganizationUserStatusType.Confirmed) {
return false; return false;
} }