Skip login page if user is already logged in

usercode · Oct 14, 2022 · fb376ec · fb376ec
1 parent 9bee806
commit fb376ec
Show file tree

Hide file tree

Showing 38 changed files with 175 additions and 151 deletions.
diff --git a/src/DragonFly.API.Client/ClientContentService.ContentSchema.cs b/src/DragonFly.API.Client/ClientContentService.ContentSchema.cs
@@ -2,24 +2,11 @@
 // https://github.com/usercode/DragonFly
 // MIT License
 
-using DragonFly.AspNetCore;
 using DragonFly.AspNetCore.Exports;
-using DragonFly.AspNetCore.API.Exports;
 using DragonFly.AspNetCore.API.Models;
-using DragonFly.Content;
-using DragonFly.Contents.Content;
-using DragonFly.Core;
-using DragonFly.Data;
 using DragonFly.Data.Models;
-using DragonFly.Models;
-using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
 using System.Net.Http.Json;
-using System.Threading.Tasks;
 
 namespace DragonFly.Client;
 
@@ -63,6 +50,11 @@ public async Task UpdateAsync(ContentSchema entity)
         await Client.PutAsJsonAsync($"api/schema", entity.ToRest());
     }
 
+    public async Task DeleteAsync(ContentSchema entity)
+    {
+        await Client.DeleteAsync($"api/schema/{entity.Id}");
+    }
+
     public async Task<QueryResult<ContentSchema>> QuerySchemasAsync()
     {
         try

diff --git a/src/DragonFly.API/Extensions/ContentSchemaApiExtensions.cs b/src/DragonFly.API/Extensions/ContentSchemaApiExtensions.cs
@@ -3,23 +3,12 @@
 // MIT License
 
 using DragonFly.AspNet.Middleware;
-using DragonFly.AspNetCore.API.Exports;
-using DragonFly.AspNetCore.API.Middlewares;
-using DragonFly.AspNetCore.API.Middlewares.ContentSchemas;
 using DragonFly.AspNetCore.API.Models;
 using DragonFly.AspNetCore.Exports;
-using DragonFly.Content;
-using DragonFly.Builders;
 using DragonFly.Data.Models;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing;
-using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace DragonFly.AspNetCore.API.Middlewares.ContentSchemas;
 
@@ -32,6 +21,7 @@ public static void MapContentSchemaRestApi(this IDragonFlyEndpointRouteBuilder e
         endpoints.MapGet("api/schema/{name}", MapGetByName);            
         endpoints.MapPost("api/schema", MapCreate);
         endpoints.MapPut("api/schema", MapUpdate);
+        endpoints.MapDelete("api/schema/{id:guid}", MapDelete);
     }
 
     private static async Task<QueryResult<RestContentSchema>> MapQuery(HttpContext context, ISchemaStorage storage)
@@ -83,4 +73,11 @@ private static async Task MapUpdate(HttpContext context, ISchemaStorage storage,
 
         await storage.UpdateAsync(m);
     }
+
+    private static async Task MapDelete(HttpContext context, ISchemaStorage storage, Guid id)
+    {
+        ContentSchema schema = await storage.GetSchemaAsync(id);
+
+        await storage.DeleteAsync(schema);
+    }
 }
diff --git a/src/DragonFly.App.Server/Dockerfile b/src/DragonFly.App.Server/Dockerfile
@@ -1,6 +1,12 @@
 #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
 FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
+RUN sed -i'.bak' 's/$/ contrib/' /etc/apt/sources.list
+RUN apt-get update
+RUN apt-get install -y ttf-mscorefonts-installer fontconfig
+RUN apt-get install -y --no-install-recommends libgdiplus libc6-dev \
+   && apt-get clean \
+   && rm -rf /var/lib/apt/lists/*
 WORKDIR /app
 EXPOSE 80
 EXPOSE 443

diff --git a/src/DragonFly.BlockField/BlockFieldManagerExtensions.cs b/src/DragonFly.BlockField/BlockFieldManagerExtensions.cs
@@ -9,6 +9,7 @@
 using System.Threading.Tasks;
 
 namespace DragonFly.BlockField;
+
 public static class BlockFieldManagerExtensions
 {
     public static void AddDefaults(this BlockFieldManager manager)

diff --git a/src/DragonFly.Core/ContentItems/Queries/ContentItemQuery.cs b/src/DragonFly.Core/ContentItems/Queries/ContentItemQuery.cs
@@ -62,6 +62,11 @@ public ContentItemQuery()
     /// </summary>
     public bool IncludeListFieldsOnly { get; set; }
 
+    /// <summary>
+    /// UsedAsset
+    /// </summary>
+    public Guid? UsedAsset { get; set; }
+
     /// <summary>
     /// Published
     /// </summary>

diff --git a/src/DragonFly.Core/ContentSchemas/ISchemaStorage.cs b/src/DragonFly.Core/ContentSchemas/ISchemaStorage.cs
@@ -23,6 +23,8 @@ public interface ISchemaStorage
 
     Task UpdateAsync(ContentSchema entity);
 
+    Task DeleteAsync(ContentSchema entity);
+
     //IList<ContentSchema> QueryContentSchemas()
     //{
     //    return QueryContentSchemas(new QueryParameters());

diff --git a/src/DragonFly.Identity.AspNetCore/DragonFly.Identity.AspNetCore.csproj b/src/DragonFly.Identity.AspNetCore/DragonFly.Identity.AspNetCore.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
 	  <TargetFramework>net6.0</TargetFramework>
 	  <Nullable>enable</Nullable>
+    <ImplicitUsings>true</ImplicitUsings>
 	  <Authors>usercode</Authors>
 	  <PackageProjectUrl>https://github.com/usercode/DragonFly</PackageProjectUrl>
 	  <Description>Headless CMS based on ASP.NET Core and Blazor</Description>

diff --git a/src/DragonFly.Identity.AspNetCore/Middlewares/Extensions.cs b/src/DragonFly.Identity.AspNetCore/Middlewares/Extensions.cs
@@ -3,28 +3,31 @@
 // MIT License
 
 using DragonFly.AspNet.Middleware;
-using DragonFly.AspNetCore.Exports;
 using DragonFly.AspNetCore.Identity.Middlewares.Roles;
 using DragonFly.AspNetCore.Identity.Middlewares.Users;
+using DragonFly.Identity;
 using DragonFly.Security;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace DragonFly.AspNetCore.Identity.Middlewares;
 
 internal static class Extensions
 {
     public static IDragonFlyEndpointRouteBuilder MapIdentityApi(this IDragonFlyEndpointRouteBuilder endpoints)
     {
+        endpoints.MapGet("identity/CurrentUser", CurrentUserAsync);
         endpoints.MapUserApi();
         endpoints.MapRoleApi();
 
         return endpoints;
     }
+
+    private static async Task CurrentUserAsync(HttpContext context, ILoginService service)
+    {
+        IdentityUser? currentUser = await service.GetCurrentUserAsync();
+
+        await context.Response.WriteAsJsonAsync(currentUser);
+    }
 }
diff --git a/src/DragonFly.Identity.AspNetCore/Middlewares/LoginMiddleware.cs b/src/DragonFly.Identity.AspNetCore/Middlewares/LoginMiddleware.cs
@@ -3,17 +3,7 @@
 // MIT License
 
 using DragonFly.AspNetCore.Exports;
-using DragonFly.AspNet.Options;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Options;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using System.Text;
-using System.Threading.Tasks;
 using DragonFly.Security;
 
 namespace DragonFly.AspNetCore.API.Middlewares.Logins;

diff --git a/src/DragonFly.Identity.AspNetCore/Services/LoginService.cs b/src/DragonFly.Identity.AspNetCore/Services/LoginService.cs
@@ -5,17 +5,13 @@
 using DragonFly.AspNetCore.Identity.MongoDB;
 using DragonFly.AspNetCore.Identity.MongoDB.Models;
 using DragonFly.AspNetCore.Identity.MongoDB.Services.Base;
+using DragonFly.AspNetCore.Identity.MongoDB.Storages.Models;
 using DragonFly.Security;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Http;
 using MongoDB.Driver;
 using MongoDB.Driver.Linq;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Security.Claims;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace DragonFly.Identity.AspNetCore.Services;
 
@@ -77,4 +73,26 @@ public async Task Logout()
     {
         await HttpContextAccessor.HttpContext!.SignOutAsync();
     }
+
+    public async Task<IdentityUser?> GetCurrentUserAsync()
+    {
+        if (HttpContextAccessor.HttpContext!.User.Identity is ClaimsIdentity claimsIdentity)
+        {
+            Claim? claimUserId = claimsIdentity.Claims.FirstOrDefault(x => x.Type == "UserId");
+
+            if (claimUserId != null)
+            {
+                Guid userIdGuid = Guid.Parse(claimUserId.Value);
+
+                MongoIdentityUser? currentUser = await Store.Users.AsQueryable().FirstOrDefaultAsync(x => x.Id == userIdGuid);
+
+                if (currentUser != null)
+                {
+                    return currentUser.ToModel(Store);
+                }
+            }
+        }
+
+        return null;
+    }
 }
diff --git a/src/DragonFly.Identity.AspNetCore/Services/PasswordHashGenerator.cs b/src/DragonFly.Identity.AspNetCore/Services/PasswordHashGenerator.cs
@@ -4,12 +4,7 @@
 
 using DragonFly.AspNetCore.Identity.MongoDB.Services.Base;
 using Microsoft.AspNetCore.Cryptography.KeyDerivation;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Security.Cryptography;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace DragonFly.AspNetCore.Identity.MongoDB.Services;
 

diff --git a/src/DragonFly.Identity.Razor/DragonFly.Identity.Razor.csproj b/src/DragonFly.Identity.Razor/DragonFly.Identity.Razor.csproj
@@ -3,6 +3,7 @@
 	<PropertyGroup>
 		<TargetFramework>net6.0</TargetFramework>
 		<Nullable>enable</Nullable>
+    <ImplicitUsings>true</ImplicitUsings>
 		<Authors>usercode</Authors>
 		<PackageProjectUrl>https://github.com/usercode/DragonFly</PackageProjectUrl>
 		<Description>Headless CMS based on ASP.NET Core and Blazor</Description>

diff --git a/src/DragonFly.Identity.Razor/Logins/Login.razor b/src/DragonFly.Identity.Razor/Logins/Login.razor
@@ -6,24 +6,27 @@
 @inject IOptions<GeneralOptions> Options
 @inject IDragonFlyApi Api
 
-<div style="display:flex; flex: 1; justify-content:center">
+@if (ShowLoginPage)
+{
+    <div style="display:flex; flex: 1; justify-content:center">
         <div class="form-signin" style="width: 100%; max-width: 350px; padding: 15px; margin: auto;">
             <h1 class="h3 mb-3 font-weight-normal">@Options.Value.Name</h1>
-        
+
             <div class="form-floating mb-3">
-              <input @bind-value="Username" type="email" class="form-control" id="floatingInput" placeholder="Username">
-              <label for="floatingInput">Username</label>
+                <input @bind-value="Username" type="email" class="form-control" id="floatingInput" placeholder="Username">
+                <label for="floatingInput">Username</label>
             </div>
             <div class="form-floating">
-              <input @bind-value="Password" type="password" class="form-control" id="floatingPassword" placeholder="Password">
-              <label for="floatingPassword">Password</label>
+                <input @bind-value="Password" type="password" class="form-control" id="floatingPassword" placeholder="Password">
+                <label for="floatingPassword">Password</label>
             </div>
-        
+
             <button class="btn btn-lg btn-primary btn-block mt-3" @onclick="x => LoginAsync()">Login</button>
             <p class="mt-5 mb-3 text-muted">© @DateTime.Now.Year</p>           
 
         </div>
-</div>
+    </div>
+}
 
 <p style="text-align:center">Version: @Api.GetVersion()</p>
 
@@ -35,6 +38,8 @@
     [Parameter]
     public string Password { get; set; }
 
+    public bool ShowLoginPage { get; set; }
+
     protected override async Task OnInitializedAsync()
     {
         //var r = await HttpClient.GetAsync("api/Login/IsLoggedIn");
@@ -46,10 +51,21 @@
         //    return;
         //}
 
-        #if DEBUG
-        Username = DefaultSecurity.DefaultUsername;
-        Password = DefaultSecurity.DefaultPassword;
-        #endif
+#if DEBUG
+    Username = DefaultSecurity.DefaultUsername;
+    Password = DefaultSecurity.DefaultPassword;
+#endif
+
+        IdentityUser? currentUser = await LoginService.GetCurrentUserAsync();
+
+        if (currentUser != null)
+        {
+            ((ApiAuthenticationStateProvider)Auth).MarkUserAsAuthenticated();
+
+            NavigationManager.NavigateTo(".");
+        }
+
+        ShowLoginPage = true;
     }
 
     public async Task LoginAsync()
@@ -58,9 +74,9 @@
 
         if (result)
         {
-            ((ApiAuthenticationStateProvider)Auth).MarkUserAsAuthenticated("Test");
+            ((ApiAuthenticationStateProvider)Auth).MarkUserAsAuthenticated();
 
-            NavigationManager.NavigateTo("./");
+            NavigationManager.NavigateTo(".");
         }
         else
         {

diff --git a/src/DragonFly.Identity.Razor/Services/LoginService.cs b/src/DragonFly.Identity.Razor/Services/LoginService.cs
@@ -3,15 +3,10 @@
 // MIT License
 
 using DragonFly.AspNetCore.Exports;
-using DragonFly.Client;
+using DragonFly.Identity;
 using DragonFly.Security;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Json;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace DragonFly.AspNetCore.Identity.Razor;
 
@@ -35,4 +30,16 @@ public async Task Logout()
     {
         await Client.PostAsync("Logout", new StringContent(string.Empty));
     }
+
+    public async Task<IdentityUser?> GetCurrentUserAsync()
+    {
+        HttpResponseMessage response = await Client.GetAsync("identity/CurrentUser");
+
+        if (response.IsSuccessStatusCode == false)
+        {
+            return null;
+        }
+
+        return await response.Content.ReadFromJsonAsync<IdentityUser>();
+    }
 }
diff --git a/src/DragonFly.Identity/DragonFly.Identity.csproj b/src/DragonFly.Identity/DragonFly.Identity.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
 	  <TargetFramework>net6.0</TargetFramework>
 	  <Nullable>enable</Nullable>
+    <ImplicitUsings>true</ImplicitUsings>
 	  <Authors>usercode</Authors>
 	  <PackageProjectUrl>https://github.com/usercode/DragonFly</PackageProjectUrl>
 	  <Description>Headless CMS based on ASP.NET Core and Blazor</Description>

diff --git a/src/DragonFly.Identity/DragonFlyApiBuilder.cs b/src/DragonFly.Identity/DragonFlyApiBuilder.cs
@@ -4,11 +4,6 @@
 
 using DragonFly.Identity.Services;
 using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace DragonFly;
 

diff --git a/src/DragonFly.Identity/Services/IIdentityService.cs b/src/DragonFly.Identity/Services/IIdentityService.cs
@@ -4,8 +4,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace DragonFly.Identity.Services;