Skip to content

Commit 00dbc65

Browse files
committed
Little bit of refactoring
1 parent 70fa391 commit 00dbc65

3 files changed

Lines changed: 21 additions & 21 deletions

File tree

src/KK.AspNetCore.EasyAuthAuthentication.Sample/Program.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.IO;
4-
using System.Linq;
5-
using System.Threading.Tasks;
6-
using Microsoft.AspNetCore;
7-
using Microsoft.AspNetCore.Hosting;
8-
using Microsoft.Extensions.Configuration;
9-
using Microsoft.Extensions.Logging;
10-
111
namespace KK.AspNetCore.EasyAuthAuthentication.Sample
122
{
3+
using System;
4+
using System.Collections.Generic;
5+
using System.IO;
6+
using System.Linq;
7+
using System.Threading.Tasks;
8+
using Microsoft.AspNetCore;
9+
using Microsoft.AspNetCore.Hosting;
10+
using Microsoft.Extensions.Configuration;
11+
using Microsoft.Extensions.Logging;
12+
1313
public class Program
1414
{
1515
public static void Main(string[] args)
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
namespace KK.AspNetCore.EasyAuthAuthentication
22
{
3+
/// <summary>
4+
/// Default values related to Azure EasyAuth authentication handler
5+
/// </summary>
36
public static class EasyAuthAuthenticationDefaults
47
{
5-
/// <summary>
6-
/// Default values related to Azure EasyAuth authentication handler
7-
/// </summary>
88
public const string AuthenticationScheme = "EasyAuth";
9-
public const string DisplayName = "Azure Easy Auth";
9+
public const string DisplayName = "Azure Easy Auth";
1010
}
1111
}

src/KK.AspNetCore.EasyAuthAuthentication/EasyAuthAuthenticationHandler.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
5050
return AuthenticateResult.Fail(ex.Message);
5151
}
5252

53-
//build up identity from json...
54-
AuthenticationTicket ticket = BuildIdentityFromJsonPayload(payload);
53+
//build up identity from json...
54+
AuthenticationTicket ticket = BuildIdentityFromJsonPayload((JObject)payload[0]);
5555

5656
Logger.LogInformation("Set identity to user context object.");
5757
this.Context.User = ticket.Principal;
@@ -66,11 +66,11 @@ protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
6666
}
6767
}
6868

69-
private AuthenticationTicket BuildIdentityFromJsonPayload(JArray payload)
69+
private AuthenticationTicket BuildIdentityFromJsonPayload(JObject payload)
7070
{
71-
var id = payload[0]["user_id"].Value<string>();
72-
var idToken = payload[0]["id_token"].Value<string>();
73-
var providerName = payload[0]["provider_name"].Value<string>();
71+
var id = payload["user_id"].Value<string>();
72+
var idToken = payload["id_token"].Value<string>();
73+
var providerName = payload["provider_name"].Value<string>();
7474

7575
Logger.LogDebug("payload was fetched from endpoint. id: {0}", id);
7676

@@ -79,7 +79,7 @@ private AuthenticationTicket BuildIdentityFromJsonPayload(JArray payload)
7979
Logger.LogInformation("building claims from payload...");
8080

8181
List<Claim> claims = new List<Claim>();
82-
foreach (var claim in payload[0]["user_claims"])
82+
foreach (var claim in payload["user_claims"])
8383
{
8484
claims.Add(new Claim(claim["typ"].ToString(), claim["val"].ToString()));
8585
}

0 commit comments

Comments
 (0)