From 3363074d86a04c39449d769ac7972b9574bad703 Mon Sep 17 00:00:00 2001 From: adimiko Date: Sat, 15 Feb 2025 00:19:24 +0100 Subject: [PATCH 1/2] Changed UserContext --- source/EasyWay.WebApi/Internals/Contexts/UserContext.cs | 6 ++---- source/EasyWay/IUserContext.cs | 2 +- source/EasyWay/Internals/Contexts/DefaultUserContext.cs | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/source/EasyWay.WebApi/Internals/Contexts/UserContext.cs b/source/EasyWay.WebApi/Internals/Contexts/UserContext.cs index dd97d85..3ca84ca 100644 --- a/source/EasyWay.WebApi/Internals/Contexts/UserContext.cs +++ b/source/EasyWay.WebApi/Internals/Contexts/UserContext.cs @@ -6,17 +6,15 @@ internal sealed class UserContext : IUserContext { public UserContext(IHttpContextAccessor httpContextAccessor) { - var userId = httpContextAccessor + UserId = httpContextAccessor .HttpContext? .User? .Claims? .SingleOrDefault(x => x.Type == "sub")? .Value; - - UserId = userId is null ? null : new Guid(userId); } - public Guid? UserId { get; } + public string? UserId { get; } public bool IsAuthenticated => UserId is not null; } diff --git a/source/EasyWay/IUserContext.cs b/source/EasyWay/IUserContext.cs index 798a113..9b5278f 100644 --- a/source/EasyWay/IUserContext.cs +++ b/source/EasyWay/IUserContext.cs @@ -2,7 +2,7 @@ { public interface IUserContext { - Guid? UserId { get; } + string? UserId { get; } bool IsAuthenticated { get; } } diff --git a/source/EasyWay/Internals/Contexts/DefaultUserContext.cs b/source/EasyWay/Internals/Contexts/DefaultUserContext.cs index a08d2d2..3c2e805 100644 --- a/source/EasyWay/Internals/Contexts/DefaultUserContext.cs +++ b/source/EasyWay/Internals/Contexts/DefaultUserContext.cs @@ -2,7 +2,7 @@ { internal class DefaultUserContext : IUserContext { - public Guid? UserId => null; + public string? UserId => null; public bool IsAuthenticated => false; } From d5695244965dca2553d7800a098e39ae9aa92bef Mon Sep 17 00:00:00 2001 From: adimiko Date: Sat, 15 Feb 2025 00:20:13 +0100 Subject: [PATCH 2/2] Added sealed for DefaultUserContext --- source/EasyWay/Internals/Contexts/DefaultUserContext.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/EasyWay/Internals/Contexts/DefaultUserContext.cs b/source/EasyWay/Internals/Contexts/DefaultUserContext.cs index 3c2e805..7c6874f 100644 --- a/source/EasyWay/Internals/Contexts/DefaultUserContext.cs +++ b/source/EasyWay/Internals/Contexts/DefaultUserContext.cs @@ -1,6 +1,6 @@ namespace EasyWay.Internals.Contexts { - internal class DefaultUserContext : IUserContext + internal sealed class DefaultUserContext : IUserContext { public string? UserId => null;