feat:restore middleware

src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth/Service/ITeamService.cs

@@ -7,7 +7,7 @@ public interface ITeamService
 {
     Task<TeamDetailModel?> GetDetailAsync(Guid id);
 
-    Task<List<TeamModel>> GetAllAsync();
+    Task<List<TeamModel>> GetAllAsync(string environment);
 
     Task<List<TeamModel>> GetUserTeamsAsync();
 }

src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/EnvironmentMiddleware.cs

@@ -0,0 +1,31 @@
+// 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.StackSdks.Auth;
+
+public class EnvironmentMiddleware : ICallerMiddleware
+{
+    public async Task HandleAsync(MasaHttpContext masaHttpContext, CallerHandlerDelegate next, CancellationToken cancellationToken = default)
+    {
+
+        try
+        {
+            if (masaHttpContext.RequestMessage.Content != null && masaHttpContext.RequestMessage.Content.Headers.ContentType?.MediaType == "application/json")
+            {
+                var body = await masaHttpContext.RequestMessage.Content.ReadAsStringAsync(CancellationToken.None);
+                var obj = JsonSerializer.Deserialize<EnvironmentModel>(body, new JsonSerializerOptions
+                {
+                    PropertyNameCaseInsensitive = true
+                });
+                if (!string.IsNullOrEmpty(obj?.Environment))
+                {
+                    masaHttpContext.RequestMessage.Headers.Add(IsolationConsts.ENVIRONMENT, obj?.Environment);
+                }
+            }
+        }
+        finally
+        {
+            await next();
+        }
+    }
+}

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

@@ -31,9 +31,9 @@ public async Task<List<TeamModel>> GetListAsync(Guid userId = default)
         return await _caller.GetAsync<List<TeamModel>>(requestUri) ?? new();
     }
 
-    public async Task<List<TeamModel>> GetAllAsync()
+    public async Task<List<TeamModel>> GetAllAsync(string environment)
     {
-        var requestUri = $"{_party}list";
+        var requestUri = $"{_party}list?{IsolationConsts.ENVIRONMENT}={environment}";
         return await _caller.GetAsync<List<TeamModel>>(requestUri) ?? new();
     }
 

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

@@ -26,6 +26,7 @@ public static IServiceCollection AddAuthClient(this IServiceCollection services,
         {
             callerBuilder
                 .UseHttpClient(builder => builder.BaseAddress = authServiceBaseAddress)
+                .AddMiddleware<EnvironmentMiddleware>()
                 .UseAuthentication();
         }, redisOptions);
     }

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

@@ -18,5 +18,6 @@
 global using Masa.Contrib.StackSdks.Auth.Model;
 global using Masa.Contrib.StackSdks.Auth.Service;
 global using Microsoft.Extensions.Configuration;
+global using System.Net.Http.Json;
 global using System.Text.Json;
 global using static Masa.Contrib.StackSdks.Auth.Constants;

src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Auth.Tests/TeamServiceTest.cs

@@ -25,12 +25,12 @@ public async Task TestGetDetailAsync()
     public async Task TestGetAllAsync()
     {
         var data = new List<TeamModel>();
-        var requestUri = $"api/team/list";
+        var requestUri = $"api/team/list?{IsolationConsts.ENVIRONMENT}=test";
         var caller = new Mock<ICaller>();
         caller.Setup(provider => provider.GetAsync<List<TeamModel>>(requestUri, default)).ReturnsAsync(data).Verifiable();
         var userContext = new Mock<IUserContext>();
         var teamService = new Mock<TeamService>(caller.Object, userContext.Object);
-        var result = await teamService.Object.GetAllAsync();
+        var result = await teamService.Object.GetAllAsync("test");
         caller.Verify(provider => provider.GetAsync<List<TeamModel>>(requestUri, default), Times.Once);
         Assert.IsTrue(result is not null);
     }

src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Auth.Tests/_Imports.cs

@@ -5,14 +5,14 @@
 global using Masa.BuildingBlocks.Caching;
 global using Masa.BuildingBlocks.Service.Caller;
 global using Masa.BuildingBlocks.StackSdks.Auth;
+global using Masa.BuildingBlocks.StackSdks.Auth.Contracts.Consts;
 global using Masa.BuildingBlocks.StackSdks.Auth.Contracts.Enum;
 global using Masa.BuildingBlocks.StackSdks.Auth.Contracts.Model;
+global using Masa.BuildingBlocks.StackSdks.Isolation;
 global using Masa.Contrib.StackSdks.Auth.Service;
 global using Microsoft.Extensions.DependencyInjection;
 global using Microsoft.VisualStudio.TestTools.UnitTesting;
 global using Moq;
-global using System.Text.Json;
-global using IdentityModel.Client;
 global using Moq.Protected;
 global using System.Net;
-global using Masa.BuildingBlocks.StackSdks.Auth.Contracts.Consts;
+global using System.Text.Json;