fix: initAdminFromEnv

Signed-off-by: mertmit <mertmit99@gmail.com>

packages/nocodb/src/helpers/initAdminFromEnv.ts

@@ -89,62 +89,21 @@ export default async function initAdminFromEnv(_ncMeta = Noco.ncMeta) {
           salt,
         );
         const email_verification_token = uuidv4();
-        const superUser = await ncMeta.metaGet2(null, null, MetaTable.USERS, {
-          roles: 'user,super',
-        });
+        // TODO improve this
+        const superUsers = await ncMeta.metaList2(null, null, MetaTable.USERS);
 
-        if (!superUser?.id) {
-          const existingUserWithNewEmail = await User.getByEmail(email, ncMeta);
-          if (existingUserWithNewEmail?.id) {
-            // clear cache
-            await NocoCache.delAll(
-              CacheScope.USER,
-              `${existingUserWithNewEmail.email}___*`,
-            );
-            await NocoCache.del(
-              `${CacheScope.USER}:${existingUserWithNewEmail.id}`,
-            );
-            await NocoCache.del(
-              `${CacheScope.USER}:${existingUserWithNewEmail.email}`,
-            );
+        for (const user of superUsers) {
+          if (!user.roles?.includes('super')) continue;
 
-            // Update email and password of super admin account
-            await User.update(
-              existingUserWithNewEmail.id,
-              {
-                salt,
-                email,
-                password,
-                email_verification_token,
-                token_version: randomTokenString(),
-                refresh_token: null,
-                roles,
-              },
-              ncMeta,
-            );
-          } else {
-            T.emit('evt', {
-              evt_type: 'project:invite',
-              count: 1,
-            });
-
-            await User.insert(
-              {
-                email,
-                salt,
-                password,
-                email_verification_token,
-                roles,
-              },
-              ncMeta,
-            );
-          }
-        } else if (email !== superUser.email) {
+          if (email !== user.email) {
             // update admin email and password and migrate projects
             // if user already present and associated with some project
 
             // check user account already present with the new admin email
-          const existingUserWithNewEmail = await User.getByEmail(email, ncMeta);
+            const existingUserWithNewEmail = await User.getByEmail(
+              email,
+              ncMeta,
+            );
 
             if (existingUserWithNewEmail?.id) {
               // get all project access belongs to the existing account
@@ -161,7 +120,7 @@ export default async function initAdminFromEnv(_ncMeta = Noco.ncMeta) {
               for (const existingUserProject of existingUserProjects) {
                 const userProject = await ProjectUser.get(
                   existingUserProject.project_id,
-                superUser.id,
+                  user.id,
                   ncMeta,
                 );
 
@@ -174,7 +133,7 @@ export default async function initAdminFromEnv(_ncMeta = Noco.ncMeta) {
                   ) {
                     await ProjectUser.update(
                       userProject.project_id,
-                    superUser.id,
+                      user.id,
                       existingUserProject.roles,
                       ncMeta,
                     );
@@ -184,7 +143,7 @@ export default async function initAdminFromEnv(_ncMeta = Noco.ncMeta) {
                   await ProjectUser.insert(
                     {
                       ...existingUserProject,
-                    fk_user_id: superUser.id,
+                      fk_user_id: user.id,
                     },
                     ncMeta,
                   );
@@ -219,7 +178,7 @@ export default async function initAdminFromEnv(_ncMeta = Noco.ncMeta) {
 
               // Update email and password of super admin account
               await User.update(
-              superUser.id,
+                user.id,
                 {
                   salt,
                   email,
@@ -233,7 +192,7 @@ export default async function initAdminFromEnv(_ncMeta = Noco.ncMeta) {
             } else {
               // if email's are not different update the password and hash
               await User.update(
-              superUser.id,
+                user.id,
                 {
                   salt,
                   email,
@@ -248,14 +207,14 @@ export default async function initAdminFromEnv(_ncMeta = Noco.ncMeta) {
           } else {
             const newPasswordHash = await promisify(bcrypt.hash)(
               process.env.NC_ADMIN_PASSWORD,
-            superUser.salt,
+              user.salt,
             );
 
-          if (newPasswordHash !== superUser.password) {
+            if (newPasswordHash !== user.password) {
               // if email's are same and passwords are different
               // then update the password and token version
               await User.update(
-              superUser.id,
+                user.id,
                 {
                   salt,
                   password,
@@ -268,11 +227,13 @@ export default async function initAdminFromEnv(_ncMeta = Noco.ncMeta) {
             }
           }
         }
+      }
+
       await ncMeta.commit();
     } catch (e) {
       console.log('Error occurred while updating/creating admin user');
-      console.log(e);
       await ncMeta.rollback(e);
+      throw e;
     }
   }
 }

packages/nocodb/src/models/User.ts

@@ -87,7 +87,7 @@ export default class User implements UserType {
 
       // check if the target email addr is in use or not
       const targetUser = await this.getByEmail(updateObj.email, ncMeta);
-      if (targetUser.id !== id) {
+      if (targetUser && targetUser.id !== id) {
         NcError.badRequest('email is in use');
       }
     } else {