Skip to content
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

Backout OpenIddict 4 upgrade #755

Merged
merged 1 commit into from
Nov 3, 2023
Merged

Backout OpenIddict 4 upgrade #755

Show file tree
Hide file tree
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
6 changes: 4 additions & 2 deletions dotnet-authserver/src/TeacherIdentity.AuthServer/Controllers/AuthorizationController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,9 +416,11 @@ public async Task<IActionResult> Exchange()
Claims.Name, Claims.Role);

// Use the client_id as the subject identifier.
identity.SetClaim(Claims.Subject, (await _applicationManager.GetClientIdAsync(application))!);
identity.AddClaim(Claims.Subject, (await _applicationManager.GetClientIdAsync(application))!,
Destinations.AccessToken, Destinations.IdentityToken);

identity.SetClaim(Claims.Name, (await _applicationManager.GetDisplayNameAsync(application))!);
identity.AddClaim(Claims.Name, (await _applicationManager.GetDisplayNameAsync(application))!,
Destinations.AccessToken, Destinations.IdentityToken);

// Note: In the original OAuth 2.0 specification, the client credentials grant
// doesn't return an identity token, which is an OpenID Connect concept.
Expand Down
8 changes: 4 additions & 4 deletions dotnet-authserver/src/TeacherIdentity.AuthServer/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,10 +357,10 @@ public static async Task Main(string[] args)
options.SetIssuer(new Uri(baseAddress));

options
.SetAuthorizationEndpointUris("connect/authorize")
.SetLogoutEndpointUris("connect/signout")
.SetTokenEndpointUris("connect/token")
.SetUserinfoEndpointUris("connect/userinfo");
.SetAuthorizationEndpointUris("/connect/authorize")
.SetLogoutEndpointUris("/connect/signout")
.SetTokenEndpointUris("/connect/token")
.SetUserinfoEndpointUris("/connect/userinfo");

options
.AllowAuthorizationCodeFlow()
Expand Down
4 changes: 2 additions & 2 deletions dotnet-authserver/src/TeacherIdentity.AuthServer/TeacherIdentity.AuthServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
<PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="2.1.175" />
<PackageReference Include="MiniValidation" Version="0.9.0" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.11" />
<PackageReference Include="OpenIddict.AspNetCore" Version="4.9.0" />
<PackageReference Include="OpenIddict.EntityFrameworkCore" Version="4.9.0" />
<PackageReference Include="OpenIddict.AspNetCore" Version="3.1.1" />
<PackageReference Include="OpenIddict.EntityFrameworkCore" Version="3.1.1" />
<PackageReference Include="Optional" Version="4.0.0" />
<PackageReference Include="Polly" Version="8.0.0" />
<PackageReference Include="RedisRateLimiting.AspNetCore" Version="1.0.9" />
Expand Down
Loading