Upgraded mooncore versions. Cleaned up code, especially startup code. Changed versions

Author: ChiaraBm

Moonlight.ApiServer.Runtime/Moonlight.ApiServer.Runtime.csproj

@@ -18,7 +18,7 @@
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="MoonCore.PluginFramework" Version="1.0.8" />
+        <PackageReference Include="MoonCore.PluginFramework" Version="1.0.9" />
     </ItemGroup>
 
     <Import Project="Plugins.props" />

Moonlight.ApiServer.Runtime/Program.cs

@@ -1,28 +1,25 @@
-using Moonlight.ApiServer.Runtime;
+using Moonlight.ApiServer.Configuration;
+using Moonlight.ApiServer.Runtime;
 using Moonlight.ApiServer.Startup;
 
 var pluginLoader = new PluginLoader();
 pluginLoader.Initialize();
-/*
-await startup.Run(args, pluginLoader.Instances);
-
-*/
-
-var cs = new Startup();
-
-await cs.InitializeAsync(args, pluginLoader.Instances);
 
 var builder = WebApplication.CreateBuilder(args);
 
-await cs.AddMoonlightAsync(builder);
+builder.AddMoonlight(pluginLoader.Instances);
 
 var app = builder.Build();
 
-await cs.AddMoonlightAsync(app);
+app.UseMoonlight(pluginLoader.Instances);
+
+// Add frontend
+var configuration = AppConfiguration.CreateEmpty();
+builder.Configuration.Bind(configuration);
 
 // Handle setup of wasm app hosting in the runtime
 // so the Moonlight.ApiServer doesn't need the wasm package
-if (cs.Configuration.Frontend.EnableHosting)
+if (configuration.Frontend.EnableHosting)
 {
     if (app.Environment.IsDevelopment())
         app.UseWebAssemblyDebugging();
@@ -31,5 +28,7 @@
     app.UseStaticFiles();
 }
 
+app.MapMoonlight(pluginLoader.Instances);
+
 
 await app.RunAsync();

Moonlight.ApiServer/Http/Controllers/Admin/ApiKeys/ApiKeysController.cs

@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using MoonCore.Common;
 using MoonCore.Extended.Abstractions;
-using MoonCore.Models;
 using Moonlight.ApiServer.Database.Entities;
 using Moonlight.ApiServer.Mappers;
 using Moonlight.ApiServer.Services;
@@ -26,7 +26,7 @@ public ApiKeysController(DatabaseRepository<ApiKey> apiKeyRepository, ApiKeyServ
 
     [HttpGet]
     [Authorize(Policy = "permissions:admin.apikeys.get")]
-    public async Task<ActionResult<ICountedData<ApiKeyResponse>>> GetAsync(
+    public async Task<ActionResult<CountedData<ApiKeyResponse>>> GetAsync(
         [FromQuery] int startIndex,
         [FromQuery] int count,
         [FromQuery] string? orderBy,

Moonlight.ApiServer/Http/Controllers/Admin/Sys/Customisation/ThemesController.cs

@@ -1,11 +1,8 @@
-using System.ComponentModel.DataAnnotations;
-using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
-using MoonCore.Exceptions;
+using MoonCore.Common;
 using MoonCore.Extended.Abstractions;
-using MoonCore.Extended.Models;
-using MoonCore.Models;
 using Moonlight.ApiServer.Database.Entities;
 using Moonlight.ApiServer.Mappers;
 using Moonlight.Shared.Http.Requests.Admin.Sys.Theme;
@@ -26,7 +23,7 @@ public ThemesController(DatabaseRepository<Theme> themeRepository)
 
     [HttpGet]
     [Authorize(Policy = "permissions:admin.system.customisation.themes.read")]
-    public async Task<ActionResult<ICountedData<ThemeResponse>>> GetAsync(
+    public async Task<ActionResult<CountedData<ThemeResponse>>> GetAsync(
         [FromQuery] int startIndex,
         [FromQuery] int count,
         [FromQuery] string? orderBy,

Moonlight.ApiServer/Http/Controllers/Admin/Sys/DiagnoseController.cs

@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Moonlight.ApiServer.Services;
 using Moonlight.Shared.Http.Requests.Admin.Sys;

Moonlight.ApiServer/Http/Controllers/Admin/Users/UsersController.cs

@@ -2,10 +2,9 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
-using MoonCore.Exceptions;
+using MoonCore.Common;
 using MoonCore.Extended.Abstractions;
 using MoonCore.Extended.Helpers;
-using MoonCore.Models;
 using Moonlight.ApiServer.Database.Entities;
 using Moonlight.ApiServer.Services;
 using Moonlight.ApiServer.Mappers;
@@ -27,7 +26,7 @@ public UsersController(DatabaseRepository<User> userRepository)
 
     [HttpGet]
     [Authorize(Policy = "permissions:admin.users.get")]
-    public async Task<ActionResult<ICountedData<UserResponse>>> GetAsync(
+    public async Task<ActionResult<CountedData<UserResponse>>> GetAsync(
         [FromQuery] int startIndex,
         [FromQuery] int count,
         [FromQuery] string? orderBy,

Moonlight.ApiServer/Http/Controllers/Auth/AuthController.cs

@@ -4,7 +4,6 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Moonlight.ApiServer.Configuration;
-using Moonlight.ApiServer.Implementations.LocalAuth;
 using Moonlight.ApiServer.Interfaces;
 using Moonlight.Shared.Http.Responses.Auth;
 

Moonlight.ApiServer/Http/Controllers/Frontend/FrontendPage.razor

@@ -1,5 +1,4 @@
 @using Moonlight.ApiServer.Database.Entities
-@using Moonlight.Shared.Misc
 
 <!DOCTYPE html>
 <html lang="en" class="bg-background text-base-content font-inter">

Moonlight.ApiServer/Http/Controllers/LocalAuth/LocalAuthController.cs

@@ -1,11 +1,9 @@
 using System.Security.Claims;
 using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using MoonCore.Exceptions;
 using MoonCore.Extended.Abstractions;
 using MoonCore.Extended.Helpers;
 using MoonCore.Helpers;

Moonlight.ApiServer/IAssemblyMarker.cs

@@ -0,0 +1,3 @@
+namespace Moonlight.ApiServer;
+
+public interface IAssemblyMarker;