refactor(server, web): standardize theme api response (#4664)

* web: standardize theme api response

* revert makefile change that i didn't mean to commit

cli/src/api/open-api/api.ts

@@ -2966,10 +2966,10 @@ export interface ServerStatsResponseDto {
 export interface ServerThemeDto {
     /**
      * 
-     * @type {SystemConfigThemeDto}
+     * @type {string}
      * @memberof ServerThemeDto
      */
-    'theme': SystemConfigThemeDto;
+    'customCss': string;
 }
 /**
  * 

mobile/openapi/doc/ServerThemeDto.md

@@ -8,7 +8,7 @@ import 'package:openapi/api.dart';
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**theme** | [**SystemConfigThemeDto**](SystemConfigThemeDto.md) |  | 
+**customCss** | **String** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

mobile/openapi/lib/model/server_theme_dto.dart

@@ -13,26 +13,26 @@ part of openapi.api;
 class ServerThemeDto {
   /// Returns a new [ServerThemeDto] instance.
   ServerThemeDto({
-    required this.theme,
+    required this.customCss,
   });
 
-  SystemConfigThemeDto theme;
+  String customCss;
 
   @override
   bool operator ==(Object other) => identical(this, other) || other is ServerThemeDto &&
-     other.theme == theme;
+     other.customCss == customCss;
 
   @override
   int get hashCode =>
     // ignore: unnecessary_parenthesis
-    (theme.hashCode);
+    (customCss.hashCode);
 
   @override
-  String toString() => 'ServerThemeDto[theme=$theme]';
+  String toString() => 'ServerThemeDto[customCss=$customCss]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
-      json[r'theme'] = this.theme;
+      json[r'customCss'] = this.customCss;
     return json;
   }
 
@@ -44,7 +44,7 @@ class ServerThemeDto {
       final json = value.cast<String, dynamic>();
 
       return ServerThemeDto(
-        theme: SystemConfigThemeDto.fromJson(json[r'theme'])!,
+        customCss: mapValueOfType<String>(json, r'customCss')!,
       );
     }
     return null;
@@ -92,7 +92,7 @@ class ServerThemeDto {
 
   /// The list of required keys that must be present in a JSON.
   static const requiredKeys = <String>{
-    'theme',
+    'customCss',
   };
 }
 

mobile/openapi/test/server_theme_dto_test.dart

@@ -16,8 +16,8 @@ void main() {
   // final instance = ServerThemeDto();
 
   group('test ServerThemeDto', () {
-    // SystemConfigThemeDto theme
+    // String customCss
-    test('to test the property `theme`', () async {
+    test('to test the property `customCss`', () async {
       // TODO
     });
 

server/immich-openapi-specs.json

@@ -7836,12 +7836,12 @@
       },
       "ServerThemeDto": {
         "properties": {
-          "theme": {
+          "customCss": {
-            "$ref": "#/components/schemas/SystemConfigThemeDto"
+            "type": "string"
           }
         },
         "required": [
-          "theme"
+          "customCss"
         ],
         "type": "object"
       },

server/src/domain/server-info/server-info.dto.ts

@@ -80,9 +80,7 @@ export class ServerMediaTypesResponseDto {
   sidecar!: string[];
 }
 
-export class ServerThemeDto {
+export class ServerThemeDto extends SystemConfigThemeDto {}
-  theme!: SystemConfigThemeDto;
-}
 
 export class ServerConfigDto {
   oauthButtonText!: string;

server/src/domain/server-info/server-info.service.ts

@@ -72,7 +72,7 @@ export class ServerInfoService {
 
   async getTheme() {
     const { theme } = await this.configCore.getConfig();
-    return { theme };
+    return theme;
   }
 
   async getConfig(): Promise<ServerConfigDto> {

server/test/e2e/server-info.e2e-spec.ts

@@ -161,9 +161,7 @@ describe(`${ServerInfoController.name} (e2e)`, () => {
       const { status, body } = await request(server).get('/server-info/theme');
       expect(status).toBe(200);
       expect(body).toEqual({
-        theme: {
+        customCss: '',
-          customCss: '',
-        },
       });
     });
   });

web/src/api/open-api/api.ts

@@ -2966,10 +2966,10 @@ export interface ServerStatsResponseDto {
 export interface ServerThemeDto {
     /**
      * 
-     * @type {SystemConfigThemeDto}
+     * @type {string}
      * @memberof ServerThemeDto
      */
-    'theme': SystemConfigThemeDto;
+    'customCss': string;
 }
 /**
  * 

web/src/routes/custom.css/+server.ts

@@ -1,9 +1,7 @@
 import { RequestHandler, text } from '@sveltejs/kit';
 export const GET = (async ({ locals: { api } }) => {
   const {
-    data: {
+    data: { customCss },
-      theme: { customCss },
-    },
   } = await api.serverInfoApi.getTheme();
   return text(customCss, {
     headers: {