resolved merge conflicts

Author: shreya-mishra11

config/config.ts

@@ -5,6 +5,7 @@ import {
   RDS_BASE_DEVELOPMENT_API_URL,
   VERIFICATION_SITE_URL,
   STAGING_VERIFICATION_SITE_URL,
+  DEVELOPMENT_VERIFICATION_SITE_URL,
 } from "../src/constants/urls";
 
 const config = (env: env) => {
@@ -19,7 +20,7 @@ const config = (env: env) => {
     },
     default: {
       RDS_BASE_API_URL: RDS_BASE_DEVELOPMENT_API_URL,
-      VERIFICATION_SITE_URL: STAGING_VERIFICATION_SITE_URL,
+      VERIFICATION_SITE_URL: DEVELOPMENT_VERIFICATION_SITE_URL,
     },
   };
 

src/constants/responses.ts

@@ -27,4 +27,5 @@ export const ROLE_ADDED = "Role added successfully";
 export const NAME_CHANGED = "User nickname changed successfully";
 
 export const VERIFICATION_STRING =
-"Like to verify yourself? click the above link and authorize real dev squad to manage your discord data";
+  "Like to verify yourself? click the above link and authorize real dev squad to manage your discord data";
+export const ROLE_REMOVED = "Role Removed successfully";

src/constants/urls.ts

@@ -1,12 +1,11 @@
-export const RDS_BASE_API_URL = "https://66ea-103-77-42-188.ngrok-free.app";
-export const RDS_BASE_STAGING_API_URL =
-  "https://66ea-103-77-42-188.ngrok-free.app";
-export const RDS_BASE_DEVELOPMENT_API_URL =
-  "https://66ea-103-77-42-188.ngrok-free.app"; // If needed, modify the URL to your local API server
+export const RDS_BASE_API_URL = "https://api.realdevsquad.com";
+export const RDS_BASE_STAGING_API_URL = "https://staging-api.realdevsquad.com";
+export const RDS_BASE_DEVELOPMENT_API_URL = "http://localhost:3000"; // If needed, modify the URL to your local API server run through ngrok
 
 export const DISCORD_BASE_URL = "https://discord.com/api/v10";
 export const DISCORD_AVATAR_BASE_URL = "https://cdn.discordapp.com/avatars";
 
 export const VERIFICATION_SITE_URL = "https://my.realdevsquad.com";
+export const DEVELOPMENT_VERIFICATION_SITE_URL = "http://localhost:3443";
 export const STAGING_VERIFICATION_SITE_URL =
   "https://staging-my.realdevsquad.com";

src/controllers/guildRoleHandler.ts

@@ -2,7 +2,11 @@ import * as response from "../constants/responses";
 import { env } from "../typeDefinitions/default.types";
 import JSONResponse from "../utils/JsonResponse";
 import { IRequest } from "itty-router";
-import { addGroupRole, createGuildRole } from "../utils/guildRole";
+import {
+  addGroupRole,
+  createGuildRole,
+  removeGuildRole,
+} from "../utils/guildRole";
 import {
   createNewRole,
   memberGroupRole,
@@ -39,3 +43,28 @@ export async function addGroupRoleHandler(request: IRequest, env: env) {
     return new JSONResponse(response.BAD_SIGNATURE);
   }
 }
+
+export async function removeGuildRoleHandler(request: IRequest, env: env) {
+  const authHeader = request.headers.get("Authorization");
+  if (!authHeader) {
+    return new JSONResponse(response.BAD_SIGNATURE, { status: 401 });
+  }
+  try {
+    await verifyAuthToken(authHeader, env);
+    const body: memberGroupRole = await request.json();
+    const res = await removeGuildRole(body, env);
+    return new JSONResponse(res, {
+      status: 200,
+      headers: {
+        "content-type": "application/json;charset=UTF-8",
+      },
+    });
+  } catch (err) {
+    return new JSONResponse(response.INTERNAL_SERVER_ERROR, {
+      status: 500,
+      headers: {
+        "content-type": "application/json;charset=UTF-8",
+      },
+    });
+  }
+}

src/index.ts

@@ -9,6 +9,7 @@ import { verifyBot } from "./utils/verifyBot";
 import {
   addGroupRoleHandler,
   createGuildRoleHandler,
+  removeGuildRoleHandler,
 } from "./controllers/guildRoleHandler";
 import { getMembersInServerHandler } from "./controllers/getMembersInServer";
 import { changeNickname } from "./controllers/changeNickname";
@@ -28,6 +29,8 @@ router.put("/roles/create", createGuildRoleHandler);
 
 router.put("/roles/add", addGroupRoleHandler);
 
+router.delete("/roles", removeGuildRoleHandler);
+
 router.get("/discord-members", getMembersInServerHandler);
 
 router.get("/member/:id", getGuildMemberDetailsHandler);

src/utils/guildRole.ts

@@ -1,4 +1,8 @@
-import { INTERNAL_SERVER_ERROR, ROLE_ADDED } from "../constants/responses";
+import {
+  INTERNAL_SERVER_ERROR,
+  ROLE_ADDED,
+  ROLE_REMOVED,
+} from "../constants/responses";
 import { DISCORD_BASE_URL } from "../constants/urls";
 import { env } from "../typeDefinitions/default.types";
 import {
@@ -55,3 +59,28 @@ export async function addGroupRole(body: memberGroupRole, env: env) {
     return INTERNAL_SERVER_ERROR;
   }
 }
+
+export async function removeGuildRole(details: memberGroupRole, env: env) {
+  const { userid, roleid } = details;
+  const removeGuildRoleUrl = `${DISCORD_BASE_URL}/guilds/${env.DISCORD_GUILD_ID}/members/${userid}/roles/${roleid}`;
+  try {
+    const response = await fetch(removeGuildRoleUrl, {
+      method: "DELETE",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bot ${env.DISCORD_TOKEN}`,
+      },
+    });
+    if (response.ok) {
+      return {
+        message: ROLE_REMOVED,
+        userAffected: {
+          userid,
+          roleid,
+        },
+      };
+    }
+  } catch (err) {
+    return INTERNAL_SERVER_ERROR;
+  }
+}

tests/unit/utils/guildRole.test.ts

@@ -1,6 +1,10 @@
 import JSONResponse from "../../../src/utils/JsonResponse";
 import * as response from "../../../src/constants/responses";
-import { createGuildRole, addGroupRole } from "../../../src/utils/guildRole";
+import {
+  createGuildRole,
+  addGroupRole,
+  removeGuildRole,
+} from "../../../src/utils/guildRole";
 import {
   dummyAddRoleBody,
   dummyCreateBody,
@@ -89,3 +93,39 @@ describe("addGroupRole", () => {
     );
   });
 });
+
+describe("removeGuildRole", () => {
+  test("Should return success message on proper response", async () => {
+    const mockResponse = {
+      ok: true,
+    };
+    jest
+      .spyOn(global, "fetch")
+      .mockImplementation(() =>
+        Promise.resolve(new JSONResponse(mockResponse))
+      );
+    const result = await removeGuildRole(dummyAddRoleBody, guildEnv);
+    expect(global.fetch).toHaveBeenCalledWith(
+      `https://discord.com/api/v10/guilds/${guildEnv.DISCORD_GUILD_ID}/members/${dummyAddRoleBody.userid}/roles/${dummyAddRoleBody.roleid}`,
+      {
+        method: "DELETE",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: `Bot ${guildEnv.DISCORD_TOKEN}`,
+        },
+      }
+    );
+    expect(result).toEqual({
+      message: response.ROLE_REMOVED,
+      userAffected: {
+        userid: dummyAddRoleBody.userid,
+        roleid: dummyAddRoleBody.roleid,
+      },
+    });
+  });
+  test("Should return internal error response on api failure", async () => {
+    jest.spyOn(global, "fetch").mockRejectedValue("Oops some error");
+    const result = await removeGuildRole(dummyAddRoleBody, guildEnv);
+    expect(result).toEqual(response.INTERNAL_SERVER_ERROR);
+  });
+});