feat:user visit fix (#180)

* feat:modify IUserService visit method * feat: add pm get apps by app types api * feat:update user visit * fix:unit test error * feat:fix test error * feat:fix test error Co-authored-by: Mayue <[email protected]> Co-authored-by: yanpengju <[email protected]>
masastack · Aug 8, 2022 · d33a4d3 · d33a4d3
1 parent 8776eec
commit d33a4d3
Show file tree

Hide file tree

Showing 30 changed files with 121 additions and 73 deletions.
diff --git a/.gitignore b/.gitignore
@@ -218,4 +218,5 @@ package-lock.json
 Thunbs.db
 #忽略nuget库 
 packages/
-.vscode/
+.vscode/
+coverage.opencover.xml
diff --git a/...ocks/Authentication/Masa.BuildingBlocks.Authentication.Identity/Entities/IIdentityUser.cs b/...ocks/Authentication/Masa.BuildingBlocks.Authentication.Identity/Entities/IIdentityUser.cs
@@ -9,5 +9,5 @@ public interface IIdentityUser
 
     string? UserName { get; set; }
 
-    IEnumerable<IdentityRole<string>> Roles { get; set; }
+    string[] Roles { get; set; }
 }
diff --git a/...locks/Authentication/Masa.BuildingBlocks.Authentication.Identity/Entities/IdentityRole.cs b/...locks/Authentication/Masa.BuildingBlocks.Authentication.Identity/Entities/IdentityRole.cs
diff --git a/...locks/Authentication/Masa.BuildingBlocks.Authentication.Identity/Entities/IdentityUser.cs b/...locks/Authentication/Masa.BuildingBlocks.Authentication.Identity/Entities/IdentityUser.cs
@@ -9,5 +9,5 @@ public class IdentityUser : IIdentityUser
 
     public string? UserName { get; set; }
 
-    public IEnumerable<IdentityRole<string>> Roles { get; set; } = new List<IdentityRole<string>>();
+    public string[] Roles { get; set; } = Array.Empty<string>();
 }
diff --git a/...BuildingBlocks/Authentication/Masa.BuildingBlocks.Authentication.Identity/IUserContext.cs b/...BuildingBlocks/Authentication/Masa.BuildingBlocks.Authentication.Identity/IUserContext.cs
@@ -15,5 +15,5 @@ public interface IUserContext
 
     TIdentityUser? GetUser<TIdentityUser>() where TIdentityUser : IIdentityUser;
 
-    IEnumerable<IdentityRole<TRoleId>> GetUserRoles<TRoleId>();
+    IEnumerable<TRoleId> GetUserRoles<TRoleId>();
 }
diff --git a/src/BuildingBlocks/Authentication/Masa.BuildingBlocks.Authentication.Identity/UserContext.cs b/src/BuildingBlocks/Authentication/Masa.BuildingBlocks.Authentication.Identity/UserContext.cs
@@ -45,12 +45,8 @@ public IDisposable Change<TIdentityUser>(TIdentityUser identityUser) where TIden
         return new DisposeAction(() => _currentUser.Value = user);
     }
 
-    public IEnumerable<IdentityRole<TRoleId>> GetUserRoles<TRoleId>()
+    public IEnumerable<TRoleId> GetUserRoles<TRoleId>()
     {
-        return GetUserSimple()?.Roles.Select(r => new IdentityRole<TRoleId>
-        {
-            Id = TypeConvertProvider.ConvertTo<TRoleId>(r.Id),
-            Name = r.Name
-        }) ?? new List<IdentityRole<TRoleId>>();
+        return GetUserSimple()?.Roles.Select(r => TypeConvertProvider.ConvertTo<TRoleId>(r)) ?? new List<TRoleId>();
     }
 }
diff --git a/...cks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Consts/IsolationConsts.cs b/...cks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Consts/IsolationConsts.cs
@@ -0,0 +1,9 @@
+// Copyright (c) MASA Stack All rights reserved.
+// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
+
+namespace Masa.BuildingBlocks.StackSdks.Auth.Contracts.Consts;
+
+public static class IsolationConsts
+{
+    public const string ENVIRONMENT = "env";
+}
diff --git a/...dingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/UserModel.cs b/...dingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/UserModel.cs
@@ -31,7 +31,7 @@ public class UserModel
 
     public AddressValueModel Address { get; set; } = new();
 
-    public List<RoleModel> Roles { get; set; } = new();
+    public List<Guid> RoleIds { get; set; } = new();
 
     public UserModel()
     {

diff --git a/src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth/Service/IUserService.cs b/src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth/Service/IUserService.cs
@@ -33,7 +33,7 @@ public interface IUserService
 
     Task<StaffDetailModel?> GetCurrentStaffAsync();
 
-    Task VisitedAsync(string url);
+    Task VisitedAsync(string appId, string url);
 
     Task<List<UserVisitedModel>> GetVisitedListAsync();
 

diff --git a/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Pm/Model/AppModel.cs b/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Pm/Model/AppModel.cs
@@ -1,8 +1,6 @@
 // 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.StackSdks.Pm.Enum;
-
 namespace Masa.BuildingBlocks.StackSdks.Pm.Model;
 
 public class AppModel
@@ -17,15 +15,28 @@ public class AppModel
 
     public AppTypes Type { get; set; }
 
+    public string Url { get; set; }
+
+    public ServiceTypes ServiceType { get; set; }
+
+    public string SwaggerUrl { get; set; }
+
+    public string Description { get; set; }
+
     public AppModel()
     {
     }
 
-    public AppModel(int id, string name, string identity, int projectId)
+    public AppModel(int id, string name, string identity, int projectId, AppTypes type, string url, ServiceTypes serviceType, string swaggerUrl, string description)
     {
         Id = id;
         Name = name;
         Identity = identity;
         ProjectId = projectId;
+        Type = type;
+        Url = url;
+        ServiceType = serviceType;
+        SwaggerUrl = swaggerUrl;
+        Description = description;
     }
 }
diff --git a/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Pm/Service/IAppService.cs b/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Pm/Service/IAppService.cs
@@ -1,8 +1,6 @@
 // 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.StackSdks.Pm.Model;
-
 namespace Masa.BuildingBlocks.StackSdks.Pm.Service;
 
 public interface IAppService
@@ -16,4 +14,6 @@ public interface IAppService
     Task<AppDetailModel> GetAsync(int Id);
 
     Task<AppDetailModel> GetByIdentityAsync(string identity);
+
+    Task<List<AppDetailModel>> GetListByAppTypes(params AppTypes[] appTypes);
 }
diff --git a/src/Contrib/Authentication/Masa.Contrib.Authentication.Identity/DefaultUserContext.cs b/src/Contrib/Authentication/Masa.Contrib.Authentication.Identity/DefaultUserContext.cs
@@ -34,12 +34,12 @@ public DefaultUserContext(
             return null;
 
         var roleStr = ClaimsPrincipal?.FindClaimValue(_optionsMonitor.CurrentValue.Role);
-        var roles = new List<IdentityRole<string>>();
+        var roles = Array.Empty<string>();
         if (!string.IsNullOrWhiteSpace(roleStr))
         {
             try
             {
-                roles = JsonSerializer.Deserialize<List<IdentityRole<string>>>(roleStr) ?? roles;
+                roles = JsonSerializer.Deserialize<string[]>(roleStr) ?? roles;
             }
             catch (Exception e)
             {

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
@@ -139,7 +139,7 @@ public void TestAddSimpleIdentityReturnUserIdEqual1()
                     new(ClaimType.DEFAULT_USER_ID, "1"),
                     new(ClaimType.DEFAULT_USER_NAME, "Jim"),
                     new(ClaimType.DEFAULT_TENANT_ID, "1"),
-                    new(ClaimType.DEFAULT_USER_ROLE, "[{ \"Name\": \"admin\",\"Id\": \"1\" }]")
+                    new(ClaimType.DEFAULT_USER_ROLE, "[\"roleId\"]")
                 })
             })
         };
@@ -176,7 +176,7 @@ public void TestAddMultiTenantIdentityReturnTenantIdIs1()
                     new(ClaimType.DEFAULT_USER_ID, "1"),
                     new(ClaimType.DEFAULT_USER_NAME, "Jim"),
                     new(ClaimType.DEFAULT_TENANT_ID, "1"),
-                    new(ClaimType.DEFAULT_USER_ROLE, "[{ \"Name\": \"admin\",\"Id\": \"1\" }]")
+                    new(ClaimType.DEFAULT_USER_ROLE, "[\"1\"]")
                 })
             })
         };

diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/Constants.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/Constants.cs
@@ -6,7 +6,5 @@ namespace Masa.Contrib.StackSdks.Auth;
 internal class Constants
 {
     public const string DEFAULT_CLIENT_NAME = "masa.contrib.basicability.auth";
-
-    public const string ENVIRONMENT_KEY = "env_key";
 }
 
diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/HttpEnvironmentDelegatingHandler.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/HttpEnvironmentDelegatingHandler.cs
@@ -5,22 +5,26 @@ namespace Masa.Contrib.StackSdks.Auth;
 
 public class HttpEnvironmentDelegatingHandler : DelegatingHandler
 {
-    readonly IHttpContextAccessor _httpContextAccessor;
     readonly IEnvironmentProvider _environmentProvider;
+    readonly IHttpContextAccessor _httpContextAccessor;
 
-    public HttpEnvironmentDelegatingHandler(IHttpContextAccessor httpContextAccessor, IEnvironmentProvider environmentProvider)
+    public HttpEnvironmentDelegatingHandler(IEnvironmentProvider environmentProvider,
+        IHttpContextAccessor httpContextAccessor)
     {
-        _httpContextAccessor = httpContextAccessor;
         _environmentProvider = environmentProvider;
+        _httpContextAccessor = httpContextAccessor;
     }
 
     protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
     {
-        var envClaim = _httpContextAccessor.HttpContext?.User.Claims.FirstOrDefault(c => c.Type == "env");
-        if (envClaim != null)
+        var requestProvider = _httpContextAccessor.HttpContext?.RequestServices.GetService<IEnvironmentProvider>();
+        if (requestProvider != null)
+        {
+            request.Headers.Add(IsolationConsts.ENVIRONMENT, requestProvider.GetEnvironment());
+        }
+        else
         {
-            _httpContextAccessor.HttpContext?.Items.TryAdd(ENVIRONMENT_KEY, _environmentProvider.GetEnvironment());
-            request.Headers.Add(ENVIRONMENT_KEY, _environmentProvider.GetEnvironment());
+            request.Headers.Add(IsolationConsts.ENVIRONMENT, _environmentProvider.GetEnvironment());
         }
         return await base.SendAsync(request, cancellationToken);
     }

diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/Service/ProjectService.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/Service/ProjectService.cs
@@ -6,21 +6,20 @@ namespace Masa.Contrib.StackSdks.Auth.Service;
 public class ProjectService : IProjectService
 {
     readonly ICaller _caller;
-    readonly IMultiEnvironmentUserContext _multiEnvironmentUserContext;
+    readonly IUserContext _userContext;
 
     const string PARTY = "api/project/";
 
-    public ProjectService(ICaller caller, IMultiEnvironmentUserContext multiEnvironmentUserContext)
+    public ProjectService(ICaller caller, IUserContext userContext)
     {
         _caller = caller;
-        _multiEnvironmentUserContext = multiEnvironmentUserContext;
+        _userContext = userContext;
     }
 
     public async Task<List<ProjectModel>> GetGlobalNavigations()
     {
-        var userId = _multiEnvironmentUserContext.GetUserId<Guid>();
-        var environment = _multiEnvironmentUserContext.Environment ?? "";
-        var requestUri = $"{PARTY}navigations?userId={userId}&environment={environment}";
+        var userId = _userContext.GetUserId<Guid>();
+        var requestUri = $"{PARTY}navigations?userId={userId}";
         return await _caller.GetAsync<List<ProjectModel>>(requestUri) ?? new();
     }
 }
diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/Service/UserService.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/Service/UserService.cs
@@ -100,11 +100,11 @@ public async Task<UserModel> GetCurrentUserAsync()
         return await _caller.GetAsync<object, StaffDetailModel>(requestUri, new { userId });
     }
 
-    public async Task VisitedAsync(string url)
+    public async Task VisitedAsync(string appId, string url)
     {
         var userId = _userContext.GetUserId<Guid>();
         var requestUri = $"api/user/visit";
-        await _caller.PostAsync<object>(requestUri, new { UserId = userId, Url = url }, true);
+        await _caller.PostAsync<object>(requestUri, new { UserId = userId, appId = appId, Url = url }, true);
     }
 
     public async Task<List<UserVisitedModel>> GetVisitedListAsync()

diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/ServiceCollectionExtensions.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/ServiceCollectionExtensions.cs
@@ -21,13 +21,12 @@ public static IServiceCollection AddAuthClient(this IServiceCollection services,
     public static IServiceCollection AddAuthClient(this IServiceCollection services, Action<CallerOptions> callerOptions)
     {
         ArgumentNullException.ThrowIfNull(callerOptions, nameof(callerOptions));
-
         if (services.All(service => service.ServiceType != typeof(IMultiEnvironmentUserContext)))
             throw new Exception("Please add IMultiEnvironmentUserContext first.");
 
         services.AddHttpContextAccessor();
+        services.TryAddScoped<IEnvironmentProvider, EnvironmentProvider>();
         services.AddScoped<HttpEnvironmentDelegatingHandler>();
-        services.AddScoped<IEnvironmentProvider, EnvironmentProvider>();
         services.AddCaller(callerOptions);
 
         services.AddScoped<IAuthClient>(serviceProvider =>

diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/_Imports.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/_Imports.cs
@@ -5,11 +5,14 @@
 global using Masa.BuildingBlocks.Service.Caller;
 global using Masa.BuildingBlocks.Service.Caller.Options;
 global using Masa.BuildingBlocks.StackSdks.Auth;
+global using Masa.BuildingBlocks.StackSdks.Auth.Contracts.Consts;
 global using Masa.BuildingBlocks.StackSdks.Auth.Contracts.Model;
 global using Masa.BuildingBlocks.StackSdks.Auth.Service;
 global using Masa.Contrib.Service.Caller;
 global using Masa.Contrib.Service.Caller.HttpClient;
 global using Masa.Contrib.StackSdks.Auth;
 global using Microsoft.AspNetCore.Http;
+global using Microsoft.Extensions.DependencyInjection;
+global using Microsoft.Extensions.DependencyInjection.Extensions;
 global using System.Text.Json;
 global using static Masa.Contrib.StackSdks.Auth.Constants;
diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Pm/Service/AppService.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Pm/Service/AppService.cs
@@ -1,9 +1,6 @@
 // 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.StackSdks.Pm.Model;
-using Masa.BuildingBlocks.StackSdks.Pm.Service;
-
 namespace Masa.Contrib.StackSdks.Pm.Service;
 
 public class AppService : IAppService
@@ -54,4 +51,12 @@ public async Task<AppDetailModel> GetWithEnvironmentClusterAsync(int id)
 
         return result ?? new();
     }
+
+    public async Task<List<AppDetailModel>> GetListByAppTypes(params AppTypes[] appTypes)
+    {
+        var requestUri = $"open-api/app/by-types";
+        var result = await _caller.PostAsync<AppTypes[], List<AppDetailModel>>(requestUri, appTypes);
+
+        return result ?? new();
+    }
 }
diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Pm/Service/ClusterService.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Pm/Service/ClusterService.cs
@@ -1,9 +1,6 @@
 // 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.StackSdks.Pm.Model;
-using Masa.BuildingBlocks.StackSdks.Pm.Service;
-
 namespace Masa.Contrib.StackSdks.Pm.Service;
 
 public class ClusterService : IClusterService

diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Pm/Service/EnvironmentService.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Pm/Service/EnvironmentService.cs
@@ -1,9 +1,6 @@
 // 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.StackSdks.Pm.Model;
-using Masa.BuildingBlocks.StackSdks.Pm.Service;
-
 namespace Masa.Contrib.StackSdks.Pm.Service;
 
 public class EnvironmentService : IEnvironmentService

diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Pm/Service/ProjectService.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Pm/Service/ProjectService.cs
@@ -1,9 +1,6 @@
 // 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.StackSdks.Pm.Model;
-using Masa.BuildingBlocks.StackSdks.Pm.Service;
-
 namespace Masa.Contrib.StackSdks.Pm.Service;
 
 public class ProjectService : IProjectService
@@ -17,7 +14,7 @@ public ProjectService(ICaller caller)
 
     public async Task<List<ProjectAppsModel>> GetProjectAppsAsync(string envName)
     {
-        var requestUri = $"api/v1/projectwithapps/{envName}";
+        var requestUri = $"open-api/projectwithapps/{envName}";
         var result = await _caller.GetAsync<List<ProjectAppsModel>>(requestUri);
 
         return result ?? new();

diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Pm/_Imports.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Pm/_Imports.cs
@@ -3,6 +3,9 @@
 
 global using Masa.BuildingBlocks.Service.Caller;
 global using Masa.BuildingBlocks.Service.Caller.Options;
+global using Masa.BuildingBlocks.StackSdks.Pm.Enum;
+global using Masa.BuildingBlocks.StackSdks.Pm.Model;
+global using Masa.BuildingBlocks.StackSdks.Pm.Service;
 global using Masa.Contrib.Service.Caller;
 global using Masa.Contrib.Service.Caller.HttpClient;
 global using Masa.Contrib.StackSdks.Pm;

diff --git a/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Auth.Tests/ProjectServiceTest.cs b/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Auth.Tests/ProjectServiceTest.cs
@@ -16,7 +16,7 @@ public async Task TestGetGlobalNavigationsAsync()
             new ProjectModel()
         };
         var userId = Guid.Parse("A9C8E0DD-1E9C-474D-8FE7-8BA9672D53D1");
-        var requestUri = $"api/project/navigations?userId={userId}&environment=development";
+        var requestUri = $"api/project/navigations?userId={userId}";
         var caller = new Mock<ICaller>();
         caller.Setup(provider => provider.GetAsync<List<ProjectModel>>(requestUri, default)).ReturnsAsync(data).Verifiable();
         var userContext = new Mock<IMultiEnvironmentUserContext>();

diff --git a/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Auth.Tests/UserServiceTest.cs b/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Auth.Tests/UserServiceTest.cs
@@ -233,8 +233,8 @@ public async Task TestGetCurrentStaffAsync()
     }
 
     [TestMethod]
-    [DataRow("https://www.baidu.com/")]
-    public async Task TestVisitedAsync(string url)
+    [DataRow("masa-auth-web-admin", "https://www.baidu.com/")]
+    public async Task TestVisitedAsync(string appId, string url)
     {
         var userId = Guid.Parse("A9C8E0DD-1E9C-474D-8FE7-8BA9672D53D1");
         var requestUri = $"api/user/visit";
@@ -243,7 +243,7 @@ public async Task TestVisitedAsync(string url)
         var userContext = new Mock<IUserContext>();
         userContext.Setup(user => user.GetUserId<Guid>()).Returns(userId).Verifiable();
         var userService = new UserService(caller.Object, userContext.Object);
-        await userService.VisitedAsync(url);
+        await userService.VisitedAsync(appId, url);
         caller.Verify(provider => provider.PostAsync<object>(requestUri, It.IsAny<object>(), true, default), Times.Once);
     }