feat(team/permission):add sdk method for team and permission

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

@@ -10,12 +10,15 @@ public AuthClient(ICallerProvider callerProvider)
         UserService = new UserService(callerProvider);
         SubjectService = new SubjectService(callerProvider);
         TeamService = new TeamService(callerProvider);
+        PermissionService = new PermissionService(callerProvider);
     }
 
     public IUserService UserService { get; }
 
     public ISubjectService SubjectService { get; }
 
     public ITeamService TeamService { get; }
+
+    public IPermissionService PermissionService { get; }
 }
 

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

@@ -1,7 +1,12 @@
+// 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;
 
 internal class Constants
 {
     public const string DEFAULT_CLIENT_NAME = "masa.contrib.basicability.auth";
+
+    public const string ENVIRONMENT_KEY = "env_key";
 }
 

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

@@ -0,0 +1,12 @@
+// 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;
+
+public class EnvironmentProvider : IEnvironmentProvider
+{
+    public string GetEnvironment()
+    {
+        return "development";
+    }
+}

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

@@ -0,0 +1,27 @@
+// 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;
+
+public class HttpEnvironmentDelegatingHandler : DelegatingHandler
+{
+    readonly IHttpContextAccessor _httpContextAccessor;
+    readonly IEnvironmentProvider _environmentProvider;
+
+    public HttpEnvironmentDelegatingHandler(IHttpContextAccessor httpContextAccessor, IEnvironmentProvider environmentProvider)
+    {
+        _httpContextAccessor = httpContextAccessor;
+        _environmentProvider = environmentProvider;
+    }
+
+    protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+    {
+        var envClaim = _httpContextAccessor.HttpContext?.User.Claims.FirstOrDefault(c => c.Type == "env");
+        if (envClaim != null)
+        {
+            _httpContextAccessor.HttpContext?.Items.TryAdd(ENVIRONMENT_KEY, _environmentProvider.GetEnvironment());
+            request.Headers.Add(ENVIRONMENT_KEY, _environmentProvider.GetEnvironment());
+        }
+        return await base.SendAsync(request, cancellationToken);
+    }
+}

src/BasicAbility/Masa.Contrib.BasicAbility.Auth/Infrastructure/BaseSingleton.cs

@@ -0,0 +1,14 @@
+// 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.Infrastructure;
+
+public class BaseSingleton
+{
+    static BaseSingleton()
+    {
+        AllSingletons = new Dictionary<Type, object>();
+    }
+
+    public static IDictionary<Type, object> AllSingletons { get; }
+}

src/BasicAbility/Masa.Contrib.BasicAbility.Auth/Infrastructure/Singleton.cs

@@ -0,0 +1,19 @@
+// 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.Infrastructure;
+
+public class Singleton<T> : BaseSingleton
+{
+    static T instance;
+
+    public static T Instance
+    {
+        get => instance;
+        set
+        {
+            instance = value;
+            AllSingletons[typeof(T)] = value;
+        }
+    }
+}

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

@@ -9,6 +9,8 @@
   <ItemGroup>
     <PackageReference Include="Masa.Utils.Caller.HttpClient" Version="$(MasaUtilsPackageVersion)" />
     <PackageReference Include="Masa.Utils.Configuration.Json" Version="$(MasaUtilsPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
+    <PackageReference Include="Masa.Utils.Extensions.DependencyInjection" Version="$(MasaUtilsPackageVersion)" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -0,0 +1,35 @@
+// 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 PermissionService : IPermissionService
+{
+    readonly ICallerProvider _callerProvider;
+
+    const string PARTY = "api/permission/";
+
+    public PermissionService(ICallerProvider callerProvider)
+    {
+        _callerProvider = callerProvider;
+    }
+
+    //todo remove userId param
+    public async Task<bool> AuthorizedAsync(string appId, string code, Guid userId)
+    {
+        var requestUri = $"{PARTY}authorized?appId={appId}&code={code}&userId={userId}";
+        return await _callerProvider.GetAsync<bool>(requestUri);
+    }
+
+    public async Task<List<MenuModel>> GetMenusAsync(string appId, Guid userId)
+    {
+        var requestUri = $"{PARTY}menus?appId={appId}&userId={userId}";
+        return await _callerProvider.GetAsync<List<MenuModel>>(requestUri, default) ?? new();
+    }
+
+    public async Task<List<string>> GetElementPermissionsAsync(string appId, Guid userId)
+    {
+        var requestUri = $"{PARTY}element-permissions?appId={appId}&userId={userId}";
+        return await _callerProvider.GetAsync<List<string>>(requestUri, default) ?? new();
+    }
+}

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

@@ -1,3 +1,6 @@
+// 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 SubjectService : ISubjectService

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

@@ -1,8 +1,12 @@
+// 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 TeamService : ITeamService
 {
     readonly ICallerProvider _callerProvider;
+    readonly string _party = "api/team/";
 
     public TeamService(ICallerProvider callerProvider)
     {
@@ -11,8 +15,18 @@ public TeamService(ICallerProvider callerProvider)
 
     public async Task<TeamDetailModel?> GetDetailAsync(Guid id)
     {
-        var requestUri = $"api/team/deatil";
+        var requestUri = $"{_party}detail";
         return await _callerProvider.GetAsync<object, TeamDetailModel>(requestUri, new { id });
     }
+
+    public async Task<List<TeamModel>> GetListAsync(Guid userId = default)
+    {
+        var requestUri = $"{_party}list";
+        if (Guid.Empty != userId)
+        {
+            requestUri = $"{requestUri}?userId={userId}";
+        }
+        return await _callerProvider.GetAsync<List<TeamModel>>(requestUri) ?? new();
+    }
 }
 

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

@@ -1,3 +1,6 @@
+// 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 UserService : IUserService
@@ -32,5 +35,17 @@ public async Task<List<StaffModel>> GetListByTeamAsync(Guid teamId)
         var requestUri = $"api/staff/getListByTeam";
         return await _callerProvider.GetAsync<object, List<StaffModel>>(requestUri, new { id = teamId }) ?? new();
     }
+
+    public async Task<bool> ValidateCredentialsByAccountAsync(string account, string password)
+    {
+        var requestUri = $"api/user/validateByAccount";
+        return await _callerProvider.PostAsync<object, bool>(requestUri, new { account = account, password = password });
+    }
+
+    public async Task<UserModel> FindByAccountAsync(string account)
+    {
+        var requestUri = $"api/user/findByAccount";
+        return await _callerProvider.GetAsync<object, UserModel>(requestUri, new { account = account }) ?? new();
+    }
 }
 

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

@@ -1,4 +1,5 @@
-
+// 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;
 
@@ -14,18 +15,22 @@ public static IServiceCollection AddAuthClient(this IServiceCollection services,
             {
                 builder.Name = DEFAULT_CLIENT_NAME;
                 builder.Configure = opt => opt.BaseAddress = new Uri(authServiceBaseAddress);
-            });
+            }).AddHttpMessageHandler<HttpEnvironmentDelegatingHandler>();
         });
     }
 
     public static IServiceCollection AddAuthClient(this IServiceCollection services, Action<CallerOptions> callerOptions)
     {
         ArgumentNullException.ThrowIfNull(callerOptions, nameof(callerOptions));
 
+        services.AddHttpContextAccessor();
+        services.AddScoped<HttpEnvironmentDelegatingHandler>();
+        services.AddSingleton<IEnvironmentProvider, EnvironmentProvider>();
         services.AddCaller(callerOptions);
 
         services.AddScoped<IAuthClient>(serviceProvider =>
         {
+            Singleton<IServiceProvider>.Instance = serviceProvider;
             var callProvider = serviceProvider.GetRequiredService<ICallerFactory>().CreateClient(DEFAULT_CLIENT_NAME);
             var authClient = new AuthClient(callProvider);
             return authClient;

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

@@ -4,8 +4,11 @@
 global using Masa.BuildingBlocks.BasicAbility.Auth;
 global using Masa.BuildingBlocks.BasicAbility.Auth.Model;
 global using Masa.BuildingBlocks.BasicAbility.Auth.Service;
+global using Masa.Contrib.BasicAbility.Auth.Infrastructure;
 global using Masa.Contrib.BasicAbility.Auth.Service;
 global using Masa.Utils.Caller.Core;
 global using Masa.Utils.Caller.HttpClient;
+global using Microsoft.AspNetCore.Http;
+global using Microsoft.Extensions.Caching.Memory;
 global using Microsoft.Extensions.DependencyInjection;
 global using static Masa.Contrib.BasicAbility.Auth.Constants;

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

@@ -0,0 +1,16 @@
+// 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.Tests
+{
+    public class BaseAuthTest
+    {
+        [TestInitialize]
+        public void Initialize()
+        {
+            IServiceCollection service = new ServiceCollection();
+            service.AddAuthClient("https://localhost:18102");
+            var authClient = service.BuildServiceProvider().GetRequiredService<IAuthClient>();
+        }
+    }
+}

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

@@ -0,0 +1,49 @@
+// 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.Tests;
+
+[TestClass]
+public class PermissionServiceTest : BaseAuthTest
+{
+    [TestMethod]
+    [DataRow("app1", "A9C8E0DD-1E9C-474D-8FE7-8BA9672D53D1")]
+    public async Task TestGetMenusAsync(string appId, string userId)
+    {
+        var data = new List<MenuModel>();
+        var requestUri = $"api/permission/menus?appId={appId}&userId={userId}";
+        var callerProvider = new Mock<ICallerProvider>();
+        callerProvider.Setup(provider => provider.GetAsync<List<MenuModel>>(requestUri, default)).ReturnsAsync(data).Verifiable();
+        var authClient = new AuthClient(callerProvider.Object);
+        var result = await authClient.PermissionService.GetMenusAsync(appId, Guid.Parse(userId));
+        callerProvider.Verify(provider => provider.GetAsync<List<MenuModel>>(It.IsAny<string>(), default), Times.Once);
+        Assert.IsTrue(result is not null);
+    }
+
+    [TestMethod]
+    [DataRow("app1", "code", "A9C8E0DD-1E9C-474D-8FE7-8BA9672D53D1")]
+    public async Task TestAuthorizedAsync(string appId, string code, string userId)
+    {
+        var data = false;
+        var requestUri = $"api/permission/authorized?code={code}&userId={userId}";
+        var callerProvider = new Mock<ICallerProvider>();
+        callerProvider.Setup(provider => provider.GetAsync<bool>(requestUri, default)).ReturnsAsync(data).Verifiable();
+        var authClient = new AuthClient(callerProvider.Object);
+        var result = await authClient.PermissionService.AuthorizedAsync(appId, code, Guid.Parse(userId));
+        callerProvider.Verify(provider => provider.GetAsync<bool>(It.IsAny<string>(), default), Times.Once);
+    }
+
+    [TestMethod]
+    [DataRow("app1", "A9C8E0DD-1E9C-474D-8FE7-8BA9672D53D1")]
+    public async Task TestGetElementPermissionsAsync(string appId, string userId)
+    {
+        var data = new List<string>();
+        var requestUri = $"api/permission/element-permissions?appId={appId}&userId={userId}";
+        var callerProvider = new Mock<ICallerProvider>();
+        callerProvider.Setup(provider => provider.GetAsync<List<string>>(requestUri, default)).ReturnsAsync(data).Verifiable();
+        var authClient = new AuthClient(callerProvider.Object);
+        var result = await authClient.PermissionService.GetElementPermissionsAsync(appId, Guid.Parse(userId));
+        callerProvider.Verify(provider => provider.GetAsync<List<string>>(It.IsAny<string>(), default), Times.Once);
+        Assert.IsTrue(result is not null);
+    }
+}

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

@@ -1,7 +1,10 @@
+// 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.Tests;
 
 [TestClass]
-public class SubjectServiceTest
+public class SubjectServiceTest : BaseAuthTest
 {
     [TestMethod]
     public async Task TestGetListAsync()

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

@@ -1,20 +1,36 @@
+// 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.Tests;
 
 [TestClass]
-public class TeamServiceTest
+public class TeamServiceTest : BaseAuthTest
 {
     [TestMethod]
-    public async Task TestGetListAsync()
+    public async Task TestGetDetailAsync()
     {
         var data = new TeamDetailModel();
         Guid teamId = Guid.NewGuid();
-        var requestUri = $"api/team/deatil";
+        var requestUri = $"api/team/detail";
         var callerProvider = new Mock<ICallerProvider>();
         callerProvider.Setup(provider => provider.GetAsync<object, TeamDetailModel>(requestUri, It.IsAny<object>(), default)).ReturnsAsync(data).Verifiable();
         var authClient = new AuthClient(callerProvider.Object);
         var result = await authClient.TeamService.GetDetailAsync(teamId);
         callerProvider.Verify(provider => provider.GetAsync<object, TeamDetailModel>(requestUri, It.IsAny<object>(), default), Times.Once);
         Assert.IsTrue(result is not null);
     }
+
+    [TestMethod]
+    public async Task TestGetListAsync()
+    {
+        var data = new List<TeamModel>();
+        var requestUri = $"api/team/list";
+        var callerProvider = new Mock<ICallerProvider>();
+        callerProvider.Setup(provider => provider.GetAsync<List<TeamModel>>(requestUri, default)).ReturnsAsync(data).Verifiable();
+        var authClient = new AuthClient(callerProvider.Object);
+        var result = await authClient.TeamService.GetListAsync();
+        callerProvider.Verify(provider => provider.GetAsync<List<TeamModel>>(requestUri, default), Times.Once);
+        Assert.IsTrue(result is not null);
+    }
 }