From 5efaa951954646572cfca664befb8d74f60fba77 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 23 May 2016 18:26:13 -0700 Subject: [PATCH] React to google/fb endpoint revisions --- shared/Mocks/Facebook/FacebookMockBackChannelHttpHandler.cs | 4 ++-- shared/Mocks/Google/GoogleMockBackChannelHttpHandler.cs | 2 +- test/E2ETests/Implementation/FacebookLoginScenarios.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/shared/Mocks/Facebook/FacebookMockBackChannelHttpHandler.cs b/shared/Mocks/Facebook/FacebookMockBackChannelHttpHandler.cs index a65343cdcb..dfae13c0fa 100644 --- a/shared/Mocks/Facebook/FacebookMockBackChannelHttpHandler.cs +++ b/shared/Mocks/Facebook/FacebookMockBackChannelHttpHandler.cs @@ -20,7 +20,7 @@ namespace MusicStore.Mocks.Facebook { var response = new HttpResponseMessage(); - if (request.RequestUri.AbsoluteUri.StartsWith("https://graph.facebook.com/v2.5/oauth/access_token")) + if (request.RequestUri.AbsoluteUri.StartsWith("https://graph.facebook.com/v2.6/oauth/access_token")) { var formData = new FormCollection(await new FormReader(await request.Content.ReadAsStreamAsync()).ReadFormAsync()); if (formData["grant_type"] == "authorization_code") @@ -37,7 +37,7 @@ namespace MusicStore.Mocks.Facebook return response; } } - else if (request.RequestUri.AbsoluteUri.StartsWith("https://graph.facebook.com/v2.5/me")) + else if (request.RequestUri.AbsoluteUri.StartsWith("https://graph.facebook.com/v2.6/me")) { var queryParameters = new QueryCollection(QueryHelpers.ParseQuery(request.RequestUri.Query)); Helpers.ThrowIfConditionFailed(() => queryParameters["appsecret_proof"].Count > 0, "appsecret_proof is empty"); diff --git a/shared/Mocks/Google/GoogleMockBackChannelHttpHandler.cs b/shared/Mocks/Google/GoogleMockBackChannelHttpHandler.cs index 820e894849..a22dabe140 100644 --- a/shared/Mocks/Google/GoogleMockBackChannelHttpHandler.cs +++ b/shared/Mocks/Google/GoogleMockBackChannelHttpHandler.cs @@ -19,7 +19,7 @@ namespace MusicStore.Mocks.Google { var response = new HttpResponseMessage(); - if (request.RequestUri.AbsoluteUri.StartsWith("https://www.googleapis.com/oauth2/v3/token")) + if (request.RequestUri.AbsoluteUri.StartsWith("https://www.googleapis.com/oauth2/v4/token")) { var formData = new FormCollection(await new FormReader(await request.Content.ReadAsStreamAsync()).ReadFormAsync()); if (formData["grant_type"] == "authorization_code") diff --git a/test/E2ETests/Implementation/FacebookLoginScenarios.cs b/test/E2ETests/Implementation/FacebookLoginScenarios.cs index b06ec8a196..22aacd5a56 100644 --- a/test/E2ETests/Implementation/FacebookLoginScenarios.cs +++ b/test/E2ETests/Implementation/FacebookLoginScenarios.cs @@ -31,7 +31,7 @@ namespace E2ETests var content = new FormUrlEncodedContent(formParameters.ToArray()); response = await DoPostAsync("Account/ExternalLogin", content); - Assert.StartsWith("https://www.facebook.com/v2.5/dialog/oauth", response.Headers.Location.ToString()); + Assert.StartsWith("https://www.facebook.com/v2.6/dialog/oauth", response.Headers.Location.ToString()); var queryItems = new QueryCollection(QueryHelpers.ParseQuery(response.Headers.Location.Query)); Assert.Equal("code", queryItems["response_type"]); Assert.Equal("[AppId]", queryItems["client_id"]);