fix(jellyfinscanner): conditionally assign the jellyfinMediaId and jellyfinMediaId4k

Previously `jellyfinMediaId4k` was being assigned even if 4k server was not setup or even if 4k
content were not present. This fixes it by conditionally assigning the jellyfinMediaId and
JellyfinMediaId4k

fix #681

server/api/jellyfin.ts

@@ -9,9 +9,6 @@ export interface JellyfinUserResponse {
   ServerId: string;
   ServerName: string;
   Id: string;
-  Policy: {
-    IsAdministrator: boolean;
-  };
   PrimaryImageTag?: string;
 }
 

server/entity/Media.ts

@@ -151,11 +151,11 @@ class Media {
   @Column({ nullable: true, type: 'varchar' })
   public ratingKey4k?: string | null;
 
-  @Column({ nullable: true, type: 'varchar' })
-  public jellyfinMediaId?: string | null;
+  @Column({ nullable: true })
+  public jellyfinMediaId?: string;
 
-  @Column({ nullable: true, type: 'varchar' })
-  public jellyfinMediaId4k?: string | null;
+  @Column({ nullable: true })
+  public jellyfinMediaId4k?: string;
 
   public serviceUrl?: string;
   public serviceUrl4k?: string;

server/lib/availabilitySync.ts

@@ -548,7 +548,7 @@ class AvailabilitySync {
         media[is4k ? 'ratingKey4k' : 'ratingKey'] =
           mediaStatus === MediaStatus.PROCESSING
             ? media[is4k ? 'ratingKey4k' : 'ratingKey']
-            : null;
+            : undefined;
       } else if (
         mediaServerType === MediaServerType.JELLYFIN ||
         mediaServerType === MediaServerType.EMBY
@@ -556,7 +556,7 @@ class AvailabilitySync {
         media[is4k ? 'jellyfinMediaId4k' : 'jellyfinMediaId'] =
           mediaStatus === MediaStatus.PROCESSING
             ? media[is4k ? 'jellyfinMediaId4k' : 'jellyfinMediaId']
-            : null;
+            : undefined;
       }
       logger.info(
         `The ${is4k ? '4K' : 'non-4K'} ${

server/lib/scanners/jellyfin/index.ts

@@ -168,9 +168,9 @@ class JellyfinScanner {
           newMedia.jellyfinMediaId =
             hasOtherResolution || (!this.enable4kMovie && has4k)
               ? metadata.Id
-              : null;
+              : undefined;
           newMedia.jellyfinMediaId4k =
-            has4k && this.enable4kMovie ? metadata.Id : null;
+            has4k && this.enable4kMovie ? metadata.Id : undefined;
           await mediaRepository.save(newMedia);
           this.log(`Saved ${metadata.Name}`);
         }
@@ -461,9 +461,9 @@ class JellyfinScanner {
               tmdbId: tvShow.id,
               tvdbId: tvShow.external_ids.tvdb_id,
               mediaAddedAt: new Date(metadata.DateCreated ?? ''),
-              jellyfinMediaId: isAllStandardSeasons ? Id : null,
+              jellyfinMediaId: isAllStandardSeasons ? Id : undefined,
               jellyfinMediaId4k:
-                isAll4kSeasons && this.enable4kShow ? Id : null,
+                isAll4kSeasons && this.enable4kShow ? Id : undefined,
               status: isAllStandardSeasons
                 ? MediaStatus.AVAILABLE
                 : newSeasons.some(

server/routes/auth.ts

@@ -276,11 +276,6 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
     });
 
     if (!user && !(await userRepository.count())) {
-      // Check if user is admin on jellyfin
-      if (account.User.Policy.IsAdministrator === false) {
-        throw new Error('not_admin');
-      }
-
       logger.info(
         'Sign-in attempt from Jellyfin user with access to the media server; creating initial admin user for Overseerr',
         {
@@ -428,11 +423,6 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
         status: 401,
         message: 'Unauthorized',
       });
-    } else if (e.message === 'not_admin') {
-      return next({
-        status: 403,
-        message: 'CREDENTIAL_ERROR_NOT_ADMIN',
-      });
     } else if (e.message === 'add_email') {
       return next({
         status: 406,

src/components/Login/JellyfinLogin.tsx

@@ -24,7 +24,6 @@ const messages = defineMessages({
   validationusernamerequired: 'Username required',
   validationpasswordrequired: 'Password required',
   loginerror: 'Something went wrong while trying to sign in.',
-  adminerror: 'You must use an admin account to sign in.',
   credentialerror: 'The username or password is incorrect.',
   signingin: 'Signing in…',
   signin: 'Sign In',
@@ -95,8 +94,6 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
               intl.formatMessage(
                 e.message == 'Request failed with status code 401'
                   ? messages.credentialerror
-                  : e.message == 'Request failed with status code 403'
-                  ? messages.adminerror
                   : messages.loginerror
               ),
               {

src/i18n/locale/en.json

@@ -220,7 +220,6 @@
   "components.Layout.VersionStatus.streamdevelop": "Overseerr Develop",
   "components.Layout.VersionStatus.streamstable": "Overseerr Stable",
   "components.Login.credentialerror": "The username or password is incorrect.",
-  "components.Login.adminerror": "You must use an admin account to sign in.",
   "components.Login.description": "Since this is your first time logging into {applicationName}, you are required to add a valid email address.",
   "components.Login.email": "Email Address",
   "components.Login.emailtooltip": "Address does not need to be associated with your {mediaServerName} instance.",