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

Fix bad rebase

This commit is contained in:
Hao Kung 2016-03-03 14:01:24 -08:00
parent ace166fa31
commit 0ab5cdc6ad
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
samples/SocialSample/Startup.cs
View File

@ -322,10 +322,10 @@ namespace CookieSample
await context.Response.WriteAsync("Tokens:<br>"); await context.Response.WriteAsync("Tokens:<br>");
await context.Response.WriteAsync("Access Token: " + await AuthenticationToken.GetTokenAsync(context, CookieAuthenticationDefaults.AuthenticationScheme, "access_token") + "<br>"); await context.Response.WriteAsync("Access Token: " + await context.Authentication.GetTokenAsync("access_token") + "<br>");
await context.Response.WriteAsync("Refresh Token: " + await AuthenticationToken.GetTokenAsync(context, CookieAuthenticationDefaults.AuthenticationScheme, "refresh_token") + "<br>"); await context.Response.WriteAsync("Refresh Token: " + await context.Authentication.GetTokenAsync("refresh_token") + "<br>");
await context.Response.WriteAsync("Token Type: " + await AuthenticationToken.GetTokenAsync(context, CookieAuthenticationDefaults.AuthenticationScheme, "token_type") + "<br>"); await context.Response.WriteAsync("Token Type: " + await context.Authentication.GetTokenAsync("token_type") + "<br>");
await context.Response.WriteAsync("expires_at: " + await AuthenticationToken.GetTokenAsync(context, CookieAuthenticationDefaults.AuthenticationScheme, "expires_at") + "<br>"); await context.Response.WriteAsync("expires_at: " + await context.Authentication.GetTokenAsync("expires_at") + "<br>");
await context.Response.WriteAsync("<a href=\"/logout\">Logout</a>"); await context.Response.WriteAsync("<a href=\"/logout\">Logout</a>");
await context.Response.WriteAsync("</body></html>"); await context.Response.WriteAsync("</body></html>");
}); });

2
test/Microsoft.AspNetCore.Authentication.Test/Google/GoogleMiddlewareTests.cs
View File

@ -793,7 +793,7 @@ namespace Microsoft.AspNetCore.Authentication.Google
{ {
var authContext = new AuthenticateContext(TestExtensions.CookieAuthenticationScheme); var authContext = new AuthenticateContext(TestExtensions.CookieAuthenticationScheme);
await context.Authentication.AuthenticateAsync(authContext); await context.Authentication.AuthenticateAsync(authContext);
var tokens = AuthenticationToken.GetTokens(new AuthenticationProperties(authContext.Properties)); var tokens = new AuthenticationProperties(authContext.Properties).GetTokens();
res.Describe(tokens); res.Describe(tokens);
} }
else if (req.Path == new PathString("/me")) else if (req.Path == new PathString("/me"))