fix(Identity): Fix the problem that IUserSetter temporarily changes t… (

#226) * fix(Identity): Fix the problem that IUserSetter temporarily changes the user to obtain user information error * chore: remove invalid parameters
masastack · Sep 2, 2022 · 244ab48 · 244ab48
1 parent c2f0504
commit 244ab48
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 2 deletions.
diff --git a/src/BuildingBlocks/Authentication/Masa.BuildingBlocks.Authentication.Identity/UserContext.cs b/src/BuildingBlocks/Authentication/Masa.BuildingBlocks.Authentication.Identity/UserContext.cs
@@ -48,7 +48,9 @@ protected UserContext(ITypeConvertProvider typeConvertProvider)
 
     public IDisposable Change<TIdentityUser>(TIdentityUser identityUser) where TIdentityUser : IIdentityUser
     {
-        var userModelType = typeof(TIdentityUser);
+        ArgumentNullException.ThrowIfNull(identityUser);
+
+        var userModelType = identityUser.GetType();
         var user = GetUser(userModelType);
         CurrentUser[userModelType] = identityUser;
         return new DisposeAction(() => CurrentUser[userModelType] = user);

diff --git a/src/Contrib/Authentication/Tests/Masa.Contrib.Authentication.Identity.Tests/TestIdentity.cs b/src/Contrib/Authentication/Tests/Masa.Contrib.Authentication.Identity.Tests/TestIdentity.cs
@@ -234,6 +234,37 @@ public void TestTemporarilyUserReturnUserIdEqual1()
         Assert.AreEqual(null, isolationUserContext.GetTenantId<int?>());
     }
 
+    [TestMethod]
+    public void TestChange()
+    {
+        var services = new ServiceCollection();
+        services.AddMasaIdentityModel();
+
+        var serviceProvider = services.BuildServiceProvider();
+        var userSetter = serviceProvider.GetService<IUserSetter>();
+        Assert.IsNotNull(userSetter);
+
+        IIdentityUser identityUser = new IdentityUser()
+        {
+            Id = "1"
+        };
+        using (userSetter.Change(identityUser))
+        {
+            var userContext = serviceProvider.GetService<IUserContext>();
+            Assert.IsNotNull(userContext);
+            Assert.AreEqual("1", userContext.UserId);
+
+            Assert.AreEqual(1, userContext.GetUserId<int>());
+        }
+
+        IIdentityUser? identityUser2 = null;
+
+        Assert.ThrowsException<ArgumentNullException>(() =>
+        {
+            userSetter.Change(identityUser2!);
+        });
+    }
+
     [TestMethod]
     public void TestCustomerUserModelReturnTrueNameEqualLisi()
     {

diff --git a/src/Utils/Caching/Distributed/Masa.Utils.Caching.Redis/Helpers/RedisHelper.cs b/src/Utils/Caching/Distributed/Masa.Utils.Caching.Redis/Helpers/RedisHelper.cs
@@ -35,7 +35,7 @@ public static class RedisHelper
 
     public static RedisValue ConvertFromValue<T>(T value)
     {
-        var type = typeof(T);
+        var type = value?.GetType() ?? typeof(T);
         dynamic redisValue;
         switch (GetCompressMode(type))
         {