feat(rebase): rebase

server/index.ts

@@ -120,8 +120,7 @@ app
         }).connect(sessionRespository) as Store,
       })
     );
-    //const apiDocs = YAML.load(API_SPEC_PATH);
-    /*
+    const apiDocs = YAML.load(API_SPEC_PATH);
     server.use('/api-docs', swaggerUi.serve, swaggerUi.setup(apiDocs));
     server.use(
       OpenApiValidator.middleware({
@@ -134,7 +133,7 @@ app
      * OpenAPI validator. Otherwise, they are treated as objects instead of strings
      * and response validation will fail
      */
-    /*
+
     server.use((_req, res, next) => {
       const original = res.json;
       res.json = function jsonp(json) {
@@ -142,7 +141,6 @@ app
       };
       next();
     });
-    */
     server.use('/api/v1', routes);
     server.get('*', (req, res) => handle(req, res));
     server.use(

server/job/jellyfinsync/index.ts

@@ -127,7 +127,7 @@ class JobJellyfinSync {
             (hasOtherResolution || (has4k && !this.enable4kMovie)) &&
             existing.jellyfinMediaID !== metadata.Id
           ) {
-            existing.jellyfinMediaID !== metadata.Id;
+            existing.jellyfinMediaID = metadata.Id;
             changedExisting = true;
           }
 

server/routes/settings/index.ts

@@ -227,7 +227,9 @@ settingsRoutes.post('/plex/sync', (req, res) => {
 
 settingsRoutes.get('/jellyfin', (_req, res) => {
   const settings = getSettings();
-  res.status(200).json(settings.jellyfin);
+
+  //DO NOT RETURN ADMIN USER CREDENTIALS!!
+  res.status(200).json(omit(settings.jellyfin, ['adminUser', 'adminPass']));
 });
 
 settingsRoutes.post('/jellyfin', (req, res) => {