nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-06 13:38:13 -05:00
Code

[Reset Password] Manage Reset Password permission (#1252)

Browse Source
This commit is contained in:
Vincent Salucci 2021-04-05 09:45:17 -05:00 committed by GitHub
parent 4b98361684
commit 7a35813dfd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Core/Context/CurrentContext.cs
View File

@ -252,6 +252,12 @@ namespace Bit.Core.Context
return OrganizationAdmin(orgId) || (Organizations?.Any(o => o.Id == orgId return OrganizationAdmin(orgId) || (Organizations?.Any(o => o.Id == orgId
&& (o.Permissions?.ManageUsers ?? false)) ?? false); && (o.Permissions?.ManageUsers ?? false)) ?? false);
} }
public bool ManageResetPassword(Guid orgId)
{
return OrganizationAdmin(orgId) || (Organizations?.Any(o => o.Id == orgId
&& (o.Permissions?.ManageResetPassword ?? false)) ?? false);
}
public async Task<ICollection<CurrentContentOrganization>> OrganizationMembershipAsync( public async Task<ICollection<CurrentContentOrganization>> OrganizationMembershipAsync(
IOrganizationUserRepository organizationUserRepository, Guid userId) IOrganizationUserRepository organizationUserRepository, Guid userId)
@ -294,7 +300,8 @@ namespace Bit.Core.Context
ManageGroups = hasClaim("managegroups"), ManageGroups = hasClaim("managegroups"),
ManagePolicies = hasClaim("managepolicies"), ManagePolicies = hasClaim("managepolicies"),
ManageSso = hasClaim("managesso"), ManageSso = hasClaim("managesso"),
ManageUsers = hasClaim("manageusers") ManageUsers = hasClaim("manageusers"),
ManageResetPassword = hasClaim("manageresetpassword")
}; };
} }
} }

1
src/Core/Context/ICurrentContext.cs
View File

@ -43,6 +43,7 @@ namespace Bit.Core.Context
bool ManagePolicies(Guid orgId); bool ManagePolicies(Guid orgId);
bool ManageSso(Guid orgId); bool ManageSso(Guid orgId);
bool ManageUsers(Guid orgId); bool ManageUsers(Guid orgId);
bool ManageResetPassword(Guid orgId);
Task<ICollection<CurrentContentOrganization>> OrganizationMembershipAsync( Task<ICollection<CurrentContentOrganization>> OrganizationMembershipAsync(
IOrganizationUserRepository organizationUserRepository, Guid userId); IOrganizationUserRepository organizationUserRepository, Guid userId);

1
src/Core/Models/Data/Permissions.cs
View File

@ -12,5 +12,6 @@ namespace Bit.Core.Models.Data
public bool ManagePolicies { get; set; } public bool ManagePolicies { get; set; }
public bool ManageSso { get; set; } public bool ManageSso { get; set; }
public bool ManageUsers { get; set; } public bool ManageUsers { get; set; }
public bool ManageResetPassword { get; set; }
} }
} }

5
src/Core/Utilities/CoreHelpers.cs
View File

@ -788,6 +788,11 @@ namespace Bit.Core.Utilities
{ {
claims.Add(new KeyValuePair<string, string>("manageusers", org.Id.ToString())); claims.Add(new KeyValuePair<string, string>("manageusers", org.Id.ToString()));
} }
if (org.Permissions.ManageResetPassword)
{
claims.Add(new KeyValuePair<string, string>("manageresetpassword", org.Id.ToString()));
}
} }
break; break;
default: default: