From 69e5e1c75b14b6c356e95930987ab5570dc52df6 Mon Sep 17 00:00:00 2001 From: Masu-Baumgartner <68913099+Masu-Baumgartner@users.noreply.github.com> Date: Tue, 5 Nov 2024 16:35:24 +0100 Subject: [PATCH] Removed unused file. Fixed typo --- .../Http/Controllers/Auth/AuthController.cs | 2 +- .../UI/Components/OAuth2Handler.razor | 103 ------------------ 2 files changed, 1 insertion(+), 104 deletions(-) delete mode 100644 Moonlight.Client/UI/Components/OAuth2Handler.razor diff --git a/Moonlight.ApiServer/Http/Controllers/Auth/AuthController.cs b/Moonlight.ApiServer/Http/Controllers/Auth/AuthController.cs index 851d4a7d..5d0c1c69 100644 --- a/Moonlight.ApiServer/Http/Controllers/Auth/AuthController.cs +++ b/Moonlight.ApiServer/Http/Controllers/Auth/AuthController.cs @@ -59,7 +59,7 @@ public class AuthController : Controller [HttpPost] public async Task Handle([FromBody] OAuth2HandleRequest request) { - var accessData = await OAuth2Service.RequestAccess(request.Code);; + var accessData = await OAuth2Service.RequestAccess(request.Code); // Find oauth2 provider var provider = OAuth2Providers.FirstOrDefault(); diff --git a/Moonlight.Client/UI/Components/OAuth2Handler.razor b/Moonlight.Client/UI/Components/OAuth2Handler.razor deleted file mode 100644 index 48a5881e..00000000 --- a/Moonlight.Client/UI/Components/OAuth2Handler.razor +++ /dev/null @@ -1,103 +0,0 @@ -@using Microsoft.AspNetCore.WebUtilities - -@inject NavigationManager Navigation - -@if (IsAuthenticated) -{ - @AuthenticatedView -} -else if (IsCodeRequest) -{ - @PostAuthView -} -else -{ - if (IsAuthStateChecking) - { - if (Loader != null) - { - @Loader - } - } - else - { - @PreAuthView - } -} - -@code -{ - [Parameter] public RenderFragment PreAuthView { get; set; } - [Parameter] public RenderFragment PostAuthView { get; set; } - [Parameter] public RenderFragment AuthenticatedView { get; set; } - [Parameter] public RenderFragment? Loader { get; set; } - - [Parameter] public Func> GetAuthState { get; set; } - [Parameter] public Func> GetLoginUrl { get; set; } - [Parameter] public Func> HandleCode { get; set; } - - private bool IsAuthStateChecking = true; - private bool IsCodeRequest = false; - private bool IsAuthenticated = false; - - private string Code; - - protected override async Task OnAfterRenderAsync(bool firstRender) - { - if (!firstRender) - return; - - await Load(); - } - - private async Task Load() - { - IsAuthenticated = false; - IsAuthStateChecking = true; - - IsCodeRequest = HandleQueryCode(); - await InvokeAsync(StateHasChanged); - - if (IsCodeRequest) - { - var codeCorrect = await HandleCode.Invoke(Code); - - if (codeCorrect) - { - IsAuthenticated = true; - await InvokeAsync(StateHasChanged); - return; - } - } - - IsAuthenticated = await GetAuthState.Invoke(); - IsAuthStateChecking = false; - await InvokeAsync(StateHasChanged); - - var url = await GetLoginUrl.Invoke(); - Navigation.NavigateTo(url, true); - } - - public async Task Reload() - => await Load(); - - private bool HandleQueryCode() - { - var uri = new Uri(Navigation.Uri); - var query = QueryHelpers.ParseQuery(uri.Query); - - if (!query.TryGetValue("code", out var codeValues)) - return false; - - if (codeValues.Count == 0) - return false; - - var code = codeValues.First(); - - if (string.IsNullOrEmpty(code)) - return false; - - Code = code; - return true; - } -} \ No newline at end of file