Merge pull request #445 from Moonlight-Panel/v2.1_OptimizeNugetBuilding

Optimize nuget building. Refactored startup. Fixed smaller issues

Author: ChiaraBm

.dockerignore

@@ -1,9 +1,35 @@
-using Moonlight.ApiServer;
-using Moonlight.ApiServer.Runtime;
-
-var startup = new Startup();
+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.Initialize(args, pluginLoader.Instances);
+
+var builder = WebApplication.CreateBuilder(args);
+
+await cs.AddMoonlight(builder);
+
+var app = builder.Build();
+
+await cs.AddMoonlight(app);
+
+// 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 (app.Environment.IsDevelopment())
+        app.UseWebAssemblyDebugging();
+
+    app.UseBlazorFrameworkFiles();
+    app.UseStaticFiles();
+}
+
 
-await startup.Run(args, pluginLoader.Instances);
+await app.RunAsync();

Moonlight.ApiServer.Runtime/Program.cs

@@ -1,24 +1,45 @@
 using MoonCore.Helpers;
+using YamlDotNet.Serialization;
 
 namespace Moonlight.ApiServer.Configuration;
 
-public class AppConfiguration
+public record AppConfiguration
 {
+    [YamlMember(Description = "The public url your instance should be accessible through")]
     public string PublicUrl { get; set; } = "http://localhost:5165";
 
+    [YamlMember(Description = "The credentials of the postgres which moonlight should use")]
     public DatabaseConfig Database { get; set; } = new();
+    
+    [YamlMember(Description = "Settings regarding authentication")]
     public AuthenticationConfig Authentication { get; set; } = new();
+    
+    [YamlMember(Description = "These options are only meant for development purposes")]
     public DevelopmentConfig Development { get; set; } = new();
-    public ClientConfig Client { get; set; } = new();
+    public FrontendData Frontend { get; set; } = new();
     public KestrelConfig Kestrel { get; set; } = new();
     public MetricsData Metrics { get; set; } = new();
 
-    public class ClientConfig
+    public static AppConfiguration CreateEmpty()
     {
-        public bool Enable { get; set; } = true;
+        return new AppConfiguration()
+        {
+            // Set arrays as empty here
+            
+            Kestrel = new()
+            {
+                AllowedOrigins = []
+            }
+        };
+    }
+
+    public record FrontendData
+    {
+        [YamlMember(Description = "Enable the hosting of the frontend. Disable this if you only want to run the api server")]
+        public bool EnableHosting { get; set; } = true;
     }
 
-    public class DatabaseConfig
+    public record DatabaseConfig
     {
         public string Host { get; set; } = "your-database-host.name";
         public int Port { get; set; } = 5432;
@@ -29,15 +50,19 @@ public class DatabaseConfig
         public string Database { get; set; } = "db_name";
     }
 
-    public class AuthenticationConfig
+    public record AuthenticationConfig
     {
+        [YamlMember(Description = "The secret token to use for creating jwts and encrypting things. This needs to be at least 32 characters long")]
         public string Secret { get; set; } = Formatter.GenerateString(32);
+        
+        [YamlMember(Description = "The lifespan of generated user tokens in hours")]
         public int TokenDuration { get; set; } = 24 * 10;
 
+        [YamlMember(Description = "This enables the use of the local oauth2 provider, so moonlight will use itself as an oauth2 provider")]
         public bool EnableLocalOAuth2 { get; set; } = true;
         public OAuth2Data OAuth2 { get; set; } = new();
 
-        public class OAuth2Data
+        public record OAuth2Data
         {
             public string Secret { get; set; } = Formatter.GenerateString(32);
             public string ClientId { get; set; } = Formatter.GenerateString(8);
@@ -46,24 +71,32 @@ public class OAuth2Data
             public string? AccessEndpoint { get; set; }
             public string? AuthorizationRedirect { get; set; }
 
+            [YamlMember(Description = "This specifies if the first registered user will become an admin automatically. This only works when using local oauth2")]
             public bool FirstUserAdmin { get; set; } = true;
         }
     }
 
-    public class DevelopmentConfig
+    public record DevelopmentConfig
     {
+        [YamlMember(Description = "This toggles the availability of the api docs via /api/swagger")]
         public bool EnableApiDocs { get; set; } = false;
     }
 
-    public class KestrelConfig
+    public record KestrelConfig
     {
+        [YamlMember(Description = "The upload limit in megabytes for the api server")]
         public int UploadLimit { get; set; } = 100;
-        public string AllowedOrigins { get; set; } = "*";
+        
+        [YamlMember(Description = "The allowed origins for the api server. Use * to allow all origins (which is not advised)")]
+        public string[] AllowedOrigins { get; set; } = ["*"];
     }
 
-    public class MetricsData
+    public record MetricsData
     {
+        [YamlMember(Description = "This enables the collecting of metrics and allows access to the /metrics endpoint")]
         public bool Enable { get; set; } = false;
+        
+        [YamlMember(Description = "The interval in which metrics are created, specified in seconds")]
         public int Interval { get; set; } = 15;
     }
 }

Moonlight.ApiServer/Configuration/AppConfiguration.cs

@@ -1,6 +1,4 @@
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace Moonlight.ApiServer.Database.Entities;
+namespace Moonlight.ApiServer.Database.Entities;
 
 public class ApiKey
 {

Moonlight.ApiServer/Database/Entities/ApiKey.cs

@@ -1,6 +1,4 @@
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace Moonlight.ApiServer.Database.Entities;
+namespace Moonlight.ApiServer.Database.Entities;
 
 public class User
 {

Moonlight.ApiServer/Database/Entities/User.cs

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

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

@@ -1,4 +1,5 @@
 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/Sys/DiagnoseController.cs

@@ -1,7 +1,6 @@
 using System.Text.Json;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using MoonCore.Helpers;
 using Moonlight.Shared.Http.Requests.Admin.Sys;
 
 namespace Moonlight.ApiServer.Http.Controllers.Admin.Sys;

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

@@ -1,19 +1,17 @@
 using System.IdentityModel.Tokens.Jwt;
 using System.Text;
-using System.Text.Json;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
 using Microsoft.IdentityModel.Tokens;
 using MoonCore.Exceptions;
 using MoonCore.Extended.Abstractions;
-using MoonCore.Helpers;
 using Moonlight.ApiServer.Configuration;
 using Moonlight.ApiServer.Database.Entities;
 using Moonlight.ApiServer.Interfaces;
 using Moonlight.Shared.Http.Requests.Auth;
 using Moonlight.Shared.Http.Responses.Auth;
-using Moonlight.Shared.Http.Responses.OAuth2;
 
 namespace Moonlight.ApiServer.Http.Controllers.Auth;
 
@@ -76,7 +74,7 @@ public async Task<LoginCompleteResponse> Complete([FromBody] LoginCompleteReques
         // Generate token
         var securityTokenDescriptor = new SecurityTokenDescriptor()
         {
-            Expires = DateTime.Now.AddYears(Configuration.Authentication.TokenDuration),
+            Expires = DateTime.Now.AddHours(Configuration.Authentication.TokenDuration),
             IssuedAt = DateTime.Now,
             NotBefore = DateTime.Now.AddMinutes(-1),
             Claims = new Dictionary<string, object>()

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

@@ -1,4 +1,5 @@
 using System.Text;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Moonlight.ApiServer.Services;
 using Moonlight.Shared.Misc;