From a6a717d6f325a6d918f1402ac50d4737af70b95a Mon Sep 17 00:00:00 2001 From: "C. Oceania" Date: Thu, 15 Feb 2024 12:11:56 -0600 Subject: [PATCH] fix issue when user name is null --- .../BotSharp.Core/Users/Services/UserService.cs | 10 +++++++++- .../BotSharp.OpenAPI/BotSharpOpenApiExtensions.cs | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs b/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs index 7dd9b327..0328c409 100644 --- a/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs +++ b/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs @@ -178,7 +178,15 @@ public class UserService : IUserService public async Task GetMyProfile() { var db = _services.GetRequiredService(); - var user = db.GetUserByUserName(_user.UserName); + User user = default; + if (_user.UserName != null) + { + user = db.GetUserByUserName(_user.UserName); + } + else if (_user.Email != null) + { + user = db.GetUserByEmail(_user.Email); + } return user; } diff --git a/src/Infrastructure/BotSharp.OpenAPI/BotSharpOpenApiExtensions.cs b/src/Infrastructure/BotSharp.OpenAPI/BotSharpOpenApiExtensions.cs index 5d744f8e..1a98f377 100644 --- a/src/Infrastructure/BotSharp.OpenAPI/BotSharpOpenApiExtensions.cs +++ b/src/Infrastructure/BotSharp.OpenAPI/BotSharpOpenApiExtensions.cs @@ -9,7 +9,7 @@ using Microsoft.IdentityModel.Logging; using Microsoft.IdentityModel.Tokens; using Microsoft.Net.Http.Headers; using Microsoft.OpenApi.Models; -using System.IdentityModel.Tokens.Jwt; +using Microsoft.IdentityModel.JsonWebTokens; namespace BotSharp.OpenAPI; @@ -55,7 +55,7 @@ public static class BotSharpOpenApiExtensions if (!enableValidation) { o.TokenValidationParameters.SignatureValidator = (string token, TokenValidationParameters parameters) => - new JwtSecurityToken(token); + new JsonWebToken(token); } }).AddCookie(options => {