nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-17 11:08:16 -05:00
Code

Changed the return type for BuildIdentityClaims() (#989)

Browse Source
This commit is contained in:
Addison Beck 2020-11-11 10:56:22 -05:00 committed by GitHub
parent 25a9991908
commit dc69f4bd46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -673,19 +673,19 @@ namespace Bit.Core.Utilities
return configDict; return configDict;
} }
public static Dictionary<string, string> BuildIdentityClaims(User user, ICollection<CurrentContext.CurrentContentOrganization> orgs, bool isPremium) public static List<KeyValuePair<string, string>> BuildIdentityClaims(User user, ICollection<CurrentContext.CurrentContentOrganization> orgs, bool isPremium)
{ {
var claims = new Dictionary<string, string>() var claims = new List<KeyValuePair<string, string>>()
{ {
{"premium", isPremium ? "true" : "false"}, new KeyValuePair<string, string>("premium", isPremium ? "true" : "false"),
{JwtClaimTypes.Email, user.Email}, new KeyValuePair<string, string>(JwtClaimTypes.Email, user.Email),
{JwtClaimTypes.EmailVerified, user.EmailVerified ? "true" : "false"}, new KeyValuePair<string, string>(JwtClaimTypes.EmailVerified, user.EmailVerified ? "true" : "false"),
{"sstamp", user.SecurityStamp} new KeyValuePair<string, string>("sstamp", user.SecurityStamp)
}; };
if (!string.IsNullOrWhiteSpace(user.Name)) if (!string.IsNullOrWhiteSpace(user.Name))
{ {
claims.Add(JwtClaimTypes.Name, user.Name); claims.Add(new KeyValuePair<string, string>(JwtClaimTypes.Name, user.Name));
} }
// Orgs that this user belongs to // Orgs that this user belongs to
@ -698,25 +698,25 @@ namespace Bit.Core.Utilities
case Enums.OrganizationUserType.Owner: case Enums.OrganizationUserType.Owner:
foreach (var org in group) foreach (var org in group)
{ {
claims.Add("orgowner", org.Id.ToString()); claims.Add(new KeyValuePair<string, string>("orgowner", org.Id.ToString()));
} }
break; break;
case Enums.OrganizationUserType.Admin: case Enums.OrganizationUserType.Admin:
foreach (var org in group) foreach (var org in group)
{ {
claims.Add("orgadmin", org.Id.ToString()); claims.Add(new KeyValuePair<string, string>("orgadmin", org.Id.ToString()));
} }
break; break;
case Enums.OrganizationUserType.Manager: case Enums.OrganizationUserType.Manager:
foreach (var org in group) foreach (var org in group)
{ {
claims.Add("orgmanager", org.Id.ToString()); claims.Add(new KeyValuePair<string, string>("orgmanager", org.Id.ToString()));
} }
break; break;
case Enums.OrganizationUserType.User: case Enums.OrganizationUserType.User:
foreach (var org in group) foreach (var org in group)
{ {
claims.Add("orguser", org.Id.ToString()); claims.Add(new KeyValuePair<string, string>("orguser", org.Id.ToString()));
} }
break; break;
default: default: