Cutlery/Kavita
1
0
Fork 0
mirror of https://github.com/Kareadita/Kavita.git synced 2026-06-06 06:45:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Inherit web links for Series and bug fixes (#4152)

Browse Source
This commit is contained in:
Fesaa
2025-10-25 21:35:53 +02:00
committed by GitHub
parent 935ed96416
commit 76f9e085eb
31 changed files with 4284 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
API/Extensions/IdentityServiceExtensions.cs
+46 -3
View File
@@ -4,6 +4,7 @@ using System.IdentityModel.Tokens.Jwt;
using System.Linq;
using System.Security.Claims;
using System.Text;
using System.Text.Json;
using System.Threading.Tasks;
using API.Constants;
using API.Data;
@@ -161,6 +162,8 @@ public static class IdentityServiceExtensions
new HttpDocumentRetriever { RequireHttps = !isDevelopment }
);
services.AddSingleton(configurationManager);
ICollection<string> supportedScopes;
try
{
@@ -242,11 +245,11 @@ public static class IdentityServiceExtensions
options.GetClaimsFromUserInfoEndpoint = true;
// Due to some (Authelia) OIDC providers, we need to map these claims explicitly. Such that no flow breaks in the
// OidcService
// OidcService. Claims from the UserInfoEndPoint are not added automatically, we map some to the claim we need.
// And copy all over down below
options.MapInboundClaims = true;
options.ClaimActions.MapJsonKey(ClaimTypes.Email, "email");
options.ClaimActions.MapJsonKey(ClaimTypes.Name, "name");
options.ClaimActions.MapJsonKey(JwtRegisteredClaimNames.PreferredUsername, "preferred_username");
options.ClaimActions.MapJsonKey(ClaimTypes.GivenName, "given_name");
options.Scope.Clear();
@@ -258,7 +261,47 @@ public static class IdentityServiceExtensions
options.Events = new OpenIdConnectEvents
{
OnTicketReceived = OidcClaimsPrincipalConverter,
OnTicketReceived = async ctx =>
{
try
{
await OidcClaimsPrincipalConverter(ctx);
}
catch (KavitaException ex)
{
Log.Error(ex, "An exception occured during initial OIDC flow");
ctx.Response.Redirect(baseUrl + "login?skipAutoLogin=true&error=" + Uri.EscapeDataString(ex.Message));
ctx.HandleResponse();
}
},
OnUserInformationReceived = ctx =>
{
if (ctx.Principal?.Identity == null)
{
return Task.CompletedTask;
}
var identity = (ClaimsIdentity) ctx.Principal.Identity;
// Copy all claims over as in, the ones we need mapped to something specific are above
foreach (var property in ctx.User.RootElement.EnumerateObject())
{
var claimType = property.Name;
if (property.Value.ValueKind == JsonValueKind.Array)
{
foreach (var element in property.Value.EnumerateArray())
{
identity.AddClaim(new Claim(claimType, element.ToString(), ClaimValueTypes.String, OpenIdConnect));
}
}
else
{
identity.AddClaim(new Claim(claimType, property.Value.ToString(), ClaimValueTypes.String, OpenIdConnect));
}
}
return Task.CompletedTask;
},
OnAuthenticationFailed = ctx =>
{
ctx.Response.Redirect(baseUrl + "login?skipAutoLogin=true&error=" + Uri.EscapeDataString(ctx.Exception.Message));