diff --git a/Kyoo.Authentication/AuthenticationModule.cs b/Kyoo.Authentication/AuthenticationModule.cs index 61f3d929..805b01cd 100644 --- a/Kyoo.Authentication/AuthenticationModule.cs +++ b/Kyoo.Authentication/AuthenticationModule.cs @@ -110,6 +110,14 @@ namespace Kyoo.Authentication CertificateOption certificateOptions = new(); _configuration.GetSection(CertificateOption.Path).Bind(certificateOptions); + clients.AddRange(IdentityContext.GetClients()); + foreach (Client client in clients) + { + client.RedirectUris = client.RedirectUris + .Select(x => x.StartsWith("/") ? publicUrl + x : x) + .ToArray(); + } + services.AddIdentityServer(options => { options.IssuerUri = publicUrl; @@ -120,7 +128,7 @@ namespace Kyoo.Authentication .AddInMemoryIdentityResources(IdentityContext.GetIdentityResources()) .AddInMemoryApiScopes(IdentityContext.GetScopes()) .AddInMemoryApiResources(IdentityContext.GetApis()) - .AddInMemoryClients(IdentityContext.GetClients().Concat(clients)) + .AddInMemoryClients(clients) .AddProfileService() .AddSigninKeys(certificateOptions); diff --git a/Kyoo.Authentication/Kyoo.Authentication.csproj b/Kyoo.Authentication/Kyoo.Authentication.csproj index 080795b2..313f57ce 100644 --- a/Kyoo.Authentication/Kyoo.Authentication.csproj +++ b/Kyoo.Authentication/Kyoo.Authentication.csproj @@ -22,7 +22,7 @@ - + login/%(RecursiveDir)%(Filename)%(Extension) Always diff --git a/Kyoo.WebApp/Front b/Kyoo.WebApp/Front index dca10903..e2941691 160000 --- a/Kyoo.WebApp/Front +++ b/Kyoo.WebApp/Front @@ -1 +1 @@ -Subproject commit dca10903ff54a8999732695b5c2a0a5c94f85200 +Subproject commit e2941691f3f57523f2094a036bf10017195f1b58