From 57622b53e77f79b2dd80449e5c8115425855a73a Mon Sep 17 00:00:00 2001
From: Halil ibrahim Kalkan <hi_kalkan@yahoo.com>
Date: Fri, 18 Jan 2019 11:16:01 +0300
Subject: [PATCH] Created IdentityModelHttpClientAuthenticatorExtensions.
 Renamed Authenticate to AuthenticateAsync

---
 ...delRemoteServiceHttpClientAuthenticator.cs |  2 +-
 .../IIdentityModelHttpClientAuthenticator.cs  |  2 +-
 ...ntityModelHttpClientAuthenticateContext.cs | 10 +++----
 ...yModelHttpClientAuthenticatorExtensions.cs | 27 +++++++++++++++++++
 ...delRemoteServiceHttpClientAuthenticator.cs |  2 +-
 5 files changed, 34 insertions(+), 9 deletions(-)
 create mode 100644 framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelHttpClientAuthenticatorExtensions.cs

diff --git a/framework/src/Volo.Abp.Http.Client.IdentityModel/Volo/Abp/Http/Client/IdentityModel/IdentityModelRemoteServiceHttpClientAuthenticator.cs b/framework/src/Volo.Abp.Http.Client.IdentityModel/Volo/Abp/Http/Client/IdentityModel/IdentityModelRemoteServiceHttpClientAuthenticator.cs
index 2a5f8871c1..b216b8e94a 100644
--- a/framework/src/Volo.Abp.Http.Client.IdentityModel/Volo/Abp/Http/Client/IdentityModel/IdentityModelRemoteServiceHttpClientAuthenticator.cs
+++ b/framework/src/Volo.Abp.Http.Client.IdentityModel/Volo/Abp/Http/Client/IdentityModel/IdentityModelRemoteServiceHttpClientAuthenticator.cs
@@ -30,7 +30,7 @@ namespace Volo.Abp.Http.Client.IdentityModel
             }
             else
             {
-                await IdentityModelHttpClientAuthenticator.Authenticate(
+                await IdentityModelHttpClientAuthenticator.AuthenticateAsync(
                     new IdentityModelHttpClientAuthenticateContext(
                         context.Client,
                         context.RemoteService.GetIdentityClient()
diff --git a/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IIdentityModelHttpClientAuthenticator.cs b/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IIdentityModelHttpClientAuthenticator.cs
index 80215263c8..09a16735ff 100644
--- a/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IIdentityModelHttpClientAuthenticator.cs
+++ b/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IIdentityModelHttpClientAuthenticator.cs
@@ -4,6 +4,6 @@ namespace Volo.Abp.IdentityModel
 {
     public interface IIdentityModelHttpClientAuthenticator
     {
-        Task Authenticate(IdentityModelHttpClientAuthenticateContext context);
+        Task AuthenticateAsync(IdentityModelHttpClientAuthenticateContext context);
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelHttpClientAuthenticateContext.cs b/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelHttpClientAuthenticateContext.cs
index 849ae7196d..441129aee7 100644
--- a/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelHttpClientAuthenticateContext.cs
+++ b/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelHttpClientAuthenticateContext.cs
@@ -1,4 +1,5 @@
 using System.Net.Http;
+using JetBrains.Annotations;
 
 namespace Volo.Abp.IdentityModel
 {
@@ -11,16 +12,13 @@ namespace Volo.Abp.IdentityModel
         /// </summary>
         public string IdentityClientName { get; }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="client"><see cref="HttpClient"/> object to be authorized</param>
+        /// <param name="client"><see cref="HttpClient"/> object to be authenticated</param>
         /// <param name="identityClientName">The identity client name configured with the <see cref="IdentityClientOptions"/>.</param>
         public IdentityModelHttpClientAuthenticateContext(
-            HttpClient client,
+            [NotNull] HttpClient client,
             string identityClientName = null)
         {
-            Client = client;
+            Client = Check.NotNull(client, nameof(client));
             IdentityClientName = identityClientName;
         }
     }
diff --git a/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelHttpClientAuthenticatorExtensions.cs b/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelHttpClientAuthenticatorExtensions.cs
new file mode 100644
index 0000000000..c40b0d8398
--- /dev/null
+++ b/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelHttpClientAuthenticatorExtensions.cs
@@ -0,0 +1,27 @@
+using System.Net.Http;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+
+namespace Volo.Abp.IdentityModel
+{
+    public static class IdentityModelHttpClientAuthenticatorExtensions
+    {
+        /// <param name="authenticator">Authenticator object</param>
+        /// <param name="client"><see cref="HttpClient"/> object to be authenticated</param>
+        /// <param name="identityClientName">The identity client name configured with the <see cref="IdentityClientOptions"/>.</param>
+        public static Task AuthenticateAsync(
+            [NotNull] this IIdentityModelHttpClientAuthenticator authenticator,
+            [NotNull] HttpClient client, 
+            string identityClientName = null)
+        {
+            Check.NotNull(authenticator, nameof(authenticator));
+
+            return authenticator.AuthenticateAsync(
+                new IdentityModelHttpClientAuthenticateContext(
+                    client,
+                    identityClientName
+                )
+            );
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelRemoteServiceHttpClientAuthenticator.cs b/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelRemoteServiceHttpClientAuthenticator.cs
index 85bf78a9c2..ee1dd28e85 100644
--- a/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelRemoteServiceHttpClientAuthenticator.cs
+++ b/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelRemoteServiceHttpClientAuthenticator.cs
@@ -25,7 +25,7 @@ namespace Volo.Abp.IdentityModel
             Logger = NullLogger<IdentityModelHttpClientAuthenticator>.Instance;
         }
 
-        public async Task Authenticate(IdentityModelHttpClientAuthenticateContext context)
+        public async Task AuthenticateAsync(IdentityModelHttpClientAuthenticateContext context)
         {
             var accessToken = await GetAccessTokenFromServerOrNullAsync(context);