feat(stack sdk)/stack sdk caller (#508)

* feat:stack sdk authentication * refactor:rename Authentication.BlazorServer to Authentication.Universal * feat:code format * rename:Universal to Standard * feat:udpate default token provider * fix:token provider * fix:pr
masastack · Mar 22, 2023 · c300f24 · c300f24
1 parent 679b50d
commit c300f24
Show file tree

Hide file tree

Showing 26 changed files with 88 additions and 48 deletions.
diff --git a/Masa.Framework.sln b/Masa.Framework.sln
@@ -549,7 +549,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Globalization", "Globalizat
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{8D7D3D21-86DB-4FCC-8FF0-6E1587ABD22A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Service.Caller.Authentication.BlazorServer.Tests", "src\Contrib\Service\Caller\Authentication\Tests\Masa.Contrib.Service.Caller.Authentication.BlazorServer.Tests\Masa.Contrib.Service.Caller.Authentication.BlazorServer.Tests.csproj", "{BEA8E5A5-E7BD-4165-80CD-D1F53ED82D02}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Service.Caller.Authentication.Standard.Tests", "src\Contrib\Service\Caller\Authentication\Tests\Masa.Contrib.Service.Caller.Authentication.Standard.Tests\Masa.Contrib.Service.Caller.Authentication.Standard.Tests.csproj", "{BEA8E5A5-E7BD-4165-80CD-D1F53ED82D02}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Authentication.OpenIdConnect.EFCore.Oracle", "src\Contrib\Authentication\OpenIdConnect\Masa.Contrib.Authentication.OpenIdConnect.EFCore.Oracle\Masa.Contrib.Authentication.OpenIdConnect.EFCore.Oracle.csproj", "{03F476EF-022A-4370-B1C3-FEEDE3BB4E7F}"
 EndProject
@@ -669,7 +669,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Service.Caller
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions", "{69BD70CA-62D8-4900-B781-4368C738B3EB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Service.Caller.Authentication.BlazorServer", "src\Contrib\Service\Caller\Authentication\Masa.Contrib.Service.Caller.Authentication.BlazorServer\Masa.Contrib.Service.Caller.Authentication.BlazorServer.csproj", "{3019BEEA-D141-4909-84A2-DC8852FF05EF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Service.Caller.Authentication.Standard", "src\Contrib\Service\Caller\Authentication\Masa.Contrib.Service.Caller.Authentication.Standard\Masa.Contrib.Service.Caller.Authentication.Standard.csproj", "{3019BEEA-D141-4909-84A2-DC8852FF05EF}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Service.Caller.Authentication.AspNetCore.Tests", "src\Contrib\Service\Caller\Authentication\Tests\Masa.Contrib.Service.Caller.Authentication.AspNetCore.Tests\Masa.Contrib.Service.Caller.Authentication.AspNetCore.Tests.csproj", "{A95600A9-01A5-438A-A3FA-85A1B261C6A0}"
 EndProject

diff --git a/...ion.BlazorServer/AuthenticationService.cs → ...ication.Standard/AuthenticationService.cs b/...ion.BlazorServer/AuthenticationService.cs → ...ication.Standard/AuthenticationService.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.Service.Caller.Authentication.BlazorServer;
+namespace Masa.Contrib.Service.Caller.Authentication.Standard;
 
 public class AuthenticationService : IAuthenticationService
 {

diff --git a/...ions/MasaCallerClientBuilderExtensions.cs → ...ions/MasaCallerClientBuilderExtensions.cs b/...ions/MasaCallerClientBuilderExtensions.cs → ...ions/MasaCallerClientBuilderExtensions.cs
@@ -7,6 +7,12 @@ namespace Masa.BuildingBlocks.Service.Caller;
 
 public static class MasaCallerClientBuilderExtensions
 {
+    public static IMasaCallerClientBuilder UseAuthentication(
+        this IMasaCallerClientBuilder masaCallerClientBuilder)
+    {
+        return UseAuthentication(masaCallerClientBuilder, (serviceProvider) => { return new TokenProvider(); });
+    }
+
     /// <summary>
     /// Caller adds default authentication
     /// </summary>
@@ -15,9 +21,10 @@ public static class MasaCallerClientBuilderExtensions
     /// <returns></returns>
     public static IMasaCallerClientBuilder UseAuthentication(
         this IMasaCallerClientBuilder masaCallerClientBuilder,
+        Func<IServiceProvider, TokenProvider> tokenProvider,
         string defaultScheme = AuthenticationConstant.DEFAULT_SCHEME)
     {
-        masaCallerClientBuilder.Services.TryAddScoped<TokenProvider>();
+        masaCallerClientBuilder.Services.TryAddScoped((serviceProvider) => { return tokenProvider.Invoke(serviceProvider); });
         masaCallerClientBuilder.UseAuthentication(serviceProvider =>
             new AuthenticationService(
                 serviceProvider.GetRequiredService<TokenProvider>(),

diff --git a/...Server/Internal/AuthenticationConstant.cs → ...andard/Internal/AuthenticationConstant.cs b/...Server/Internal/AuthenticationConstant.cs → ...andard/Internal/AuthenticationConstant.cs
@@ -1,11 +1,11 @@
-// Copyright (c) MASA Stack All rights reserved.
+// Copyright (c) MASA Stack All rights reserved.
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
-[assembly: InternalsVisibleTo("Masa.Contrib.Service.Caller.Authentication.BlazorServer.Tests")]
+[assembly: InternalsVisibleTo("Masa.Contrib.Service.Caller.Authentication.Standard.Tests")]
 
 // ReSharper disable once CheckNamespace
 
-namespace Masa.Contrib.Service.Caller.Authentication.BlazorServer;
+namespace Masa.Contrib.Service.Caller.Authentication.Standard;
 
 internal static class AuthenticationConstant
 {

diff --git a/...Caller.Authentication.BlazorServer.csproj → ...ice.Caller.Authentication.Standard.csproj b/...Caller.Authentication.BlazorServer.csproj → ...ice.Caller.Authentication.Standard.csproj
diff --git a/...hentication.BlazorServer/TokenProvider.cs → ....Authentication.Standard/TokenProvider.cs b/...hentication.BlazorServer/TokenProvider.cs → ....Authentication.Standard/TokenProvider.cs
@@ -1,7 +1,7 @@
-// Copyright (c) MASA Stack All rights reserved.
+// 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.Service.Caller.Authentication.BlazorServer;
+namespace Masa.Contrib.Service.Caller.Authentication.Standard;
 
 [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
 public class TokenProvider

diff --git a/...r.Authentication.BlazorServer/_Imports.cs → ...aller.Authentication.Standard/_Imports.cs b/...r.Authentication.BlazorServer/_Imports.cs → ...aller.Authentication.Standard/_Imports.cs
@@ -2,8 +2,7 @@
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
 global using Masa.BuildingBlocks.Service.Caller;
-global using Masa.Contrib.Service.Caller.Authentication;
-global using Masa.Contrib.Service.Caller.Authentication.BlazorServer;
+global using Masa.Contrib.Service.Caller.Authentication.Standard;
 global using Microsoft.Extensions.DependencyInjection;
 global using Microsoft.Extensions.DependencyInjection.Extensions;
 global using System.Net.Http.Headers;

diff --git a/...Server.Tests/AuthenticationServiceTest.cs → ...andard.Tests/AuthenticationServiceTest.cs b/...Server.Tests/AuthenticationServiceTest.cs → ...andard.Tests/AuthenticationServiceTest.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.Service.Caller.Authentication.BlazorServer.Tests;
+namespace Masa.Contrib.Service.Caller.Authentication.Standard.Tests;
 
 [TestClass]
 public class AuthenticationServiceTest
@@ -20,7 +20,7 @@ public async Task TestExecuteAsync()
         };
         await authenticationService.ExecuteAsync(httpRequestMessage);
         Assert.IsNotNull(httpRequestMessage.Headers.Authorization);
-        Assert.AreEqual($"{AuthenticationConstant.DEFAULT_SCHEME} {tokenProvider.Authorization}",httpRequestMessage.Headers.Authorization.ToString());
+        Assert.AreEqual($"{AuthenticationConstant.DEFAULT_SCHEME} {tokenProvider.Authorization}", httpRequestMessage.Headers.Authorization.ToString());
     }
 
     [TestMethod]

diff --git a/....Authentication.BlazorServer.Tests.csproj → ...ller.Authentication.Standard.Tests.csproj b/....Authentication.BlazorServer.Tests.csproj → ...ller.Authentication.Standard.Tests.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Masa.Contrib.Service.Caller.Authentication.BlazorServer\Masa.Contrib.Service.Caller.Authentication.BlazorServer.csproj" />
+    <ProjectReference Include="..\..\Masa.Contrib.Service.Caller.Authentication.Standard\Masa.Contrib.Service.Caller.Authentication.Standard.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/.../MasaCallerClientBuilderExtensionsTest.cs → .../MasaCallerClientBuilderExtensionsTest.cs b/.../MasaCallerClientBuilderExtensionsTest.cs → .../MasaCallerClientBuilderExtensionsTest.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.Service.Caller.Authentication.BlazorServer.Tests;
+namespace Masa.Contrib.Service.Caller.Authentication.Standard.Tests;
 
 [TestClass]
 public class MasaCallerClientBuilderExtensionsTest

diff --git a/...entication.BlazorServer.Tests/_Imports.cs → ...Authentication.Standard.Tests/_Imports.cs b/...entication.BlazorServer.Tests/_Imports.cs → ...Authentication.Standard.Tests/_Imports.cs
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
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="IdentityModel" Version="6.1.0-preview.1" />
+    <PackageReference Include="IdentityModel" Version="$(IdentityModelPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftPackageVersion)" />
   </ItemGroup>
 
@@ -19,6 +19,7 @@
     <ProjectReference Include="..\..\..\Utils\Extensions\Masa.Utils.Extensions.DependencyInjection\Masa.Utils.Extensions.DependencyInjection.csproj" />
     <ProjectReference Include="..\..\Caching\Distributed\Masa.Contrib.Caching.Distributed.StackExchangeRedis\Masa.Contrib.Caching.Distributed.StackExchangeRedis.csproj" />
     <ProjectReference Include="..\..\Caching\Masa.Contrib.Caching.MultilevelCache\Masa.Contrib.Caching.MultilevelCache.csproj" />
+    <ProjectReference Include="..\..\Service\Caller\Authentication\Masa.Contrib.Service.Caller.Authentication.Standard\Masa.Contrib.Service.Caller.Authentication.Standard.csproj" />
     <ProjectReference Include="..\..\Service\Caller\Masa.Contrib.Service.Caller.HttpClient\Masa.Contrib.Service.Caller.HttpClient.csproj" />
   </ItemGroup>
 

diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/ServiceCollectionExtensions.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/ServiceCollectionExtensions.cs
@@ -25,7 +25,8 @@ public static IServiceCollection AddAuthClient(this IServiceCollection services,
         return services.AddAuthClient(callerOptionsBuilder =>
         {
             callerOptionsBuilder
-                .UseHttpClient(builder => builder.BaseAddress = authServiceBaseAddress);//Need to use the AuthenticationService provided by MasaStack
+                .UseHttpClient(builder => builder.BaseAddress = authServiceBaseAddress)
+                .UseAuthentication();
         }, redisOptions);
     }
 
@@ -48,7 +49,7 @@ public static IServiceCollection AddAuthClient(this IServiceCollection services,
             var authClient = new AuthClient(caller, userContext, authClientMultilevelCacheProvider.GetMultilevelCacheClient());
             return authClient;
         });
-        services.AddSingleton<IThirdPartyIdpService>(serviceProvider =>
+        services.AddScoped<IThirdPartyIdpService>(serviceProvider =>
         {
             var callProvider = serviceProvider.GetRequiredService<ICallerFactory>().Create(DEFAULT_CLIENT_NAME);
             var authClientMultilevelCacheProvider = serviceProvider.GetRequiredService<AuthClientMultilevelCacheProvider>();

diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Caller/JwtTokenValidator.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Caller/JwtTokenValidator.cs
@@ -22,9 +22,9 @@ public JwtTokenValidator(
         _logger = logger;
     }
 
-    public async Task ValidateTokenAsync(TokenProvider tokenProvider)
+    public async Task<ClaimsPrincipal?> ValidateTokenAsync(TokenProvider tokenProvider)
     {
-        var discoveryDocument = await _httpClient.GetDiscoveryDocumentAsync(_jwtTokenValidatorOptions.AuthorityEndpoint);
+        var discoveryDocument = await GetDiscoveryDocument();
         var validationParameters = new TokenValidationParameters
         {
             ValidateLifetime = _jwtTokenValidatorOptions.ValidateLifetime,
@@ -37,44 +37,61 @@ public async Task ValidateTokenAsync(TokenProvider tokenProvider)
         };
         JwtSecurityTokenHandler handler = new();
         handler.InboundClaimTypeMap.Clear();
+        ClaimsPrincipal? claimsPrincipal = null;
         try
         {
-            handler.ValidateToken(tokenProvider.AccessToken, validationParameters, out SecurityToken _);
+            claimsPrincipal = handler.ValidateToken(tokenProvider.AccessToken, validationParameters, out SecurityToken _);
         }
         catch (SecurityTokenExpiredException)
         {
-            if (!string.IsNullOrEmpty(tokenProvider.RefreshToken))
+            var tokenResult = await RefreshTokenAsync(tokenProvider.RefreshToken);
+            if (tokenResult != null)
             {
-                var tokenClient = new TokenClient(_httpClient, new TokenClientOptions
-                {
-                    Address = discoveryDocument.TokenEndpoint,
-                    ClientId = _clientRefreshTokenOptions.ClientId,
-                    ClientSecret = _clientRefreshTokenOptions.ClientSecret
-                });
-                var tokenResult = await tokenClient.RequestRefreshTokenAsync(tokenProvider.RefreshToken).ConfigureAwait(false);
                 if (tokenResult.IsError)
                 {
                     _logger?.LogError("JwtTokenValidator failed, RefreshToken failed, Error Message: {Message}", tokenResult.Error);
-                    throw new UserFriendlyException($"JwtTokenValidator failed, RefreshToken failed, Error Message: {tokenResult.Error}");
                 }
                 else
                 {
                     tokenProvider.AccessToken = tokenResult.AccessToken;
-                    handler.ValidateToken(tokenProvider.AccessToken, validationParameters, out SecurityToken _);
+                    return handler.ValidateToken(tokenProvider.AccessToken, validationParameters, out SecurityToken _);
                 }
             }
-            else
-            {
-                _logger?.LogWarning(
-                    "RefreshToken is null,please AllowOfflineAccess value(true) and RequestedScopes should contains offline_access");
-                throw new UserFriendlyException("JwtTokenValidator failed, RefreshToken is null");
-            }
         }
         catch (Exception e)
         {
             _logger?.LogError(e, "JwtTokenValidator failed");
             throw new UserFriendlyException("JwtTokenValidator failed");
         }
+        return claimsPrincipal;
+    }
+
+    public async Task<TokenResponse?> RefreshTokenAsync(string? refreshToken)
+    {
+        if (string.IsNullOrEmpty(refreshToken))
+        {
+            _logger?.LogWarning("RefreshToken is null,please AllowOfflineAccess value(true) and RequestedScopes should contains offline_access");
+            throw new ArgumentNullException(nameof(refreshToken));
+        }
+        if (string.IsNullOrEmpty(_clientRefreshTokenOptions.ClientId))
+        {
+            _logger?.LogWarning("ClientRefreshTokenOptions.ClientId is empty,refresh token no work");
+            return null;
+        }
+        var tokenEndpoint = (await GetDiscoveryDocument()).TokenEndpoint;
+        var tokenClient = new TokenClient(_httpClient, new TokenClientOptions
+        {
+            Address = tokenEndpoint,
+            ClientId = _clientRefreshTokenOptions.ClientId,
+            ClientSecret = _clientRefreshTokenOptions.ClientSecret
+        });
+        var tokenResult = await tokenClient.RequestRefreshTokenAsync(refreshToken).ConfigureAwait(false);
+        return tokenResult;
+    }
+
+    private async Task<DiscoveryDocumentResponse> GetDiscoveryDocument()
+    {
+        return await _httpClient.GetDiscoveryDocumentAsync(_jwtTokenValidatorOptions.AuthorityEndpoint);
     }
 
     private static List<SecurityKey> GetIssuerSigningKeys(DiscoveryDocumentResponse discoveryDocument)

diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Caller/ServiceCollectionExtensions.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Caller/ServiceCollectionExtensions.cs
@@ -5,6 +5,15 @@ namespace Masa.Contrib.StackSdks.Caller;
 
 public static class ServiceCollectionExtensions
 {
+    public static IServiceCollection AddStackCaller(
+       this IServiceCollection services,
+       Assembly assembly,
+       Action<JwtTokenValidatorOptions> jwtTokenValidatorOptions,
+       Action<ClientRefreshTokenOptions>? clientRefreshTokenOptions = null)
+    {
+        return AddStackCaller(services, assembly, (serviceProvider) => new TokenProvider(), jwtTokenValidatorOptions, clientRefreshTokenOptions);
+    }
+
     public static IServiceCollection AddStackCaller(
         this IServiceCollection services,
         Assembly assembly,
@@ -16,7 +25,7 @@ public static IServiceCollection AddStackCaller(
 
         services.Configure(jwtTokenValidatorOptions);
         services.Configure(clientRefreshTokenOptions);
-        services.AddScoped((serviceProvider) => { return tokenProvider.Invoke(serviceProvider); });
+        services.TryAddScoped((serviceProvider) => { return tokenProvider.Invoke(serviceProvider); });
         services.AddSingleton<JwtTokenValidator>();
         services.AddAutoRegistrationCaller(assembly);
         return services;

diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Caller/_Imports.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Caller/_Imports.cs
@@ -6,10 +6,12 @@
 global using Masa.BuildingBlocks.Service.Caller;
 global using Masa.Contrib.Service.Caller.HttpClient;
 global using Microsoft.Extensions.DependencyInjection;
+global using Microsoft.Extensions.DependencyInjection.Extensions;
 global using Microsoft.Extensions.Logging;
 global using Microsoft.Extensions.Options;
 global using Microsoft.IdentityModel.Tokens;
 global using System.IdentityModel.Tokens.Jwt;
 global using System.Net.Http.Headers;
 global using System.Reflection;
+global using System.Security.Claims;
 global using System.Security.Cryptography;
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
@@ -12,6 +12,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\BuildingBlocks\StackSdks\Masa.BuildingBlocks.StackSdks.Mc\Masa.BuildingBlocks.StackSdks.Mc.csproj" />
+    <ProjectReference Include="..\..\Service\Caller\Authentication\Masa.Contrib.Service.Caller.Authentication.Standard\Masa.Contrib.Service.Caller.Authentication.Standard.csproj" />
     <ProjectReference Include="..\..\Service\Caller\Masa.Contrib.Service.Caller.HttpClient\Masa.Contrib.Service.Caller.HttpClient.csproj" />
   </ItemGroup>
 

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,7 @@ public static IServiceCollection AddMcClient(this IServiceCollection services, s
             callerOptions.UseHttpClient(builder =>
             {
                 builder.Configure = opt => opt.BaseAddress = new Uri(mcServiceBaseAddress);
-            }); //Need to use the AuthenticationService provided by MasaStack
+            }).UseAuthentication();
         });
     }
 
@@ -30,7 +30,7 @@ public static IServiceCollection AddMcClient(this IServiceCollection services, F
                 .UseHttpClient(builder =>
                 {
                     builder.BaseAddress = mcServiceBaseAddressFunc.Invoke();
-                }); //Need to use the AuthenticationService provided by MasaStack
+                }).UseAuthentication();
         });
     }
 

diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Pm/Masa.Contrib.StackSdks.Pm.csproj b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Pm/Masa.Contrib.StackSdks.Pm.csproj
@@ -9,6 +9,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\BuildingBlocks\StackSdks\Masa.BuildingBlocks.StackSdks.Pm\Masa.BuildingBlocks.StackSdks.Pm.csproj" />
     <ProjectReference Include="..\..\..\Utils\Configuration\Masa.Utils.Configuration.Json\Masa.Utils.Configuration.Json.csproj" />
+    <ProjectReference Include="..\..\Service\Caller\Authentication\Masa.Contrib.Service.Caller.Authentication.Standard\Masa.Contrib.Service.Caller.Authentication.Standard.csproj" />
     <ProjectReference Include="..\..\Service\Caller\Masa.Contrib.Service.Caller.HttpClient\Masa.Contrib.Service.Caller.HttpClient.csproj" />
   </ItemGroup>
 

diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Pm/ServiceCollectionExtensions.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Pm/ServiceCollectionExtensions.cs
@@ -16,7 +16,7 @@ public static IServiceCollection AddPmClient(this IServiceCollection services, s
             callerOptions.UseHttpClient(builder =>
             {
                 builder.BaseAddress = pmServiceBaseAddress;
-            });
+            }).UseAuthentication();
         });
     }
 
@@ -29,7 +29,7 @@ public static IServiceCollection AddPmClient(this IServiceCollection services, F
             callerOptions.UseHttpClient(builder =>
             {
                 builder.BaseAddress = pmServiceBaseAddressFunc.Invoke();
-            }); //Need to use the AuthenticationService provided by MasaStack
+            }).UseAuthentication();
         });
     }
 

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
@@ -13,7 +13,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\BuildingBlocks\Authentication\Masa.BuildingBlocks.Authentication.Identity\Masa.BuildingBlocks.Authentication.Identity.csproj" />
     <ProjectReference Include="..\..\..\BuildingBlocks\StackSdks\Masa.BuildingBlocks.StackSdks.Scheduler\Masa.BuildingBlocks.StackSdks.Scheduler.csproj" />
-    <ProjectReference Include="..\..\Service\Caller\Authentication\Masa.Contrib.Service.Caller.Authentication.AspNetCore\Masa.Contrib.Service.Caller.Authentication.AspNetCore.csproj" />
+    <ProjectReference Include="..\..\Service\Caller\Authentication\Masa.Contrib.Service.Caller.Authentication.Standard\Masa.Contrib.Service.Caller.Authentication.Standard.csproj" />
     <ProjectReference Include="..\..\Service\Caller\Masa.Contrib.Service.Caller.HttpClient\Masa.Contrib.Service.Caller.HttpClient.csproj" />
   </ItemGroup>
 

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,7 @@ public static IServiceCollection AddSchedulerClient(this IServiceCollection serv
                 .UseHttpClient(builder =>
                 {
                     builder.Configure = opt => opt.BaseAddress = new Uri(schedulerServiceBaseAddress);
-                }); //Need to use the AuthenticationService provided by MasaStack
+                }).UseAuthentication();
         });
     }