Merge pull request #2224 from Real-Dev-Squad/revert-2192-feat/verify-functionality

Revert "remove unverified role on /verify"

Author: iamitprakash

constants/discordRoles.ts

@@ -4,10 +4,8 @@ const { getDiscordMembers } = require("../services/discordService");
 const { addOrUpdate, getUsersByRole, updateUsersInBatch } = require("../models/users");
 const { retrieveDiscordUsers, fetchUsersForKeyValues } = require("../services/dataAccessLayer");
 const { EXTERNAL_ACCOUNTS_POST_ACTIONS } = require("../constants/external-accounts");
-const { DISCORD_ROLES } = require("../constants/discordRoles");
 const logger = require("../utils/logger");
 const { markUnDoneTasksOfArchivedUsersBacklog } = require("../models/tasks");
-const removeDiscordRoleUtils = require("../utils/removeDiscordRole");
 
 const addExternalAccountData = async (req, res) => {
   const createdOn = Date.now();
@@ -48,7 +46,6 @@ const getExternalAccountData = async (req, res) => {
     return res.boom.serverUnavailable(SOMETHING_WENT_WRONG);
   }
 };
-
 const linkExternalAccount = async (req, res) => {
   try {
     const { id: userId, roles } = req.userData;
@@ -72,19 +69,6 @@ const linkExternalAccount = async (req, res) => {
       userId
     );
 
-    const unverifiedRoleRemovalResponse = await removeDiscordRoleUtils.removeDiscordRole(
-      req.userData,
-      attributes.discordId,
-      undefined,
-      DISCORD_ROLES.UNVERIFIED
-    );
-
-    if (!unverifiedRoleRemovalResponse.success) {
-      return res.status(500).json({
-        message: `User details updated but ${unverifiedRoleRemovalResponse.message}. Please contact admin`,
-      });
-    }
-
     return res.status(204).json({ message: "Your discord profile has been linked successfully" });
   } catch (error) {
     logger.error(`Error getting external account data: ${error}`);

controllers/external-accounts.js

@@ -17,7 +17,6 @@ const userData = require("../fixtures/user/user")();
 const userModel = firestore.collection("users");
 const tasksModel = firestore.collection("tasks");
 const { EXTERNAL_ACCOUNTS_POST_ACTIONS } = require("../../constants/external-accounts");
-const removeDiscordRoleUtils = require("../../utils/removeDiscordRole");
 chai.use(chaiHttp);
 const cookieName = config.get("userToken.cookieName");
 
@@ -538,11 +537,6 @@ describe("External Accounts", function () {
       expect(getUserResponseBeforeUpdate.body).to.not.have.property("discordId");
       expect(getUserResponseBeforeUpdate.body).to.not.have.property("discordJoinedAt");
 
-      const removeDiscordRoleStub = Sinon.stub(removeDiscordRoleUtils, "removeDiscordRole").resolves({
-        success: true,
-        message: "Role deleted successfully",
-      });
-
       const response = await chai
         .request(app)
         .patch(`/external-accounts/link/${externalAccountData[2].token}`)
@@ -559,60 +553,6 @@ describe("External Accounts", function () {
       expect(updatedUserDetails.body.roles.in_discord).to.equal(true);
       expect(updatedUserDetails.body).to.have.property("discordId");
       expect(updatedUserDetails.body).to.have.property("discordJoinedAt");
-
-      removeDiscordRoleStub.restore();
-    });
-
-    it("Should return 500 when removeDiscordRole fails because role doesn't exist", async function () {
-      await externalAccountsModel.addExternalAccountData(externalAccountData[2]);
-
-      const removeDiscordRoleStub = Sinon.stub(removeDiscordRoleUtils, "removeDiscordRole").resolves({
-        success: false,
-        message: "Role doesn't exist",
-      });
-
-      const response = await chai
-        .request(app)
-        .patch(`/external-accounts/link/${externalAccountData[2].token}`)
-        .query({ action: EXTERNAL_ACCOUNTS_POST_ACTIONS.DISCORD_USERS_SYNC })
-        .set("Cookie", `${cookieName}=${newUserJWT}`);
-
-      const unverifiedRoleRemovalResponse = await removeDiscordRoleStub();
-
-      expect(response).to.have.status(500);
-      expect(response.body).to.be.an("object");
-      expect(response.body).to.have.property("message");
-      expect(response.body.message).to.equal(
-        `User details updated but ${unverifiedRoleRemovalResponse.message}. Please contact admin`
-      );
-
-      removeDiscordRoleStub.restore();
-    });
-
-    it("Should return 500 when removeDiscordRole fails because role deletion failed", async function () {
-      await externalAccountsModel.addExternalAccountData(externalAccountData[2]);
-
-      const removeDiscordRoleStub = Sinon.stub(removeDiscordRoleUtils, "removeDiscordRole").resolves({
-        success: false,
-        message: "Role deletion failed",
-      });
-
-      const response = await chai
-        .request(app)
-        .patch(`/external-accounts/link/${externalAccountData[2].token}`)
-        .query({ action: EXTERNAL_ACCOUNTS_POST_ACTIONS.DISCORD_USERS_SYNC })
-        .set("Cookie", `${cookieName}=${newUserJWT}`);
-
-      const unverifiedRoleRemovalResponse = await removeDiscordRoleStub();
-
-      expect(response).to.have.status(500);
-      expect(response.body).to.be.an("object");
-      expect(response.body).to.have.property("message");
-      expect(response.body.message).to.equal(
-        `User details updated but ${unverifiedRoleRemovalResponse.message}. Please contact admin`
-      );
-
-      removeDiscordRoleStub.restore();
     });
   });
 });