Skip to content

Support v2.8 with new JSON format #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stbentia wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support v2.8 with new JSON format #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions Owin.OAuth.Multitenant/Facebook/FacebookAuthenticationHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ namespace Kingdango.Owin.Security.ExtensibleMiddleware.Facebook
public class FacebookAuthenticationHandler : AuthenticationHandler<FacebookAuthenticationOptions>
{
private const string XmlSchemaString = "http://www.w3.org/2001/XMLSchema#string";
private const string TokenEndpoint = "https://graph.facebook.com/oauth/access_token";
private const string GraphApiEndpoint = "https://graph.facebook.com/me";

private const string TokenEndpoint = "https://graph.facebook.com/v2.8/oauth/access_token";
private const string GraphApiEndpoint = "https://graph.facebook.com/v2.8/me";
private readonly ILogger _logger;
private readonly HttpClient _httpClient;

Expand Down Expand Up @@ -86,13 +86,19 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()
HttpResponseMessage tokenResponse = await _httpClient.GetAsync(TokenEndpoint + "?" + tokenRequest, Request.CallCancelled);
tokenResponse.EnsureSuccessStatusCode();
string text = await tokenResponse.Content.ReadAsStringAsync();
IFormCollection form = WebHelpers.ParseForm(text);
JObject response = JObject.Parse(text);
string accessToken = response.Value<string>("access_token");
if (string.IsNullOrWhiteSpace(accessToken))
{
_logger.WriteWarning("Access token was not found");
return new AuthenticationTicket(null, properties);
}

string accessToken = form["access_token"];
string expires = form["expires"];
string expires = response.Value<string>("expires_in");
string graphAddress = WebUtilities.AddQueryString(GraphApiEndpoint, "access_token", accessToken);

HttpResponseMessage graphResponse = await _httpClient.GetAsync(
GraphApiEndpoint + "?access_token=" + Uri.EscapeDataString(accessToken), Request.CallCancelled);
HttpResponseMessage graphResponse = await _httpClient.GetAsync(graphAddress, Request.CallCancelled);
graphResponse.EnsureSuccessStatusCode();
text = await graphResponse.Content.ReadAsStringAsync();
JObject user = JObject.Parse(text);
Expand Down Expand Up @@ -251,4 +257,4 @@ private async Task<bool> InvokeReplyPathAsync()
return false;
}
}
}
}