Merge branch 'develop' into iss2261

Author: Achintya-Chatterjee

controllers/awsAccess.ts

@@ -21,6 +21,12 @@ export const addUserToAWSGroup = async (req, res) => {
       if (awsUserId === null){
         // We need to create the user in AWS before and then fetch its Id
         userCreationResponse = await createUser(userInfoData.user.username, userInfoData.user.email);
+        
+        if (userCreationResponse.conflict){
+          return res.status(400).json({
+            error: `Username or Email is already being used, please use another email / username for creating account in AWS`
+          })
+        }
         awsUserId = userCreationResponse.UserId;
       }
 

routes/discordactions.js

@@ -30,19 +30,11 @@ const ROLES = require("../constants/roles");
 const { Services } = require("../constants/bot");
 const { verifyCronJob } = require("../middlewares/authorizeBot");
 const { authorizeAndAuthenticate } = require("../middlewares/authorizeUsersAndService");
-const { devFlagMiddleware } = require("../middlewares/devFlag");
 const router = express.Router();
 
 router.post("/groups", authenticate, checkIsVerifiedDiscord, validateGroupRoleBody, createGroupRole);
 router.get("/groups", authenticate, checkIsVerifiedDiscord, getAllGroupRoles);
-router.delete(
-  "/groups/:groupId",
-  authenticate,
-  checkIsVerifiedDiscord,
-  authorizeRoles([SUPERUSER]),
-  devFlagMiddleware,
-  deleteGroupRole
-);
+router.delete("/groups/:groupId", authenticate, checkIsVerifiedDiscord, authorizeRoles([SUPERUSER]), deleteGroupRole);
 router.post("/roles", authenticate, checkIsVerifiedDiscord, validateMemberRoleBody, addGroupRoleToMember);
 router.get("/invite", authenticate, getUserDiscordInvite);
 router.post("/invite", authenticate, checkCanGenerateDiscordLink, generateInviteForUser);

test/integration/discordactions.test.js

@@ -233,18 +233,6 @@ describe("Discord actions", function () {
       await cleanDb();
     });
 
-    it("should return 404 when not in dev mode", function (done) {
-      chai
-        .request(app)
-        .delete(`/discord-actions/groups/${groupId}`)
-        .set("cookie", `${cookieName}=${superUserAuthToken}`)
-        .end((err, res) => {
-          expect(res).to.have.status(404);
-          expect(res.body.error).to.equal("Not Found");
-          done(err);
-        });
-    });
-
     it("should return 404 if group role not found", function (done) {
       sinon.stub(discordRolesModel, "isGroupRoleExists").resolves({
         roleExists: false,

utils/awsFunctions.ts

@@ -67,7 +67,10 @@ import {
       const command = new CreateUserCommand(params);
       return (await client.send(command));
     } catch (error) {
-      console.error(`The error from create user ${error}`);
+      if (error.__type === 'ConflictException'){
+        return { conflict: true };
+      }
+
       throw new Error(`Failed to create user: ${error instanceof Error ? error.message : String(error)}`);
     }
   };
@@ -93,7 +96,6 @@ export const addUserToGroup = async (groupId: string, awsUserId: string): Promis
       const command = new CreateGroupMembershipCommand(params);
       return (await client.send(command));
     } catch (error) {
-      console.error("Error adding user to group:", error);
       if (error.__type === 'ConflictException'){
         return { conflict: true };
       }