Prepare Blazor Server

usercode · Apr 18, 2024 · 433acf3 · 433acf3
1 parent 15df966
commit 433acf3
Show file tree

Hide file tree

Showing 83 changed files with 1,204 additions and 558 deletions.
diff --git a/README.md b/README.md
@@ -214,11 +214,7 @@ if (env.IsDevelopment())
   app.UseWebAssemblyDebugging();
 }
 
-app.UseDragonFly(x => x             
-                  .MapImageWizard()
-                  .MapApiKey()
-                  .MapIdentity()
-                  .MapRestApi());
+app.UseDragonFly();
 app.UseDragonFlyManager();
 app.UseRouting();
 app.Run();
@@ -231,7 +227,7 @@ var builder = WebAssemblyHostBuilder.CreateDefault(args);
 builder.RootComponents.Add<DragonFly.App.Client.App>("app");
 
 //Register DragonFly components
-builder.AddDragonFly()
+builder.AddDragonFlyClient()
           .AddRestApi()
           .AddBlockField()
           .AddIdentity()

diff --git a/src/DragonFly.API.Client/ClientAPI/ClientContentService.BackgroundTask.cs b/src/DragonFly.API.Client/ClientAPI/ClientContentService.BackgroundTask.cs
@@ -3,7 +3,6 @@
 // MIT License
 
 using System.Net.Http.Json;
-using DragonFly.Query;
 
 namespace DragonFly.API.Client;
 
@@ -12,6 +11,8 @@ namespace DragonFly.API.Client;
 /// </summary>
 public partial class ClientContentService : IBackgroundTaskService
 {
+    public event Func<BackgroundTaskStatusChange, IBackgroundTaskInfo, Task> BackgroundTaskChanged;
+
     public async Task<IBackgroundTaskInfo[]> GetTasksAsync()
     {
         var response = await Client.PostAsync("api/task/query", new StringContent(string.Empty));

diff --git a/src/DragonFly.API/Extensions/DragonFlyBuilderExtensions.cs b/src/DragonFly.API/Extensions/DragonFlyBuilderExtensions.cs
@@ -22,14 +22,9 @@ public static IDragonFlyBuilder AddRestApi(this IDragonFlyBuilder builder)
 
         builder.AddRestApiCore();
 
-        return builder;
-    }
-
-    public static IDragonFlyMiddlewareBuilder MapRestApi(this IDragonFlyMiddlewareBuilder builder)
-    {
-        builder.Endpoints(endpoints =>
+        builder.AddEndpoint(x =>
         {
-            RouteGroupBuilder group = endpoints.MapGroup("api")
+            RouteGroupBuilder group = x.MapGroup("api")
                                                 .RequirePermission()
                                                 .WithDisplayName("DragonFly.API");
 

diff --git a/src/DragonFly.ApiKeys.Client/DragonFlyBuilderExtensions.cs b/src/DragonFly.ApiKeys.Client/DragonFlyBuilderExtensions.cs
@@ -7,6 +7,7 @@
 using DragonFly.ApiKeys.Razor.Services;
 using DragonFly.ApiKeys.Client;
 using DragonFly.Client.Builders;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 
 namespace DragonFly.Client;
 
@@ -16,7 +17,7 @@ public static IDragonFlyBuilder AddApiKeys(this IDragonFlyBuilder builder)
     {
         builder.AddRazorRouting();
 
-        builder.Services.AddTransient<IApiKeyService, ApiKeyService>();
+        builder.Services.TryAddTransient<IApiKeyService, ApiKeyService>();
 
         builder.Init<ApiKeyInitializer>();
 

diff --git a/src/DragonFly.ApiKeys/DragonFly.ApiKeys.csproj b/src/DragonFly.ApiKeys/DragonFly.ApiKeys.csproj
@@ -29,8 +29,8 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="MongoDB.Driver" Version="2.24.0" />
-		<PackageReference Include="MongoDB.Driver.GridFS" Version="2.24.0" />
+		<PackageReference Include="MongoDB.Driver" Version="2.25.0" />
+		<PackageReference Include="MongoDB.Driver.GridFS" Version="2.25.0" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/DragonFly.ApiKeys/DragonFlyBuilderExtensions.cs b/src/DragonFly.ApiKeys/DragonFlyBuilderExtensions.cs
@@ -23,7 +23,7 @@ public static IDragonFlyBuilder AddApiKeys(this IDragonFlyBuilder builder)
         builder.Services.AddSingleton<MongoIdentityStore>();
         builder.Services.AddSingleton<IAuthorizationHandler, PermissionHandler>();
 
-        builder.Authentication.AddApiKey(ApiKeyAuthenticationDefaults.AuthenticationScheme);
+        builder.Services.AddAuthentication().AddApiKey(ApiKeyAuthenticationDefaults.AuthenticationScheme);
 
         builder.AddPermissionScheme(ApiKeyAuthenticationDefaults.AuthenticationScheme);
 
@@ -38,12 +38,7 @@ public static IDragonFlyBuilder AddApiKeys(this IDragonFlyBuilder builder)
                             .Add(ApiKeyPermissions.DeleteApiKey);
         });
 
-        return builder;
-    }
-
-    public static IDragonFlyMiddlewareBuilder MapApiKey(this IDragonFlyMiddlewareBuilder builder)
-    {
-        builder.Endpoints(x => x.MapApiKeyApi());
+        builder.AddEndpoint(x => x.MapApiKeyApi());
 
         return builder;
     }

diff --git a/src/DragonFly.ApiKeys/Middlewares/ApiKeys/ApiKeysExtensions.cs b/src/DragonFly.ApiKeys/Middlewares/ApiKeys/ApiKeysExtensions.cs
@@ -14,7 +14,7 @@ namespace DragonFly.ApiKeys.AspNetCore.Middlewares;
 
 static class ApiKeysExtensions
 {
-    public static void MapApiKeyApi(this IDragonFlyEndpointBuilder endpoints)
+    public static IEndpointConventionBuilder MapApiKeyApi(this IEndpointRouteBuilder endpoints)
     {
         RouteGroupBuilder group = endpoints.MapGroup("api/apikey");
 
@@ -23,6 +23,8 @@ public static void MapApiKeyApi(this IDragonFlyEndpointBuilder endpoints)
         group.MapPost("", MapCreate).RequirePermission(ApiKeyPermissions.CreateApiKey);
         group.MapPut("", MapUpdate).RequirePermission(ApiKeyPermissions.UpdateApiKey);
         group.MapDelete("{id:guid}", MapDelete).RequirePermission(ApiKeyPermissions.DeleteApiKey);
+
+        return group;
     }
 
     private static async Task<Results<Ok<ApiKey>, NotFound>> MapGet(Guid id, IApiKeyService service)

diff --git a/src/DragonFly.App.Server/Components/App.razor b/src/DragonFly.App.Server/Components/App.razor
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+    <title>DragonFly</title>
+    <base href="/manager/" />
+    <link href="/_content/DragonFly.Client/css/bootstrap.min.css" rel="stylesheet" />
+    <link href="/_content/DragonFly.Client/css/all.min.css" rel="stylesheet" />
+    <link href="/_content/DragonFly.Client/lib/font-awesome/css/all.min.css" rel="stylesheet" />
+    <script src="/_content/BlazorStrap/blazorstrap.js"></script>
+    <script src="/_content/DragonFly.Client/lib/tinymce/tinymce.min.js"></script>
+    <script src="/_content/TinyMCE.Blazor/tinymce-blazor.js"></script>
+    <HeadOutlet @rendermode="InteractiveServer" />
+</head>
+<body>
+    <app>
+        <Routes @rendermode="InteractiveServer" />
+    </app>
+    <script src="_framework/blazor.web.js"></script>
+</body>
+</html>
diff --git a/src/DragonFly.App.Client/App.razor → ...gonFly.App.Server/Components/Routes.razor b/src/DragonFly.App.Client/App.razor → ...gonFly.App.Server/Components/Routes.razor
diff --git a/src/DragonFly.App.Server/Components/_Imports.razor b/src/DragonFly.App.Server/Components/_Imports.razor
@@ -0,0 +1,12 @@
+@using System.Net.Http
+@using System.Net.Http.Json
+@using Microsoft.AspNetCore.Components.Authorization
+@using Microsoft.AspNetCore.Components.Forms
+@using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
+@using static Microsoft.AspNetCore.Components.Web.RenderMode
+@using Microsoft.AspNetCore.Components.Web.Virtualization
+@using Microsoft.JSInterop
+@using DragonFly.Client
+@using DragonFly.Client.Shared
+@using DragonFly.Identity.Client.Logins
diff --git a/src/DragonFly.App.Server/Dockerfile b/src/DragonFly.App.Server/Dockerfile
@@ -10,27 +10,21 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
 COPY ["DragonFly.App.Server/DragonFly.App.Server.csproj", "DragonFly.App.Server/"]
-COPY ["DragonFly.API/DragonFly.API.csproj", "DragonFly.API/"]
-COPY ["DragonFly.API.Core/DragonFly.API.Core.csproj", "DragonFly.API.Core/"]
+COPY ["DragonFly.AspNetCore/DragonFly.AspNetCore.csproj", "DragonFly.AspNetCore/"]
 COPY ["DragonFly.Core/DragonFly.Core.csproj", "DragonFly.Core/"]
 COPY ["DragonFly.Generator/DragonFly.Generator.csproj", "DragonFly.Generator/"]
-COPY ["DragonFly.AspNetCore/DragonFly.AspNetCore.csproj", "DragonFly.AspNetCore/"]
-COPY ["DragonFly.App.Client/DragonFly.App.Client.csproj", "DragonFly.App.Client/"]
 COPY ["DragonFly.Client/DragonFly.Client.csproj", "DragonFly.Client/"]
-COPY ["DragonFly.API.Client/DragonFly.API.Client.csproj", "DragonFly.API.Client/"]
-COPY ["DragonFly.ApiKeys.Client/DragonFly.ApiKeys.Client.csproj", "DragonFly.ApiKeys.Client/"]
+COPY ["DragonFly.ApiKeys/DragonFly.ApiKeys.csproj", "DragonFly.ApiKeys/"]
 COPY ["DragonFly.ApiKeys.Core/DragonFly.ApiKeys.Core.csproj", "DragonFly.ApiKeys.Core/"]
-COPY ["DragonFly.BlockField.Client/DragonFly.BlockField.Client.csproj", "DragonFly.BlockField.Client/"]
-COPY ["DragonFly.BlockField.Core/DragonFly.BlockField.Core.csproj", "DragonFly.BlockField.Core/"]
-COPY ["DragonFly.Identity.Client/DragonFly.Identity.Client.csproj", "DragonFly.Identity.Client/"]
+COPY ["DragonFly.API.Core/DragonFly.API.Core.csproj", "DragonFly.API.Core/"]
+COPY ["DragonFly.ApiKeys.Client/DragonFly.ApiKeys.Client.csproj", "DragonFly.ApiKeys.Client/"]
+COPY ["DragonFly.Identity/DragonFly.Identity.csproj", "DragonFly.Identity/"]
 COPY ["DragonFly.Identity.Core/DragonFly.Identity.Core.csproj", "DragonFly.Identity.Core/"]
-COPY ["DragonFly.BlockField/DragonFly.BlockField.csproj", "DragonFly.BlockField/"]
+COPY ["DragonFly.Identity.Client/DragonFly.Identity.Client.csproj", "DragonFly.Identity.Client/"]
 COPY ["DragonFly.ImageWizard/DragonFly.ImageWizard.csproj", "DragonFly.ImageWizard/"]
 COPY ["DragonFly.MongoDB/DragonFly.MongoDB.csproj", "DragonFly.MongoDB/"]
-COPY ["DragonFly.Identity/DragonFly.Identity.csproj", "DragonFly.Identity/"]
-COPY ["DragonFly.ApiKeys/DragonFly.ApiKeys.csproj", "DragonFly.ApiKeys/"]
 COPY ["DragonFly.SampleData/DragonFly.SampleData.csproj", "DragonFly.SampleData/"]
-RUN dotnet restore "./DragonFly.App.Server/./DragonFly.App.Server.csproj"
+RUN dotnet restore "./DragonFly.App.Server/DragonFly.App.Server.csproj"
 COPY . .
 WORKDIR "/src/DragonFly.App.Server"
 RUN dotnet build "./DragonFly.App.Server.csproj" -c $BUILD_CONFIGURATION -o /app/build

diff --git a/src/DragonFly.App.Server/Dockerfile.original b/src/DragonFly.App.Server/Dockerfile.original
@@ -0,0 +1,45 @@
+#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
+
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+USER app
+WORKDIR /app
+EXPOSE 8080
+EXPOSE 8081
+
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+ARG BUILD_CONFIGURATION=Release
+WORKDIR /src
+COPY ["DragonFly.App.Server/DragonFly.App.Server.csproj", "DragonFly.App.Server/"]
+COPY ["DragonFly.API/DragonFly.API.csproj", "DragonFly.API/"]
+COPY ["DragonFly.API.Core/DragonFly.API.Core.csproj", "DragonFly.API.Core/"]
+COPY ["DragonFly.Core/DragonFly.Core.csproj", "DragonFly.Core/"]
+COPY ["DragonFly.Generator/DragonFly.Generator.csproj", "DragonFly.Generator/"]
+COPY ["DragonFly.AspNetCore/DragonFly.AspNetCore.csproj", "DragonFly.AspNetCore/"]
+COPY ["DragonFly.App.Client/DragonFly.App.Client.csproj", "DragonFly.App.Client/"]
+COPY ["DragonFly.Client/DragonFly.Client.csproj", "DragonFly.Client/"]
+COPY ["DragonFly.API.Client/DragonFly.API.Client.csproj", "DragonFly.API.Client/"]
+COPY ["DragonFly.ApiKeys.Client/DragonFly.ApiKeys.Client.csproj", "DragonFly.ApiKeys.Client/"]
+COPY ["DragonFly.ApiKeys.Core/DragonFly.ApiKeys.Core.csproj", "DragonFly.ApiKeys.Core/"]
+COPY ["DragonFly.BlockField.Client/DragonFly.BlockField.Client.csproj", "DragonFly.BlockField.Client/"]
+COPY ["DragonFly.BlockField.Core/DragonFly.BlockField.Core.csproj", "DragonFly.BlockField.Core/"]
+COPY ["DragonFly.Identity.Client/DragonFly.Identity.Client.csproj", "DragonFly.Identity.Client/"]
+COPY ["DragonFly.Identity.Core/DragonFly.Identity.Core.csproj", "DragonFly.Identity.Core/"]
+COPY ["DragonFly.BlockField/DragonFly.BlockField.csproj", "DragonFly.BlockField/"]
+COPY ["DragonFly.ImageWizard/DragonFly.ImageWizard.csproj", "DragonFly.ImageWizard/"]
+COPY ["DragonFly.MongoDB/DragonFly.MongoDB.csproj", "DragonFly.MongoDB/"]
+COPY ["DragonFly.Identity/DragonFly.Identity.csproj", "DragonFly.Identity/"]
+COPY ["DragonFly.ApiKeys/DragonFly.ApiKeys.csproj", "DragonFly.ApiKeys/"]
+COPY ["DragonFly.SampleData/DragonFly.SampleData.csproj", "DragonFly.SampleData/"]
+RUN dotnet restore "./DragonFly.App.Server/./DragonFly.App.Server.csproj"
+COPY . .
+WORKDIR "/src/DragonFly.App.Server"
+RUN dotnet build "./DragonFly.App.Server.csproj" -c $BUILD_CONFIGURATION -o /app/build
+
+FROM build AS publish
+ARG BUILD_CONFIGURATION=Release
+RUN dotnet publish "./DragonFly.App.Server.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "DragonFly.App.Server.dll"]
diff --git a/src/DragonFly.App.Server/DragonFly.App.Server.csproj b/src/DragonFly.App.Server/DragonFly.App.Server.csproj
@@ -11,25 +11,26 @@
   <ItemGroup>
     <None Remove="FileCache\**" />
   </ItemGroup>
-
+  
   <ItemGroup>
-	  <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
+	  <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.20.1" />
 	  <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\DragonFly.API\DragonFly.API.csproj" />
-    <ProjectReference Include="..\DragonFly.App.Client\DragonFly.App.Client.csproj" />
     <ProjectReference Include="..\DragonFly.AspNetCore\DragonFly.AspNetCore.csproj" />
-    <ProjectReference Include="..\DragonFly.ImageWizard\DragonFly.ImageWizard.csproj" />
-    <ProjectReference Include="..\DragonFly.MongoDB\DragonFly.MongoDB.csproj" />
-    <ProjectReference Include="..\DragonFly.Identity\DragonFly.Identity.csproj" />
+    <ProjectReference Include="..\DragonFly.Client\DragonFly.Client.csproj" />
     <ProjectReference Include="..\DragonFly.ApiKeys\DragonFly.ApiKeys.csproj" />
+    <ProjectReference Include="..\DragonFly.ApiKeys.Client\DragonFly.ApiKeys.Client.csproj" />    
+    <ProjectReference Include="..\DragonFly.Identity\DragonFly.Identity.csproj" />
+    <ProjectReference Include="..\DragonFly.Identity.Client\DragonFly.Identity.Client.csproj" />
+    <ProjectReference Include="..\DragonFly.ImageWizard\DragonFly.ImageWizard.csproj" />
+    <ProjectReference Include="..\DragonFly.MongoDB\DragonFly.MongoDB.csproj" />    
     <ProjectReference Include="..\DragonFly.SampleData\DragonFly.SampleData.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\DragonFly.Generator\DragonFly.Generator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />    
+    <ProjectReference Include="..\DragonFly.Generator\DragonFly.Generator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
 </Project>
diff --git a/src/DragonFly.App.Server/Program.cs b/src/DragonFly.App.Server/Program.cs
@@ -3,17 +3,22 @@
 // MIT License
 
 using System;
+using System.Linq;
 using System.Threading.Tasks;
 using DragonFly;
 using DragonFly.API;
+using DragonFly.App.Server.Components;
 using DragonFly.AspNetCore;
+using DragonFly.Client;
 using DragonFly.MongoDB;
 using DragonFlyABC;
 using DragonFlyTEST;
 using FFMpegCore;
 using ImageWizard;
 using ImageWizard.Caches;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Components.Authorization;
+using Microsoft.AspNetCore.Components.Server;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.HttpOverrides;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
@@ -60,7 +65,6 @@
 //DragonFly services
 builder.Services.AddDragonFly()
                     .AddImageWizard()
-                    .AddRestApi()
                     .AddMongoDbStorage()
                     .AddMongoDbIdentity()
                     .AddApiKeys()
@@ -71,8 +75,16 @@
                     .Init(x =>
                     {
                            
-                    })
-                    ;
+                    });
+
+//Blazor Server client
+builder.Services.AddDragonFlyClient()
+                    .AddIdentity()
+                    .AddApiKeys()
+                    .Init(x =>
+                    {
+                        x.Field().Add<HtmlField>().WithTinyMceView();
+                    });
 
 var app = builder.Build();
 
@@ -156,22 +168,18 @@
     });
 }
 
-IHostEnvironment env = app.Services.GetRequiredService<IHostEnvironment>();
-
-if (env.IsDevelopment())
+if (app.Environment.IsDevelopment())
 {
     app.UseDeveloperExceptionPage();
-    app.UseWebAssemblyDebugging();
 }
 
 app.UseForwardedHeaders();
 app.UseHttpsRedirection();
-app.UseDragonFly(x => x
-                        .MapImageWizard()
-                        .MapApiKey()
-                        .MapIdentity()
-                        .MapRestApi());
-app.UseDragonFlyManager();
+app.UseStaticFiles();
+app.UseAntiforgery();
+app.UseDragonFly();
+//app.UseDragonFlyManager();
+app.UseDragonFlyManager<App>();
 app.UseSwagger();
 app.UseSwaggerUI();
 

diff --git a/src/DragonFly.App.Server/appsettings.json b/src/DragonFly.App.Server/appsettings.json
@@ -8,7 +8,8 @@
   },
   "MongoDB": {
     "Hostname": "localhost",
-    "Database": "DragonFly_App"
+    "Database": "DragonFly_App",
+    "Port": 27019
   },
   "ImageWizard": {
     "Key": "DEMO+KEY+++PLEASE+CHANGE+THIS+KEY+++PLEASE+CHANGE+THIS+KEY+++PLEASE+CHANGE+THIS+KEY+++=="

diff --git a/src/DragonFly.App.WebAssembly.Client/App.razor b/src/DragonFly.App.WebAssembly.Client/App.razor
@@ -0,0 +1,16 @@
+<CascadingAuthenticationState>
+    <Router AppAssembly="@typeof(Program).Assembly" AdditionalAssemblies="RazorRoutingManager.Default.Items">
+        <Found Context="routeData">
+            <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)">
+                <NotAuthorized>
+                    <Login />
+                </NotAuthorized>
+            </AuthorizeRouteView>
+        </Found>
+        <NotFound>
+            <LayoutView Layout="@typeof(MainLayout)">
+                <p>Sorry, there's nothing at this address.</p>
+            </LayoutView>
+        </NotFound>
+    </Router>
+</CascadingAuthenticationState>
diff --git a/...ly.App.Client/DragonFly.App.Client.csproj → ...t/DragonFly.App.WebAssembly.Client.csproj b/...ly.App.Client/DragonFly.App.Client.csproj → ...t/DragonFly.App.WebAssembly.Client.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.4" />
   </ItemGroup>
 
   <ItemGroup>