Added functionality to passdown the header to bot

controllers/discordactions.js

@@ -5,6 +5,7 @@
 const discordRolesModel = require("../models/discordactions");
 const discordServices = require("../services/discordService");
 const { fetchAllUsers, fetchUser } = require("../models/users");
+const { genrateCloudFlareHeaders } = require("../utils/discord-actions");
 const discordDeveloperRoleId = config.get("discordDeveloperRoleId");
 const discordMavenRoleId = config.get("discordMavenRoleId");
 
@@ -39,15 +40,13 @@
  createdBy: req.userData.id,
  date: admin.firestore.Timestamp.fromDate(new Date()),
  };
- const authToken = jwt.sign({}, config.get("rdsServerlessBot.rdsServerLessPrivateKey"), {
- algorithm: "RS256",
- expiresIn: config.get("rdsServerlessBot.ttl"),
- });
+
+ const headers = genrateCloudFlareHeaders(req.userData);
 
  const responseForCreatedRole = await fetch(`${DISCORD_BASE_URL}/roles/create`, {
  method: "PUT",
  body: JSON.stringify(dataForDiscord),
- headers: { "Content-Type": "application/json", Authorization: `Bearer ${authToken}` },
+ headers,
  }).then((response) => response.json());
 
  groupRoleData.roleid = responseForCreatedRole.id;
@@ -132,14 +131,12 @@
  const dataForDiscord = {
  ...req.body,
  };
- const authToken = jwt.sign({}, config.get("rdsServerlessBot.rdsServerLessPrivateKey"), {
- algorithm: "RS256",
- expiresIn: config.get("rdsServerlessBot.ttl"),
- });
+ const headers = genrateCloudFlareHeaders(req.userData);
+
  const apiCallToDiscord = fetch(`${DISCORD_BASE_URL}/roles/add`, {
  method: "PUT",
  body: JSON.stringify(dataForDiscord),
- headers: { "Content-Type": "application/json", Authorization: `Bearer ${authToken}` },
+ headers,
  });
  const discordLastJoinedDateUpdate = discordRolesModel.groupUpdateLastJoinDate({
  id: existingRoles.docs[0].id,
@@ -168,6 +165,7 @@
  if (!roleExists || req.userData.id !== userData.user.id) {
  res.boom.forbidden("Permission denied. Cannot delete the role.");
  }
+ await discordServices.removeRoleFromUser(roleid, userid, req.userData);
 
  const { wasSuccess } = await discordRolesModel.removeMemberGroup(roleid, userid);
  if (wasSuccess) {
@@ -285,7 +283,7 @@
  const nickNameUpdatedUsers = [];
  let counter = 0;
  for (let i = 0; i < usersToBeEffected.length; i++) {
  const { discordId, username, first_name: firstName } = usersToBeEffected[i];
  try {
  if (counter % 10 === 0 && counter !== 0) {
  await new Promise((resolve) => setTimeout(resolve, 5500));
@@ -301,7 +299,7 @@
  if (message) {
  counter++;
  totalNicknamesUpdated.count++;
  nickNameUpdatedUsers.push(usersToBeEffected[i].id);
  }
  }
  } catch (error) {

models/discordactions.js

@@ -47,16 +47,12 @@
 
 const removeMemberGroup = async (roleId, discordId) => {
  try {
- const discordResponse = await removeRoleFromUser(roleId, discordId);
- if (discordResponse) {
- const backendResponse = await deleteRoleFromDatabase(roleId, discordId);
- return backendResponse;
- }
+ const backendResponse = await deleteRoleFromDatabase(roleId, discordId);
+ return backendResponse;
  } catch (error) {
  logger.error(`Error while removing role: ${error}`);
  throw new Error(error);
  }
- return false;
 };
 
 const deleteRoleFromDatabase = async (roleId, discordId) => {
@@ -494,7 +490,7 @@
 
  for (let i = 0; i < nicknameUpdateBatches.length; i++) {
  const promises = [];
  const usersStatusDocsBatch = nicknameUpdateBatches[i];
  usersStatusDocsBatch.forEach((document) => {
  const doc = document.data();
  const userId = doc.userId;

services/discordService.js

@@ -1,6 +1,6 @@
 const firestore = require("../utils/firestore");
 const { fetchAllUsers } = require("../models/users");
-const { generateAuthTokenForCloudflare } = require("../utils/discord-actions");
+const { generateAuthTokenForCloudflare, genrateCloudFlareHeaders } = require("../utils/discord-actions");
 const userModel = firestore.collection("users");
 const DISCORD_BASE_URL = config.get("services.discordBot.baseUrl");
 
@@ -70,12 +70,12 @@ const addRoleToUser = async (userid, roleid) => {
  return response;
 };
 
-const removeRoleFromUser = async (roleId, discordId) => {
+const removeRoleFromUser = async (roleId, discordId, userData) => {
  try {
- const authToken = generateAuthTokenForCloudflare();
+ const headers = genrateCloudFlareHeaders(userData);
  const data = await fetch(`${DISCORD_BASE_URL}/roles`, {
  method: "DELETE",
- headers: { "Content-Type": "application/json", Authorization: `Bearer ${authToken}` },
+ headers,
  body: JSON.stringify({ userid: discordId, roleid: roleId }),
  });
  const response = await data.json();

test/unit/utils/genrateCloudFlare.test.js

@@ -0,0 +1,16 @@
+const { expect } = require("chai");
+const { genrateCloudFlareHeaders } = require("../../../utils/discord-actions");
+
+describe("genrateCloudFlareHeaders", function () {
+ it("generates headers with prop Content-Type and Authorization", function () {
+ const data = genrateCloudFlareHeaders();
+ expect(data["Content-Type"]).to.be("application/json");
+ expect(data).to.include("eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9");
+ });
+ it("generates headers with prop Content-Type and Authorization and X-Audit-Log-Reason when id and userName is passed", function () {
+ const data = genrateCloudFlareHeaders({ id: "is", userName: "userName" });
+ expect(data["Content-Type"]).to.be("application/json");
+ expect(data.Authorization).to.include("eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9");
+ expect(data["X-Audit-Log-Reason"]).to.be("Action initiator's username=>userName and id=id");
+ });
+});

utils/discord-actions.js

@@ -10,6 +10,17 @@ const generateAuthTokenForCloudflare = () => {
  });
  return authToken;
 };
+const genrateCloudFlareHeaders = ({ userName, id }) => {
+ const authToken = generateAuthTokenForCloudflare();
+ const headers = {
+ "Content-Type": "application/json",
+ Authorization: `Bearer ${authToken}`,
+ };
+ if (userName && id) {
+ headers["X-Audit-Log-Reason"] = `Action initiator's username=>${userName} and id=${id}`;
+ }
+ return headers;
+};
 
 const generateDiscordProfileImageUrl = async (discordId) => {
  try {
@@ -29,4 +40,5 @@ const generateDiscordProfileImageUrl = async (discordId) => {
 module.exports = {
  generateDiscordProfileImageUrl,
  generateAuthTokenForCloudflare,
+ genrateCloudFlareHeaders,
 };