DotBased

@@ -1 +1 @@
-Subproject commit 17f69824eb3a854be545c3517c8ecd4bb63eab7b
+Subproject commit 0fed89e140c1500495e01f1f836416f107dcdbce

SharpRSS.Blazor/Components/Pages/Auth/Login.razor

@@ -1,18 +0,0 @@
-@page "/Auth/Login"
-@using SharpRSS.Blazor.Extensions
-@inject NavigationManager NavigationManager
-@attribute [AllowAnonymous]
-
-<PageTitle>Login | SharpRSS</PageTitle>
-
-@code {
-    
-    private string RedirectAfterLogin { get; set; } = string.Empty;
-    
-    protected override Task OnInitializedAsync()
-    {
-        RedirectAfterLogin = NavigationManager.GetQueryParameters().TryGetValue("RedirectUrl", out var redirectUrl) ? redirectUrl.ToString() : string.Empty;
-        //TODO: Checking based auth or external (OIDC, etc.)
-        return base.OnInitializedAsync();
-    }
-}

SharpRSS.Blazor/Components/Redirector.razor

@@ -1,29 +0,0 @@
-@inject NavigationManager NavigationManager
-
-<PageTitle>Redirecting...</PageTitle>
-<MudElement>
-    <MudOverlay DarkBackground="true" Visible="true">
-        <MudProgressCircular Size="Size.Large" Color="Color.Primary" Indeterminate="true"/>
-    </MudOverlay>
-</MudElement>
-
-@code {
-    
-    [CascadingParameter]
-    private Task<AuthenticationState> AuthStateTask { get; set; } = null!;
-    [Parameter]
-    [EditorRequired]
-    public string RedirectUri { get; set; }
-    private bool _isAuthenticated;
-    
-    protected override async Task OnInitializedAsync()
-    {
-        var authState = await AuthStateTask;
-        if (authState.User.Identity != null) _isAuthenticated = authState.User.Identity.IsAuthenticated;
-        
-        NavigationManager.NavigateTo(RedirectUri);
-        
-        await base.OnInitializedAsync();
-    }
-
-}

SharpRSS.Blazor/Components/Routes.razor

@@ -1,16 +1,7 @@
-<CascadingAuthenticationState>
-    <Router AppAssembly="typeof(Program).Assembly">
+<Router AppAssembly="typeof(Program).Assembly">
     <Found Context="routeData">
-            @*<RouteView RouteData="routeData" DefaultLayout="typeof(Layout.MainLayout)"/>
-            <FocusOnNavigate RouteData="routeData" Selector="h1"/>*@
-            <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(EmptyLayout)">
-                <Authorizing>
-                    <p>Determining session state, please wait...</p>
-                </Authorizing>
-                <NotAuthorized>
-                    <Redirector RedirectUri="/auth/login"/>
-                </NotAuthorized>
-            </AuthorizeRouteView>
+        <RouteView RouteData="routeData" DefaultLayout="typeof(Layout.MainLayout)"/>
+        <FocusOnNavigate RouteData="routeData" Selector="h1"/>
     </Found>
     <NotFound>
         <LayoutView Layout="@typeof(EmptyLayout)">
@@ -19,5 +10,4 @@
             <p>Page not found!</p>
         </LayoutView>
     </NotFound>
-    </Router>
-</CascadingAuthenticationState>
+</Router>

SharpRSS.Blazor/Extensions/NavigationManagerExtensions.cs

@@ -1,14 +0,0 @@
-using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.WebUtilities;
-using Microsoft.Extensions.Primitives;
-
-namespace SharpRSS.Blazor.Extensions;
-
-public static class NavigationManagerExtensions
-{
-    public static Dictionary<string, StringValues> GetQueryParameters(this NavigationManager navigationManager)
-    {
-        var uri = navigationManager.ToAbsoluteUri(navigationManager.Uri);
-        return QueryHelpers.ParseQuery(uri.Query);
-    }
-}

SharpRSS.Blazor/Program.cs

@@ -23,10 +23,8 @@ builder.Services.AddBasedServerAuth(options =>
     options.LogoutPath = "/auth/logout";
     options.SeedData = service =>
     {
-        service.CreateUserAsync(new UserModel() { UserName = "Admin", Email = "admin@example.com", Enabled = true, PasswordHash  = "password", Roles =
-            [new RoleModel { Name = "Admin", Description = "Administration role." }]
-        });
-        service.CreateUserAsync(new UserModel() { UserName = "User", Email = "user@example.com", Enabled = true, PasswordHash = "password"});
+        /*service.CreateUserAsync(new UserModel() { UserName = "Admin", Email = "admin@example.com", Enabled = true, PasswordHash  = "password", Roles = new List<RoleModel>() { new RoleModel() { Name = "Admin", Description = "Administration role." }}});
+        service.CreateUserAsync(new UserModel() { UserName = "User", Email = "user@example.com", Enabled = true, PasswordHash = "password"});*/
     };
     options.SetDataRepositoryType<MemoryAuthDataRepository>();
     options.SetSessionStateProviderType<LocalStorageSessionStateProvider>();