Browse Source

Created IdentityModelHttpClientAuthenticatorExtensions. Renamed Authenticate to AuthenticateAsync

pull/746/head
Halil ibrahim Kalkan 8 years ago
parent
commit
57622b53e7
  1. 2
      framework/src/Volo.Abp.Http.Client.IdentityModel/Volo/Abp/Http/Client/IdentityModel/IdentityModelRemoteServiceHttpClientAuthenticator.cs
  2. 2
      framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IIdentityModelHttpClientAuthenticator.cs
  3. 10
      framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelHttpClientAuthenticateContext.cs
  4. 27
      framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelHttpClientAuthenticatorExtensions.cs
  5. 2
      framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelRemoteServiceHttpClientAuthenticator.cs

2
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 else
{ {
await IdentityModelHttpClientAuthenticator.Authenticate( await IdentityModelHttpClientAuthenticator.AuthenticateAsync(
new IdentityModelHttpClientAuthenticateContext( new IdentityModelHttpClientAuthenticateContext(
context.Client, context.Client,
context.RemoteService.GetIdentityClient() context.RemoteService.GetIdentityClient()

2
framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IIdentityModelHttpClientAuthenticator.cs

@ -4,6 +4,6 @@ namespace Volo.Abp.IdentityModel
{ {
public interface IIdentityModelHttpClientAuthenticator public interface IIdentityModelHttpClientAuthenticator
{ {
Task Authenticate(IdentityModelHttpClientAuthenticateContext context); Task AuthenticateAsync(IdentityModelHttpClientAuthenticateContext context);
} }
} }

10
framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelHttpClientAuthenticateContext.cs

@ -1,4 +1,5 @@
using System.Net.Http; using System.Net.Http;
using JetBrains.Annotations;
namespace Volo.Abp.IdentityModel namespace Volo.Abp.IdentityModel
{ {
@ -11,16 +12,13 @@ namespace Volo.Abp.IdentityModel
/// </summary> /// </summary>
public string IdentityClientName { get; } public string IdentityClientName { get; }
/// <summary> /// <param name="client"><see cref="HttpClient"/> object to be authenticated</param>
///
/// </summary>
/// <param name="client"><see cref="HttpClient"/> object to be authorized</param>
/// <param name="identityClientName">The identity client name configured with the <see cref="IdentityClientOptions"/>.</param> /// <param name="identityClientName">The identity client name configured with the <see cref="IdentityClientOptions"/>.</param>
public IdentityModelHttpClientAuthenticateContext( public IdentityModelHttpClientAuthenticateContext(
HttpClient client, [NotNull] HttpClient client,
string identityClientName = null) string identityClientName = null)
{ {
Client = client; Client = Check.NotNull(client, nameof(client));
IdentityClientName = identityClientName; IdentityClientName = identityClientName;
} }
} }

27
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
)
);
}
}
}

2
framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelRemoteServiceHttpClientAuthenticator.cs

@ -25,7 +25,7 @@ namespace Volo.Abp.IdentityModel
Logger = NullLogger<IdentityModelHttpClientAuthenticator>.Instance; Logger = NullLogger<IdentityModelHttpClientAuthenticator>.Instance;
} }
public async Task Authenticate(IdentityModelHttpClientAuthenticateContext context) public async Task AuthenticateAsync(IdentityModelHttpClientAuthenticateContext context)
{ {
var accessToken = await GetAccessTokenFromServerOrNullAsync(context); var accessToken = await GetAccessTokenFromServerOrNullAsync(context);

Loading…
Cancel
Save