huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#565 Update facebook APIs to v2.5.

This commit is contained in:
Chris R 2015-12-02 10:16:29 -08:00
parent 17e9a3336f
commit a18181d363
5 changed files with 48 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
samples/SocialSample/Startup.cs
View File

@ -1,3 +1,4 @@
using System;
using System.Linq;
using System.Net.Http;
using System.Net.Http.Headers;
@ -5,6 +6,7 @@ using System.Security.Claims;
using System.Text.Encodings.Web;
using System.Threading.Tasks;
using Microsoft.AspNet.Authentication.Cookies;
using Microsoft.AspNet.Authentication.Facebook;
using Microsoft.AspNet.Authentication.Google;
using Microsoft.AspNet.Authentication.MicrosoftAccount;
using Microsoft.AspNet.Authentication.OAuth;
@ -30,6 +32,24 @@ namespace CookieSample
{
loggerfactory.AddConsole(LogLevel.Information);
// Simple error page to avoid a repo dependency.
app.Use(async (context, next) =>
{
try
{
await next();
}
catch (Exception ex)
{
if (context.Response.HasStarted)
{
throw;
}
context.Response.StatusCode = 500;
await context.Response.WriteAsync(ex.ToString());
}
});
app.UseCookieAuthentication(options =>
{
options.AutomaticAuthenticate = true;
@ -38,10 +58,12 @@ namespace CookieSample
});
// https://developers.facebook.com/apps/
app.UseFacebookAuthentication(options =>
app.UseFacebookAuthentication(new FacebookOptions()
{
options.AppId = "569522623154478";
options.AppSecret = "a124463c4719c94b4228d9a240e5dc1a";
AppId = "569522623154478",
AppSecret = "a124463c4719c94b4228d9a240e5dc1a",
Scope = { "email" },
Fields = { "name", "email" },
});
app.UseOAuthAuthentication(new OAuthOptions

6
src/Microsoft.AspNet.Authentication.Facebook/FacebookDefaults.cs
View File

@ -7,10 +7,10 @@ namespace Microsoft.AspNet.Authentication.Facebook
{
public const string AuthenticationScheme = "Facebook";
public static readonly string AuthorizationEndpoint = "https://www.facebook.com/v2.2/dialog/oauth";
public static readonly string AuthorizationEndpoint = "https://www.facebook.com/v2.5/dialog/oauth";
public static readonly string TokenEndpoint = "https://graph.facebook.com/v2.2/oauth/access_token";
public static readonly string TokenEndpoint = "https://graph.facebook.com/v2.5/oauth/access_token";
public static readonly string UserInformationEndpoint = "https://graph.facebook.com/v2.2/me";
public static readonly string UserInformationEndpoint = "https://graph.facebook.com/v2.5/me";
}
}

32
src/Microsoft.AspNet.Authentication.Facebook/FacebookHandler.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using System.Globalization;
using System.Net.Http;
using System.Security.Claims;
@ -10,8 +9,6 @@ using System.Text;
using System.Threading.Tasks;
using Microsoft.AspNet.Authentication.OAuth;
using Microsoft.AspNet.Http.Authentication;
using Microsoft.AspNet.Http.Extensions;
using Microsoft.AspNet.Http.Internal;
using Microsoft.AspNet.WebUtilities;
using Newtonsoft.Json.Linq;
@ -24,31 +21,6 @@ namespace Microsoft.AspNet.Authentication.Facebook
{
}
protected override async Task<OAuthTokenResponse> ExchangeCodeAsync(string code, string redirectUri)
{
var queryBuilder = new QueryBuilder()
{
{ "grant_type", "authorization_code" },
{ "code", code },
{ "redirect_uri", redirectUri },
{ "client_id", Options.AppId },
{ "client_secret", Options.AppSecret },
};
var response = await Backchannel.GetAsync(Options.TokenEndpoint + queryBuilder.ToString(), Context.RequestAborted);
response.EnsureSuccessStatusCode();
var form = new FormCollection(FormReader.ReadForm(await response.Content.ReadAsStringAsync()));
var payload = new JObject();
foreach (string key in form.Keys)
{
payload.Add(string.Equals(key, "expires", StringComparison.OrdinalIgnoreCase) ? "expires_in" : key, (string)form[key]);
}
// The refresh token is not available.
return OAuthTokenResponse.Success(payload);
}
protected override async Task<AuthenticationTicket> CreateTicketAsync(ClaimsIdentity identity, AuthenticationProperties properties, OAuthTokenResponse tokens)
{
var endpoint = QueryHelpers.AddQueryString(Options.UserInformationEndpoint, "access_token", tokens.AccessToken);
@ -56,6 +28,10 @@ namespace Microsoft.AspNet.Authentication.Facebook
{
endpoint = QueryHelpers.AddQueryString(endpoint, "appsecret_proof", GenerateAppSecretProof(tokens.AccessToken));
}
if (Options.Fields.Count > 0)
{
endpoint = QueryHelpers.AddQueryString(endpoint, "fields", string.Join(",", Options.Fields));
}
var response = await Backchannel.GetAsync(endpoint, Context.RequestAborted);
response.EnsureSuccessStatusCode();

10
src/Microsoft.AspNet.Authentication.Facebook/FacebookOptions.cs
View File

@ -1,8 +1,9 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using Microsoft.AspNet.Http;
using System.Collections.Generic;
using Microsoft.AspNet.Authentication.OAuth;
using Microsoft.AspNet.Http;
namespace Microsoft.AspNet.Authentication.Facebook
{
@ -24,6 +25,7 @@ namespace Microsoft.AspNet.Authentication.Facebook
TokenEndpoint = FacebookDefaults.TokenEndpoint;
UserInformationEndpoint = FacebookDefaults.UserInformationEndpoint;
SaveTokensAsClaims = false;
Fields = new List<string>();
}
// Facebook uses a non-standard term for this field.
@ -51,5 +53,11 @@ namespace Microsoft.AspNet.Authentication.Facebook
/// This is enabled by default.
/// </summary>
public bool SendAppSecretProof { get; set; }
/// <summary>
/// The list of fields to retrieve from the UserInformationEndpoint.
/// https://developers.facebook.com/docs/graph-api/reference/user
/// </summary>
public IList<string> Fields { get; }
}
}

14
test/Microsoft.AspNet.Authentication.Test/Facebook/FacebookMiddlewareTests.cs
View File

@ -86,7 +86,7 @@ namespace Microsoft.AspNet.Authentication.Facebook
var transaction = await server.SendAsync("http://example.com/base/login");
Assert.Equal(HttpStatusCode.Redirect, transaction.Response.StatusCode);
var location = transaction.Response.Headers.Location.AbsoluteUri;
Assert.Contains("https://www.facebook.com/v2.2/dialog/oauth", location);
Assert.Contains("https://www.facebook.com/v2.5/dialog/oauth", location);
Assert.Contains("response_type=code", location);
Assert.Contains("client_id=", location);
Assert.Contains("redirect_uri=" + UrlEncoder.Default.Encode("http://example.com/base/signin-facebook"), location);
@ -113,7 +113,7 @@ namespace Microsoft.AspNet.Authentication.Facebook
var transaction = await server.SendAsync("http://example.com/login");
Assert.Equal(HttpStatusCode.Redirect, transaction.Response.StatusCode);
var location = transaction.Response.Headers.Location.AbsoluteUri;
Assert.Contains("https://www.facebook.com/v2.2/dialog/oauth", location);
Assert.Contains("https://www.facebook.com/v2.5/dialog/oauth", location);
Assert.Contains("response_type=code", location);
Assert.Contains("client_id=", location);
Assert.Contains("redirect_uri="+ UrlEncoder.Default.Encode("http://example.com/signin-facebook"), location);
@ -147,7 +147,7 @@ namespace Microsoft.AspNet.Authentication.Facebook
var transaction = await server.SendAsync("http://example.com/challenge");
Assert.Equal(HttpStatusCode.Redirect, transaction.Response.StatusCode);
var location = transaction.Response.Headers.Location.AbsoluteUri;
Assert.Contains("https://www.facebook.com/v2.2/dialog/oauth", location);
Assert.Contains("https://www.facebook.com/v2.5/dialog/oauth", location);
Assert.Contains("response_type=code", location);
Assert.Contains("client_id=", location);
Assert.Contains("redirect_uri=", location);
@ -178,11 +178,11 @@ namespace Microsoft.AspNet.Authentication.Facebook
if (req.RequestUri.GetComponents(UriComponents.SchemeAndServer | UriComponents.Path, UriFormat.UriEscaped) == FacebookDefaults.TokenEndpoint)
{
var res = new HttpResponseMessage(HttpStatusCode.OK);
var tokenResponse = new Dictionary<string, string>
var graphResponse = JsonConvert.SerializeObject(new
{
{ "access_token", "TestAuthToken" },
};
res.Content = new FormUrlEncodedContent(tokenResponse);
access_token = "TestAuthToken"
});
res.Content = new StringContent(graphResponse, Encoding.UTF8);
return res;
}
if (req.RequestUri.GetComponents(UriComponents.SchemeAndServer | UriComponents.Path, UriFormat.UriEscaped) ==