Added "UseCurrentAccessToken" option.

framework/src/Volo.Abp.Http.Client.IdentityModel/Volo/Abp/Http/Client/IdentityModel/IdentityModelRemoteServiceHttpClientAuthenticator.cs

@@ -22,26 +22,24 @@ namespace Volo.Abp.Http.Client.IdentityModel
 
         public async Task Authenticate(RemoteServiceHttpClientAuthenticateContext context)
         {
-            var accessToken = await GetAccessTokenFromHttpContextOrNullAsync();
-
-            if (accessToken != null)
-            {
-                context.Client.SetBearerToken(accessToken);
-            }
-            else
+            if (context.RemoteService.GetUseCurrentAccessToken() != false)
             {
-                await IdentityModelHttpClientAuthenticator.AuthenticateAsync(
-                    new IdentityModelHttpClientAuthenticateContext(
-                        context.Client,
-                        context.RemoteService.GetIdentityClient()
-                    )
-                );
+                var accessToken = await GetAccessTokenFromHttpContextOrNullAsync();
+                if (accessToken != null)
+                {
+                    context.Client.SetBearerToken(accessToken);
+                    return;
+                }
             }
+
+            await IdentityModelHttpClientAuthenticator.AuthenticateAsync(
+                context.Client,
+                context.RemoteService.GetIdentityClient()
+            );
         }
 
         protected virtual async Task<string> GetAccessTokenFromHttpContextOrNullAsync()
         {
-            //TODO: What if the access_token in the current Http Request is not usable for this client?
             var httpContext = HttpContextAccessor?.HttpContext;
             if (httpContext == null)
             {

framework/src/Volo.Abp.Http.Client.IdentityModel/Volo/Abp/Http/Client/RemoteServiceConfigurationExtensions.cs

@@ -5,19 +5,48 @@ namespace Volo.Abp.Http.Client
 {
     public static class RemoteServiceConfigurationExtensions
     {
-        public const string IdentityClient = "IdentityClient";
+        public const string IdentityClientName = "IdentityClient";
+        public const string UseCurrentAccessTokenName = "UseCurrentAccessToken";
 
         [CanBeNull]
         public static string GetIdentityClient([NotNull] this RemoteServiceConfiguration configuration)
         {
             Check.NotNullOrEmpty(configuration, nameof(configuration));
 
-            return configuration.GetOrDefault(IdentityClient);
+            return configuration.GetOrDefault(IdentityClientName);
         }
 
         public static RemoteServiceConfiguration SetIdentityClient([NotNull] this RemoteServiceConfiguration configuration, [CanBeNull] string value)
         {
-            configuration[IdentityClient] = value;
+            configuration[IdentityClientName] = value;
+            return configuration;
+        }
+
+        [CanBeNull]
+        public static bool? GetUseCurrentAccessToken([NotNull] this RemoteServiceConfiguration configuration)
+        {
+            Check.NotNullOrEmpty(configuration, nameof(configuration));
+
+            var value = configuration.GetOrDefault(UseCurrentAccessTokenName);
+            if (value == null)
+            {
+                return null;
+            }
+
+            return bool.Parse(value);
+        }
+
+        public static RemoteServiceConfiguration SetUseCurrentAccessToken([NotNull] this RemoteServiceConfiguration configuration, [CanBeNull] bool? value)
+        {
+            if (value == null)
+            {
+                configuration.Remove(UseCurrentAccessTokenName);
+            }
+            else
+            {
+                configuration[UseCurrentAccessTokenName] = value.Value.ToString().ToLowerInvariant();
+            }
+
             return configuration;
         }
     }

framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/Authentication/RemoteServiceHttpClientAuthenticateContext.cs

@@ -10,14 +10,18 @@ namespace Volo.Abp.Http.Client.Authentication
 
         public RemoteServiceConfiguration RemoteService { get; }
 
+        public string RemoteServiceName { get; }
+
         public RemoteServiceHttpClientAuthenticateContext(
             HttpClient client, 
             HttpRequestMessage request,
-            RemoteServiceConfiguration remoteService)
+            RemoteServiceConfiguration remoteService,
+            string remoteServiceName)
         {
             Client = client;
             Request = request;
             RemoteService = remoteService;
+            RemoteServiceName = remoteServiceName;
         }
     }
 }

framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs

@@ -132,7 +132,8 @@ namespace Volo.Abp.Http.Client.DynamicProxying
                     new RemoteServiceHttpClientAuthenticateContext(
                         client,
                         requestMessage,
-                        remoteServiceConfig
+                        remoteServiceConfig,
+                        clientConfig.RemoteServiceName
                     )
                 );
 

samples/MicroserviceDemo/applications/PublicWebSite.Host/PublicWebSiteHostModule.cs

@@ -66,10 +66,8 @@ namespace PublicWebSite.Host
                     options.Scope.Add("email");
                     options.Scope.Add("phone");
                     options.Scope.Add("PublicWebSiteGateway");
-                    options.Scope.Add("InternalGateway");
                     options.Scope.Add("ProductService");
                     options.Scope.Add("BloggingService");
-                    options.Scope.Add("IdentityService");
                     options.ClaimActions.MapAbpClaimTypes();
                 });
 

samples/MicroserviceDemo/microservices/BloggingService.Host/appsettings.json

@@ -9,7 +9,17 @@
   },
   "RemoteServices": {
     "Default": {
-      "BaseUrl": "http://localhost:65129/"
+      "BaseUrl": "http://localhost:65129/",
+      "UseCurrentAccessToken": "false"
+    }
+  },
+  "IdentityClients": {
+    "Default": {
+      "GrantType": "client_credentials",
+      "ClientId": "blogging-service-client",
+      "ClientSecret": "1q2w3e*",
+      "Authority": "http://localhost:64999",
+      "Scope": "InternalGateway IdentityService"
     }
   },
   "Redis": {