From 01e9616828837377f88ca50847abe9f0cdab6b8c Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 5 Jan 2016 16:22:48 -0800 Subject: [PATCH] React to security changes --- shared/Mocks/Facebook/TestFacebookEvents.cs | 4 ++-- shared/Mocks/Google/TestGoogleEvents.cs | 4 ++-- .../MicrosoftAccount/TestMicrosoftAccountEvents.cs | 4 ++-- shared/Mocks/OpenIdConnect/TestOpenIdConnectEvents.cs | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/shared/Mocks/Facebook/TestFacebookEvents.cs b/shared/Mocks/Facebook/TestFacebookEvents.cs index de3a1b3c58..af073da374 100644 --- a/shared/Mocks/Facebook/TestFacebookEvents.cs +++ b/shared/Mocks/Facebook/TestFacebookEvents.cs @@ -15,7 +15,7 @@ namespace MusicStore.Mocks.Facebook { internal static Task OnCreatingTicket(OAuthCreatingTicketContext context) { - if (context.Principal != null) + if (context.Ticket.Principal != null) { Helpers.ThrowIfConditionFailed(() => context.AccessToken == "ValidAccessToken", ""); Helpers.ThrowIfConditionFailed(() => FacebookHelper.GetEmail(context.User) == "AspnetvnextTest@test.com", ""); @@ -26,7 +26,7 @@ namespace MusicStore.Mocks.Facebook Helpers.ThrowIfConditionFailed(() => context.User.SelectToken("id").ToString() == FacebookHelper.GetId(context.User), ""); Helpers.ThrowIfConditionFailed(() => context.ExpiresIn.Value == TimeSpan.FromSeconds(100), ""); Helpers.ThrowIfConditionFailed(() => context.AccessToken == "ValidAccessToken", ""); - context.Principal.Identities.First().AddClaim(new Claim("ManageStore", "false")); + context.Ticket.Principal.Identities.First().AddClaim(new Claim("ManageStore", "false")); } return Task.FromResult(0); diff --git a/shared/Mocks/Google/TestGoogleEvents.cs b/shared/Mocks/Google/TestGoogleEvents.cs index d4132ea052..c7948b9d39 100644 --- a/shared/Mocks/Google/TestGoogleEvents.cs +++ b/shared/Mocks/Google/TestGoogleEvents.cs @@ -15,7 +15,7 @@ namespace MusicStore.Mocks.Google { internal static Task OnCreatingTicket(OAuthCreatingTicketContext context) { - if (context.Principal != null) + if (context.Ticket.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.Google Helpers.ThrowIfConditionFailed(() => GoogleHelper.GetName(context.User) == "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.Principal.Identities.First().AddClaim(new Claim("ManageStore", "false")); + context.Ticket.Principal.Identities.First().AddClaim(new Claim("ManageStore", "false")); } return Task.FromResult(0); diff --git a/shared/Mocks/MicrosoftAccount/TestMicrosoftAccountEvents.cs b/shared/Mocks/MicrosoftAccount/TestMicrosoftAccountEvents.cs index cc3329d034..9471d25f1c 100644 --- a/shared/Mocks/MicrosoftAccount/TestMicrosoftAccountEvents.cs +++ b/shared/Mocks/MicrosoftAccount/TestMicrosoftAccountEvents.cs @@ -15,7 +15,7 @@ namespace MusicStore.Mocks.MicrosoftAccount { internal static Task OnCreatingTicket(OAuthCreatingTicketContext context) { - if (context.Principal != null) + if (context.Ticket.Principal != null) { Helpers.ThrowIfConditionFailed(() => context.AccessToken == "ValidAccessToken", "Access token is not valid"); Helpers.ThrowIfConditionFailed(() => context.RefreshToken == "ValidRefreshToken", "Refresh token is not valid"); @@ -26,7 +26,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(() => MicrosoftAccountHelper.GetId(context.User) == context.User.SelectToken("id").ToString(), "User id is not valid"); - context.Principal.Identities.First().AddClaim(new Claim("ManageStore", "false")); + context.Ticket.Principal.Identities.First().AddClaim(new Claim("ManageStore", "false")); } return Task.FromResult(0); diff --git a/shared/Mocks/OpenIdConnect/TestOpenIdConnectEvents.cs b/shared/Mocks/OpenIdConnect/TestOpenIdConnectEvents.cs index 13a0cf4f0e..b7c90b0026 100644 --- a/shared/Mocks/OpenIdConnect/TestOpenIdConnectEvents.cs +++ b/shared/Mocks/OpenIdConnect/TestOpenIdConnectEvents.cs @@ -28,10 +28,10 @@ namespace MusicStore.Mocks.OpenIdConnect internal static Task AuthorizationResponseRecieved(AuthorizationResponseReceivedContext context) { - Helpers.ThrowIfConditionFailed(() => context.AuthenticationTicket != null, "context.AuthenticationTicket is null."); - Helpers.ThrowIfConditionFailed(() => context.AuthenticationTicket.Principal != null, "context.AuthenticationTicket.Principal is null."); - Helpers.ThrowIfConditionFailed(() => context.AuthenticationTicket.Principal.Identity != null, "context.AuthenticationTicket.Principal.Identity is null."); - Helpers.ThrowIfConditionFailed(() => !string.IsNullOrWhiteSpace(context.AuthenticationTicket.Principal.Identity.Name), "context.AuthenticationTicket.Principal.Identity.Name is null."); + 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."); eventsFired.Add(nameof(AuthorizationResponseRecieved)); return Task.FromResult(0); } @@ -49,7 +49,7 @@ namespace MusicStore.Mocks.OpenIdConnect eventsFired.Contains(nameof(AuthorizationResponseRecieved)) && eventsFired.Contains(nameof(AuthorizationCodeReceived))) { - ((ClaimsIdentity)context.AuthenticationTicket.Principal.Identity).AddClaim(new Claim("ManageStore", "Allowed")); + ((ClaimsIdentity)context.Ticket.Principal.Identity).AddClaim(new Claim("ManageStore", "Allowed")); } return Task.FromResult(0);