resolved comments

Author: Suvidh-kaushik

controllers/users.js

@@ -14,7 +14,7 @@ const dataAccess = require("../services/dataAccessLayer");
 const { isLastPRMergedWithinDays } = require("../services/githubService");
 const logger = require("../utils/logger");
 const { SOMETHING_WENT_WRONG, INTERNAL_SERVER_ERROR } = require("../constants/errorMessages");
-const { OVERDUE_TASKS } = require("../constants/users");
+const { OVERDUE_TASKS, ALL_USER_ROLES } = require("../constants/users");
 const { getPaginationLink, getUsernamesFromPRs, getRoleToUpdate } = require("../utils/users");
 const { setInDiscordFalseScript, setUserDiscordNickname } = require("../services/discordService");
 const { generateDiscordProfileImageUrl } = require("../utils/discord-actions");
@@ -470,9 +470,9 @@ const getSelfDetails = async (req, res) => {
  * @param res {Object} - Express response object
  */
 
-const updateSelf = async (req, res) => {
+const updateSelf = async (req, res, next) => {
   try {
-    const { id: userId, roles: userRoles, discordId, incompleteUserDetails } = req.userData;
+    const { id: userId, roles: userRoles, discordId, incompleteUserDetails, role: existingRole } = req.userData;
     const devFeatureFlag = req.query.dev === "true";
     const { user } = await dataAccess.retrieveUsers({ id: userId });
     const { first_name: firstName, last_name: lastName, role } = req.body;
@@ -488,7 +488,7 @@ const updateSelf = async (req, res) => {
         req.body.role = role;
         await userQuery.setIncompleteUserDetails(userId);
       } else {
-        const alreadyHasRole = userRoles[role];
+        const alreadyHasRole = ALL_USER_ROLES.includes(existingRole);
         if (role && !alreadyHasRole) {
           req.body.role = role;
         }
@@ -523,7 +523,6 @@ const updateSelf = async (req, res) => {
       }
     }
 
-    // Handle developer-specific logic for disabledRoles
     if (userRoles.in_discord && !user.incompleteUserDetails) {
       const membersInDiscord = await getDiscordMembers();
       if (!Array.isArray(membersInDiscord))
@@ -532,35 +531,17 @@ const updateSelf = async (req, res) => {
       if (discordMember) {
         const { roles } = discordMember;
         if (roles && roles.includes(discordDeveloperRoleId)) {
-          // Developers can only update disabledRoles with dev flag
-          if (req.body.disabledRoles) {
-            if (devFeatureFlag) {
-              const updatedUser = await userQuery.addOrUpdate(
-                { disabled_roles: rolesToDisable },
-                userId,
-                devFeatureFlag
-              );
-              if (updatedUser) {
-                return res
-                  .status(200)
-                  .send({ message: "Privilege modified successfully!", disabled_roles: rolesToDisable });
-              }
-            } else {
-              // disabledRoles without dev flag should return 403
-              return res.boom.forbidden(
-                "Developers can only update disabled_roles. Use profile service for updating other attributes."
-              );
+          if (req.body.disabledRoles && devFeatureFlag) {
+            const updatedUser = await userQuery.addOrUpdate({ disabled_roles: rolesToDisable }, userId, devFeatureFlag);
+            if (updatedUser) {
+              return res
+                .status(200)
+                .send({ message: "Privilege modified successfully!", disabled_roles: rolesToDisable });
             }
           }
-          // Check if developer is trying to update something other than disabledRoles
-          const hasOtherFields = Object.keys(req.body).some(
-            (key) => key !== "disabledRoles" && req.body[key] !== undefined
+          return res.boom.forbidden(
+            "Developers can only update disabled_roles. Use profile service for updating other attributes."
           );
-          if (hasOtherFields) {
-            return res.boom.forbidden(
-              "Developers can only update disabled_roles. Use profile service for updating other attributes."
-            );
-          }
         }
       }
     }
@@ -576,7 +557,7 @@ const updateSelf = async (req, res) => {
     return res.boom.notFound("User not found");
   } catch (error) {
     logger.error(`Error while updating user: ${error}`);
-    return res.boom.serverUnavailable(SOMETHING_WENT_WRONG);
+    return next(error);
   }
 };
 

test/fixtures/user/user.js

@@ -61,6 +61,7 @@ module.exports = () => {
       },
       nickname_synced: false,
       profileStatus: "BLOCKED",
+      incompleteUserDetails: false,
     },
     {
       username: "pranavg",

test/integration/auth.test.js

@@ -457,7 +457,7 @@ describe("auth", function () {
       .query({ code: "codeReturnedByGoogle", state: rdsUiUrl })
       .redirects(0);
     expect(res).to.have.status(302);
-    expect(res.headers.location).to.equal(rdsUiUrl);
+    expect(res.headers.location).to.equal("https://my.realdevsquad.com/new-signup");
   });
 
   it("should get the verified email and redirect the google user to the goto page on successful login", async function () {

test/integration/users.test.js

@@ -2992,7 +2992,7 @@ describe("Users", function () {
     let id, jwtoken;
 
     beforeEach(async function () {
-      id = await addUser();
+      id = await addUser(userData[0]);
       jwtoken = authService.generateAuthToken({ userId: id });
       fetchStub = Sinon.stub(global, "fetch");
       const discordMembers = [...getDiscordMembers];