diff --git a/src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Masa.BuildingBlocks.StackSdks.Auth.Contracts.csproj b/src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Masa.BuildingBlocks.StackSdks.Auth.Contracts.csproj
index 09b34205e..eb726d334 100644
--- a/src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Masa.BuildingBlocks.StackSdks.Auth.Contracts.csproj
+++ b/src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Masa.BuildingBlocks.StackSdks.Auth.Contracts.csproj
@@ -9,6 +9,7 @@
+
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
index 931121baa..2230b76fe 100644
--- 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/src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/IEnvironmentModel.cs b/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Isolation/Models/IEnvironmentModel.cs
similarity index 78%
rename from src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/IEnvironmentModel.cs
rename to src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Isolation/Models/IEnvironmentModel.cs
index b61b3f093..5ec7b569f 100644
--- a/src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/IEnvironmentModel.cs
+++ b/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.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
index 7766ec43c..c4c7048fd 100644
--- 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 @@
+
diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Alert/ServiceCollectionExtensions.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Alert/ServiceCollectionExtensions.cs
index 06b5f2b05..abc359a3f 100644
--- 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()
+ .UseAuthentication();
});
}
@@ -28,7 +30,9 @@ public static IServiceCollection AddAlertClient(this IServiceCollection services
.UseHttpClient(builder =>
{
builder.BaseAddress = alertServiceBaseAddressFunc.Invoke();
- }).UseAuthentication();
+ })
+ .AddMiddleware()
+ .UseAuthentication();
});
}
diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Alert/_Imports.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Alert/_Imports.cs
index fa1d0bec7..c134a0b7b 100644
--- 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
index ea95fff60..231af0041 100644
--- 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 @@
+
diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/ServiceCollectionExtensions.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/ServiceCollectionExtensions.cs
index 0fda17c98..a8f555ecd 100644
--- 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()
+ .AddMiddleware()
.UseAuthentication();
}, redisOptions);
}
diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/_Imports.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/_Imports.cs
index 5c433a247..37bea4e45 100644
--- 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/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/EnvironmentMiddleware.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Isolation/EnvironmentCallerMiddleware.cs
similarity index 79%
rename from src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/EnvironmentMiddleware.cs
rename to src/Contrib/StackSdks/Masa.Contrib.StackSdks.Isolation/EnvironmentCallerMiddleware.cs
index 878861ea0..64f42d040 100644
--- a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/EnvironmentMiddleware.cs
+++ b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.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? _logger;
+ readonly ILogger? _logger;
- public EnvironmentMiddleware(ILoggerFactory? loggerFactory = null)
+ public EnvironmentCallerMiddleware(ILoggerFactory? loggerFactory = null)
{
- _logger = loggerFactory?.CreateLogger();
+ _logger = loggerFactory?.CreateLogger();
}
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/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/Model/EnvironmentModel.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Isolation/EnvironmentModel.cs
similarity index 84%
rename from src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/Model/EnvironmentModel.cs
rename to src/Contrib/StackSdks/Masa.Contrib.StackSdks.Isolation/EnvironmentModel.cs
index 7be83bc54..2b4b3b48e 100644
--- a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/Model/EnvironmentModel.cs
+++ b/src/Contrib/StackSdks/Masa.Contrib.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
index 3d131a0fd..d35acc303 100644
--- 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
index 5308f134e..e4c756c9c 100644
--- 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 @@
+
diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Mc/ServiceCollectionExtensions.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Mc/ServiceCollectionExtensions.cs
index a3407f9e4..2a1de0300 100644
--- 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()
+ .UseAuthentication();
});
}
@@ -30,7 +32,9 @@ public static IServiceCollection AddMcClient(this IServiceCollection services, F
.UseHttpClient(builder =>
{
builder.BaseAddress = mcServiceBaseAddressFunc.Invoke();
- }).UseAuthentication();
+ })
+ .AddMiddleware()
+ .UseAuthentication();
});
}
diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Mc/_Imports.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Mc/_Imports.cs
index 9e697ce6a..be9b80040 100644
--- 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/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Scheduler/Masa.Contrib.StackSdks.Scheduler.csproj b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Scheduler/Masa.Contrib.StackSdks.Scheduler.csproj
index 13add0323..8e25e7f5d 100644
--- a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Scheduler/Masa.Contrib.StackSdks.Scheduler.csproj
+++ b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Scheduler/Masa.Contrib.StackSdks.Scheduler.csproj
@@ -15,6 +15,7 @@
+
diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Scheduler/ServiceCollectionExtensions.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Scheduler/ServiceCollectionExtensions.cs
index 2a62456cc..eb2c66ad5 100644
--- 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()
+ .UseAuthentication();
});
}
diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Scheduler/_Imports.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Scheduler/_Imports.cs
index 0a9afa20a..10739e795 100644
--- 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;
+