feat(auth):update auth sdk idntity

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

@@ -5,12 +5,13 @@ namespace Masa.Contrib.BasicAbility.Auth;
 
 public class AuthClient : IAuthClient
 {
-    public AuthClient(ICallerProvider callerProvider)
+    public AuthClient(ICallerProvider callerProvider, IMultiEnvironmentUserContext userContext)
     {
-        UserService = new UserService(callerProvider);
+        UserService = new UserService(callerProvider, userContext);
         SubjectService = new SubjectService(callerProvider);
         TeamService = new TeamService(callerProvider);
-        PermissionService = new PermissionService(callerProvider);
+        ProjectService = new ProjectService(callerProvider, userContext);
+        PermissionService = new PermissionService(callerProvider, userContext);
     }
 
     public IUserService UserService { get; }
@@ -20,5 +21,7 @@ public AuthClient(ICallerProvider callerProvider)
     public ITeamService TeamService { get; }
 
     public IPermissionService PermissionService { get; }
+
+    public IProjectService ProjectService { get; }
 }
 

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

@@ -5,8 +5,15 @@ namespace Masa.Contrib.BasicAbility.Auth;
 
 public class EnvironmentProvider : IEnvironmentProvider
 {
+    readonly IMultiEnvironmentUserContext _multiEnvironmentUserContext;
+
+    public EnvironmentProvider(IMultiEnvironmentUserContext multiEnvironmentUserContext)
+    {
+        _multiEnvironmentUserContext = multiEnvironmentUserContext;
+    }
+
     public string GetEnvironment()
     {
-        return "development";
+        return _multiEnvironmentUserContext.Environment ?? "";
     }
 }

src/BasicAbility/Masa.Contrib.BasicAbility.Auth/Masa.Contrib.BasicAbility.Auth.csproj

@@ -15,6 +15,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\BuildingBlocks\MASA.BuildingBlocks\src\BasicAbility\Masa.BuildingBlocks.BasicAbility.Auth\Masa.BuildingBlocks.BasicAbility.Auth.csproj" />
+    <ProjectReference Include="..\..\BuildingBlocks\MASA.BuildingBlocks\src\Identity\Masa.BuildingBlocks.Identity.IdentityModel\Masa.BuildingBlocks.Identity.IdentityModel.csproj" />
   </ItemGroup>
 
 </Project>

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

@@ -6,30 +6,70 @@ namespace Masa.Contrib.BasicAbility.Auth.Service;
 public class PermissionService : IPermissionService
 {
     readonly ICallerProvider _callerProvider;
+    readonly IUserContext _userContext;
 
-    const string PARTY = "api/permission/";
+    const string PART = "api/permission/";
 
-    public PermissionService(ICallerProvider callerProvider)
+    public PermissionService(ICallerProvider callerProvider, IUserContext userContext)
     {
         _callerProvider = callerProvider;
+        _userContext = userContext;
     }
 
     //todo remove userId param
-    public async Task<bool> AuthorizedAsync(string appId, string code, Guid userId)
+    public async Task<bool> AuthorizedAsync(string appId, string code)
     {
-        var requestUri = $"{PARTY}authorized?appId={appId}&code={code}&userId={userId}";
+        var userId = _userContext.GetUserId<Guid>();
+        var requestUri = $"{PART}authorized?appId={appId}&code={code}&userId={userId}";
         return await _callerProvider.GetAsync<bool>(requestUri);
     }
 
-    public async Task<List<MenuModel>> GetMenusAsync(string appId, Guid userId)
+    public async Task<List<MenuModel>> GetMenusAsync(string appId)
     {
-        var requestUri = $"{PARTY}menus?appId={appId}&userId={userId}";
+        var userId = _userContext.GetUserId<Guid>();
+        var requestUri = $"{PART}menus?appId={appId}&userId={userId}";
         return await _callerProvider.GetAsync<List<MenuModel>>(requestUri, default) ?? new();
     }
 
-    public async Task<List<string>> GetElementPermissionsAsync(string appId, Guid userId)
+    public async Task<List<string>> GetElementPermissionsAsync(string appId)
     {
-        var requestUri = $"{PARTY}element-permissions?appId={appId}&userId={userId}";
+        var userId = _userContext.GetUserId<Guid>();
+        var requestUri = $"{PART}element-permissions?appId={appId}&userId={userId}";
         return await _callerProvider.GetAsync<List<string>>(requestUri, default) ?? new();
     }
+
+    public async Task<bool> AddFavoriteMenuAsync(Guid menuId)
+    {
+        try
+        {
+            var userId = _userContext.GetUserId<Guid>();
+            await _callerProvider.PutAsync($"{PART}addFavoriteMenu?permissionId={menuId}&userId={userId}", null);
+            return true;
+        }
+        catch
+        {
+            return false;
+        }
+    }
+
+    public async Task<bool> RemoveFavoriteMenuAsync(Guid menuId)
+    {
+        try
+        {
+            var userId = _userContext.GetUserId<Guid>();
+            await _callerProvider.PutAsync($"{PART}removeFavoriteMenu?permissionId={menuId}&userId={userId}", null);
+            return true;
+        }
+        catch
+        {
+            return false;
+        }
+    }
+
+    public async Task<List<CollectMenuModel>> GetFavoriteMenuListAsync()
+    {
+        var userId = _userContext.GetUserId<Guid>();
+        var requestUri = $"{PART}menu-favorite-list?userId={userId}";
+        return await _callerProvider.GetAsync<List<CollectMenuModel>>(requestUri, default) ?? new();
+    }
 }

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

@@ -0,0 +1,26 @@
+// Copyright (c) MASA Stack All rights reserved.
+// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
+
+namespace Masa.Contrib.BasicAbility.Auth.Service;
+
+public class ProjectService : IProjectService
+{
+    readonly ICallerProvider _callerProvider;
+    readonly IMultiEnvironmentUserContext _multiEnvironmentUserContext;
+
+    const string PARTY = "api/project/";
+
+    public ProjectService(ICallerProvider callerProvider, IMultiEnvironmentUserContext multiEnvironmentUserContext)
+    {
+        _callerProvider = callerProvider;
+        _multiEnvironmentUserContext = multiEnvironmentUserContext;
+    }
+
+    public async Task<List<ProjectModel>> GetGlobalNavigations()
+    {
+        var userId = _multiEnvironmentUserContext.GetUserId<Guid>();
+        var environment = _multiEnvironmentUserContext.Environment ?? "";
+        var requestUri = $"{PARTY}navigations?userId={userId}&environment={environment}";
+        return await _callerProvider.GetAsync<List<ProjectModel>>(requestUri) ?? new();
+    }
+}

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

@@ -6,10 +6,12 @@ namespace Masa.Contrib.BasicAbility.Auth.Service;
 public class UserService : IUserService
 {
     readonly ICallerProvider _callerProvider;
+    readonly IUserContext _userContext;
 
-    public UserService(ICallerProvider callerProvider)
+    public UserService(ICallerProvider callerProvider, IUserContext userContext)
     {
         _callerProvider = callerProvider;
+        _userContext = userContext;
     }
 
     public async Task<UserModel?> AddAsync(AddUserModel user)
@@ -47,5 +49,19 @@ public async Task<UserModel> FindByAccountAsync(string account)
         var requestUri = $"api/user/findByAccount";
         return await _callerProvider.GetAsync<object, UserModel>(requestUri, new { account = account }) ?? new();
     }
+
+    public async Task VisitedAsync(string url)
+    {
+        var userId = _userContext.GetUserId<Guid>();
+        var requestUri = $"api/user/visit";
+        await _callerProvider.PostAsync<object>(requestUri, new { UserId = userId, Url = url }, true);
+    }
+
+    public async Task<List<UserVisitedModel>> GetUserVisitedListAsync()
+    {
+        var userId = _userContext.GetUserId<Guid>();
+        var requestUri = $"api/user/visitedList";
+        return (await _callerProvider.GetAsync<object, List<UserVisitedModel>>(requestUri, new { userId = userId })) ?? new();
+    }
 }
 

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

@@ -8,7 +8,8 @@ public static class ServiceCollectionExtensions
     public static IServiceCollection AddAuthClient(this IServiceCollection services, string authServiceBaseAddress)
     {
         ArgumentNullException.ThrowIfNull(authServiceBaseAddress, nameof(authServiceBaseAddress));
-
+#warning modify
+        services.AddSingleton<IRequestMessage, JsonRequestMessage>();
         return services.AddAuthClient(callerOptions =>
         {
             callerOptions.UseHttpClient(builder =>
@@ -23,15 +24,21 @@ public static IServiceCollection AddAuthClient(this IServiceCollection services,
     {
         ArgumentNullException.ThrowIfNull(callerOptions, nameof(callerOptions));
 
+        if (!services.Any(service => service.ServiceType == typeof(IMultiEnvironmentUserContext)))
+        {
+            throw new Exception("Please add IMultiEnvironmentUserContext first.");
+        }
+
         services.AddHttpContextAccessor();
         services.AddScoped<HttpEnvironmentDelegatingHandler>();
-        services.AddSingleton<IEnvironmentProvider, EnvironmentProvider>();
+        services.AddScoped<IEnvironmentProvider, EnvironmentProvider>();
         services.AddCaller(callerOptions);
 
         services.AddScoped<IAuthClient>(serviceProvider =>
         {
+            var userContext = serviceProvider.GetRequiredService<IMultiEnvironmentUserContext>();
             var callProvider = serviceProvider.GetRequiredService<ICallerFactory>().CreateClient(DEFAULT_CLIENT_NAME);
-            var authClient = new AuthClient(callProvider);
+            var authClient = new AuthClient(callProvider, userContext);
             return authClient;
         });
 

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

@@ -4,6 +4,7 @@
 global using Masa.BuildingBlocks.BasicAbility.Auth;
 global using Masa.BuildingBlocks.BasicAbility.Auth.Model;
 global using Masa.BuildingBlocks.BasicAbility.Auth.Service;
+global using Masa.BuildingBlocks.Identity.IdentityModel;
 global using Masa.Contrib.BasicAbility.Auth;
 global using Masa.Contrib.BasicAbility.Auth.Service;
 global using Masa.Utils.Caller.Core;

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

@@ -1,3 +1,8 @@
+// Copyright (c) MASA Stack All rights reserved.
+// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
+
+using Masa.BuildingBlocks.Identity.IdentityModel;
+
 namespace Masa.Contrib.BasicAbility.Auth.Tests;
 
 [TestClass]
@@ -7,12 +12,21 @@ public class AuthClientTest
     public void TestAddAuthClient()
     {
         var services = new ServiceCollection();
+        services.AddMasaIdentityModel(IdentityType.MultiEnvironment);
         services.AddAuthClient("https://localhost:18102");
         var authClient = services.BuildServiceProvider().GetRequiredService<IAuthClient>();
 
         Assert.IsNotNull(authClient);
     }
 
+    [TestMethod]
+    public void TestAddAuthClientNoAddMasaIdentity()
+    {
+        var services = new ServiceCollection();
+        Assert.ThrowsException<Exception>(() => services.AddAuthClient("https://localhost:18102"),
+            "Please add IMultiEnvironmentUserContext first.");
+    }
+
     [TestMethod]
     public void TestAddAuthClientShouldThrowArgumentNullException()
     {
@@ -24,7 +38,6 @@ public void TestAddAuthClientShouldThrowArgumentNullException()
     public void TestAddAuthClientShouldThrowArgumentNullException2()
     {
         var services = new ServiceCollection();
-
         Assert.ThrowsException<ArgumentNullException>(() => services.AddAuthClient(callerOptions: null!));
     }
 }

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

@@ -1,6 +1,8 @@
 // Copyright (c) MASA Stack All rights reserved.
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
+using Masa.BuildingBlocks.Identity.IdentityModel;
+
 namespace Masa.Contrib.BasicAbility.Auth.Tests
 {
     public class BaseAuthTest
@@ -9,6 +11,7 @@ public class BaseAuthTest
         public void Initialize()
         {
             IServiceCollection service = new ServiceCollection();
+            service.AddMasaIdentityModel(IdentityType.MultiEnvironment);
             service.AddAuthClient("https://localhost:18102");
             var authClient = service.BuildServiceProvider().GetRequiredService<IAuthClient>();
         }

test/Masa.Contrib.BasicAbility.Auth.Tests/Masa.Contrib.BasicAbility.Auth.Tests.csproj

@@ -18,6 +18,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\BasicAbility\Masa.Contrib.BasicAbility.Auth\Masa.Contrib.BasicAbility.Auth.csproj" />
     <ProjectReference Include="..\..\src\BuildingBlocks\MASA.BuildingBlocks\src\BasicAbility\Masa.BuildingBlocks.BasicAbility.Auth\Masa.BuildingBlocks.BasicAbility.Auth.csproj" />
+    <ProjectReference Include="..\..\src\Identity\Masa.Contrib.Identity.IdentityModel\Masa.Contrib.Identity.IdentityModel.csproj" />
   </ItemGroup>
 
 </Project>