reactor : EnvironmentCallerMiddleware (#647)

masastack · Jul 12, 2023 · 819eeaf · 819eeaf
1 parent eeb3ad8
commit 819eeaf
Show file tree

Hide file tree

Showing 18 changed files with 37 additions and 19 deletions.
diff --git a/...ildingBlocks.StackSdks.Auth.Contracts/Masa.BuildingBlocks.StackSdks.Auth.Contracts.csproj b/...ildingBlocks.StackSdks.Auth.Contracts/Masa.BuildingBlocks.StackSdks.Auth.Contracts.csproj
@@ -9,6 +9,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\Authentication\Masa.BuildingBlocks.Authentication.Identity\Masa.BuildingBlocks.Authentication.Identity.csproj" />
     <ProjectReference Include="..\..\..\Exception\Masa.BuildingBlocks.Exceptions\Masa.BuildingBlocks.Exceptions.csproj" />
+    <ProjectReference Include="..\..\Masa.BuildingBlocks.StackSdks.Isolation\Masa.BuildingBlocks.StackSdks.Isolation.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/_Imports.cs b/src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/_Imports.cs
@@ -3,4 +3,5 @@
 
 global using Masa.BuildingBlocks.Authentication.Identity;
 global using Masa.BuildingBlocks.StackSdks.Auth.Contracts.Enum;
+global using Masa.BuildingBlocks.StackSdks.Isolation.Models;
 global using System.ComponentModel;
diff --git a/...Auth.Contracts/Model/IEnvironmentModel.cs → ...dks.Isolation/Models/IEnvironmentModel.cs b/...Auth.Contracts/Model/IEnvironmentModel.cs → ...dks.Isolation/Models/IEnvironmentModel.cs
@@ -1,9 +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.BuildingBlocks.StackSdks.Auth.Contracts.Model;
+namespace Masa.BuildingBlocks.StackSdks.Isolation.Models;
 
 public interface IEnvironmentModel
 {
     public string Environment { get; set; }
 }
+
diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Alert/Masa.Contrib.StackSdks.Alert.csproj b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Alert/Masa.Contrib.StackSdks.Alert.csproj
@@ -10,6 +10,7 @@
     <ProjectReference Include="..\..\..\BuildingBlocks\StackSdks\Masa.BuildingBlocks.StackSdks.Alert\Masa.BuildingBlocks.StackSdks.Alert.csproj" />
     <ProjectReference Include="..\..\Service\Caller\Masa.Contrib.Service.Caller.HttpClient\Masa.Contrib.Service.Caller.HttpClient.csproj" />
     <ProjectReference Include="..\Masa.Contrib.StackSdks.Caller\Masa.Contrib.StackSdks.Caller.csproj" />
+    <ProjectReference Include="..\Masa.Contrib.StackSdks.Isolation\Masa.Contrib.StackSdks.Isolation.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Alert/ServiceCollectionExtensions.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Alert/ServiceCollectionExtensions.cs
@@ -14,7 +14,9 @@ public static IServiceCollection AddAlertClient(this IServiceCollection services
             callerBuilder.UseHttpClient(builder =>
             {
                 builder.Configure = opt => opt.BaseAddress = new Uri(alertServiceBaseAddress);
-            }).UseAuthentication();
+            })
+            .AddMiddleware<EnvironmentCallerMiddleware>()
+            .UseAuthentication();
         });
     }
 
@@ -28,7 +30,9 @@ public static IServiceCollection AddAlertClient(this IServiceCollection services
                 .UseHttpClient(builder =>
                 {
                     builder.BaseAddress = alertServiceBaseAddressFunc.Invoke();
-                }).UseAuthentication();
+                })
+                .AddMiddleware<EnvironmentCallerMiddleware>()
+                .UseAuthentication();
         });
     }
 

diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Alert/_Imports.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Alert/_Imports.cs
@@ -8,9 +8,5 @@
 global using Masa.BuildingBlocks.StackSdks.Alert.Service;
 global using Masa.Contrib.StackSdks.Alert;
 global using Masa.Contrib.StackSdks.Alert.Service;
-global using System.Collections.Concurrent;
-global using System.ComponentModel;
-global using System.Diagnostics.CodeAnalysis;
-global using System.Globalization;
-global using System.Reflection;
+global using Masa.Contrib.StackSdks.Isolation;
 global using static Masa.Contrib.StackSdks.Alert.Constants;
diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/Masa.Contrib.StackSdks.Auth.csproj b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/Masa.Contrib.StackSdks.Auth.csproj
@@ -22,6 +22,7 @@
     <ProjectReference Include="..\..\Caching\Masa.Contrib.Caching.MultilevelCache\Masa.Contrib.Caching.MultilevelCache.csproj" />
     <ProjectReference Include="..\..\Service\Caller\Masa.Contrib.Service.Caller.HttpClient\Masa.Contrib.Service.Caller.HttpClient.csproj" />
     <ProjectReference Include="..\Masa.Contrib.StackSdks.Caller\Masa.Contrib.StackSdks.Caller.csproj" />
+    <ProjectReference Include="..\Masa.Contrib.StackSdks.Isolation\Masa.Contrib.StackSdks.Isolation.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/ServiceCollectionExtensions.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/ServiceCollectionExtensions.cs
@@ -26,7 +26,7 @@ public static IServiceCollection AddAuthClient(this IServiceCollection services,
         {
             callerBuilder
                 .UseHttpClient(builder => builder.BaseAddress = authServiceBaseAddress)
-                .AddMiddleware<EnvironmentMiddleware>()
+                .AddMiddleware<EnvironmentCallerMiddleware>()
                 .UseAuthentication();
         }, redisOptions);
     }

diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/_Imports.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/_Imports.cs
@@ -17,6 +17,7 @@
 global using Masa.Contrib.StackSdks.Auth;
 global using Masa.Contrib.StackSdks.Auth.Model;
 global using Masa.Contrib.StackSdks.Auth.Service;
+global using Masa.Contrib.StackSdks.Isolation;
 global using Microsoft.Extensions.Configuration;
 global using Microsoft.Extensions.Logging;
 global using System.Text.Json;

diff --git a/...b.StackSdks.Auth/EnvironmentMiddleware.cs → ....Isolation/EnvironmentCallerMiddleware.cs b/...b.StackSdks.Auth/EnvironmentMiddleware.cs → ....Isolation/EnvironmentCallerMiddleware.cs
@@ -1,15 +1,15 @@
 // 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;
+namespace Masa.Contrib.StackSdks.Isolation;
 
-public class EnvironmentMiddleware : ICallerMiddleware
+public class EnvironmentCallerMiddleware : ICallerMiddleware
 {
-    readonly ILogger<EnvironmentMiddleware>? _logger;
+    readonly ILogger<EnvironmentCallerMiddleware>? _logger;
 
-    public EnvironmentMiddleware(ILoggerFactory? loggerFactory = null)
+    public EnvironmentCallerMiddleware(ILoggerFactory? loggerFactory = null)
     {
-        _logger = loggerFactory?.CreateLogger<EnvironmentMiddleware>();
+        _logger = loggerFactory?.CreateLogger<EnvironmentCallerMiddleware>();
     }
 
     public async Task HandleAsync(MasaHttpContext masaHttpContext, CallerHandlerDelegate next, CancellationToken cancellationToken = default)
@@ -40,3 +40,4 @@ public async Task HandleAsync(MasaHttpContext masaHttpContext, CallerHandlerDele
         }
     }
 }
+
diff --git a/....StackSdks.Auth/Model/EnvironmentModel.cs → ...b.StackSdks.Isolation/EnvironmentModel.cs b/....StackSdks.Auth/Model/EnvironmentModel.cs → ...b.StackSdks.Isolation/EnvironmentModel.cs
@@ -1,7 +1,7 @@
 // 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.Model;
+namespace Masa.Contrib.StackSdks.Isolation;
 
 internal class EnvironmentModel : IEnvironmentModel
 {

diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Isolation/_Imports.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Isolation/_Imports.cs
@@ -7,6 +7,7 @@
 global using Masa.BuildingBlocks.Configuration.Options;
 global using Masa.BuildingBlocks.Data;
 global using Masa.BuildingBlocks.Isolation;
+global using Masa.BuildingBlocks.Service.Caller;
 global using Masa.BuildingBlocks.StackSdks.Config;
 global using Masa.BuildingBlocks.StackSdks.Config.Models;
 global using Masa.BuildingBlocks.StackSdks.Isolation;

diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Mc/Masa.Contrib.StackSdks.Mc.csproj b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Mc/Masa.Contrib.StackSdks.Mc.csproj
@@ -14,6 +14,7 @@
     <ProjectReference Include="..\..\..\BuildingBlocks\StackSdks\Masa.BuildingBlocks.StackSdks.Mc\Masa.BuildingBlocks.StackSdks.Mc.csproj" />
     <ProjectReference Include="..\Masa.Contrib.StackSdks.Caller\Masa.Contrib.StackSdks.Caller.csproj" />
     <ProjectReference Include="..\..\Service\Caller\Masa.Contrib.Service.Caller.HttpClient\Masa.Contrib.Service.Caller.HttpClient.csproj" />
+    <ProjectReference Include="..\Masa.Contrib.StackSdks.Isolation\Masa.Contrib.StackSdks.Isolation.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Mc/ServiceCollectionExtensions.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Mc/ServiceCollectionExtensions.cs
@@ -16,7 +16,9 @@ public static IServiceCollection AddMcClient(this IServiceCollection services, s
             callerBuilder.UseHttpClient(builder =>
             {
                 builder.Configure = opt => opt.BaseAddress = new Uri(mcServiceBaseAddress);
-            }).UseAuthentication();
+            })
+            .AddMiddleware<EnvironmentCallerMiddleware>()
+            .UseAuthentication();
         });
     }
 
@@ -30,7 +32,9 @@ public static IServiceCollection AddMcClient(this IServiceCollection services, F
                 .UseHttpClient(builder =>
                 {
                     builder.BaseAddress = mcServiceBaseAddressFunc.Invoke();
-                }).UseAuthentication();
+                })
+                .AddMiddleware<EnvironmentCallerMiddleware>()
+                .UseAuthentication();
         });
     }
 

diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Mc/_Imports.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Mc/_Imports.cs
@@ -9,6 +9,7 @@
 global using Masa.Contrib.StackSdks.Mc;
 global using Masa.Contrib.StackSdks.Mc.Infrastructure.Helper;
 global using Masa.Contrib.StackSdks.Mc.Service;
+global using Masa.Contrib.StackSdks.Isolation;
 global using System.Collections.Concurrent;
 global using System.ComponentModel;
 global using System.Diagnostics.CodeAnalysis;

diff --git a/...ontrib/StackSdks/Masa.Contrib.StackSdks.Scheduler/Masa.Contrib.StackSdks.Scheduler.csproj b/...ontrib/StackSdks/Masa.Contrib.StackSdks.Scheduler/Masa.Contrib.StackSdks.Scheduler.csproj
@@ -15,6 +15,7 @@
     <ProjectReference Include="..\..\..\BuildingBlocks\StackSdks\Masa.BuildingBlocks.StackSdks.Scheduler\Masa.BuildingBlocks.StackSdks.Scheduler.csproj" />
     <ProjectReference Include="..\Masa.Contrib.StackSdks.Caller\Masa.Contrib.StackSdks.Caller.csproj" />
     <ProjectReference Include="..\..\Service\Caller\Masa.Contrib.Service.Caller.HttpClient\Masa.Contrib.Service.Caller.HttpClient.csproj" />
+    <ProjectReference Include="..\Masa.Contrib.StackSdks.Isolation\Masa.Contrib.StackSdks.Isolation.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Scheduler/ServiceCollectionExtensions.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Scheduler/ServiceCollectionExtensions.cs
@@ -20,7 +20,9 @@ public static IServiceCollection AddSchedulerClient(this IServiceCollection serv
                 .UseHttpClient(builder =>
                 {
                     builder.Configure = opt => opt.BaseAddress = new Uri(schedulerServiceBaseAddress);
-                }).UseAuthentication();
+                })
+                .AddMiddleware<EnvironmentCallerMiddleware>()
+                .UseAuthentication();
         });
     }
 

diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Scheduler/_Imports.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Scheduler/_Imports.cs
@@ -8,6 +8,7 @@
 global using Masa.BuildingBlocks.StackSdks.Scheduler.Model;
 global using Masa.BuildingBlocks.StackSdks.Scheduler.Request;
 global using Masa.BuildingBlocks.StackSdks.Scheduler.Service;
+global using Masa.Contrib.StackSdks.Isolation;
 global using Masa.Contrib.StackSdks.Scheduler;
 global using Masa.Contrib.StackSdks.Scheduler.Logger;
 global using Masa.Contrib.StackSdks.Scheduler.Services;
@@ -17,4 +18,4 @@
 global using Microsoft.Extensions.DependencyInjection;
 global using Microsoft.Extensions.Logging;
 global using static Masa.Contrib.StackSdks.Scheduler.Constants;
-global using IAuthenticationService = Masa.BuildingBlocks.Service.Caller.IAuthenticationService;
+