From 80f2bf926048363ec6d3457da8397ccb6e5fca01 Mon Sep 17 00:00:00 2001
From: Chad Scharf <3904944+cscharf@users.noreply.github.com>
Date: Fri, 13 Nov 2020 11:26:05 -0500
Subject: [PATCH] Fix null email parameter from missing email claim (#993)

---
 src/Core/IdentityServer/CustomTokenRequestValidator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Core/IdentityServer/CustomTokenRequestValidator.cs b/src/Core/IdentityServer/CustomTokenRequestValidator.cs
index 1e076af5a..f19089126 100644
--- a/src/Core/IdentityServer/CustomTokenRequestValidator.cs
+++ b/src/Core/IdentityServer/CustomTokenRequestValidator.cs
@@ -56,7 +56,7 @@ namespace Bit.Core.IdentityServer
         {
             var email = context.Result.ValidatedRequest.Subject?.GetDisplayName() 
                 ?? context.Result.ValidatedRequest.ClientClaims?.FirstOrDefault(claim => claim.Type == JwtClaimTypes.Email)?.Value;
-            var user = await _userManager.FindByEmailAsync(email);
+            var user = string.IsNullOrWhiteSpace(email) ? null : await _userManager.FindByEmailAsync(email);
             return (user, user != null);
         }