From 082c4fa5c643f84b20fa72c586a28299b844b4de Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Thu, 29 Jun 2017 18:35:35 -0700 Subject: [PATCH] React to auth changes --- .../ForTesting/Mocks/Facebook/TestFacebookEvents.cs | 6 +++--- .../ForTesting/Mocks/Google/TestGoogleEvents.cs | 6 +++--- .../Mocks/MicrosoftAccount/TestMicrosoftAccountEvents.cs | 6 +++--- .../Mocks/OpenIdConnect/TestOpenIdConnectEvents.cs | 9 ++++----- .../ForTesting/Mocks/Twitter/TestTwitterEvents.cs | 2 +- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/samples/MusicStore/ForTesting/Mocks/Facebook/TestFacebookEvents.cs b/samples/MusicStore/ForTesting/Mocks/Facebook/TestFacebookEvents.cs index 53035a107e..cf8bb10d37 100644 --- a/samples/MusicStore/ForTesting/Mocks/Facebook/TestFacebookEvents.cs +++ b/samples/MusicStore/ForTesting/Mocks/Facebook/TestFacebookEvents.cs @@ -14,7 +14,7 @@ namespace MusicStore.Mocks.Facebook { internal static Task OnCreatingTicket(OAuthCreatingTicketContext context) { - if (context.Ticket.Principal != null) + if (context.Principal != null) { Helpers.ThrowIfConditionFailed(() => context.AccessToken == "ValidAccessToken", ""); Helpers.ThrowIfConditionFailed(() => context.Identity.FindFirst(ClaimTypes.Email)?.Value == "AspnetvnextTest@test.com", ""); @@ -24,7 +24,7 @@ namespace MusicStore.Mocks.Facebook Helpers.ThrowIfConditionFailed(() => context.User.SelectToken("id").ToString() == context.Identity.FindFirst(ClaimTypes.NameIdentifier)?.Value, ""); Helpers.ThrowIfConditionFailed(() => context.ExpiresIn.Value == TimeSpan.FromSeconds(100), ""); Helpers.ThrowIfConditionFailed(() => context.AccessToken == "ValidAccessToken", ""); - context.Ticket.Principal.Identities.First().AddClaim(new Claim("ManageStore", "false")); + context.Principal.Identities.First().AddClaim(new Claim("ManageStore", "false")); } return Task.FromResult(0); @@ -47,7 +47,7 @@ namespace MusicStore.Mocks.Facebook return Task.FromResult(0); } - internal static Task RedirectToAuthorizationEndpoint(OAuthRedirectToAuthorizationContext context) + internal static Task RedirectToAuthorizationEndpoint(RedirectContext context) { context.Response.Redirect(context.RedirectUri + "&custom_redirect_uri=custom"); return Task.FromResult(0); diff --git a/samples/MusicStore/ForTesting/Mocks/Google/TestGoogleEvents.cs b/samples/MusicStore/ForTesting/Mocks/Google/TestGoogleEvents.cs index 37eaefabd9..4dec753c30 100644 --- a/samples/MusicStore/ForTesting/Mocks/Google/TestGoogleEvents.cs +++ b/samples/MusicStore/ForTesting/Mocks/Google/TestGoogleEvents.cs @@ -14,7 +14,7 @@ namespace MusicStore.Mocks.Google { internal static Task OnCreatingTicket(OAuthCreatingTicketContext context) { - if (context.Ticket.Principal != null) + if (context.Principal != null) { Helpers.ThrowIfConditionFailed(() => context.AccessToken == "ValidAccessToken", "Access token is not valid"); Helpers.ThrowIfConditionFailed(() => context.RefreshToken == "ValidRefreshToken", "Refresh token is not valid"); @@ -24,7 +24,7 @@ namespace MusicStore.Mocks.Google Helpers.ThrowIfConditionFailed(() => context.Identity.FindFirst(ClaimTypes.Name)?.Value == "AspnetvnextTest AspnetvnextTest", "Name is not valid"); Helpers.ThrowIfConditionFailed(() => context.ExpiresIn.Value == TimeSpan.FromSeconds(1200), "ExpiresIn is not valid"); Helpers.ThrowIfConditionFailed(() => context.User != null, "User object is not valid"); - context.Ticket.Principal.Identities.First().AddClaim(new Claim("ManageStore", "false")); + context.Principal.Identities.First().AddClaim(new Claim("ManageStore", "false")); } return Task.FromResult(0); @@ -47,7 +47,7 @@ namespace MusicStore.Mocks.Google return Task.FromResult(0); } - internal static Task RedirectToAuthorizationEndpoint(OAuthRedirectToAuthorizationContext context) + internal static Task RedirectToAuthorizationEndpoint(RedirectContext context) { context.Response.Redirect(context.RedirectUri + "&custom_redirect_uri=custom"); return Task.FromResult(0); diff --git a/samples/MusicStore/ForTesting/Mocks/MicrosoftAccount/TestMicrosoftAccountEvents.cs b/samples/MusicStore/ForTesting/Mocks/MicrosoftAccount/TestMicrosoftAccountEvents.cs index ec5b2d37c4..3639a7bb27 100644 --- a/samples/MusicStore/ForTesting/Mocks/MicrosoftAccount/TestMicrosoftAccountEvents.cs +++ b/samples/MusicStore/ForTesting/Mocks/MicrosoftAccount/TestMicrosoftAccountEvents.cs @@ -14,7 +14,7 @@ namespace MusicStore.Mocks.MicrosoftAccount { internal static Task OnCreatingTicket(OAuthCreatingTicketContext context) { - if (context.Ticket.Principal != null) + if (context.Principal != null) { Helpers.ThrowIfConditionFailed(() => context.AccessToken == "ValidAccessToken", "Access token is not valid"); Helpers.ThrowIfConditionFailed(() => context.RefreshToken == "ValidRefreshToken", "Refresh token is not valid"); @@ -25,7 +25,7 @@ namespace MusicStore.Mocks.MicrosoftAccount Helpers.ThrowIfConditionFailed(() => context.ExpiresIn.Value == TimeSpan.FromSeconds(3600), "ExpiresIn is not valid"); Helpers.ThrowIfConditionFailed(() => context.User != null, "User object is not valid"); Helpers.ThrowIfConditionFailed(() => context.Identity.FindFirst(ClaimTypes.NameIdentifier)?.Value == context.User.SelectToken("id").ToString(), "User id is not valid"); - context.Ticket.Principal.Identities.First().AddClaim(new Claim("ManageStore", "false")); + context.Principal.Identities.First().AddClaim(new Claim("ManageStore", "false")); } return Task.FromResult(0); @@ -48,7 +48,7 @@ namespace MusicStore.Mocks.MicrosoftAccount return Task.FromResult(0); } - internal static Task RedirectToAuthorizationEndpoint(OAuthRedirectToAuthorizationContext context) + internal static Task RedirectToAuthorizationEndpoint(RedirectContext context) { context.Response.Redirect(context.RedirectUri + "&custom_redirect_uri=custom"); return Task.FromResult(0); diff --git a/samples/MusicStore/ForTesting/Mocks/OpenIdConnect/TestOpenIdConnectEvents.cs b/samples/MusicStore/ForTesting/Mocks/OpenIdConnect/TestOpenIdConnectEvents.cs index c17219d11a..781aa241a6 100644 --- a/samples/MusicStore/ForTesting/Mocks/OpenIdConnect/TestOpenIdConnectEvents.cs +++ b/samples/MusicStore/ForTesting/Mocks/OpenIdConnect/TestOpenIdConnectEvents.cs @@ -21,10 +21,9 @@ namespace MusicStore.Mocks.OpenIdConnect internal static Task TokenValidated(TokenValidatedContext context) { - Helpers.ThrowIfConditionFailed(() => context.Ticket != null, "context.Ticket is null."); - Helpers.ThrowIfConditionFailed(() => context.Ticket.Principal != null, "context.Ticket.Principal is null."); - Helpers.ThrowIfConditionFailed(() => context.Ticket.Principal.Identity != null, "context.Ticket.Principal.Identity is null."); - Helpers.ThrowIfConditionFailed(() => !string.IsNullOrWhiteSpace(context.Ticket.Principal.Identity.Name), "context.Ticket.Principal.Identity.Name is null."); + Helpers.ThrowIfConditionFailed(() => context.Principal != null, "context.Principal is null."); + Helpers.ThrowIfConditionFailed(() => context.Principal.Identity != null, "context.Principal.Identity is null."); + Helpers.ThrowIfConditionFailed(() => !string.IsNullOrWhiteSpace(context.Principal.Identity.Name), "context.Principal.Identity.Name is null."); eventsFired.Add(nameof(TokenValidated)); return Task.FromResult(0); } @@ -41,7 +40,7 @@ namespace MusicStore.Mocks.OpenIdConnect eventsFired.Contains(nameof(TokenValidated)) && eventsFired.Contains(nameof(AuthorizationCodeReceived))) { - ((ClaimsIdentity)context.Ticket.Principal.Identity).AddClaim(new Claim("ManageStore", "Allowed")); + ((ClaimsIdentity)context.Principal.Identity).AddClaim(new Claim("ManageStore", "Allowed")); } return Task.FromResult(0); diff --git a/samples/MusicStore/ForTesting/Mocks/Twitter/TestTwitterEvents.cs b/samples/MusicStore/ForTesting/Mocks/Twitter/TestTwitterEvents.cs index 2f8ce04fe5..fee4bc7fdb 100644 --- a/samples/MusicStore/ForTesting/Mocks/Twitter/TestTwitterEvents.cs +++ b/samples/MusicStore/ForTesting/Mocks/Twitter/TestTwitterEvents.cs @@ -41,7 +41,7 @@ namespace MusicStore.Mocks.Twitter return Task.FromResult(0); } - internal static Task RedirectToAuthorizationEndpoint(TwitterRedirectToAuthorizationEndpointContext context) + internal static Task RedirectToAuthorizationEndpoint(RedirectContext context) { context.Response.Redirect(context.RedirectUri + "&custom_redirect_uri=custom"); return Task.FromResult(0);