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

Performed some null checks (#991)

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

2
src/Core/IdentityServer/CustomTokenRequestValidator.cs
View File

@ -54,7 +54,7 @@ namespace Bit.Core.IdentityServer
protected async override Task<(User, bool)> ValidateContextAsync(CustomTokenRequestValidationContext context) protected async override Task<(User, bool)> ValidateContextAsync(CustomTokenRequestValidationContext context)
{ {
var email = context.Result.ValidatedRequest.Subject?.GetDisplayName() var email = context.Result.ValidatedRequest.Subject?.GetDisplayName()
?? context.Result.ValidatedRequest.ClientClaims.FirstOrDefault(claim => claim.Type == JwtClaimTypes.Email).Value; ?? context.Result.ValidatedRequest.ClientClaims?.FirstOrDefault(claim => claim.Type == JwtClaimTypes.Email)?.Value;
var user = await _userManager.FindByEmailAsync(email); var user = await _userManager.FindByEmailAsync(email);
return (user, user != null); return (user, user != null);
} }