fix:(login) Admin should be able to login after signup #579

atlp-rwanda · Oct 16, 2024 · 2a508f4 · 2a508f4
1 parent c99966a
commit 2a508f4
Showing 1 changed file with 21 additions and 12 deletions.
diff --git a/src/resolvers/userResolver.ts b/src/resolvers/userResolver.ts
@@ -353,6 +353,22 @@ const resolvers: any = {
           { user },
           { $push: { activity: { $each: [newActivity] } } }
         )
+         if (user?.role === RoleOfUser.ADMIN) {
+      const organization = await Organization.findOne({
+        name: org?.name,
+        admin: user.id,
+      });
+      if (organization) {
+        const token = generateToken(user._id, user._doc?.role || 'user');
+        const data = {
+          token: token,
+          user: user.toJSON(),
+        };
+        return data;
+      } else {
+        throw new Error('Organization not found for the admin.');
+      }
+    }
         if (
           user?.role === RoleOfUser.TRAINEE &&
           user?.organizations?.includes(org?.name)
@@ -392,19 +408,12 @@ const resolvers: any = {
             throw new Error('You are not assigned to any cohort ot team yet.')
           }
         }
-        const organization: any = await Organization.findOne({
-          name: org?.name,
-          admin: user.id,
-        })
+        // const organization: any = await Organization.findOne({
+        //   name: org?.name,
+        //   admin: user.id,
+        // })
 
-        if (user?.role === RoleOfUser.ADMIN && organization) {
-          const token = generateToken(user._id, user._doc?.role || 'user')
-          const data = {
-            token: token,
-            user: user.toJSON(),
-          }
-          return data
-        } else if (user?.role === RoleOfUser.MANAGER) {
+       else if (user?.role === RoleOfUser.MANAGER) {
           const program: any = await Program.find({
             manager: user.id,
           }).populate({