Renamed SharedSerializationContext to SerializationContext. Added error handling and no build cache functionality

Moonlight.Api/Http/Controllers/Admin/ApiKeyController.cs

@@ -6,9 +6,9 @@ using Moonlight.Api.Database.Entities;
 using Moonlight.Api.Mappers;
 using Moonlight.Shared;
 using Moonlight.Shared.Http.Requests;
-using Moonlight.Shared.Http.Requests.ApiKeys;
+using Moonlight.Shared.Http.Requests.Admin.ApiKeys;
 using Moonlight.Shared.Http.Responses;
-using Moonlight.Shared.Http.Responses.ApiKeys;
+using Moonlight.Shared.Http.Responses.Admin.ApiKeys;
 
 namespace Moonlight.Api.Http.Controllers.Admin;
 

Moonlight.Api/Http/Controllers/Admin/ContainerHelperController.cs

@@ -4,6 +4,7 @@ using Microsoft.Extensions.Options;
 using Moonlight.Api.Configuration;
 using Moonlight.Api.Mappers;
 using Moonlight.Api.Services;
+using Moonlight.Shared.Http.Events;
 using Moonlight.Shared.Http.Requests.Admin.ContainerHelper;
 using Moonlight.Shared.Http.Responses.Admin;
 
@@ -34,9 +35,9 @@ public class ContainerHelperController : Controller
     }
 
     [HttpPost("rebuild")]
-    public Task<IResult> RebuildAsync()
+    public Task<IResult> RebuildAsync([FromBody] RequestRebuildDto request)
     {
-        var result = ContainerHelperService.RebuildAsync();
+        var result = ContainerHelperService.RebuildAsync(request.NoBuildCache);
         var mappedResult = result.Select(ContainerHelperMapper.ToDto);
 
         return Task.FromResult<IResult>(

Moonlight.Api/Http/Controllers/Admin/RoleMembersController.cs

@@ -6,7 +6,7 @@ using Moonlight.Api.Database.Entities;
 using Moonlight.Api.Mappers;
 using Moonlight.Shared;
 using Moonlight.Shared.Http.Responses;
-using Moonlight.Shared.Http.Responses.Users;
+using Moonlight.Shared.Http.Responses.Admin.Users;
 
 namespace Moonlight.Api.Http.Controllers.Admin;
 

Moonlight.Api/Http/Controllers/Admin/RolesController.cs

@@ -6,7 +6,7 @@ using Moonlight.Api.Database.Entities;
 using Moonlight.Api.Mappers;
 using Moonlight.Shared;
 using Moonlight.Shared.Http.Requests;
-using Moonlight.Shared.Http.Requests.Roles;
+using Moonlight.Shared.Http.Requests.Admin.Roles;
 using Moonlight.Shared.Http.Responses;
 using Moonlight.Shared.Http.Responses.Admin;
 

Moonlight.Api/Http/Controllers/Admin/ThemesController.cs

@@ -7,9 +7,9 @@ using Moonlight.Api.Mappers;
 using Moonlight.Api.Services;
 using Moonlight.Shared;
 using Moonlight.Shared.Http.Requests;
-using Moonlight.Shared.Http.Requests.Themes;
+using Moonlight.Shared.Http.Requests.Admin.Themes;
 using Moonlight.Shared.Http.Responses;
-using Moonlight.Shared.Http.Responses.Themes;
+using Moonlight.Shared.Http.Responses.Admin.Themes;
 
 namespace Moonlight.Api.Http.Controllers.Admin;
 

Moonlight.Api/Http/Controllers/Admin/UsersController.cs

@@ -6,9 +6,9 @@ using Moonlight.Api.Database.Entities;
 using Moonlight.Api.Mappers;
 using Moonlight.Shared;
 using Moonlight.Shared.Http.Requests;
-using Moonlight.Shared.Http.Requests.Users;
+using Moonlight.Shared.Http.Requests.Admin.Users;
 using Moonlight.Shared.Http.Responses;
-using Moonlight.Shared.Http.Responses.Users;
+using Moonlight.Shared.Http.Responses.Admin.Users;
 
 namespace Moonlight.Api.Http.Controllers.Admin;
 

Moonlight.Api/Http/Controllers/AuthController.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Moonlight.Shared.Http.Responses.Auth;
+using Moonlight.Shared.Http.Responses.Admin.Auth;
 
 namespace Moonlight.Api.Http.Controllers;
 

Moonlight.Api/Http/Controllers/FrontendController.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Moonlight.Api.Mappers;
 using Moonlight.Api.Services;
-using Moonlight.Shared.Http.Responses.Frontend;
+using Moonlight.Shared.Http.Responses.Admin.Frontend;
 
 namespace Moonlight.Api.Http.Controllers;
 

Moonlight.Api/Http/Services/ContainerHelper/Requests/RequestRebuildDto.cs

@@ -0,0 +1,3 @@
+namespace Moonlight.Api.Http.Services.ContainerHelper.Requests;
+
+public record RequestRebuildDto(bool NoBuildCache);

Moonlight.Api/Http/Services/ContainerHelper/SerializationContext.cs

@@ -8,6 +8,7 @@ namespace Moonlight.Api.Http.Services.ContainerHelper;
 [JsonSerializable(typeof(SetVersionDto))]
 [JsonSerializable(typeof(ProblemDetails))]
 [JsonSerializable(typeof(RebuildEventDto))]
+[JsonSerializable(typeof(RequestRebuildDto))]
 public partial class SerializationContext : JsonSerializerContext
 {
     private static JsonSerializerOptions? InternalTunedOptions;

Moonlight.Api/Mappers/ApiKeyMapper.cs

@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Moonlight.Api.Database.Entities;
-using Moonlight.Shared.Http.Requests.ApiKeys;
+using Moonlight.Shared.Http.Requests.Admin.ApiKeys;
-using Moonlight.Shared.Http.Responses.ApiKeys;
+using Moonlight.Shared.Http.Responses.Admin.ApiKeys;
 using Riok.Mapperly.Abstractions;
 
 namespace Moonlight.Api.Mappers;

Moonlight.Api/Mappers/FrontendConfigMapper.cs

@@ -1,6 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using Moonlight.Api.Models;
-using Moonlight.Shared.Http.Responses.Frontend;
+using Moonlight.Shared.Http.Responses.Admin.Frontend;
 using Riok.Mapperly.Abstractions;
 
 namespace Moonlight.Api.Mappers;

Moonlight.Api/Mappers/RoleMapper.cs

@@ -1,6 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using Moonlight.Api.Database.Entities;
-using Moonlight.Shared.Http.Requests.Roles;
+using Moonlight.Shared.Http.Requests.Admin.Roles;
 using Moonlight.Shared.Http.Responses.Admin;
 using Riok.Mapperly.Abstractions;
 

Moonlight.Api/Mappers/ThemeMapper.cs

@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Moonlight.Api.Database.Entities;
-using Moonlight.Shared.Http.Requests.Themes;
+using Moonlight.Shared.Http.Requests.Admin.Themes;
-using Moonlight.Shared.Http.Responses.Themes;
+using Moonlight.Shared.Http.Responses.Admin.Themes;
 using Riok.Mapperly.Abstractions;
 
 namespace Moonlight.Api.Mappers;

Moonlight.Api/Mappers/UserMapper.cs

@@ -1,8 +1,8 @@
 using System.Diagnostics.CodeAnalysis;
 using Riok.Mapperly.Abstractions;
-using Moonlight.Shared.Http.Requests.Users;
-using Moonlight.Shared.Http.Responses.Users;
 using Moonlight.Api.Database.Entities;
+using Moonlight.Shared.Http.Requests.Admin.Users;
+using Moonlight.Shared.Http.Responses.Admin.Users;
 
 namespace Moonlight.Api.Mappers;
 

Moonlight.Api/Services/ContainerHelperService.cs

@@ -1,4 +1,5 @@
-using System.Net.Http.Json;
+using System.Net.Http.Headers;
+using System.Net.Http.Json;
 using System.Text.Json;
 using Moonlight.Api.Http.Services.ContainerHelper;
 using Moonlight.Api.Http.Services.ContainerHelper.Requests;
@@ -32,11 +33,22 @@ public class ContainerHelperService
         }
     }
 
-    public async IAsyncEnumerable<RebuildEventDto> RebuildAsync()
+    public async IAsyncEnumerable<RebuildEventDto> RebuildAsync(bool noBuildCache)
     {
         var client = HttpClientFactory.CreateClient("ContainerHelper");
 
-        var response = await client.GetAsync("api/rebuild", HttpCompletionOption.ResponseHeadersRead);
+        var request = new HttpRequestMessage(HttpMethod.Post, "api/rebuild");
+
+        request.Content = JsonContent.Create(
+            new RequestRebuildDto(noBuildCache),
+            null,
+            SerializationContext.TunedOptions
+        );
+
+        var response = await client.SendAsync(
+            request,
+            HttpCompletionOption.ResponseHeadersRead
+        );
 
         if (!response.IsSuccessStatusCode)
         {
@@ -90,15 +102,16 @@ public class ContainerHelperService
             new SetVersionDto(version),
             SerializationContext.TunedOptions
         );
-        
+
-        if(response.IsSuccessStatusCode)
+        if (response.IsSuccessStatusCode)
             return;
-        
+
-        var problemDetails = await response.Content.ReadFromJsonAsync<ProblemDetails>(SerializationContext.TunedOptions);
+        var problemDetails =
-        
+            await response.Content.ReadFromJsonAsync<ProblemDetails>(SerializationContext.TunedOptions);
-        if(problemDetails == null)
+
+        if (problemDetails == null)
             throw new HttpRequestException($"Failed to set version: {response.ReasonPhrase}");
-        
+
         throw new HttpRequestException($"Failed to set version: {problemDetails.Detail ?? problemDetails.Title}");
     }
 }

Moonlight.Api/Startup/Startup.Base.cs

@@ -19,7 +19,7 @@ public partial class Startup
     {
         builder.Services.AddControllers().AddJsonOptions(options =>
         {
-            options.JsonSerializerOptions.TypeInfoResolverChain.Add(SharedSerializationContext.Default);
+            options.JsonSerializerOptions.TypeInfoResolverChain.Add(SerializationContext.Default);
         });
 
         builder.Logging.ClearProviders();

Moonlight.Frontend/Constants.cs

@@ -18,7 +18,7 @@ public static class Constants
             };
 
             // Add source generated options from shared project
-            InternalOptions.TypeInfoResolverChain.Add(SharedSerializationContext.Default);
+            InternalOptions.TypeInfoResolverChain.Add(SerializationContext.Default);
 
             return InternalOptions;
         }

Moonlight.Frontend/Mappers/ApiKeyMapper.cs

@@ -1,6 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
-using Moonlight.Shared.Http.Requests.ApiKeys;
+using Moonlight.Shared.Http.Requests.Admin.ApiKeys;
-using Moonlight.Shared.Http.Responses.ApiKeys;
+using Moonlight.Shared.Http.Responses.Admin.ApiKeys;
 using Riok.Mapperly.Abstractions;
 
 namespace Moonlight.Frontend.Mappers;

Moonlight.Frontend/Mappers/RoleMapper.cs

@@ -1,5 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
-using Moonlight.Shared.Http.Requests.Roles;
+using Moonlight.Shared.Http.Requests.Admin.Roles;
 using Moonlight.Shared.Http.Responses.Admin;
 using Riok.Mapperly.Abstractions;
 

Moonlight.Frontend/Mappers/ThemeMapper.cs

@@ -1,6 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
-using Moonlight.Shared.Http.Requests.Themes;
+using Moonlight.Shared.Http.Requests.Admin.Themes;
-using Moonlight.Shared.Http.Responses.Themes;
+using Moonlight.Shared.Http.Responses.Admin.Themes;
 using Riok.Mapperly.Abstractions;
 
 namespace Moonlight.Frontend.Mappers;

Moonlight.Frontend/Mappers/UserMapper.cs

@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
+using Moonlight.Shared.Http.Requests.Admin.Users;
+using Moonlight.Shared.Http.Responses.Admin.Users;
 using Riok.Mapperly.Abstractions;
-using Moonlight.Shared.Http.Requests.Users;
-using Moonlight.Shared.Http.Responses.Users;
 
 namespace Moonlight.Frontend.Mappers;
 

Moonlight.Frontend/Services/RemoteAuthProvider.cs

@@ -3,7 +3,7 @@ using System.Net.Http.Json;
 using System.Security.Claims;
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.Extensions.Logging;
-using Moonlight.Shared.Http.Responses.Auth;
+using Moonlight.Shared.Http.Responses.Admin.Auth;
 
 namespace Moonlight.Frontend.Services;
 

Moonlight.Frontend/UI/Admin/Modals/CreateApiKeyDialog.razor

@@ -1,6 +1,6 @@
 @using Moonlight.Frontend.Helpers
 @using Moonlight.Frontend.UI.Admin.Components
-@using Moonlight.Shared.Http.Requests.ApiKeys
+@using Moonlight.Shared.Http.Requests.Admin.ApiKeys
 @using Moonlight.Shared.Http.Responses
 @using ShadcnBlazor.Dialogs
 @using ShadcnBlazor.Extras.Forms

Moonlight.Frontend/UI/Admin/Modals/CreateRoleDialog.razor

@@ -1,6 +1,6 @@
 @using Moonlight.Frontend.Helpers
 @using Moonlight.Frontend.UI.Admin.Components
-@using Moonlight.Shared.Http.Requests.Roles
+@using Moonlight.Shared.Http.Requests.Admin.Roles
 @using ShadcnBlazor.Dialogs
 @using ShadcnBlazor.Extras.Forms
 @using ShadcnBlazor.Extras.Toasts

Moonlight.Frontend/UI/Admin/Modals/CreateUserDialog.razor

@@ -1,5 +1,5 @@
 @using Moonlight.Frontend.Helpers
-@using Moonlight.Shared.Http.Requests.Users
+@using Moonlight.Shared.Http.Requests.Admin.Users
 @using Moonlight.Shared.Http.Responses
 @using ShadcnBlazor.Dialogs
 @using ShadcnBlazor.Extras.Forms

Moonlight.Frontend/UI/Admin/Modals/ManageRoleMembersDialog.razor

@@ -1,7 +1,7 @@
 @using LucideBlazor
 @using Moonlight.Shared.Http.Responses
 @using Moonlight.Shared.Http.Responses.Admin
-@using Moonlight.Shared.Http.Responses.Users
+@using Moonlight.Shared.Http.Responses.Admin.Users
 @using ShadcnBlazor.Buttons
 @using ShadcnBlazor.DataGrids
 @using ShadcnBlazor.Dialogs

Moonlight.Frontend/UI/Admin/Modals/UpdateApiKeyDialog.razor

@@ -1,8 +1,8 @@
 @using Moonlight.Frontend.Helpers
 @using Moonlight.Frontend.Mappers
 @using Moonlight.Frontend.UI.Admin.Components
-@using Moonlight.Shared.Http.Requests.ApiKeys
+@using Moonlight.Shared.Http.Requests.Admin.ApiKeys
-@using Moonlight.Shared.Http.Responses.ApiKeys
+@using Moonlight.Shared.Http.Responses.Admin.ApiKeys
 @using ShadcnBlazor.Dialogs
 @using ShadcnBlazor.Extras.Forms
 @using ShadcnBlazor.Extras.Toasts

Moonlight.Frontend/UI/Admin/Modals/UpdateInstanceModal.razor

@@ -2,6 +2,7 @@
 
 @using System.Text.Json
 @using LucideBlazor
+@using Moonlight.Shared.Http
 @using Moonlight.Shared.Http.Events
 @using Moonlight.Shared.Http.Requests.Admin.ContainerHelper
 @using ShadcnBlazor.Buttons
@@ -18,13 +19,20 @@
 </DialogHeader>
 
 <div class="grid grid-cols-1 xl:grid-cols-2 w-full gap-5">
-    <div class="text-base flex flex-col p-2 gap-y-0.5">
+    <div class="text-base flex flex-col p-2 gap-y-1">
         @for (var i = 0; i < Steps.Length; i++)
         {
             if (CurrentStep == i)
             {
-                <div class="flex flex-row items-center gap-x-2">
+                <div class="flex flex-row items-center gap-x-1">
-                    <Spinner ClassName="size-4"/>
+                    @if (IsFailed)
+                    {
+                        <CircleXIcon ClassName="text-red-500 size-5"/>
+                    }
+                    else
+                    {
+                        <Spinner ClassName="size-5"/>
+                    }
                     <span>
                         @Steps[i]
                     </span>
@@ -34,8 +42,8 @@
             {
                 if (i < CurrentStep)
                 {
-                    <div class="flex flex-row items-center gap-x-2">
+                    <div class="flex flex-row items-center gap-x-1">
-                        <CheckIcon ClassName="text-green-500 size-4"/>
+                        <CircleCheckIcon ClassName="text-green-500 size-5"/>
                         <span>
                             @Steps[i]
                         </span>
@@ -43,8 +51,8 @@
                 }
                 else
                 {
-                    <div class="text-muted-foreground flex flex-row items-center gap-x-2">
+                    <div class="text-muted-foreground flex flex-row items-center gap-x-1">
-                        <span class="size-4"></span>
+                        <span class="size-5"></span>
                         @Steps[i]
                     </div>
                 }
@@ -61,7 +69,7 @@
     </div>
 </div>
 
-@if (CurrentStep == Steps.Length)
+@if (CurrentStep == Steps.Length || IsFailed)
 {
     <DialogFooter ClassName="justify-end">
         <Button Variant="ButtonVariant.Outline" @onclick="CloseAsync">Close</Button>
@@ -77,7 +85,9 @@ else
 @code
 {
     [Parameter] public string Version { get; set; }
-    
+    [Parameter] public bool NoBuildCache { get; set; }
+
+    private bool IsFailed;
     private int Progress;
     private int CurrentStep;
 
@@ -114,15 +124,23 @@ else
         await HttpClient.PostAsJsonAsync("api/admin/ch/version", new SetVersionDto()
         {
             Version = Version
-        });
+        }, SerializationContext.TunedOptions);
 
         // Starting rebuild task
         CurrentStep = 2;
         Progress = 30;
         await InvokeAsync(StateHasChanged);
 
+        var request = new HttpRequestMessage(HttpMethod.Post, "api/admin/ch/rebuild");
+
+        request.Content = JsonContent.Create(
+            new RequestRebuildDto(NoBuildCache),
+            null,
+            SerializationContext.TunedOptions
+        );
+
         var response = await HttpClient.SendAsync(
-            new HttpRequestMessage(HttpMethod.Post, "api/admin/ch/rebuild"),
+            request,
             HttpCompletionOption.ResponseHeadersRead
         );
 
@@ -176,6 +194,13 @@ else
                         }
 
                         break;
+
+                    case RebuildEventType.Failed:
+
+                        IsFailed = true;
+                        await InvokeAsync(StateHasChanged);
+
+                        return;
                 }
 
                 await InvokeAsync(StateHasChanged);
@@ -187,7 +212,7 @@ else
         } while (true);
 
         // Waiting for container instance to start up
-        
+
         CurrentStep = 5;
         Progress = 90;
         await InvokeAsync(StateHasChanged);

Moonlight.Frontend/UI/Admin/Modals/UpdateRoleDialog.razor

@@ -1,7 +1,7 @@
 @using Moonlight.Frontend.Helpers
 @using Moonlight.Frontend.Mappers
 @using Moonlight.Frontend.UI.Admin.Components
-@using Moonlight.Shared.Http.Requests.Roles
+@using Moonlight.Shared.Http.Requests.Admin.Roles
 @using Moonlight.Shared.Http.Responses.Admin
 @using ShadcnBlazor.Dialogs
 @using ShadcnBlazor.Extras.Forms

Moonlight.Frontend/UI/Admin/Modals/UpdateUserDialog.razor

@@ -1,8 +1,8 @@
 @using Moonlight.Frontend.Helpers
 @using Moonlight.Frontend.Mappers
-@using Moonlight.Shared.Http.Requests.Users
+@using Moonlight.Shared.Http.Requests.Admin.Users
 @using Moonlight.Shared.Http.Responses
-@using Moonlight.Shared.Http.Responses.Users
+@using Moonlight.Shared.Http.Responses.Admin.Users
 @using ShadcnBlazor.Dialogs
 @using ShadcnBlazor.Extras.Forms
 @using ShadcnBlazor.Extras.Toasts

Moonlight.Frontend/UI/Admin/Views/Sys/ApiKeys.razor

@@ -1,12 +1,11 @@
-@using Moonlight.Shared.Http.Requests.ApiKeys
+@using LucideBlazor
-@using Moonlight.Shared.Http.Responses.ApiKeys
-@using LucideBlazor
 @using Microsoft.AspNetCore.Authorization
 @using Microsoft.AspNetCore.Components.Authorization
 @using Moonlight.Frontend.UI.Admin.Modals
 @using Moonlight.Shared
 @using Moonlight.Shared.Http.Requests
 @using Moonlight.Shared.Http.Responses
+@using Moonlight.Shared.Http.Responses.Admin.ApiKeys
 @using ShadcnBlazor.DataGrids
 @using ShadcnBlazor.Dropdowns
 @using ShadcnBlazor.Extras.AlertDialogs

Moonlight.Frontend/UI/Admin/Views/Sys/Instance.razor

@@ -10,6 +10,7 @@
 @using ShadcnBlazor.Extras.Dialogs
 @using ShadcnBlazor.Fields
 @using ShadcnBlazor.Selects
+@using ShadcnBlazor.Switches
 
 @inject HttpClient HttpClient
 @inject DialogService DialogService
@@ -30,9 +31,7 @@
                             <FieldGroup>
                                 <FieldSet>
                                     <Field>
-                                        <FieldLabel>
+                                        <FieldLabel>Version / Branch</FieldLabel>
-                                            Version
-                                        </FieldLabel>
                                         <FieldContent>
                                             <Select DefaultValue="@SelectedVersion" @bind-Value="SelectedVersion">
                                                 <SelectTrigger ClassName="w-64">
@@ -40,12 +39,19 @@
                                                 </SelectTrigger>
                                                 <SelectContent ClassName="w-64">
                                                     <SelectItem Value="v2.1">v2.1</SelectItem>
+                                                    <SelectItem Value="v2.1.1">v2.1.1</SelectItem>
                                                     <SelectItem Value="feat/ContainerHelper">feat/ContainerHelper
                                                     </SelectItem>
                                                 </SelectContent>
                                             </Select>
                                         </FieldContent>
                                     </Field>
+                                    <Field>
+                                        <FieldLabel>Bypass Build Cache</FieldLabel>
+                                        <FieldContent>
+                                            <Switch @bind-Value="NoBuildCache" />
+                                        </FieldContent>
+                                    </Field>
                                 </FieldSet>
                                 <Field Orientation="FieldOrientation.Horizontal">
                                     <Button @onclick="AskApplyAsync">Apply</Button>
@@ -110,6 +116,7 @@
 {
     private ContainerHelperStatusDto StatusDto;
     private string SelectedVersion = "v2.1";
+    private bool NoBuildCache;
 
     private async Task LoadAsync(LazyLoader _)
     {
@@ -119,7 +126,11 @@
     private async Task ApplyAsync()
     {
         await DialogService.LaunchAsync<UpdateInstanceModal>(
-            parameters => { parameters[nameof(UpdateInstanceModal.Version)] = SelectedVersion; },
+            parameters =>
+            {
+                parameters[nameof(UpdateInstanceModal.Version)] = SelectedVersion;
+                parameters[nameof(UpdateInstanceModal.NoBuildCache)] = NoBuildCache;
+            },
             onConfigure: model =>
             {
                 model.ShowCloseButton = false;
@@ -130,17 +141,17 @@
 
     private async Task AskApplyAsync()
     {
-        if(string.IsNullOrWhiteSpace(SelectedVersion))
+        if (string.IsNullOrWhiteSpace(SelectedVersion))
             return;
-        
+
         var shouldContinue = await ConfirmRiskyVersionAsync(
             "Moonlight Rebuild",
             "If you continue the moonlight instance will become unavailable during the rebuild process. This will impact users on this instance"
         );
-        
+
-        if(!shouldContinue)
+        if (!shouldContinue)
             return;
-        
+
         if (!Regex.IsMatch(SelectedVersion, @"^v\d+(\.\d+)*b?$"))
         {
             shouldContinue = await ConfirmRiskyVersionAsync(
@@ -163,7 +174,7 @@
 
         if (!shouldContinue)
             return;
-                
+
         await ApplyAsync();
     }
 

Moonlight.Frontend/UI/Admin/Views/Sys/Themes/Create.razor

@@ -5,7 +5,7 @@
 @using LucideBlazor
 @using Moonlight.Frontend.Helpers
 @using Moonlight.Frontend.Services
-@using Moonlight.Shared.Http.Requests.Themes
+@using Moonlight.Shared.Http.Requests.Admin.Themes
 @using ShadcnBlazor.Buttons
 @using ShadcnBlazor.Cards
 @using ShadcnBlazor.Extras.Editors

Moonlight.Frontend/UI/Admin/Views/Sys/Themes/Index.razor

@@ -4,7 +4,7 @@
 @using Moonlight.Shared
 @using Moonlight.Shared.Http.Requests
 @using Moonlight.Shared.Http.Responses
-@using Moonlight.Shared.Http.Responses.Themes
+@using Moonlight.Shared.Http.Responses.Admin.Themes
 @using ShadcnBlazor.DataGrids
 @using ShadcnBlazor.Dropdowns
 @using ShadcnBlazor.Extras.AlertDialogs

Moonlight.Frontend/UI/Admin/Views/Sys/Themes/Update.razor

@@ -6,8 +6,8 @@
 @using Moonlight.Frontend.Helpers
 @using Moonlight.Frontend.Mappers
 @using Moonlight.Frontend.Services
-@using Moonlight.Shared.Http.Requests.Themes
+@using Moonlight.Shared.Http.Requests.Admin.Themes
-@using Moonlight.Shared.Http.Responses.Themes
+@using Moonlight.Shared.Http.Responses.Admin.Themes
 @using ShadcnBlazor.Buttons
 @using ShadcnBlazor.Cards
 @using ShadcnBlazor.Extras.Common

Moonlight.Frontend/UI/Admin/Views/Users/Roles.razor

@@ -4,7 +4,6 @@
 @using Moonlight.Frontend.UI.Admin.Modals
 @using Moonlight.Shared
 @using Moonlight.Shared.Http.Requests
-@using Moonlight.Shared.Http.Requests.Roles
 @using Moonlight.Shared.Http.Responses
 @using Moonlight.Shared.Http.Responses.Admin
 @using ShadcnBlazor.DataGrids

Moonlight.Frontend/UI/Admin/Views/Users/Users.razor

@@ -10,9 +10,8 @@
 @using ShadcnBlazor.Extras.Toasts
 @using ShadcnBlazor.Tabels
 @using Moonlight.Shared.Http.Requests
-@using Moonlight.Shared.Http.Requests.Users
 @using Moonlight.Shared.Http.Responses
-@using Moonlight.Shared.Http.Responses.Users
+@using Moonlight.Shared.Http.Responses.Admin.Users
 @using ShadcnBlazor.Extras.Dialogs
 
 @inject HttpClient HttpClient

Moonlight.Frontend/UI/Shared/Components/Auth/Authentication.razor

@@ -1,7 +1,7 @@
-@using ShadcnBlazor.Cards
+@using Moonlight.Shared.Http.Responses.Admin.Auth
+@using ShadcnBlazor.Cards
 @using ShadcnBlazor.Spinners
 @using ShadcnBlazor.Buttons
-@using Moonlight.Shared.Http.Responses.Auth
 
 @inject HttpClient HttpClient
 @inject NavigationManager Navigation

Moonlight.Shared/Http/Requests/Admin/ApiKeys/CreateApiKeyDto.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.Shared.Http.Requests.ApiKeys;
+namespace Moonlight.Shared.Http.Requests.Admin.ApiKeys;
 
 public class CreateApiKeyDto
 {

Moonlight.Shared/Http/Requests/Admin/ApiKeys/UpdateApiKeyDto.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.Shared.Http.Requests.ApiKeys;
+namespace Moonlight.Shared.Http.Requests.Admin.ApiKeys;
 
 public class UpdateApiKeyDto
 {

Moonlight.Shared/Http/Requests/Admin/ContainerHelper/RequestRebuildDto.cs

@@ -0,0 +1,15 @@
+namespace Moonlight.Shared.Http.Requests.Admin.ContainerHelper;
+
+public class RequestRebuildDto
+{
+    public bool NoBuildCache { get; set; }
+
+    public RequestRebuildDto()
+    {
+    }
+
+    public RequestRebuildDto(bool noBuildCache)
+    {
+        NoBuildCache = noBuildCache;
+    }
+}

Moonlight.Shared/Http/Requests/Admin/Roles/CreateRoleDto.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.Shared.Http.Requests.Roles;
+namespace Moonlight.Shared.Http.Requests.Admin.Roles;
 
 public class CreateRoleDto
 {

Moonlight.Shared/Http/Requests/Admin/Roles/UpdateRoleDto.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.Shared.Http.Requests.Roles;
+namespace Moonlight.Shared.Http.Requests.Admin.Roles;
 
 public class UpdateRoleDto
 {

Moonlight.Shared/Http/Requests/Admin/Themes/CreateThemeDto.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.Shared.Http.Requests.Themes;
+namespace Moonlight.Shared.Http.Requests.Admin.Themes;
 
 public class CreateThemeDto
 {

Moonlight.Shared/Http/Requests/Admin/Themes/UpdateThemeDto.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.Shared.Http.Requests.Themes;
+namespace Moonlight.Shared.Http.Requests.Admin.Themes;
 
 public class UpdateThemeDto
 {

Moonlight.Shared/Http/Requests/Admin/Users/CreateUserDto.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.Shared.Http.Requests.Users;
+namespace Moonlight.Shared.Http.Requests.Admin.Users;
 
 public class CreateUserDto
 {

Moonlight.Shared/Http/Requests/Admin/Users/UpdateUserDto.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.Shared.Http.Requests.Users;
+namespace Moonlight.Shared.Http.Requests.Admin.Users;
 
 public class UpdateUserDto
 {

Moonlight.Shared/Http/Responses/Admin/ApiKeys/ApiKeyDto.cs

@@ -1,3 +1,3 @@
-namespace Moonlight.Shared.Http.Responses.ApiKeys;
+namespace Moonlight.Shared.Http.Responses.Admin.ApiKeys;
 
 public record ApiKeyDto(int Id, string Name, string Description, string[] Permissions, string Key, DateTimeOffset CreatedAt, DateTimeOffset UpdatedAt);

Moonlight.Shared/Http/Responses/Admin/Auth/ClaimDto.cs

@@ -0,0 +1,3 @@
+namespace Moonlight.Shared.Http.Responses.Admin.Auth;
+
+public record ClaimDto(string Type, string Value);

Moonlight.Shared/Http/Responses/Admin/Auth/SchemeDto.cs

@@ -1,3 +1,3 @@
-namespace Moonlight.Shared.Http.Responses.Auth;
+namespace Moonlight.Shared.Http.Responses.Admin.Auth;
 
 public record SchemeDto(string Name, string DisplayName);

Moonlight.Shared/Http/Responses/Admin/Frontend/FrontendConfigDto.cs

@@ -1,3 +1,3 @@
-namespace Moonlight.Shared.Http.Responses.Frontend;
+namespace Moonlight.Shared.Http.Responses.Admin.Frontend;
 
 public record FrontendConfigDto(string Name, string? ThemeCss);

Moonlight.Shared/Http/Responses/Admin/Themes/ThemeDto.cs

@@ -1,3 +1,3 @@
-namespace Moonlight.Shared.Http.Responses.Themes;
+namespace Moonlight.Shared.Http.Responses.Admin.Themes;
 
 public record ThemeDto(int Id, string Name, string Author, string Version, string CssContent, bool IsEnabled);

Moonlight.Shared/Http/Responses/Admin/Users/UserDto.cs

@@ -1,3 +1,3 @@
-namespace Moonlight.Shared.Http.Responses.Users;
+namespace Moonlight.Shared.Http.Responses.Admin.Users;
 
 public record UserDto(int Id, string Username, string Email, DateTimeOffset CreatedAt, DateTimeOffset UpdatedAt);

Moonlight.Shared/Http/Responses/Auth/ClaimDto.cs

@@ -1,3 +0,0 @@
-namespace Moonlight.Shared.Http.Responses.Auth;
-
-public record ClaimDto(string Type, string Value);

Moonlight.Shared/Http/SerializationContext.cs

@@ -1,16 +1,17 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using Moonlight.Shared.Http.Events;
-using Moonlight.Shared.Http.Requests.ApiKeys;
+using Moonlight.Shared.Http.Requests.Admin.ApiKeys;
-using Moonlight.Shared.Http.Requests.Roles;
+using Moonlight.Shared.Http.Requests.Admin.ContainerHelper;
-using Moonlight.Shared.Http.Requests.Themes;
+using Moonlight.Shared.Http.Requests.Admin.Roles;
-using Moonlight.Shared.Http.Requests.Users;
+using Moonlight.Shared.Http.Requests.Admin.Themes;
+using Moonlight.Shared.Http.Requests.Admin.Users;
 using Moonlight.Shared.Http.Responses;
 using Moonlight.Shared.Http.Responses.Admin;
-using Moonlight.Shared.Http.Responses.ApiKeys;
+using Moonlight.Shared.Http.Responses.Admin.ApiKeys;
-using Moonlight.Shared.Http.Responses.Auth;
+using Moonlight.Shared.Http.Responses.Admin.Auth;
-using Moonlight.Shared.Http.Responses.Themes;
+using Moonlight.Shared.Http.Responses.Admin.Themes;
-using Moonlight.Shared.Http.Responses.Users;
+using Moonlight.Shared.Http.Responses.Admin.Users;
 
 namespace Moonlight.Shared.Http;
 
@@ -51,10 +52,12 @@ namespace Moonlight.Shared.Http;
 
 // Container Helper
 [JsonSerializable(typeof(ContainerHelperStatusDto))]
+[JsonSerializable(typeof(RequestRebuildDto))]
+[JsonSerializable(typeof(SetVersionDto))]
 
 // Misc
 [JsonSerializable(typeof(ProblemDetails))]
-public partial class SharedSerializationContext : JsonSerializerContext
+public partial class SerializationContext : JsonSerializerContext
 {
     private static JsonSerializerOptions? InternalTunedOptions;