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

Revert "Move SPA flows to use code (#11227)" (#11596) 

This reverts commit 2287abcc3e.
This commit is contained in:
Javier Calvarro Nelson 2019-06-27 01:01:01 +02:00 committed by GitHub
parent 59292a5245
commit 1defaa5ac2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 400 additions and 1708 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Controllers/ConfigurationController.cs
View File

@ -1,29 +0,0 @@
using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
using Microsoft.AspNetCore.Mvc;
namespace ApiAuthSample.Controllers
{
public class ConfigurationController : ControllerBase
{
private readonly IClientRequestParametersProvider _clientRequestParametersProvider;
public ConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
{
_clientRequestParametersProvider = clientRequestParametersProvider;
}
[HttpGet("/_configuration/{clientId}")]
public IActionResult GetClientParameters(string clientId)
{
var parameters = _clientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
if (parameters == null)
{
return BadRequest($"Parameters for client '{clientId}' not found.");
}
else
{
return Ok(parameters);
}
}
}
}

14
src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Pages/Index.cshtml
View File

@ -14,15 +14,21 @@
</head> </head>
<body> <body>
<h1>ApiAuthSample SPA client</h1> <h1>ApiAuthSample SPA client</h1>
<button id="login" disabled>Login</button> <button id="login">Login</button>
<button id="logout" disabled>Logout</button> <button id="logout" disabled>Logout</button>
<button id="call-api" disabled>Call API</button> <button id="call-api" disabled>Call API</button>
<div id="login-result"></div> <div id="login-result"></div>
<div id="api-result"></div> <div id="api-result"></div>
<script src="/js/oidc-client.js"></script> <script src="/js/oidc-client.js"></script>
<script src="js/app.js"></script> <script id="apiauth" type="text/javascript" asp-apiauth-parameters="ApiAuthSampleSPA">
<script id="apiauth" type="text/javascript"> let $data = document.querySelector("#apiauth");
initializeApplication(); let configuration = {};
for (let key in $data.dataset) {
configuration[key] = $data.dataset[key];
}
let mgr = new Oidc.UserManager(configuration);
</script> </script>
<script src="js/app.js"></script>
</body> </body>
</html> </html>

BIN
src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/app.db
View File

Binary file not shown.

42
src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/wwwroot/js/app.js
View File

@ -1,13 +1,4 @@
var ids = { 
login: 'login',
logout: 'logout',
callApi: 'call-api',
loginResult: 'login-result',
apiResults: 'api-result'
};
let mgr = undefined;
function invokeLogin() { function invokeLogin() {
// Redirects to the Authorization Server for sign in. // Redirects to the Authorization Server for sign in.
return mgr.signinRedirect(); return mgr.signinRedirect();
@ -52,14 +43,19 @@ async function callApi() {
// Code to update the UI // Code to update the UI
if (window.location.hash || window.location.search) { if (window.location.hash) {
initializeApplication() handleAuthorizationServerCallback();
.then(() => { window.location.hash = '';
handleAuthorizationServerCallback();
window.location.hash = '';
});
} }
let ids = {
login: 'login',
logout: 'logout',
callApi: 'call-api',
loginResult: 'login-result',
apiResults: 'api-result'
};
document.onreadystatechange = function () { document.onreadystatechange = function () {
if (document.readyState === 'complete') { if (document.readyState === 'complete') {
let login = document.getElementById(ids.login); let login = document.getElementById(ids.login);
@ -72,20 +68,6 @@ document.onreadystatechange = function () {
} }
}; };
async function initializeApplication() {
const response = await fetch('_configuration/ApiAuthSampleSPA');
const configuration = await response.json();
mgr = new Oidc.UserManager(configuration);
enableLoginButton();
function enableLoginButton() {
const login = document.querySelector('#login');
login.disabled = false;
}
}
function updateUserUI(user, error) { function updateUserUI(user, error) {
let loginResults = document.getElementById(ids.loginResult); let loginResults = document.getElementById(ids.loginResult);
let heading = document.createElement('h2'); let heading = document.createElement('h2');

1881
src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/wwwroot/js/oidc-client.js
View File

File diff suppressed because one or more lines are too long

33
src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/wwwroot/js/oidc-client.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
src/Identity/ApiAuthorization.IdentityServer/src/Extensions/DefaultClientRequestParametersProvider.cs
View File

@ -38,6 +38,8 @@ namespace Microsoft.AspNetCore.ApiAuthorization.IdentityServer
{ {
case ApplicationProfiles.IdentityServerSPA: case ApplicationProfiles.IdentityServerSPA:
case ApplicationProfiles.SPA: case ApplicationProfiles.SPA:
responseType = "id_token token";
break;
case ApplicationProfiles.NativeApp: case ApplicationProfiles.NativeApp:
responseType = "code"; responseType = "code";
break; break;

8
src/Identity/ApiAuthorization.IdentityServer/src/Options/ClientBuilder.cs
View File

@ -28,9 +28,7 @@ namespace Microsoft.AspNetCore.ApiAuthorization.IdentityServer
var client = CreateClient(clientId); var client = CreateClient(clientId);
return new ClientBuilder(client) return new ClientBuilder(client)
.WithApplicationProfile(ApplicationProfiles.IdentityServerSPA) .WithApplicationProfile(ApplicationProfiles.IdentityServerSPA)
.WithAllowedGrants(GrantTypes.Code) .WithAllowedGrants(GrantTypes.Implicit)
.WithoutClientSecrets()
.WithPkce()
.WithAllowedOrigins(Array.Empty<string>()) .WithAllowedOrigins(Array.Empty<string>())
.AllowAccessTokensViaBrowser(); .AllowAccessTokensViaBrowser();
} }
@ -45,9 +43,7 @@ namespace Microsoft.AspNetCore.ApiAuthorization.IdentityServer
var client = CreateClient(clientId); var client = CreateClient(clientId);
return new ClientBuilder(client) return new ClientBuilder(client)
.WithApplicationProfile(ApplicationProfiles.SPA) .WithApplicationProfile(ApplicationProfiles.SPA)
.WithAllowedGrants(GrantTypes.Code) .WithAllowedGrants(GrantTypes.Implicit)
.WithoutClientSecrets()
.WithPkce()
.AllowAccessTokensViaBrowser(); .AllowAccessTokensViaBrowser();
} }

6
src/Identity/ApiAuthorization.IdentityServer/test/Configuration/ConfigureClientsTests.cs
View File

@ -63,7 +63,7 @@ namespace Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Configuration
Assert.Empty(client.AllowedCorsOrigins); Assert.Empty(client.AllowedCorsOrigins);
Assert.False(client.RequireConsent); Assert.False(client.RequireConsent);
Assert.Empty(client.ClientSecrets); Assert.Empty(client.ClientSecrets);
Assert.Equal(GrantTypes.Code.ToArray(), client.AllowedGrantTypes.ToArray()); Assert.Equal(GrantTypes.Implicit.ToArray(), client.AllowedGrantTypes.ToArray());
} }
[Fact] [Fact]
@ -139,7 +139,7 @@ namespace Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Configuration
Assert.Equal(new[] { expectedAllowedOrigins }, client.AllowedCorsOrigins); Assert.Equal(new[] { expectedAllowedOrigins }, client.AllowedCorsOrigins);
Assert.False(client.RequireConsent); Assert.False(client.RequireConsent);
Assert.Empty(client.ClientSecrets); Assert.Empty(client.ClientSecrets);
Assert.Equal(GrantTypes.Code.ToArray(), client.AllowedGrantTypes.ToArray()); Assert.Equal(GrantTypes.Implicit.ToArray(), client.AllowedGrantTypes.ToArray());
} }
[Fact] [Fact]
@ -175,7 +175,7 @@ namespace Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Configuration
Assert.Empty(client.AllowedCorsOrigins); Assert.Empty(client.AllowedCorsOrigins);
Assert.False(client.RequireConsent); Assert.False(client.RequireConsent);
Assert.Empty(client.ClientSecrets); Assert.Empty(client.ClientSecrets);
Assert.Equal(GrantTypes.Code.ToArray(), client.AllowedGrantTypes.ToArray()); Assert.Equal(GrantTypes.Implicit.ToArray(), client.AllowedGrantTypes.ToArray());
} }
} }
} }

2
src/Identity/ApiAuthorization.IdentityServer/test/Extensions/DefaultClientRequestParametersProviderTests.cs
View File

@ -46,7 +46,7 @@ namespace Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Extensions
["client_id"] = "SPA", ["client_id"] = "SPA",
["redirect_uri"] = "http://localhost/authentication/login-callback", ["redirect_uri"] = "http://localhost/authentication/login-callback",
["post_logout_redirect_uri"] = "http://localhost/authentication/logout-callback", ["post_logout_redirect_uri"] = "http://localhost/authentication/logout-callback",
["response_type"] = "code", ["response_type"] = "id_token token",
["scope"] = "a/b c/d" ["scope"] = "a/b c/d"
}; };

63
src/Identity/ApiAuthorization.IdentityServer/test/TagHelpers/ClientParametersTagHelperTests.cs Normal file
View File

@ -0,0 +1,63 @@
// 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.Collections.Generic;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Razor.TagHelpers;
using Moq;
using Xunit;
namespace Microsoft.AspNetCore.ApiAuthorization.IdentityServer
{
public class ClientParametersTagHelperTests
{
[Fact]
public void ProcessThrows_WhenClientIdNotFound()
{
// Arrange
var clientRequestParametersProvider = new Mock<IClientRequestParametersProvider>();
clientRequestParametersProvider.Setup(c => c.GetClientParameters(It.IsAny<HttpContext>(), It.IsAny<string>())).Returns<IDictionary<string, string>>(null);
var tagHelperContext = new TagHelperContext(new TagHelperAttributeList(), new Dictionary<object, object>(), "id");
var tagHelperOutput = new TagHelperOutput("meta", new TagHelperAttributeList(), (something, encoder) => Task.FromResult<TagHelperContent>(null));
var tagHelper = new ClientParametersTagHelper(clientRequestParametersProvider.Object);
tagHelper.ClientId = "id";
tagHelper.ViewContext = new ViewContext() { HttpContext = new DefaultHttpContext() };
// Act & Assert
var exception = Assert.Throws<InvalidOperationException>(() => tagHelper.Process(tagHelperContext, tagHelperOutput));
Assert.Equal("Parameters for client 'id' not found.", exception.Message);
}
[Fact]
public void ProcessAddsAttributesToTag_WhenClientIdFound()
{
// Arrange
var clientRequestParametersProvider = new Mock<IClientRequestParametersProvider>();
clientRequestParametersProvider.Setup(c => c.GetClientParameters(It.IsAny<HttpContext>(), It.IsAny<string>()))
.Returns(new Dictionary<string, string>()
{
["client_id"] = "SampleApp",
["scope"] = "SampleAPI openid",
["redirect_uri"] = "https://www.example.com/auth-callback",
["response_type"] = "id_token code"
});
var tagHelperContext = new TagHelperContext(new TagHelperAttributeList(), new Dictionary<object, object>(), "id");
var tagHelperOutput = new TagHelperOutput("meta", new TagHelperAttributeList(), (something, encoder) => Task.FromResult<TagHelperContent>(null));
var tagHelper = new ClientParametersTagHelper(clientRequestParametersProvider.Object);
tagHelper.ViewContext = new ViewContext() { HttpContext = new DefaultHttpContext() };
// Act
tagHelper.Process(tagHelperContext, tagHelperOutput);
// Assert
Assert.Contains(tagHelperOutput.Attributes, th => th.Name == "data-client_id" && th.Value is string value && value == "SampleApp");
Assert.Contains(tagHelperOutput.Attributes, th => th.Name == "data-scope" && th.Value is string value && value == "SampleAPI openid");
Assert.Contains(tagHelperOutput.Attributes, th => th.Name == "data-redirect_uri" && th.Value is string value && value == "https://www.example.com/auth-callback");
Assert.Contains(tagHelperOutput.Attributes, th => th.Name == "data-response_type" && th.Value is string value && value == "id_token code");
}
}
}

2
src/Identity/samples/IdentitySample.DefaultUI/Views/Shared/_LoginPartial.cshtml
View File

@ -21,4 +21,4 @@ else
<li><a asp-area="Identity" asp-page="/Account/Register">Register</a></li> <li><a asp-area="Identity" asp-page="/Account/Register">Register</a></li>
<li><a asp-area="Identity" asp-page="/Account/Login">Login</a></li> <li><a asp-area="Identity" asp-page="/Account/Login">Login</a></li>
</ul> </ul>
} }

13
src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Pages/Shared/_LoginPartial.cshtml
View File

@ -3,15 +3,6 @@
@inject SignInManager<ApplicationUser> SignInManager @inject SignInManager<ApplicationUser> SignInManager
@inject UserManager<ApplicationUser> UserManager @inject UserManager<ApplicationUser> UserManager
@{
string returnUrl = null;
var query = ViewContext.HttpContext.Request.Query;
if (query.ContainsKey("returnUrl"))
{
returnUrl = query["returnUrl"];
}
}
<ul class="navbar-nav"> <ul class="navbar-nav">
@if (SignInManager.IsSignedIn(User)) @if (SignInManager.IsSignedIn(User))
{ {
@ -27,10 +18,10 @@
else else
{ {
<li class="nav-item"> <li class="nav-item">
<a class="nav-link text-dark" asp-area="Identity" asp-page="/Account/Register" asp-route-returnUrl="@returnUrl">Register</a> <a class="nav-link text-dark" asp-area="Identity" asp-page="/Account/Register">Register</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link text-dark" asp-area="Identity" asp-page="/Account/Login" asp-route-returnUrl="@returnUrl">Login</a> <a class="nav-link text-dark" asp-area="Identity" asp-page="/Account/Login">Login</a>
</li> </li>
} }
</ul> </ul>

13
src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Pages/Shared/_LoginPartial.cshtml
View File

@ -3,15 +3,6 @@
@inject SignInManager<ApplicationUser> SignInManager @inject SignInManager<ApplicationUser> SignInManager
@inject UserManager<ApplicationUser> UserManager @inject UserManager<ApplicationUser> UserManager
@{
string returnUrl = null;
var query = ViewContext.HttpContext.Request.Query;
if (query.ContainsKey("returnUrl"))
{
returnUrl = query["returnUrl"];
}
}
<ul class="navbar-nav"> <ul class="navbar-nav">
@if (SignInManager.IsSignedIn(User)) @if (SignInManager.IsSignedIn(User))
{ {
@ -27,10 +18,10 @@
else else
{ {
<li class="nav-item"> <li class="nav-item">
<a class="nav-link text-dark" asp-area="Identity" asp-page="/Account/Register" asp-route-returnUrl="@returnUrl">Register</a> <a class="nav-link text-dark" asp-area="Identity" asp-page="/Account/Register">Register</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link text-dark" asp-area="Identity" asp-page="/Account/Login"asp-route-returnUrl="@returnUrl">Login</a> <a class="nav-link text-dark" asp-area="Identity" asp-page="/Account/Login">Login</a>
</li> </li>
} }
</ul> </ul>