feat(users): add editable usernames (#715)

server/routes/auth.ts

@@ -48,13 +48,17 @@ authRoutes.post('/login', async (req, res, next) => {
       // Let's check if their plex token is up to date
       if (user.plexToken !== body.authToken) {
         user.plexToken = body.authToken;
-        await userRepository.save(user);
       }
 
       // Update the users avatar with their plex thumbnail (incase it changed)
       user.avatar = account.thumb;
       user.email = account.email;
-      user.username = account.username;
+      user.plexUsername = account.username;
+
+      if (user.username === account.username) {
+        user.username = '';
+      }
+      await userRepository.save(user);
     } else {
       // Here we check if it's the first user. If it is, we create the user with no check
       // and give them admin permissions
@@ -63,7 +67,7 @@ authRoutes.post('/login', async (req, res, next) => {
       if (totalUsers === 0) {
         user = new User({
           email: account.email,
-          username: account.username,
+          plexUsername: account.username,
           plexId: account.id,
           plexToken: account.authToken,
           permissions: Permission.ADMIN,
@@ -86,7 +90,7 @@ authRoutes.post('/login', async (req, res, next) => {
         if (await mainPlexTv.checkUserAccess(account)) {
           user = new User({
             email: account.email,
-            username: account.username,
+            plexUsername: account.username,
             plexId: account.id,
             plexToken: account.authToken,
             permissions: settings.main.defaultPermissions,
@@ -141,7 +145,7 @@ authRoutes.post('/local', async (req, res, next) => {
   try {
     const user = await userRepository.findOne({
       select: ['id', 'password'],
-      where: { email: body.email, userType: UserType.LOCAL },
+      where: { email: body.email },
     });
 
     const isCorrectCredentials = await user?.passwordMatch(body.password);

server/routes/user.ts

@@ -138,7 +138,11 @@ router.put<{ id: string }>('/:id', async (req, res, next) => {
       });
     }
 
-    Object.assign(user, req.body);
+    Object.assign(user, {
+      username: req.body.username,
+      permissions: req.body.permissions,
+    });
+
     await userRepository.save(user);
 
     return res.status(200).json(user.filter());
@@ -213,20 +217,32 @@ router.post('/import-from-plex', async (req, res, next) => {
     const createdUsers: User[] = [];
     for (const rawUser of plexUsersResponse.MediaContainer.User) {
       const account = rawUser.$;
+
       const user = await userRepository.findOne({
-        where: { plexId: account.id },
+        where: [{ plexId: account.id }, { email: account.email }],
       });
+
       if (user) {
         // Update the users avatar with their plex thumbnail (incase it changed)
         user.avatar = account.thumb;
         user.email = account.email;
-        user.username = account.username;
+        user.plexUsername = account.username;
+
+        // in-case the user was previously a local account
+        if (user.userType === UserType.LOCAL) {
+          user.userType = UserType.PLEX;
+          user.plexId = parseInt(account.id);
+
+          if (user.username === account.username) {
+            user.username = '';
+          }
+        }
         await userRepository.save(user);
       } else {
         // Check to make sure it's a real account
         if (account.email && account.username) {
           const newUser = new User({
-            username: account.username,
+            plexUsername: account.username,
             email: account.email,
             permissions: settings.main.defaultPermissions,
             plexId: parseInt(account.id),