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

PM-20532 - CurrentContext.cs - short circuit context building based on send type.

Browse Source
This commit is contained in:
Jared Snider 2025-06-02 17:57:14 -04:00
parent 4e4bca5c0e
commit bb15deda3d
No known key found for this signature in database
GPG Key ID: A149DDD612516286
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -134,6 +134,26 @@ public class CurrentContext : ICurrentContext
var claimsDict = user.Claims.GroupBy(c => c.Type).ToDictionary(c => c.Key, c => c.Select(v => v)); var claimsDict = user.Claims.GroupBy(c => c.Type).ToDictionary(c => c.Key, c => c.Select(v => v));
var clientType = GetClaimValue(claimsDict, Claims.Type);
if (clientType != null)
{
Enum.TryParse(clientType, out IdentityClientType c);
IdentityClientType = c;
}
if (IdentityClientType == IdentityClientType.Send)
{
// For the Send client, we don't need to set any User specific properties on the context
// so just short circuit and return here.
return Task.FromResult(0);
}
if (IdentityClientType == IdentityClientType.ServiceAccount)
{
ServiceAccountOrganizationId = new Guid(GetClaimValue(claimsDict, Claims.Organization));
}
var subject = GetClaimValue(claimsDict, "sub"); var subject = GetClaimValue(claimsDict, "sub");
if (Guid.TryParse(subject, out var subIdGuid)) if (Guid.TryParse(subject, out var subIdGuid))
{ {
@ -162,20 +182,7 @@ public class CurrentContext : ICurrentContext
} }
} }
var clientType = GetClaimValue(claimsDict, Claims.Type);
if (clientType != null)
{
Enum.TryParse(clientType, out IdentityClientType c);
IdentityClientType = c;
}
if (IdentityClientType == IdentityClientType.ServiceAccount)
{
ServiceAccountOrganizationId = new Guid(GetClaimValue(claimsDict, Claims.Organization));
}
// TODO: IdentityClientType.Send should maybe be wired up here. Have further discussion with Justin
// Create an ExtensionMethod on HttpContext to get the send id from the subject claim
DeviceIdentifier = GetClaimValue(claimsDict, Claims.Device); DeviceIdentifier = GetClaimValue(claimsDict, Claims.Device);