Revert "Feat/auth sdk user (#155)" (#156)

This reverts commit 88b1a9e.

Author: zhenlei520

Masa.Contrib.sln

@@ -310,15 +310,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.BasicAbility.M
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Data.UoW.EF", "src\Data\Masa.Contrib.Data.UoW.EF\Masa.Contrib.Data.UoW.EF.csproj", "{FC4E526A-DBFC-406A-8ED3-64983B67F688}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Data.DistributedLock.Medallion.Redis", "src\Data\DistributedLock\Masa.Contrib.Data.DistributedLock.Medallion.Redis\Masa.Contrib.Data.DistributedLock.Medallion.Redis.csproj", "{AE3607C0-3278-46D7-97CD-4E6F37C120D3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Contrib.Data.DistributedLock.Medallion.Redis", "src\Data\DistributedLock\Masa.Contrib.Data.DistributedLock.Medallion.Redis\Masa.Contrib.Data.DistributedLock.Medallion.Redis.csproj", "{AE3607C0-3278-46D7-97CD-4E6F37C120D3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Data.DistributedLock.Medallion", "src\Data\DistributedLock\Masa.Contrib.Data.DistributedLock.Medallion\Masa.Contrib.Data.DistributedLock.Medallion.csproj", "{A1232A01-3927-4EDE-B7D4-657E08DEB36D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Contrib.Data.DistributedLock.Medallion", "src\Data\DistributedLock\Masa.Contrib.Data.DistributedLock.Medallion\Masa.Contrib.Data.DistributedLock.Medallion.csproj", "{A1232A01-3927-4EDE-B7D4-657E08DEB36D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Data.DistributedLock.Local.Tests", "test\Masa.Contrib.Data.DistributedLock.Local.Tests\Masa.Contrib.Data.DistributedLock.Local.Tests.csproj", "{2870B6BB-4188-45A0-A2D3-085834EBDC2A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Contrib.Data.DistributedLock.Local.Tests", "test\Masa.Contrib.Data.DistributedLock.Local.Tests\Masa.Contrib.Data.DistributedLock.Local.Tests.csproj", "{2870B6BB-4188-45A0-A2D3-085834EBDC2A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Data.DistributedLock.Medallion.Tests", "test\Masa.Contrib.Data.DistributedLock.Medallion.Tests\Masa.Contrib.Data.DistributedLock.Medallion.Tests.csproj", "{913DA066-8A23-4671-AC8F-B5B61134F8FE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Contrib.Data.DistributedLock.Medallion.Tests", "test\Masa.Contrib.Data.DistributedLock.Medallion.Tests\Masa.Contrib.Data.DistributedLock.Medallion.Tests.csproj", "{913DA066-8A23-4671-AC8F-B5B61134F8FE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Dispatcher.Tests", "test\Masa.Contrib.Dispatcher.Tests\Masa.Contrib.Dispatcher.Tests.csproj", "{4CD3D849-7277-4C9C-9461-7ABB66F78629}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Contrib.Dispatcher.Tests", "test\Masa.Contrib.Dispatcher.Tests\Masa.Contrib.Dispatcher.Tests.csproj", "{4CD3D849-7277-4C9C-9461-7ABB66F78629}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.BasicAbility.Tsc.Tests", "test\Masa.Contrib.BasicAbility.Tsc.Test\Masa.Contrib.BasicAbility.Tsc.Tests.csproj", "{FED315CF-7CA2-4653-AD37-BC0C1D7FFD22}"
 EndProject

src/BasicAbility/Masa.Contrib.BasicAbility.Auth/Service/UserService.cs

@@ -132,22 +132,5 @@ public async Task<List<UserPortraitModel>> GetUserPortraitsAsync(params Guid[] u
         var requestUri = $"api/user/portraits";
         return await _callerProvider.PostAsync<Guid[], List<UserPortraitModel>>(requestUri, userIds) ?? new();
     }
-
-    public async Task SaveUserSystemDataAsync<T>(string systemId, T data)
-    {
-        var userId = _userContext.GetUserId<Guid>();
-        var requestUri = $"api/user/UserSystemData";
-        await _callerProvider.PostAsync<object>(requestUri,
-            new { UserId = userId, SystemId = systemId, Data = JsonSerializer.Serialize(data) },
-            true);
-    }
-
-    public async Task<T?> GetUserSystemDataAsync<T>(string systemId)
-    {
-        var userId = _userContext.GetUserId<Guid>();
-        var requestUri = $"api/user/GetUserSystemData";
-        var data = await _callerProvider.GetAsync<object, string>(requestUri, new { userId = userId, systemId = systemId });
-        return JsonSerializer.Deserialize<T>(data);
-    }
 }
 

src/BasicAbility/Masa.Contrib.BasicAbility.Auth/_Imports.cs

@@ -10,5 +10,4 @@
 global using Masa.Utils.Caller.Core;
 global using Masa.Utils.Caller.HttpClient;
 global using Microsoft.AspNetCore.Http;
-global using System.Text.Json;
 global using static Masa.Contrib.BasicAbility.Auth.Constants;

src/BuildingBlocks/MASA.BuildingBlocks

@@ -233,22 +233,16 @@ public async Task TestVisitedAsync(string url)
     public async Task TestGetVisitedListAsync()
     {
         var userId = Guid.Parse("A9C8E0DD-1E9C-474D-8FE7-8BA9672D53D1");
-        var data = new List<UserVisitedModel>() {
-            new UserVisitedModel
-            {
-                Name="baidu",
-                Url = "https://www.baidu.com/"
-            }
-        };
+        var data = new List<UserVisitedModel>();
         var requestUri = $"api/user/visitedList";
         var callerProvider = new Mock<ICallerProvider>();
-        callerProvider.Setup(provider => provider.GetAsync<object, List<UserVisitedModel>>(requestUri, It.IsAny<object>(), default)).ReturnsAsync(data).Verifiable();
+        callerProvider.Setup(provider => provider.GetAsync<object, List<UserVisitedModel>>(requestUri, new { userId = userId }, default)).ReturnsAsync(data).Verifiable();
         var userContext = new Mock<IUserContext>();
         userContext.Setup(user => user.GetUserId<Guid>()).Returns(userId).Verifiable();
         var userService = new UserService(callerProvider.Object, userContext.Object);
         var result = await userService.GetVisitedListAsync();
         callerProvider.Verify(provider => provider.GetAsync<object, List<UserVisitedModel>>(requestUri, It.IsAny<object>(), default), Times.Once);
-        Assert.IsTrue(result.Count == 1);
+        Assert.IsTrue(result is not null);
     }
 
     [TestMethod]
@@ -312,87 +306,5 @@ public async Task GetUserPortraitsAsync()
         callerProvider.Verify(provider => provider.PostAsync<Guid[], List<UserPortraitModel>>(requestUri, new Guid[] { userId }, default), Times.Once);
         Assert.IsTrue(data.Count == 1);
     }
-
-    [TestMethod]
-    [DataRow("masa-auth")]
-    public async Task TestIntGetUserSystemDataAsync(string systemId)
-    {
-        var userId = Guid.Parse("A9C8E0DD-1E9C-474D-8FE7-8BA9672D53D1");
-        var data = 1;
-        var requestUri = $"api/user/GetUserSystemData";
-        var callerProvider = new Mock<ICallerProvider>();
-        callerProvider.Setup(provider => provider.GetAsync<object, string>(requestUri, It.IsAny<object>(), default))
-            .ReturnsAsync(data.ToString()).Verifiable();
-        var userContext = new Mock<IUserContext>();
-        userContext.Setup(user => user.GetUserId<Guid>()).Returns(userId).Verifiable();
-        var userService = new UserService(callerProvider.Object, userContext.Object);
-        var result = await userService.GetUserSystemDataAsync<int>(systemId);
-        Assert.IsTrue(result == 1);
-    }
-
-    [TestMethod]
-    [DataRow("masa-auth")]
-    public async Task TestObjectGetUserSystemDataAsync(string systemId)
-    {
-        var userId = Guid.Parse("A9C8E0DD-1E9C-474D-8FE7-8BA9672D53D1");
-        var data = new SystemData
-        {
-            Name = "name",
-            Value = "value"
-        };
-        var requestUri = $"api/user/GetUserSystemData";
-        var callerProvider = new Mock<ICallerProvider>();
-        callerProvider.Setup(provider => provider.GetAsync<object, string>(requestUri, It.IsAny<object>(), default))
-            .ReturnsAsync(JsonSerializer.Serialize(data)).Verifiable();
-        var userContext = new Mock<IUserContext>();
-        userContext.Setup(user => user.GetUserId<Guid>()).Returns(userId).Verifiable();
-        var userService = new UserService(callerProvider.Object, userContext.Object);
-        var result = await userService.GetUserSystemDataAsync<SystemData>(systemId);
-        Assert.IsTrue(result is not null);
-    }
-
-    [TestMethod]
-    [DataRow("masa-auth")]
-    public async Task TestIntSaveUserSystemDataAsync(string systemId)
-    {
-        var userId = Guid.Parse("A9C8E0DD-1E9C-474D-8FE7-8BA9672D53D1");
-        var requestUri = $"api/user/UserSystemData";
-        var value = 1;
-        var data = new { UserId = userId, SystemId = systemId, Data = JsonSerializer.Serialize(value) };
-        var callerProvider = new Mock<ICallerProvider>();
-        callerProvider.Setup(provider => provider.PostAsync<object>(requestUri, data, true, default)).Verifiable();
-        var userContext = new Mock<IUserContext>();
-        userContext.Setup(user => user.GetUserId<Guid>()).Returns(userId).Verifiable();
-        var userService = new UserService(callerProvider.Object, userContext.Object);
-        await userService.SaveUserSystemDataAsync(systemId, value);
-        callerProvider.Verify(provider => provider.PostAsync<object>(requestUri, It.IsAny<object>(), true, default), Times.Once);
-    }
-
-    [TestMethod]
-    [DataRow("masa-auth")]
-    public async Task TestObjectSaveUserSystemDataAsync(string systemId)
-    {
-        var userId = Guid.Parse("A9C8E0DD-1E9C-474D-8FE7-8BA9672D53D1");
-        var requestUri = $"api/user/UserSystemData";
-        var value = new SystemData
-        {
-            Name = "name",
-            Value = "value"
-        };
-        var data = new { UserId = userId, SystemId = systemId, Data = JsonSerializer.Serialize(value) };
-        var callerProvider = new Mock<ICallerProvider>();
-        callerProvider.Setup(provider => provider.PostAsync<object>(requestUri, data, true, default)).Verifiable();
-        var userContext = new Mock<IUserContext>();
-        userContext.Setup(user => user.GetUserId<Guid>()).Returns(userId).Verifiable();
-        var userService = new UserService(callerProvider.Object, userContext.Object);
-        await userService.SaveUserSystemDataAsync(systemId, value);
-        callerProvider.Verify(provider => provider.PostAsync<object>(requestUri, It.IsAny<object>(), true, default), Times.Once);
-    }
 }
 
-
-class SystemData
-{
-    public string Name { get; set; }
-    public string Value { get; set; }
-}

test/Masa.Contrib.BasicAbility.Auth.Tests/UserServiceTest.cs

@@ -10,4 +10,3 @@
 global using Microsoft.Extensions.DependencyInjection;
 global using Microsoft.VisualStudio.TestTools.UnitTesting;
 global using Moq;
-global using System.Text.Json;