Adjusting to use new extension methods to configure and handle token auth and oauth2

Moonlight.ApiServer/Properties/launchSettings.json

@@ -9,6 +9,17 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
       "hotReloadEnabled": true
+    },
+    "WASM Debug": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": false,
+      "applicationUrl": "http://localhost:5165",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "hotReloadEnabled": true,
+      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}"
     }
   }
 }

Moonlight.Client/Implementations/AuthenticationUiHandler.cs

@@ -1,8 +1,6 @@
 using Microsoft.AspNetCore.Components;
-using MoonCore.Blazor.Helpers;
 using Moonlight.Client.Interfaces;
 using Moonlight.Client.Services;
-using Moonlight.Client.UI.Screens;
 
 namespace Moonlight.Client.Implementations;
 
@@ -11,18 +9,12 @@ public class AuthenticationUiHandler : IAppLoader, IAppScreen
     public int Priority => 0;
 
     public Task<bool> ShouldRender(IServiceProvider serviceProvider)
-    {
-        return Task.FromResult<bool>(false);
-        var identityService = serviceProvider.GetRequiredService<IdentityService>();
-        
-        return Task.FromResult(!identityService.IsLoggedIn); // Only show the screen when we are not logged in
-    }
+        => Task.FromResult(false);
 
-    public RenderFragment Render() => ComponentHelper.FromType<AuthenticationScreen>();
+    public RenderFragment Render() => throw new NotImplementedException();
 
     public async Task Load(IServiceProvider serviceProvider)
     {
-        return;
         var identityService = serviceProvider.GetRequiredService<IdentityService>();
         await identityService.Check();
     }

Moonlight.Client/Moonlight.Client.csproj

@@ -31,4 +31,8 @@
       <Folder Include="wwwroot\css\" />
     </ItemGroup>
 
+    <ItemGroup>
+      <_ContentIncludedByDefault Remove="UI\Screens\AuthenticationScreen.razor" />
+    </ItemGroup>
+
 </Project>

Moonlight.Client/Services/IdentityService.cs

@@ -9,10 +9,10 @@ namespace Moonlight.Client.Services;
 [Scoped]
 public class IdentityService
 {
-    public string Username { get; private set; }
-    public string Email { get; private set; }
-    public string[] Permissions { get; private set; }
-    public bool IsLoggedIn { get; private set; }
+    public string Username { get; private set; } = "";
+    public string Email { get; private set; } = "";
+    public string[] Permissions { get; private set; } = [];
+    public bool IsLoggedIn { get; private set; } = false;
 
     private readonly HttpApiClient HttpApiClient;
     private readonly LocalStorageService LocalStorageService;
@@ -25,20 +25,15 @@ public class IdentityService
 
     public async Task Check()
     {
-        try
-        {
-            var response = await HttpApiClient.GetJson<CheckResponse>("api/auth/check");
+        IsLoggedIn = false;
+        
+        var response = await HttpApiClient.GetJson<CheckResponse>("api/auth/check");
 
-            Username = response.Username;
-            Email = response.Email;
-            Permissions = response.Permissions;
+        Username = response.Username;
+        Email = response.Email;
+        Permissions = response.Permissions;
 
-            IsLoggedIn = true;
-        }
-        catch (HttpApiException)
-        {
-            IsLoggedIn = false;
-        }
+        IsLoggedIn = true;
 
         //await OnStateChanged?.Invoke();
     }

Moonlight.Client/UI/App.razor

@@ -1,22 +1,28 @@
 @using Moonlight.Client.UI.Layouts
+@using MoonCore.Blazor.Components
+@using Moonlight.Client.UI.Components
 
-<Router AppAssembly="@typeof(App).Assembly">
-    <Found Context="routeData">
-        <CascadingValue Name="TargetPageType" Value="routeData.PageType">
-            <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)"/>
-        </CascadingValue>
-    </Found>
-    <NotFound>
-        <PageTitle>Not found</PageTitle>
-        <LayoutView Layout="@typeof(MainLayout)">
-            <div class="flex flex-col justify-center text-center">
-                <img class="h-48 mt-5 mb-3" src="/svg/notfound.svg" alt="Not found illustration"/>
+<ErrorLogger>
+    <OAuth2AuthenticationHandler>
+        <Router AppAssembly="@typeof(App).Assembly">
+            <Found Context="routeData">
+                <CascadingValue Name="TargetPageType" Value="routeData.PageType">
+                    <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)"/>
+                </CascadingValue>
+            </Found>
+            <NotFound>
+                <PageTitle>Not found</PageTitle>
+                <LayoutView Layout="@typeof(MainLayout)">
+                    <div class="flex flex-col justify-center text-center">
+                        <img class="h-48 mt-5 mb-3" src="/svg/notfound.svg" alt="Not found illustration"/>
 
-                <h3 class="mt-2 font-semibold text-white text-lg">Page not found</h3>
-                <p class="mt-1 text-gray-300">
-                    The page you requested does not exist
-                </p>
-            </div>
-        </LayoutView>
-    </NotFound>
-</Router>
+                        <h3 class="mt-2 font-semibold text-white text-lg">Page not found</h3>
+                        <p class="mt-1 text-gray-300">
+                            The page you requested does not exist
+                        </p>
+                    </div>
+                </LayoutView>
+            </NotFound>
+        </Router>
+    </OAuth2AuthenticationHandler>
+</ErrorLogger>

Moonlight.Client/UI/Components/TestyHmm.razor

@@ -1,78 +0,0 @@
-@using Microsoft.AspNetCore.WebUtilities
-@using MoonCore.Blazor.Services
-@using MoonCore.Exceptions
-@using MoonCore.Helpers
-@inherits ErrorBoundaryBase
-
-@inject NavigationManager Navigation
-@inject OAuth2FrontendService OAuth2FrontendService
-
-@if (IsCompleting)
-{
-    
-}
-else
-{
-    @ChildContent
-}
-
-@code
-{
-    private bool IsCompleting = false;
-    private string Code;
-
-    protected override void OnInitialized()
-    {
-        var uri = new Uri(Navigation.Uri);
-
-        if (!QueryHelpers.ParseQuery(uri.Query).TryGetValue("code", out var codeSv))
-            return;
-        
-        try
-        {
-            if (codeSv.Count == 0 || string.IsNullOrEmpty(codeSv.First()))
-                return;
-
-            var code = codeSv.First();
-
-            Code = code!;
-            IsCompleting = true;
-        }
-        catch (Exception e)
-        {
-            Console.WriteLine("FUUCK");
-            Console.WriteLine(e);
-            throw;
-        }
-    }
-
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        if (!firstRender)
-            return;
-        
-        if(!IsCompleting)
-            return;
-
-        if (!await OAuth2FrontendService.Complete(Code))
-            await RedirectToAuth();
-
-        IsCompleting = false;
-        await InvokeAsync(StateHasChanged);
-    }
-
-    protected override async Task OnErrorAsync(Exception exception)
-    {
-        if (exception is not HttpApiException httpApiException || httpApiException.Status != 401)
-            throw exception;
-
-        // If we reach this point, we got a 401 unauthenticated, so we need to log in
-        await RedirectToAuth();
-    }
-
-    private async Task RedirectToAuth()
-    {
-        var url = await OAuth2FrontendService.Start();
-        Navigation.NavigateTo(url, true);
-    }
-}

Moonlight.Client/UI/Layouts/MainLayout.razor

@@ -35,16 +35,12 @@ else
 
             <main class="py-10">
                 <div class="px-4 sm:px-6 lg:px-8">
-                    <ErrorHandler CustomHandler="HandleException">
-
-                        <TestyHmm>
-                            <PermissionHandler CheckFunction="CheckPermission">
-                                <CascadingValue Value="this" IsFixed="true">
-                                    @Body
-                                </CascadingValue>
-                            </PermissionHandler>
-                        </TestyHmm>
-
+                    <ErrorHandler>
+                        <PermissionHandler CheckFunction="CheckPermission">
+                            <CascadingValue Value="this" IsFixed="true">
+                                @Body
+                            </CascadingValue>
+                        </PermissionHandler>
                     </ErrorHandler>
                 </div>
             </main>
@@ -110,6 +106,10 @@ else
                 Logger.LogDebug("Running application loader '{name}'", loader.GetType().Name);
                 await loader.Load(ServiceProvider);
             }
+            catch (HttpApiException)
+            {
+                throw;
+            }
             catch (Exception e)
             {
                 Logger.LogCritical("An app loader threw an unhandled exception: {e}", e);
@@ -139,15 +139,4 @@ else
     }
 
     private bool CheckPermission(string permission) => IdentityService.HasPermission(permission);
-
-    private Task<bool> HandleException(Exception exception, ErrorHandler handler)
-    {
-        if (exception is HttpApiException httpApiException && httpApiException.Status == 401)
-        {
-            Task.Run(Load);
-            return Task.FromResult(true);
-        }
-
-        return Task.FromResult(false);
-    }
 }

Moonlight.Client/UI/Screens/AuthenticationScreen.razor

@@ -1,186 +0,0 @@
-@page "/auth"
-
-@using MoonCore.Blazor.Services
-@using MoonCore.Helpers
-@using Moonlight.Client.Services
-@using Moonlight.Shared.Http.Requests.Auth
-@using Moonlight.Shared.Http.Responses.Auth
-
-@inject NavigationManager Navigation
-@inject HttpApiClient HttpApiClient
-@inject WindowService WindowService
-@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">
-
-        <div class="card card-body w-full max-w-lg">
-            @if (IsAuthenticating)
-            {
-                <div class="sm:mx-auto sm:w-full sm:max-w-sm mb-5">
-                    <h2 class="mt-6 text-center text-2xl font-bold leading-9 tracking-tight text-gray-100">Login flow started in new window/tab</h2>
-                </div>
-
-                <div class="flex justify-center">
-                    <div id="loader" class="my-10"></div>
-                </div>
-            }
-            else
-            {
-                <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">
-                    <h2 class="mt-6 text-center text-2xl font-bold leading-9 tracking-tight text-gray-100">Login to access your account</h2>
-                </div>
-
-                <div class="flex justify-center">
-                    <WButton OnClick="StartAuth" CssClasses="btn btn-primary">
-                        Proceed to login
-                        <i class="bi bi-arrow-right"></i>
-                    </WButton>
-                </div>
-            }
-        </div>
-
-    </div>
-}
-else
-{
-    <div class="h-full w-full min-h-[100dvh] flex items-center justify-center px-5 md:px-0">
-
-        <div class="card card-body w-full max-w-lg">
-            @if (IsHandlingDone)
-            {
-                <div class="sm:mx-auto sm:w-full sm:max-w-sm mb-5">
-                    <img class="mx-auto w-auto h-32" src="/svg/completed.svg" alt="Completed illustration">
-                    <h2 class="mt-6 text-center text-2xl font-semibold leading-9 tracking-tight text-gray-100">
-                        Login successful. You can close this window now
-                    </h2>
-                </div>
-            }
-            else
-            {
-                <div class="flex justify-center">
-                    <div id="loader"></div>
-                </div>
-            }
-        </div>
-
-    </div>
-}
-
-@code
-{
-    [SupplyParameterFromQuery(Name = "code")]
-    [Parameter]
-    public string? Code { get; set; }
-
-    private bool IsAuthenticating = false;
-    private bool IsHandlingDone = false;
-
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        if (!firstRender)
-            return;
-
-        if (Code == null)
-            return;
-
-        try
-        {
-            var authHandleData = await HttpApiClient.PostJson<OAuth2HandleResponse>("api/auth", new OAuth2HandleRequest()
-            {
-                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);
-
-            try
-            {
-                await WindowService.Close();
-            }
-            finally
-            {
-                await Task.Delay(TimeSpan.FromSeconds(2));
-                
-                Navigation.NavigateTo("/", true);
-            }
-        }
-        catch (Exception e)
-        {
-            Logger.LogError("An unhandled error occured while handling oauth2 code: {e}", e);
-        }
-    }
-
-    private async Task StartAuth(WButton _)
-    {
-        var authStartData = await HttpApiClient.GetJson<OAuth2StartResponse>("api/auth");
-
-        var uri = authStartData.Endpoint
-                  + $"?client_id={authStartData.ClientId}" +
-                  $"&redirect_uri={authStartData.RedirectUri}" +
-                  $"&response_type=code";
-
-        Navigation.NavigateTo(uri, true);
-        return;
-        
-        // TODO: Make this configurable
-        
-        try
-        {
-            await WindowService.Open(
-                uri,
-                "OAuth2 Flow",
-                600,
-                470
-            );
-
-            IsAuthenticating = true;
-            await InvokeAsync(StateHasChanged);
-
-            Task.Run(async () =>
-            {
-                while (true)
-                {
-                    await Task.Delay(1000);
-
-                    try
-                    {
-                        if(!await LocalStorageService.ContainsKey("AccessToken"))
-                            continue;
-                        
-                        if (HttpClient.DefaultRequestHeaders.Contains("Authorization"))
-                            HttpClient.DefaultRequestHeaders.Remove("Authorization");
-
-                        HttpClient.DefaultRequestHeaders.Add("Authorization", "Bearer " + await LocalStorageService.GetString("AccessToken"));
-
-                        var res = await HttpClient.GetAsync("api/auth/check");
-
-                        if (res.IsSuccessStatusCode)
-                            break;
-                    }
-                    catch (Exception e)
-                    {
-                        Console.WriteLine(e);
-                    }
-                }
-                
-                Navigation.NavigateTo(Navigation.Uri, true);
-            });
-        }
-        catch (Exception)
-        {
-            Navigation.NavigateTo(uri, true);
-        }
-    }
-}