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

React to OpenId renames

This commit is contained in:
Pranav K 2016-06-03 20:03:55 -07:00
parent 120021e8a3
commit bffbfc7f9e
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/OpenIdConnect.AzureAdSample/Startup.cs
View File

@ -80,7 +80,7 @@ namespace OpenIdConnect.AzureAdSample
ClientId = clientId, ClientId = clientId,
ClientSecret = clientSecret, // for code flow ClientSecret = clientSecret, // for code flow
Authority = authority, Authority = authority,
ResponseType = OpenIdConnectResponseTypes.CodeIdToken, ResponseType = OpenIdConnectResponseType.CodeIdToken,
// GetClaimsFromUserInfoEndpoint = true, // GetClaimsFromUserInfoEndpoint = true,
Events = new OpenIdConnectEvents() Events = new OpenIdConnectEvents()
{ {

2
samples/OpenIdConnectSample/Startup.cs
View File

@ -72,7 +72,7 @@ namespace OpenIdConnectSample
ClientId = Configuration["oidc:clientid"], ClientId = Configuration["oidc:clientid"],
ClientSecret = Configuration["oidc:clientsecret"], // for code flow ClientSecret = Configuration["oidc:clientsecret"], // for code flow
Authority = Configuration["oidc:authority"], Authority = Configuration["oidc:authority"],
ResponseType = OpenIdConnectResponseTypes.Code, ResponseType = OpenIdConnectResponseType.Code,
GetClaimsFromUserInfoEndpoint = true GetClaimsFromUserInfoEndpoint = true
}); });

4
src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectHandler.cs
View File

@ -286,8 +286,8 @@ namespace Microsoft.AspNetCore.Authentication.OpenIdConnect
// Omitting the response_mode parameter when it already corresponds to the default // Omitting the response_mode parameter when it already corresponds to the default
// response_mode used for the specified response_type is recommended by the specifications. // response_mode used for the specified response_type is recommended by the specifications.
// See http://openid.net/specs/oauth-v2-multiple-response-types-1_0.html#ResponseModes // See http://openid.net/specs/oauth-v2-multiple-response-types-1_0.html#ResponseModes
if (!string.Equals(Options.ResponseType, OpenIdConnectResponseTypes.Code, StringComparison.Ordinal) || if (!string.Equals(Options.ResponseType, OpenIdConnectResponseType.Code, StringComparison.Ordinal) ||
!string.Equals(Options.ResponseMode, OpenIdConnectResponseModes.Query, StringComparison.Ordinal)) !string.Equals(Options.ResponseMode, OpenIdConnectResponseMode.Query, StringComparison.Ordinal))
{ {
message.ResponseMode = Options.ResponseMode; message.ResponseMode = Options.ResponseMode;
} }

8
src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectOptions.cs
View File

@ -38,8 +38,8 @@ namespace Microsoft.AspNetCore.Builder
/// <para>Caption: <see cref="OpenIdConnectDefaults.Caption"/>.</para> /// <para>Caption: <see cref="OpenIdConnectDefaults.Caption"/>.</para>
/// <para>ProtocolValidator: new <see cref="OpenIdConnectProtocolValidator"/>.</para> /// <para>ProtocolValidator: new <see cref="OpenIdConnectProtocolValidator"/>.</para>
/// <para>RefreshOnIssuerKeyNotFound: true</para> /// <para>RefreshOnIssuerKeyNotFound: true</para>
/// <para>ResponseType: <see cref="OpenIdConnectResponseTypes.CodeIdToken"/></para> /// <para>ResponseType: <see cref="OpenIdConnectResponseType.CodeIdToken"/></para>
/// <para>Scope: <see cref="OpenIdConnectScopes.OpenIdProfile"/>.</para> /// <para>Scope: <see cref="OpenIdConnectScope.OpenIdProfile"/>.</para>
/// <para>TokenValidationParameters: new <see cref="TokenValidationParameters"/> with AuthenticationScheme = authenticationScheme.</para> /// <para>TokenValidationParameters: new <see cref="TokenValidationParameters"/> with AuthenticationScheme = authenticationScheme.</para>
/// <para>UseTokenLifetime: false.</para> /// <para>UseTokenLifetime: false.</para>
/// </remarks> /// </remarks>
@ -144,12 +144,12 @@ namespace Microsoft.AspNetCore.Builder
/// <summary> /// <summary>
/// Gets or sets the 'response_mode'. /// Gets or sets the 'response_mode'.
/// </summary> /// </summary>
public string ResponseMode { get; set; } = OpenIdConnectResponseModes.FormPost; public string ResponseMode { get; set; } = OpenIdConnectResponseMode.FormPost;
/// <summary> /// <summary>
/// Gets or sets the 'response_type'. /// Gets or sets the 'response_type'.
/// </summary> /// </summary>
public string ResponseType { get; set; } = OpenIdConnectResponseTypes.IdToken; public string ResponseType { get; set; } = OpenIdConnectResponseType.IdToken;
/// <summary> /// <summary>
/// Gets the list of permissions to request. /// Gets the list of permissions to request.

12
test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/ExpectedQueryValues.cs
View File

@ -25,8 +25,8 @@ namespace Microsoft.AspNetCore.Authentication.Tests.OpenIdConnect
public static ExpectedQueryValues Defaults(string authority) public static ExpectedQueryValues Defaults(string authority)
{ {
var result = new ExpectedQueryValues(authority); var result = new ExpectedQueryValues(authority);
result.Scope = OpenIdConnectScopes.OpenIdProfile; result.Scope = OpenIdConnectScope.OpenIdProfile;
result.ResponseType = OpenIdConnectResponseTypes.CodeIdToken; result.ResponseType = OpenIdConnectResponseType.CodeIdToken;
return result; return result;
} }
@ -111,11 +111,11 @@ namespace Microsoft.AspNetCore.Authentication.Tests.OpenIdConnect
public string RedirectUri { get; set; } = Guid.NewGuid().ToString(); public string RedirectUri { get; set; } = Guid.NewGuid().ToString();
public OpenIdConnectRequestType RequestType { get; set; } = OpenIdConnectRequestType.AuthenticationRequest; public OpenIdConnectRequestType RequestType { get; set; } = OpenIdConnectRequestType.Authentication;
public string Resource { get; set; } = Guid.NewGuid().ToString(); public string Resource { get; set; } = Guid.NewGuid().ToString();
public string ResponseMode { get; set; } = OpenIdConnectResponseModes.FormPost; public string ResponseMode { get; set; } = OpenIdConnectResponseMode.FormPost;
public string ResponseType { get; set; } = Guid.NewGuid().ToString(); public string ResponseType { get; set; } = Guid.NewGuid().ToString();
@ -127,11 +127,11 @@ namespace Microsoft.AspNetCore.Authentication.Tests.OpenIdConnect
{ {
get get
{ {
if (RequestType == OpenIdConnectRequestType.TokenRequest) if (RequestType == OpenIdConnectRequestType.Token)
{ {
return Configuration?.EndSessionEndpoint ?? Authority + @"/oauth2/token"; return Configuration?.EndSessionEndpoint ?? Authority + @"/oauth2/token";
} }
else if (RequestType == OpenIdConnectRequestType.LogoutRequest) else if (RequestType == OpenIdConnectRequestType.Logout)
{ {
return Configuration?.TokenEndpoint ?? Authority + @"/oauth2/logout"; return Configuration?.TokenEndpoint ?? Authority + @"/oauth2/logout";
} }

4
test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/OpenIdConnectMiddlewareTests.cs
View File

@ -113,7 +113,7 @@ namespace Microsoft.AspNetCore.Authentication.Tests.OpenIdConnect
var queryValues = new ExpectedQueryValues(DefaultAuthority, configuration) var queryValues = new ExpectedQueryValues(DefaultAuthority, configuration)
{ {
RequestType = OpenIdConnectRequestType.AuthenticationRequest RequestType = OpenIdConnectRequestType.Authentication
}; };
var server = CreateServer(GetProtocolMessageOptions()); var server = CreateServer(GetProtocolMessageOptions());
var transaction = await SendAsync(server, DefaultHost + Challenge); var transaction = await SendAsync(server, DefaultHost + Challenge);
@ -135,7 +135,7 @@ namespace Microsoft.AspNetCore.Authentication.Tests.OpenIdConnect
var queryValues = new ExpectedQueryValues(DefaultAuthority, configuration) var queryValues = new ExpectedQueryValues(DefaultAuthority, configuration)
{ {
RequestType = OpenIdConnectRequestType.LogoutRequest RequestType = OpenIdConnectRequestType.Logout
}; };
var server = CreateServer(GetProtocolMessageOptions()); var server = CreateServer(GetProtocolMessageOptions());
var transaction = await SendAsync(server, DefaultHost + Signout); var transaction = await SendAsync(server, DefaultHost + Signout);