Merge branch 'develop' into feat/add-unverified-role-tracking

Author: shobhan-sundar-goutam

config/custom-environment-variables.js

@@ -10,6 +10,14 @@ module.exports = {
     __name: "PORT",
     __format: "number",
   },
+
+  aws: {
+    region: "AWS_REGION",
+    access_key: "AWS_ACCESS_KEY",
+    secret_key: "AWS_SECRET_KEY",
+    identity_store_id: "IDENTITY_STORE_ID",
+  },
+
   enableFileLogs: {
     __name: "ENABLE_FILE_LOGS",
     __format: "boolean",

config/default.js

@@ -20,6 +20,13 @@ module.exports = {
     org: "Real-Dev-Squad",
   },
 
+  aws: {
+    region: "<aws-region>",
+    access_key: "<aws-access-key>",
+    secret_key: "<aws-secret-key>",
+    identity_store_id: "<identity-store-id>",
+  },
+
   githubOauth: {
     clientId: "<clientId>",
     clientSecret: "<clientSecret>",

constants/logs.ts

@@ -16,6 +16,7 @@ export const logType = {
   EXTENSION_REQUESTS: "extensionRequests",
   TASK: "task",
   TASK_REQUESTS: "taskRequests",
+  USER_DETAILS_UPDATED: "USER_DETAILS_UPDATED", 
   ...REQUEST_LOG_TYPE,
 };
 

constants/urls.ts

@@ -1,5 +1,7 @@
 export const GITHUB_URL = "https://github.com";
+export const PROFILE_SVC_GITHUB_URL = "https://github.com/Real-Dev-Squad/sample-profile-service";
 
 module.exports = {
   GITHUB_URL,
+  PROFILE_SVC_GITHUB_URL,
 };

constants/userDataLevels.ts

@@ -7,7 +7,7 @@ const ACCESS_LEVEL = {
 
 const ROLE_LEVEL = {
   private: ["super_user"],
-  internal: ["super_user"],
+  internal: ["super_user", "cloudfare_worker"],
   confidential: ["super_user"],
 };
 

controllers/arts.js

@@ -50,6 +50,10 @@ const getSelfArts = async (req, res) => {
   try {
     const { id } = req.userData;
     const arts = await artsQuery.fetchUserArts(id);
+    res.set(
+      "X-Deprecation-Warning",
+      "WARNING: This endpoint is deprecated and will be removed in the future. Please use /arts/:userId to get the art details."
+    );
     return res.json({
       message: "User arts returned successfully!",
       arts,
@@ -64,6 +68,11 @@ const getUserArts = async (req, res) => {
   try {
     const userId = req.params.userId;
     const arts = await artsQuery.fetchUserArts(userId);
+
+    if (!arts || arts.length === 0) {
+      return res.status(204).send();
+    }
+
     return res.json({
       message: `User Arts of userId ${userId} returned successfully`,
       arts,

controllers/awsAccess.ts

@@ -0,0 +1,46 @@
+import { PROFILE_SVC_GITHUB_URL } from "../constants/urls";
+import {addUserToGroup, createUser, fetchAwsUserIdByUsername} from "../utils/awsFunctions";
+const dataAccess = require("../services/dataAccessLayer");
+const userDataLevels = require('../constants/userDataLevels');
+
+export const addUserToAWSGroup = async (req, res) => {
+    const { groupId, userId } = req.body;
+
+    try {
+      const userInfoData = await dataAccess.retrieveUsers({ discordId: userId, level: userDataLevels.ACCESS_LEVEL.INTERNAL, role: 'cloudfare_worker'});
+      if (!userInfoData.userExists) {
+        return res.status(400).json({ error: "User not found" });
+      } else if(!userInfoData.user.email) {
+        return res.status(400).json({ error: `User email is required to create an AWS user. Please update your email by setting up Profile service, url : ${PROFILE_SVC_GITHUB_URL}` });
+      }
+      
+      let awsUserId = await fetchAwsUserIdByUsername(userInfoData.user.username);
+      
+      let userCreationResponse = null;
+      
+      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);
+        awsUserId = userCreationResponse.UserId;
+      }
+
+      let userAdditionResponse = await addUserToGroup(groupId, awsUserId)
+
+      if (userAdditionResponse){
+        if (userAdditionResponse.conflict){
+          return res.status(200).json({
+            message: `User ${userId} is already part of the AWS group, please try signing in.`
+          })
+        } else {
+          return res.status(200).json({
+            message: `User ${userId} successfully added to group ${groupId}.`
+          });
+        }
+      }
+    } catch (error) {
+      logger.error(`Error in adding user - ${userId} to AWS group - ${groupId} error - ${error}`);
+        return res.status(500).json({
+          error: `Something went wrong, please try again`
+        });
+    }
+};

controllers/discordactions.js

@@ -6,6 +6,7 @@ const discordRolesModel = require("../models/discordactions");
 const discordServices = require("../services/discordService");
 const { fetchAllUsers, fetchUser } = require("../models/users");
 const { generateCloudFlareHeaders } = require("../utils/discord-actions");
+const { addLog } = require("../models/logs");
 const discordDeveloperRoleId = config.get("discordDeveloperRoleId");
 const discordMavenRoleId = config.get("discordMavenRoleId");
 
@@ -63,6 +64,60 @@ const createGroupRole = async (req, res) => {
   }
 };
 
+/**
+ * Controller function to handle the soft deletion of a group role.
+ *
+ * @param {Object} req - The request object
+ * @param {Object} res - The response object
+ * @returns {Promise<void>}
+ */
+const deleteGroupRole = async (req, res) => {
+  const { groupId } = req.params;
+
+  try {
+    const { roleExists, existingRoles } = await discordRolesModel.isGroupRoleExists({ groupId });
+
+    if (!roleExists) {
+      return res.boom.notFound("Group role not found");
+    }
+
+    const roleData = existingRoles.data();
+
+    const discordDeletion = await discordServices.deleteGroupRoleFromDiscord(roleData.roleid);
+
+    if (!discordDeletion.success) {
+      return res.boom.badImplementation(discordDeletion.message);
+    }
+
+    const { isSuccess } = await discordRolesModel.deleteGroupRole(groupId, req.userData.id);
+
+    if (!isSuccess) {
+      logger.error(`Role deleted from Discord but failed to delete from database for groupId: ${groupId}`);
+      return res.boom.badImplementation("Group role deletion failed");
+    }
+
+    const groupDeletionLog = {
+      type: "group-role-deletion",
+      meta: {
+        userId: req.userData.id,
+      },
+      body: {
+        groupId: groupId,
+        roleName: roleData.rolename,
+        discordRoleId: roleData.roleid,
+        action: "delete",
+      },
+    };
+    await addLog(groupDeletionLog.type, groupDeletionLog.meta, groupDeletionLog.body);
+    return res.status(200).json({
+      message: "Group role deleted successfully",
+    });
+  } catch (error) {
+    logger.error(`Error while deleting group role: ${error}`);
+    return res.boom.badImplementation("Internal server error");
+  }
+};
+
 /**
  * Gets all group-roles
  *
@@ -491,4 +546,5 @@ module.exports = {
   setRoleToUsersWith31DaysPlusOnboarding,
   getUserDiscordInvite,
   generateInviteForUser,
+  deleteGroupRole,
 };

controllers/extensionRequests.js

@@ -202,12 +202,22 @@ const getSelfExtensionRequests = async (req, res) => {
  * @param res {Object} - Express response object
  */
 const updateExtensionRequest = async (req, res) => {
+  const { dev } = req.query;
+  const isDev = dev === "true";
   try {
     const extensionRequest = await extensionRequestsQuery.fetchExtensionRequest(req.params.id);
     if (!extensionRequest.extensionRequestData) {
       return res.boom.notFound("Extension Request not found");
     }
 
+    if (
+      isDev &&
+      !req.userData?.roles.super_user &&
+      extensionRequest.extensionRequestData.status !== EXTENSION_REQUEST_STATUS.PENDING
+    ) {
+      return res.boom.badRequest("Only pending extension request can be updated");
+    }
+
     if (req.body.assignee) {
       const { taskData: task } = await tasks.fetchTask(extensionRequest.extensionRequestData.taskId);
       if (task.assignee !== (await getUsername(req.body.assignee))) {

controllers/tasks.js

@@ -13,6 +13,7 @@ const { updateUserStatusOnTaskUpdate, updateStatusOnTaskCompletion } = require("
 const dataAccess = require("../services/dataAccessLayer");
 const { parseSearchQuery } = require("../utils/tasks");
 const { addTaskCreatedAtAndUpdatedAtFields } = require("../services/tasks");
+const tasksService = require("../services/tasks");
 const { RQLQueryParser } = require("../utils/RQLParser");
 const { getMissedProgressUpdatesUsers } = require("../models/discordactions");
 const { logType } = require("../constants/logs");
@@ -134,7 +135,19 @@ const fetchPaginatedTasks = async (query) => {
 
 const fetchTasks = async (req, res) => {
   try {
-    const { status, page, size, prev, next, q: queryString, assignee, title, userFeatureFlag } = req.query;
+    const {
+      status,
+      page,
+      size,
+      prev,
+      next,
+      q: queryString,
+      assignee,
+      title,
+      userFeatureFlag,
+      orphaned,
+      dev,
+    } = req.query;
     const transformedQuery = transformQuery(status, size, page, assignee, title);
 
     if (queryString !== undefined) {
@@ -159,6 +172,28 @@ const fetchTasks = async (req, res) => {
       });
     }
 
+    const isOrphaned = orphaned === "true";
+    const isDev = dev === "true";
+    if (isOrphaned) {
+      if (!isDev) {
+        return res.boom.notFound("Route not found");
+      }
+      try {
+        const orphanedTasks = await tasksService.fetchOrphanedTasks();
+        if (!orphanedTasks || orphanedTasks.length === 0) {
+          return res.sendStatus(204);
+        }
+        const tasksWithRdsAssigneeInfo = await fetchTasksWithRdsAssigneeInfo(orphanedTasks);
+        return res.status(200).json({
+          message: "Orphan tasks fetched successfully",
+          data: tasksWithRdsAssigneeInfo,
+        });
+      } catch (error) {
+        logger.error("Error in getting tasks which were orphaned", error);
+        return res.boom.badImplementation(INTERNAL_SERVER_ERROR);
+      }
+    }
+
     const paginatedTasks = await fetchPaginatedTasks({ ...transformedQuery, prev, next, userFeatureFlag });
     return res.json({
       message: "Tasks returned successfully!",