Changed auth success ui. Switched to new interface service. Upgraded mooncore versions

Moonlight.ApiServer/Http/Controllers/Auth/AuthController.cs

@@ -26,23 +26,26 @@ public class AuthController : Controller
     private readonly TokenHelper TokenHelper;
     private readonly ConfigService<AppConfiguration> ConfigService;
     private readonly DatabaseRepository<User> UserRepository;
-    private readonly ImplementationService ImplementationService;
     private readonly ILogger<AuthController> Logger;
+    private readonly IOAuth2Provider[] OAuth2Providers;
+    private readonly IAuthInterceptor[] AuthInterceptors;
 
     public AuthController(
         OAuth2Service oAuth2Service,
         TokenHelper tokenHelper,
         DatabaseRepository<User> userRepository,
         ConfigService<AppConfiguration> configService,
-        ImplementationService implementationService,
+        ILogger<AuthController> logger,
-        ILogger<AuthController> logger)
+        IOAuth2Provider[] oAuth2Providers,
+        IAuthInterceptor[] authInterceptors)
     {
         OAuth2Service = oAuth2Service;
         TokenHelper = tokenHelper;
         UserRepository = userRepository;
         ConfigService = configService;
-        ImplementationService = implementationService;
         Logger = logger;
+        OAuth2Providers = oAuth2Providers;
+        AuthInterceptors = authInterceptors;
     }
 
     [HttpGet]
@@ -59,7 +62,7 @@ public class AuthController : Controller
         var accessData = await OAuth2Service.RequestAccess(request.Code);;
 
         // Find oauth2 provider
-        var provider = ImplementationService.Get<IOAuth2Provider>().FirstOrDefault();
+        var provider = OAuth2Providers.FirstOrDefault();
 
         if (provider == null)
             throw new HttpApiException("No oauth2 provider has been registered", 500);
@@ -71,9 +74,7 @@ public class AuthController : Controller
             throw new HttpApiException("The oauth2 provider was unable to authenticate you", 401);
         
         // Allow plugins to intercept access calls
-        var interceptors = ImplementationService.Get<IAuthInterceptor>();
+        if (AuthInterceptors.Any(interceptor => !interceptor.AllowAccess(user, HttpContext.RequestServices)))
-
-        if (interceptors.Any(interceptor => !interceptor.AllowAccess(user, HttpContext.RequestServices)))
             throw new HttpApiException("Unable to get access token", 401);
 
         // Save oauth2 refresh and access tokens for later use (re-authentication etc.).
@@ -144,7 +145,7 @@ public class AuthController : Controller
     private bool ProcessRefreshData(Dictionary<string, JsonElement> refreshTokenData, Dictionary<string, object> newData, IServiceProvider serviceProvider)
     {
         // Find oauth2 provider
-        var provider = ImplementationService.Get<IOAuth2Provider>().FirstOrDefault();
+        var provider = OAuth2Providers.FirstOrDefault();
 
         if (provider == null)
             throw new HttpApiException("No oauth2 provider has been registered", 500);
@@ -162,9 +163,7 @@ public class AuthController : Controller
             return false;
 
         // Allow plugins to intercept the refresh call
-        var interceptors = ImplementationService.Get<IAuthInterceptor>();
+        if (AuthInterceptors.Any(interceptor => !interceptor.AllowRefresh(user, serviceProvider)))
-
-        if (interceptors.Any(interceptor => !interceptor.AllowRefresh(user, serviceProvider)))
             return false;
 
         // Check if it's time to resync with the oauth2 provider

Moonlight.ApiServer/Moonlight.ApiServer.csproj

@@ -12,11 +12,11 @@
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="MoonCore" Version="1.6.6" />
+        <PackageReference Include="MoonCore" Version="1.6.7" />
         <PackageReference Include="MoonCore.Blazor" Version="1.2.4" />
         <PackageReference Include="MoonCore.Blazor.Tailwind" Version="1.0.7" />
         <PackageReference Include="MoonCore.Extended" Version="1.1.2" />
-        <PackageReference Include="MoonCore.PluginFramework" Version="1.0.0" />
+        <PackageReference Include="MoonCore.PluginFramework" Version="1.0.2" />
         <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
         <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0"/>
         <PackageReference Include="Ben.Demystifier" Version="0.4.1" />

Moonlight.ApiServer/Program.cs

@@ -1,3 +1,4 @@
+using System.Reflection;
 using System.Text.Json;
 using Microsoft.OpenApi.Models;
 using MoonCore.Extended.Abstractions;
@@ -7,6 +8,7 @@ using MoonCore.Extended.OAuth2.ApiServer;
 using MoonCore.Extensions;
 using MoonCore.Helpers;
 using MoonCore.Models;
+using MoonCore.PluginFramework.Extensions;
 using MoonCore.PluginFramework.Services;
 using MoonCore.Services;
 using Moonlight.ApiServer.Configuration;
@@ -16,6 +18,7 @@ using Moonlight.ApiServer.Helpers;
 using Moonlight.ApiServer.Helpers.Authentication;
 using Moonlight.ApiServer.Http.Middleware;
 using Moonlight.ApiServer.Implementations.OAuth2;
+using Moonlight.ApiServer.Interfaces.Auth;
 using Moonlight.ApiServer.Interfaces.OAuth2;
 
 // Prepare file system
@@ -186,12 +189,13 @@ if (configService.Get().Development.EnableApiDocs)
 }
 
 // Implementation service
-var implementationService = new ImplementationService();
+builder.Services.AddPlugins(configuration =>
-
+{
-if(config.Authentication.UseLocalOAuth2)
+    configuration.AddInterface<IOAuth2Provider>();
-    implementationService.Register<IOAuth2Provider, LocalOAuth2Provider>();
+    configuration.AddInterface<IAuthInterceptor>();
-
+    
-builder.Services.AddSingleton(implementationService);
+    configuration.AddAssembly(Assembly.GetEntryAssembly()!);
+}, logger);
 
 var app = builder.Build();
 

Moonlight.Client/Moonlight.Client.csproj

@@ -10,9 +10,9 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.6"/>
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.6" PrivateAssets="all"/>
-        <PackageReference Include="MoonCore" Version="1.6.6" />
+        <PackageReference Include="MoonCore" Version="1.6.7" />
         <PackageReference Include="MoonCore.Blazor" Version="1.2.4" />
-        <PackageReference Include="MoonCore.PluginFramework" Version="1.0.0" />
+        <PackageReference Include="MoonCore.PluginFramework" Version="1.0.2" />
         <PackageReference Include="MoonCore.Blazor.Tailwind" Version="1.0.7" />
     </ItemGroup>
 

Moonlight.Client/Program.cs

@@ -1,3 +1,4 @@
+using System.Reflection;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using MoonCore.Blazor.Extensions;
@@ -9,6 +10,7 @@ using MoonCore.Exceptions;
 using MoonCore.Extensions;
 using MoonCore.Helpers;
 using MoonCore.Models;
+using MoonCore.PluginFramework.Extensions;
 using MoonCore.PluginFramework.Services;
 using Moonlight.Client.Implementations;
 using Moonlight.Client.Interfaces;
@@ -103,16 +105,16 @@ builder.Services.AutoAddServices<Program>();
 FormComponentRepository.Set<string, StringComponent>();
 FormComponentRepository.Set<int, IntComponent>();
 
-// Implementation service
+// Interface service
-var implementationService = new ImplementationService();
+builder.Services.AddPlugins(configuration =>
-
+{
-implementationService.Register<ISidebarItemProvider, DefaultSidebarItemProvider>();
+    configuration.AddAssembly(Assembly.GetEntryAssembly()!);
-
+    
-var authUiHandler = new AuthenticationUiHandler();
+    configuration.AddInterface<IAppLoader>();
-implementationService.Register<IAppScreen>(authUiHandler);
+    configuration.AddInterface<IAppScreen>();
-implementationService.Register<IAppLoader>(authUiHandler);
+    
-
+    configuration.AddInterface<ISidebarItemProvider>();
-builder.Services.AddSingleton(implementationService);
+}, logger);
 
 var app = builder.Build();
 

Moonlight.Client/UI/Layouts/MainLayout.razor

@@ -8,10 +8,11 @@
 
 @inherits LayoutComponentBase
 
-@inject ImplementationService ImplementationService
 @inject IdentityService IdentityService
 @inject IServiceProvider ServiceProvider
 @inject ILogger<MainLayout> Logger
+@inject IAppLoader[] AppLoaders
+@inject IAppScreen[] AppScreens
 
 @if (IsLoading)
 {
@@ -98,8 +99,7 @@ else
 
     private async Task RunLoaders()
     {
-        var appLoaders = ImplementationService
+        var appLoaders = AppLoaders
-            .Get<IAppLoader>()
             .OrderBy(x => x.Priority);
 
         foreach (var loader in appLoaders) //TODO: Measure performance of every loader?
@@ -120,8 +120,7 @@ else
     {
         CurrentScreen = null;
 
-        var appScreens = ImplementationService
+        var appScreens = AppScreens
-            .Get<IAppScreen>()
             .OrderBy(x => x.Priority);
 
         foreach (var screen in appScreens)

Moonlight.Client/UI/Partials/AppSidebar.razor

@@ -6,7 +6,7 @@
 
 @inject NavigationManager Navigation
 @inject IdentityService IdentityService
-@inject ImplementationService ImplementationService
+@inject ISidebarItemProvider[] SidebarItemProviders
 
 @{
     var url = new Uri(Navigation.Uri);
@@ -168,7 +168,7 @@
 
     protected override void OnInitialized()
     {
-        Items = ImplementationService.Get<ISidebarItemProvider>()
+        Items = SidebarItemProviders
             .SelectMany(x => x.Get())
             .Where(x => x.Permission == null || (x.Permission != null && IdentityService.HasPermission(x.Permission)))
             .GroupBy(x => x.Group ?? "")

Moonlight.Client/UI/Screens/AuthenticationScreen.razor

@@ -12,6 +12,8 @@
 @inject HttpClient HttpClient
 @inject LocalStorageService LocalStorageService
 
+@inject ILogger<AuthenticationScreen> Logger
+
 @if (Code == null)
 {
     <div class="h-full w-full min-h-[100dvh] flex items-center justify-center px-5 md:px-0">
@@ -53,14 +55,10 @@ else
             @if (IsHandlingDone)
             {
                 <div class="sm:mx-auto sm:w-full sm:max-w-sm mb-5">
-                    <img class="mx-auto h-16 w-auto" src="/logolong.webp" alt="Moonlight">
+                    <img class="mx-auto w-auto h-32" src="/svg/completed.svg" alt="Completed illustration">
-                    <h2 class="mt-6 text-center text-2xl font-bold leading-9 tracking-tight text-gray-100">Login to access your account</h2>
+                    <h2 class="mt-6 text-center text-2xl font-semibold leading-9 tracking-tight text-gray-100">
-                </div>
-
-                <div class="flex justify-center">
-                    <p class="mt-3 text-center text-md text-gray-400">
                         Login successful. You can close this window now
-                    </p>
+                    </h2>
                 </div>
             }
             else
@@ -91,25 +89,35 @@ else
         if (Code == null)
             return;
 
-        var authHandleData = await HttpApiClient.PostJson<OAuth2HandleResponse>("api/auth", new OAuth2HandleRequest()
-        {
-            Code = Code
-        });
-
-        await LocalStorageService.SetString("AccessToken", authHandleData.AccessToken);
-        await LocalStorageService.SetString("RefreshToken", authHandleData.RefreshToken);
-        await LocalStorageService.Set("ExpiresAt", authHandleData.ExpiresAt);
-        
         try
         {
-            await WindowService.Close();
+            var authHandleData = await HttpApiClient.PostJson<OAuth2HandleResponse>("api/auth", new OAuth2HandleRequest()
-        }
+            {
-        finally
+                Code = Code
-        {
+            });
+
+            // Save the auth handle data
+            await LocalStorageService.SetString("AccessToken", authHandleData.AccessToken);
+            await LocalStorageService.SetString("RefreshToken", authHandleData.RefreshToken);
+            await LocalStorageService.Set("ExpiresAt", authHandleData.ExpiresAt);
+
+            // Update UI
             IsHandlingDone = true;
             await InvokeAsync(StateHasChanged);
+            await Task.Delay(TimeSpan.FromSeconds(2));
 
-            Navigation.NavigateTo("/", true);
+            try
+            {
+                await WindowService.Close();
+            }
+            finally
+            {
+                Navigation.NavigateTo("/", true);
+            }
+        }
+        catch (Exception e)
+        {
+            Logger.LogError("An unhandled error occured while handling oauth2 code: {e}", e);
         }
     }