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
///
public string IdentityClientName { get; }
- ///
- ///
- ///
- /// object to be authorized
+ /// object to be authenticated
/// The identity client name configured with the .
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
+ {
+ /// Authenticator object
+ /// object to be authenticated
+ /// The identity client name configured with the .
+ 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.Instance;
}
- public async Task Authenticate(IdentityModelHttpClientAuthenticateContext context)
+ public async Task AuthenticateAsync(IdentityModelHttpClientAuthenticateContext context)
{
var accessToken = await GetAccessTokenFromServerOrNullAsync(context);