Merge pull request #64 from Real-Dev-Squad/develop

ankushdharkar · web-flow · commit 9eb00b80e979 · 2023-05-13T09:57:55.000-07:00
Sync dev to main
diff --git a/src/constants/responses.ts b/src/constants/responses.ts
@@ -23,3 +23,5 @@ export const RETRY_COMMAND =
   "Oops, we didn't catch that! Please use the command again.";
 
 export const ROLE_ADDED = "Role added successfully";
+
+export const NAME_CHANGED = "User nickname changed successfully";
diff --git a/src/controllers/changeNickname.ts b/src/controllers/changeNickname.ts
@@ -0,0 +1,23 @@
+import { IRequest } from "itty-router";
+import { env } from "../typeDefinitions/default.types";
+import JSONResponse from "../utils/JsonResponse";
+import * as response from "../constants/responses";
+import { verifyAuthToken } from "../utils/verifyAuthToken";
+import { updateNickName } from "../utils/updateNickname";
+
+export async function changeNickname(request: IRequest, env: env) {
+  const authHeader = await request.headers.get("Authorization");
+
+  if (!authHeader) {
+    return new JSONResponse(response.BAD_SIGNATURE);
+  }
+
+  try {
+    await verifyAuthToken(authHeader, env);
+    const { discordId, userName } = await request.json();
+    const res = await updateNickName(discordId, userName, env);
+    return new JSONResponse(res);
+  } catch {
+    return new JSONResponse(response.BAD_SIGNATURE);
+  }
+}
diff --git a/src/index.ts b/src/index.ts
@@ -11,6 +11,7 @@ import {
   createGuildRoleHandler,
 } from "./controllers/guildRoleHandler";
 import { getMembersInServerHandler } from "./controllers/getMembersInServer";
+import { changeNickname } from "./controllers/changeNickname";
 
 const router = Router();
 
@@ -20,6 +21,8 @@ router.get("/", async () => {
   });
 });
 
+router.patch("/guild/member", changeNickname);
+
 router.put("/roles/create", createGuildRoleHandler);
 
 router.put("/roles/add", addGroupRoleHandler);
diff --git a/src/utils/updateNickname.ts b/src/utils/updateNickname.ts
@@ -1,4 +1,4 @@
-import { INTERNAL_SERVER_ERROR } from "../constants/responses";
+import { INTERNAL_SERVER_ERROR, NAME_CHANGED } from "../constants/responses";
 import { DISCORD_BASE_URL } from "../constants/urls";
 import { env } from "../typeDefinitions/default.types";
 
@@ -19,13 +19,9 @@ export async function updateNickName(
       body: JSON.stringify(data),
     });
     if (nameChangeResponse.ok) {
-      return await nameChangeResponse.json();
-    } else {
-      console.log(nameChangeResponse.json());
-      return INTERNAL_SERVER_ERROR;
+      return NAME_CHANGED;
     }
   } catch (error) {
-    console.log(error);
     return INTERNAL_SERVER_ERROR;
   }
 }
diff --git a/tests/unit/utils/discordEphemeralResponse.test.ts b/tests/unit/utils/discordEphemeralResponse.test.ts
@@ -1,7 +1,7 @@
 import { InteractionResponseType } from "discord-interactions";
-import { responseJson } from "../../src/typeDefinitions/default.types";
-import JSONResponse from "../../src/utils/JsonResponse";
-import { discordEphemeralResponse } from "../../src/utils/discordEphemeralResponse";
+import { responseJson } from "../../../src/typeDefinitions/default.types";
+import JSONResponse from "../../../src/utils/JsonResponse";
+import { discordEphemeralResponse } from "../../../src/utils/discordEphemeralResponse";
 
 describe("Test discordEphemeralResponse function", () => {
   it("should return a JSONResponse", () => {
diff --git a/tests/unit/utils/discordResponse.test.ts b/tests/unit/utils/discordResponse.test.ts
@@ -1,7 +1,7 @@
 import { InteractionResponseType } from "discord-interactions";
-import { responseJson } from "../../src/typeDefinitions/default.types";
-import { discordTextResponse } from "../../src/utils/discordResponse";
-import JSONResponse from "../../src/utils/JsonResponse";
+import { responseJson } from "../../../src/typeDefinitions/default.types";
+import { discordTextResponse } from "../../../src/utils/discordResponse";
+import JSONResponse from "../../../src/utils/JsonResponse";
 
 describe("Test discordResponse function", () => {
   it("should return a JSONResponse", () => {
diff --git a/tests/unit/utils/getCommandName.test.ts b/tests/unit/utils/getCommandName.test.ts
@@ -1,5 +1,5 @@
-import { HELLO, VERIFY } from "../../src/constants/commands";
-import { getCommandName } from "../../src/utils/getCommandName";
+import { HELLO, VERIFY } from "../../../src/constants/commands";
+import { getCommandName } from "../../../src/utils/getCommandName";
 
 describe("Test getCommandName function", () => {
   it("Returns hello command name in lower case", () => {
diff --git a/tests/unit/utils/getMembersInServer.test.ts b/tests/unit/utils/getMembersInServer.test.ts
@@ -1,6 +1,6 @@
-import { DISCORD_BASE_URL } from "../../src/constants/urls";
-import JSONResponse from "../../src/utils/JsonResponse";
-import { getMembersInServer } from "../../src/utils/getMembersInServer";
+import { DISCORD_BASE_URL } from "../../../src/constants/urls";
+import JSONResponse from "../../../src/utils/JsonResponse";
+import { getMembersInServer } from "../../../src/utils/getMembersInServer";
 
 describe("getMembersInServer", () => {
   const mockEnv = {
diff --git a/tests/unit/utils/guildRole.test.ts b/tests/unit/utils/guildRole.test.ts
@@ -1,11 +1,11 @@
-import JSONResponse from "../../src/utils/JsonResponse";
-import * as response from "../../src/constants/responses";
-import { createGuildRole, addGroupRole } from "../../src/utils/guildRole";
+import JSONResponse from "../../../src/utils/JsonResponse";
+import * as response from "../../../src/constants/responses";
+import { createGuildRole, addGroupRole } from "../../../src/utils/guildRole";
 import {
   dummyAddRoleBody,
   dummyCreateBody,
   guildEnv,
-} from "../fixtures/fixture";
+} from "../../fixtures/fixture";
 
 describe("createGuildRole", () => {
   test("should return INTERNAL_SERVER_ERROR when response is not ok", async () => {
diff --git a/tests/unit/utils/lowerCaseMessageCommands.test.ts b/tests/unit/utils/lowerCaseMessageCommands.test.ts
@@ -1,5 +1,5 @@
-import { lowerCaseMessageCommands } from "../../src/utils/lowerCaseMessageCommand";
-import { dummyHelloMessage, dummyVerifyMessage } from "../fixtures/fixture";
+import { lowerCaseMessageCommands } from "../../../src/utils/lowerCaseMessageCommand";
+import { dummyHelloMessage, dummyVerifyMessage } from "../../fixtures/fixture";
 
 describe("Test LowerCaseMessageCommand function", () => {
   it("Should return the `HELLO` message in lower case", () => {
diff --git a/tests/unit/utils/updateNickname.test.ts b/tests/unit/utils/updateNickname.test.ts
@@ -0,0 +1,71 @@
+import {
+  INTERNAL_SERVER_ERROR,
+  NAME_CHANGED,
+} from "../../../src/constants/responses";
+import { DISCORD_BASE_URL } from "../../../src/constants/urls";
+import JSONResponse from "../../../src/utils/JsonResponse";
+import { updateNickName } from "../../../src/utils/updateNickname";
+
+describe("Update nickname", () => {
+  const mockEnv = {
+    BOT_PUBLIC_KEY: "xyz",
+    DISCORD_GUILD_ID: "123",
+    DISCORD_TOKEN: "abc",
+  };
+
+  const mockData = { discordId: "12345678910111213", nickname: "jhon" };
+
+  test("updatenickname fetch is called with expected parameters", async () => {
+    const data = { nick: mockData.nickname };
+
+    jest
+      .spyOn(global, "fetch")
+      .mockImplementation(() =>
+        Promise.resolve(new JSONResponse(NAME_CHANGED))
+      );
+
+    const response = await updateNickName(
+      mockData.discordId,
+      mockData.nickname,
+      mockEnv
+    );
+
+    expect(global.fetch).toHaveBeenCalledWith(
+      `${DISCORD_BASE_URL}/guilds/${mockEnv.DISCORD_GUILD_ID}/members/${mockData.discordId}`,
+      {
+        method: "PATCH",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: `Bot ${mockEnv.DISCORD_TOKEN}`,
+        },
+        body: JSON.stringify(data),
+      }
+    );
+
+    expect(response).toEqual(NAME_CHANGED);
+  });
+
+  test("Return Internal server error for improper body", async () => {
+    jest
+      .spyOn(global, "fetch")
+      .mockRejectedValue(() =>
+        Promise.resolve(new JSONResponse({ INTERNAL_SERVER_ERROR }))
+      );
+
+    const response = await updateNickName(mockData.discordId, "", mockEnv);
+
+    expect(response).toEqual(INTERNAL_SERVER_ERROR);
+
+    expect(global.fetch).toHaveBeenCalledWith(
+      `${DISCORD_BASE_URL}/guilds/${mockEnv.DISCORD_GUILD_ID}/members/${mockData.discordId}`,
+      {
+        method: "PATCH",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: `Bot ${mockEnv.DISCORD_TOKEN}`,
+        },
+        body: JSON.stringify({ nick: "" }),
+      }
+    );
+  });
+});

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { INTERNAL_SERVER_ERROR } from "../constants/responses";`
	`1`	`+import { INTERNAL_SERVER_ERROR, NAME_CHANGED } from "../constants/responses";`
`2`	`2`	`import { DISCORD_BASE_URL } from "../constants/urls";`
`3`	`3`	`import { env } from "../typeDefinitions/default.types";`
`4`	`4`
`@@ -19,13 +19,9 @@ export async function updateNickName(`
`19`	`19`	`body: JSON.stringify(data),`
`20`	`20`	`});`
`21`	`21`	`if (nameChangeResponse.ok) {`
`22`		`- return await nameChangeResponse.json();`
`23`		`- } else {`
`24`		`- console.log(nameChangeResponse.json());`
`25`		`- return INTERNAL_SERVER_ERROR;`
	`22`	`+ return NAME_CHANGED;`
`26`	`23`	`}`
`27`	`24`	`} catch (error) {`
`28`		`- console.log(error);`
`29`	`25`	`return INTERNAL_SERVER_ERROR;`
`30`	`26`	`}`
`31`	`27`	`}`