diff --git a/Kyoo/Kyoo.csproj b/Kyoo/Kyoo.csproj index 174707ee..8c55136c 100644 --- a/Kyoo/Kyoo.csproj +++ b/Kyoo/Kyoo.csproj @@ -18,6 +18,8 @@ + + diff --git a/Kyoo/Models/IdentityContext.cs b/Kyoo/Models/IdentityContext.cs index ba3700a2..407fd640 100644 --- a/Kyoo/Models/IdentityContext.cs +++ b/Kyoo/Models/IdentityContext.cs @@ -23,11 +23,14 @@ namespace Kyoo { ClientId = "kyoo.webapp", AllowedGrantTypes = GrantTypes.Code, + RequirePkce = true, + AllowAccessTokensViaBrowser = true, AllowOfflineAccess = true, RequireClientSecret = false, RequireConsent = false, + AccessTokenType = AccessTokenType.Reference, AllowedScopes = { "kyoo.admin", "kyoo.write", "kyoo.read", "openid", "profile" }, - RedirectUris = { "/logged", "/silent" }, + RedirectUris = { "/silent", "/" }, PostLogoutRedirectUris = { "/logout" } } }; diff --git a/Kyoo/Program.cs b/Kyoo/Program.cs index b73d3595..6e2f119b 100644 --- a/Kyoo/Program.cs +++ b/Kyoo/Program.cs @@ -4,6 +4,9 @@ using Kyoo.Controllers; using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; +using Serilog; +using Serilog.Events; +using Serilog.Sinks.SystemConsole.Themes; namespace Kyoo { @@ -11,12 +14,25 @@ namespace Kyoo { public static async Task Main(string[] args) { + Log.Logger = new LoggerConfiguration() + .MinimumLevel.Verbose() + .MinimumLevel.Override("Microsoft", LogEventLevel.Warning) + .MinimumLevel.Override("System", LogEventLevel.Warning) + .MinimumLevel.Override("Microsoft.AspNetCore.Authentication", LogEventLevel.Information) + .Enrich.FromLogContext() + .WriteTo.Console( + outputTemplate: + "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}", + theme: AnsiConsoleTheme.Literate) + .CreateLogger(); + Console.WriteLine($"Running as: {Environment.UserName}"); await CreateWebHostBuilder(args).Build().RunAsync(); } public static IWebHostBuilder CreateWebHostBuilder(string[] args) => WebHost.CreateDefaultBuilder(args) + .UseSerilog() .UseKestrel((config) => { config.AddServerHeader = false; }) .UseUrls("http://*:5000") .UseStartup(); diff --git a/Kyoo/Views/WebClient b/Kyoo/Views/WebClient index a0c75642..afdddfd7 160000 --- a/Kyoo/Views/WebClient +++ b/Kyoo/Views/WebClient @@ -1 +1 @@ -Subproject commit a0c75642302151caf6fc0c616305f569cc6557e5 +Subproject commit afdddfd7b12d9e31367cec4ad20c3ea2ac169f0c