From 1c986b3bb5823e14ae9173ec36eb765ff5ff8116 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Mon, 31 Aug 2015 10:31:58 -0700 Subject: [PATCH] Reacting to HttpAbstractions changes --- src/MusicStore.Spa/Models/ShoppingCart.cs | 2 +- src/MusicStore/Controllers/CheckoutController.cs | 2 +- src/MusicStore/Controllers/ShoppingCartController.cs | 3 ++- .../Mocks/Facebook/FacebookMockBackChannelHttpHandler.cs | 2 +- .../shared/Mocks/Google/GoogleMockBackChannelHttpHandler.cs | 2 +- .../MicrosoftAccount/MicrosoftAccountMockBackChannelHandler.cs | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/MusicStore.Spa/Models/ShoppingCart.cs b/src/MusicStore.Spa/Models/ShoppingCart.cs index 4e0a0ac7ed..41b327746f 100644 --- a/src/MusicStore.Spa/Models/ShoppingCart.cs +++ b/src/MusicStore.Spa/Models/ShoppingCart.cs @@ -185,7 +185,7 @@ namespace MusicStore.Models // We're using HttpContextBase to allow access to cookies. public string GetCartId(HttpContext context) { - var sessionCookie = context.Request.Cookies.Get("Session"); + var sessionCookie = context.Request.Cookies["Session"]; string cartId = null; if (string.IsNullOrWhiteSpace(sessionCookie)) diff --git a/src/MusicStore/Controllers/CheckoutController.cs b/src/MusicStore/Controllers/CheckoutController.cs index 2fc44e35ca..7df364aaed 100644 --- a/src/MusicStore/Controllers/CheckoutController.cs +++ b/src/MusicStore/Controllers/CheckoutController.cs @@ -41,7 +41,7 @@ namespace MusicStore.Controllers try { - if (string.Equals(formCollection.GetValues("PromoCode").FirstOrDefault(), PromoCode, + if (string.Equals(formCollection["PromoCode"].FirstOrDefault(), PromoCode, StringComparison.OrdinalIgnoreCase) == false) { return View(order); diff --git a/src/MusicStore/Controllers/ShoppingCartController.cs b/src/MusicStore/Controllers/ShoppingCartController.cs index 54a63fcd40..5f17730884 100644 --- a/src/MusicStore/Controllers/ShoppingCartController.cs +++ b/src/MusicStore/Controllers/ShoppingCartController.cs @@ -4,6 +4,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Antiforgery; using Microsoft.AspNet.Mvc; using Microsoft.Data.Entity; +using Microsoft.Framework.Primitives; using MusicStore.Models; using MusicStore.ViewModels; @@ -61,7 +62,7 @@ namespace MusicStore.Controllers { var cookieToken = string.Empty; var formToken = string.Empty; - string[] tokenHeaders = null; + StringValues tokenHeaders; string[] tokens = null; if (Context.Request.Headers.TryGetValue("RequestVerificationToken", out tokenHeaders)) diff --git a/test/E2ETests/compiler/shared/Mocks/Facebook/FacebookMockBackChannelHttpHandler.cs b/test/E2ETests/compiler/shared/Mocks/Facebook/FacebookMockBackChannelHttpHandler.cs index b020369ca6..425c0c642a 100644 --- a/test/E2ETests/compiler/shared/Mocks/Facebook/FacebookMockBackChannelHttpHandler.cs +++ b/test/E2ETests/compiler/shared/Mocks/Facebook/FacebookMockBackChannelHttpHandler.cs @@ -24,7 +24,7 @@ namespace MusicStore.Mocks.Facebook { if (queryParameters["code"] == "ValidCode") { - Helpers.ThrowIfConditionFailed(() => queryParameters["redirect_uri"].EndsWith("signin-facebook"), "Redirect URI is not ending with /signin-facebook"); + Helpers.ThrowIfConditionFailed(() => ((string)queryParameters["redirect_uri"]).EndsWith("signin-facebook"), "Redirect URI is not ending with /signin-facebook"); Helpers.ThrowIfConditionFailed(() => queryParameters["client_id"] == "[AppId]", "Invalid client Id received"); Helpers.ThrowIfConditionFailed(() => queryParameters["client_secret"] == "[AppSecret]", "Invalid client secret received"); response.Content = new StringContent("access_token=ValidAccessToken&expires=100"); diff --git a/test/E2ETests/compiler/shared/Mocks/Google/GoogleMockBackChannelHttpHandler.cs b/test/E2ETests/compiler/shared/Mocks/Google/GoogleMockBackChannelHttpHandler.cs index e862733806..7c3c30b2b0 100644 --- a/test/E2ETests/compiler/shared/Mocks/Google/GoogleMockBackChannelHttpHandler.cs +++ b/test/E2ETests/compiler/shared/Mocks/Google/GoogleMockBackChannelHttpHandler.cs @@ -24,7 +24,7 @@ namespace MusicStore.Mocks.Google { if (formData["code"] == "ValidCode") { - if (formData["redirect_uri"] != null && formData["redirect_uri"].EndsWith("signin-google") && + if (formData["redirect_uri"] != null && ((string)formData["redirect_uri"]).EndsWith("signin-google") && formData["client_id"] == "[ClientId]" && formData["client_secret"] == "[ClientSecret]") { response.Content = new StringContent("{\"access_token\":\"ValidAccessToken\",\"refresh_token\":\"ValidRefreshToken\",\"token_type\":\"Bearer\",\"expires_in\":\"1200\",\"id_token\":\"Token\"}", Encoding.UTF8, "application/json"); diff --git a/test/E2ETests/compiler/shared/Mocks/MicrosoftAccount/MicrosoftAccountMockBackChannelHandler.cs b/test/E2ETests/compiler/shared/Mocks/MicrosoftAccount/MicrosoftAccountMockBackChannelHandler.cs index ddcca7e165..c1df0b9c9c 100644 --- a/test/E2ETests/compiler/shared/Mocks/MicrosoftAccount/MicrosoftAccountMockBackChannelHandler.cs +++ b/test/E2ETests/compiler/shared/Mocks/MicrosoftAccount/MicrosoftAccountMockBackChannelHandler.cs @@ -24,7 +24,7 @@ namespace MusicStore.Mocks.MicrosoftAccount { if (formData["code"] == "ValidCode") { - if (formData["redirect_uri"] != null && formData["redirect_uri"].EndsWith("signin-microsoft") && + if (formData["redirect_uri"] != null && ((string)formData["redirect_uri"]).EndsWith("signin-microsoft") && formData["client_id"] == "[ClientId]" && formData["client_secret"] == "[ClientSecret]") { response.Content = new StringContent("{\"token_type\":\"bearer\",\"expires_in\":3600,\"scope\":\"wl.basic\",\"access_token\":\"ValidAccessToken\",\"refresh_token\":\"ValidRefreshToken\",\"authentication_token\":\"ValidAuthenticationToken\"}");