Merge branch 'develop'

server/routes/auth.ts

@@ -210,30 +210,43 @@ authRoutes.post('/local', async (req, res, next) => {
     const mainPlexTv = new PlexTvAPI(mainUser.plexToken ?? '');
 
     if (!user.plexId) {
-      const plexUsersResponse = await mainPlexTv.getUsers();
+      try {
-      const account = plexUsersResponse.MediaContainer.User.find(
+        const plexUsersResponse = await mainPlexTv.getUsers();
-        (account) =>
+        const account = plexUsersResponse.MediaContainer.User.find(
-          account.$.email &&
+          (account) =>
-          account.$.email.toLowerCase() === user.email.toLowerCase()
+            account.$.email &&
-      )?.$;
+            account.$.email.toLowerCase() === user.email.toLowerCase()
-
+        )?.$;
-      if (account) {
+
-        logger.info('Found matching Plex user; updating user with Plex data', {
+        if (
-          label: 'API',
+          account &&
-          ip: req.ip,
+          (await mainPlexTv.checkUserAccess(parseInt(account.id)))
-          email: body.email,
+        ) {
-          userId: user.id,
+          logger.info(
-          plexId: account.id,
+            'Found matching Plex user; updating user with Plex data',
-          plexUsername: account.username,
+            {
-        });
+              label: 'API',
+              ip: req.ip,
+              email: body.email,
+              userId: user.id,
+              plexId: account.id,
+              plexUsername: account.username,
+            }
+          );
 
-        user.plexId = parseInt(account.id);
+          user.plexId = parseInt(account.id);
-        user.avatar = account.thumb;
+          user.avatar = account.thumb;
-        user.email = account.email;
+          user.email = account.email;
-        user.plexUsername = account.username;
+          user.plexUsername = account.username;
-        user.userType = UserType.PLEX;
+          user.userType = UserType.PLEX;
 
-        await userRepository.save(user);
+          await userRepository.save(user);
+        }
+      } catch (e) {
+        logger.error('Something went wrong fetching Plex users', {
+          label: 'API',
+          errorMessage: e.message,
+        });
       }
     }