Dev to main sync

constants/errorMessages.js

@@ -8,4 +8,5 @@ module.exports = {
   BAD_REQUEST: "BAD_REQUEST",
   INVALID_QUERY_PARAM: "Invalid Query Parameters Passed",
   FILE_TOO_LARGE: (size) => `File too large, max accepted size is ${size} MB`,
+  USER_DOES_NOT_EXIST_ERROR: "User does not exist!",
 };

constants/tasks.js

@@ -20,6 +20,7 @@ const TASK_STATUS = {
   RELEASED: "RELEASED",
   VERIFIED: "VERIFIED",
   DONE: "DONE",
+  OVERDUE: "OVERDUE",
 };
 
 // TODO: convert this to new task status

constants/userDataLevels.js

@@ -0,0 +1,21 @@
+const ACCESS_LEVEL = {
+  PUBLIC: "public",
+  INTERNAL: "internal",
+  PRIVATE: "private",
+  CONFIDENTIAL: "confidential",
+};
+
+const ROLE_LEVEL = {
+  private: ["super_user"],
+  internal: ["super_user"],
+  confidential: ["super_user"],
+};
+
+const KEYS_NOT_ALLOWED = {
+  public: ["email", "phone", "chaincode"],
+  internal: ["phone", "chaincode"],
+  private: ["chaincode"],
+  confidential: [],
+};
+
+module.exports = { ACCESS_LEVEL, KEYS_NOT_ALLOWED, ROLE_LEVEL };

constants/users.js

@@ -4,8 +4,6 @@ const profileStatus = {
   NOT_APPROVED: "NOT APPROVED",
 };
 
-const USER_SENSITIVE_DATA = ["phone", "email", "chaincode", "tokens"];
-
 const USER_STATUS = {
   OOO: "ooo",
   IDLE: "idle",
@@ -19,9 +17,34 @@ const ALLOWED_FILTER_PARAMS = {
   ROLE: ["role"],
 };
 
+const DOCUMENT_WRITE_SIZE = 500;
+
+const USERS_PATCH_HANDLER_ACTIONS = {
+  ARCHIVE_USERS: "archiveUsers",
+  NON_VERFIED_DISCORD_USERS: "nonVerifiedDiscordUsers",
+};
+
+const USERS_PATCH_HANDLER_ERROR_MESSAGES = {
+  VALIDATE_PAYLOAD: "Invalid Payload",
+  ARCHIVE_USERS: {
+    NO_USERS_DATA_TO_UPDATE: "Couldn't find any users currently inactive in Discord but not archived.",
+    BATCH_DATA_UPDATED_FAILED: "Firebase batch operation failed",
+  },
+};
+
+const USERS_PATCH_HANDLER_SUCCESS_MESSAGES = {
+  ARCHIVE_USERS: {
+    SUCCESSFULLY_UPDATED_DATA: "Successfully updated users archived role to true if in_discord role is false",
+    SUCCESSFULLY_COMPLETED_BATCH_UPDATES: "Successfully completed batch updates",
+  },
+};
+
 module.exports = {
   profileStatus,
   USER_STATUS,
   ALLOWED_FILTER_PARAMS,
-  USER_SENSITIVE_DATA,
+  DOCUMENT_WRITE_SIZE,
+  USERS_PATCH_HANDLER_ACTIONS,
+  USERS_PATCH_HANDLER_ERROR_MESSAGES,
+  USERS_PATCH_HANDLER_SUCCESS_MESSAGES,
 };

controllers/auth.js

@@ -2,7 +2,13 @@ const passport = require("passport");
 const users = require("../models/users");
 const QrCodeAuthModel = require("../models/qrCodeAuth");
 const authService = require("../services/authService");
-const { SOMETHING_WENT_WRONG, DATA_ADDED_SUCCESSFULLY, BAD_REQUEST } = require("../constants/errorMessages");
+const dataAccess = require("../services/dataAccessLayer");
+const {
+  SOMETHING_WENT_WRONG,
+  DATA_ADDED_SUCCESSFULLY,
+  USER_DOES_NOT_EXIST_ERROR,
+} = require("../constants/errorMessages");
+const { generateUniqueToken } = require("../utils/generateUniqueToken");
 
 /**
  * Makes authentication call to GitHub statergy
@@ -49,11 +55,10 @@ const githubAuthCallback = (req, res, next) => {
         logger.error(err);
         return res.boom.unauthorized("User cannot be authenticated");
       }
-
       userData = {
         github_id: user.username,
         github_display_name: user.displayName,
-        // github_account_created_at: user.created_at,
+        github_created_at: Number(new Date(user._json.created_at).getTime()),
         created_at: Date.now(),
         updated_at: Date.now(),
       };
@@ -111,13 +116,12 @@ const storeUserDeviceInfo = async (req, res) => {
       authorization_status: "NOT_INIT",
     };
 
-    const userInfo = await QrCodeAuthModel.storeUserDeviceInfo(userJson);
+    const userInfoData = await dataAccess.retrieveUsers({ id: userJson.user_id });
 
-    if (!userInfo) {
-      return res.status(404).json({
-        message: BAD_REQUEST,
-      });
+    if (!userInfoData.userExists) {
+      return res.boom.notFound(USER_DOES_NOT_EXIST_ERROR);
     }
+    const userInfo = await QrCodeAuthModel.storeUserDeviceInfo(userJson);
 
     return res.status(201).json({
       ...userInfo,
@@ -133,7 +137,11 @@ const updateAuthStatus = async (req, res) => {
   try {
     const userId = req.userData.id;
     const authStatus = req.params.authorization_status;
-    const result = await QrCodeAuthModel.updateStatus(userId, authStatus);
+    let token;
+    if (authStatus === "AUTHORIZED") {
+      token = await generateUniqueToken();
+    }
+    const result = await QrCodeAuthModel.updateStatus(userId, authStatus, token);
 
     if (!result.userExists) {
       return res.boom.notFound("Document not found!");
@@ -151,8 +159,8 @@ const updateAuthStatus = async (req, res) => {
 
 const fetchUserDeviceInfo = async (req, res) => {
   try {
-    const deviceId = req.query.device_id;
-    const userDeviceInfoData = await QrCodeAuthModel.retrieveUserDeviceInfo(deviceId);
+    const { device_id: deviceId } = req.query;
+    const userDeviceInfoData = await QrCodeAuthModel.retrieveUserDeviceInfo({ deviceId });
     if (!userDeviceInfoData.userExists) {
       return res.boom.notFound(`User with id ${deviceId} does not exist.`);
     }
@@ -166,11 +174,29 @@ const fetchUserDeviceInfo = async (req, res) => {
   }
 };
 
+const fetchDeviceDetails = async (req, res) => {
+  try {
+    const userId = req.userData.id;
+    const userDeviceInfoData = await QrCodeAuthModel.retrieveUserDeviceInfo({ userId });
+    if (!userDeviceInfoData.userExists) {
+      return res.boom.notFound(`User with id ${userId} does not exist.`);
+    }
+    return res.json({
+      message: "Authentication document Exists",
+      data: { device_info: userDeviceInfoData.data?.device_info },
+    });
+  } catch (error) {
+    logger.error(`Error while fetching user device info: ${error}`);
+    return res.boom.badImplementation(SOMETHING_WENT_WRONG);
+  }
+};
+
 module.exports = {
   githubAuthLogin,
   githubAuthCallback,
   signout,
   storeUserDeviceInfo,
   updateAuthStatus,
   fetchUserDeviceInfo,
+  fetchDeviceDetails,
 };

controllers/discordactions.js

@@ -3,6 +3,7 @@ const admin = require("firebase-admin");
 const config = require("config");
 const jwt = require("jsonwebtoken");
 const discordRolesModel = require("../models/discordactions");
+const { retrieveUsers } = require("../services/dataAccessLayer");
 
 /**
  * Creates a role
@@ -66,9 +67,25 @@ const createGroupRole = async (req, res) => {
 const getAllGroupRoles = async (req, res) => {
   try {
     const { groups } = await discordRolesModel.getAllGroupRoles();
+    const groupsWithMemberCount = await discordRolesModel.getNumberOfMemberForGroups(groups);
+    const groupCreatorIds = groupsWithMemberCount.reduce((ids, group) => {
+      ids.add(group.createdBy);
+      return ids;
+    }, new Set());
+    const groupCreatorsDetails = await retrieveUsers({ userIds: Array.from(groupCreatorIds) });
+    const groupsWithUserDetails = groupsWithMemberCount.map((group) => {
+      const groupCreator = groupCreatorsDetails[group.createdBy];
+      return {
+        ...group,
+        firstName: groupCreator.first_name,
+        lastName: groupCreator.last_name,
+        image: groupCreator.picture?.url,
+      };
+    });
+
     return res.json({
       message: "Roles fetched successfully!",
-      groups,
+      groups: groupsWithUserDetails,
     });
   } catch (err) {
     logger.error(`Error while getting roles: ${err}`);

controllers/events.js

@@ -1,9 +1,11 @@
-/* eslint-disable camelcase */
 const { GET_ALL_EVENTS_LIMIT_MIN, UNWANTED_PROPERTIES_FROM_100MS } = require("../constants/events");
+const { INTERNAL_SERVER_ERROR } = require("../constants/errorMessages");
+
 const { EventTokenService, EventAPIService } = require("../services");
-const { removeUnwantedProperties } = require("../utils/events");
 const eventQuery = require("../models/events");
+
 const logger = require("../utils/logger");
+const { removeUnwantedProperties } = require("../utils/events");
 
 const tokenService = new EventTokenService();
 const apiService = new EventAPIService(tokenService);
@@ -100,7 +102,7 @@ const joinEvent = async (req, res) => {
     });
   } catch (error) {
     logger.error({ error });
-    return res.status(500).send("Internal Server Error");
+    return res.boom.badImplementation(INTERNAL_SERVER_ERROR);
   }
 };
 
@@ -193,11 +195,77 @@ const endActiveEvent = async (req, res) => {
   }
 };
 
+/**
+ * Adds a peer to an event.
+ *
+ * @async
+ * @function
+ * @param {Object} req - The Express request object.
+ * @param {Object} res - The Express response object.
+ * @returns {Promise<Object>} The JSON response with the added peer data and a success message.
+ * @throws {Object} The JSON response with an error message if an error occurred while adding the peer.
+ */
+const addPeerToEvent = async (req, res) => {
+  try {
+    const data = await eventQuery.addPeerToEvent({
+      peerId: req.body.peerId,
+      name: req.body.name,
+      role: req.body.role,
+      joinedAt: req.body.joinedAt,
+      eventId: req.params.id,
+    });
+    return res.status(200).json({
+      data,
+      message: `Selected Participant is added to the event.`,
+    });
+  } catch (error) {
+    logger.error({ error });
+    return res.status(500).json({
+      error: error.code,
+      message: "You can't add selected Participant. Please ask Admin or Host for help.",
+    });
+  }
+};
+
+/**
+ * Kicks out a peer from an event.
+ *
+ * @async
+ * @function
+ * @param {Object} req - The Express request object.
+ * @param {Object} res - The Express response object.
+ * @returns {Promise<Object>} The JSON response with a success message if the peer is successfully kicked out.
+ * @throws {Object} The JSON response with an error message if an error occurred while kicking out the peer.
+ */
+const kickoutPeer = async (req, res) => {
+  const { id } = req.params;
+  const payload = {
+    peer_id: req.body.peerId,
+    reason: req.body.reason,
+  };
+
+  try {
+    await apiService.post(`/active-rooms/${id}/remove-peers`, payload);
+    await eventQuery.kickoutPeer({ eventId: id, peerId: payload.peer_id, reason: req.body.reason });
+    return res.status(200).json({
+      message: `Selected Participant is removed from event.`,
+    });
+  } catch (error) {
+    logger.error({ error });
+    return res.status(500).json({
+      error: error.code,
+      message: "You can't remove selected Participant from Remove, Please ask Admin or Host for help.",
+    });
+  }
+};
+
 module.exports = {
   createEvent,
   getAllEvents,
   joinEvent,
   getEventById,
   updateEvent,
   endActiveEvent,
+  addPeerToEvent,
+  kickoutPeer,
 };

controllers/extensionRequests.js

@@ -1,7 +1,7 @@
 const extensionRequestsQuery = require("../models/extensionRequests");
 const { addLog } = require("../models/logs");
 const tasks = require("../models/tasks");
-const { getUsername } = require("../utils/users");
+const { getUsername, getUsernameElseUndefined, getUserIdElseUndefined } = require("../utils/users");
 const { EXTENSION_REQUEST_STATUS } = require("../constants/extensionRequests");
 const { INTERNAL_SERVER_ERROR } = require("../constants/errorMessages");
 /**
@@ -14,11 +14,22 @@ const createTaskExtensionRequest = async (req, res) => {
   try {
     const extensionBody = req.body;
 
+    let assigneeUsername = await getUsernameElseUndefined(extensionBody.assignee);
+    let assigneeId = extensionBody.assignee;
+    if (!assigneeUsername) {
+      assigneeId = await getUserIdElseUndefined(extensionBody.assignee);
+      assigneeUsername = extensionBody.assignee;
+      extensionBody.assignee = assigneeId;
+    }
+
+    if (!assigneeId) {
+      return res.boom.badRequest("User with this id or username doesn't exist.");
+    }
+
     if (req.userData.id !== extensionBody.assignee && !req.userData.roles?.super_user) {
-      return res.boom.forbidden("Only Super User can create an extension request for this task.");
+      return res.boom.forbidden("Only assigned user and super user can create an extension request for this task.");
     }
 
-    const assigneeUsername = await getUsername(extensionBody.assignee);
     const { taskData: task } = await tasks.fetchTask(extensionBody.taskId);
     if (!task) {
       return res.boom.badRequest("Task with this id or taskid doesn't exist.");

controllers/members.js

@@ -1,8 +1,9 @@
 const ROLES = require("../constants/roles");
 const members = require("../models/members");
 const tasks = require("../models/tasks");
-const { SOMETHING_WENT_WRONG } = require("../constants/errorMessages");
+const { SOMETHING_WENT_WRONG, INTERNAL_SERVER_ERROR } = require("../constants/errorMessages");
 const dataAccess = require("../services/dataAccessLayer");
+const { addLog } = require("../models/logs");
 /**
  * Fetches the data about our members
  *
@@ -83,17 +84,33 @@ const archiveMembers = async (req, res) => {
   try {
     const { username } = req.params;
     const user = await dataAccess.retrieveUsers({ username });
+    const superUserId = req.userData.id;
+    const { reason } = req.body;
+    const roles = req?.userData?.roles;
     if (user?.userExists) {
       const successObject = await members.addArchiveRoleToMembers(user.user.id);
       if (successObject.isArchived) {
         return res.boom.badRequest("User is already archived");
       }
+      const body = {
+        reason: reason || "",
+        archived_user: {
+          user_id: user.user.id,
+          username: user.user.username,
+        },
+        archived_by: {
+          user_id: superUserId,
+          roles: roles,
+        },
+      };
+
+      addLog("archived-details", {}, body);
       return res.status(204).send();
     }
     return res.boom.notFound("User doesn't exist");
   } catch (err) {
     logger.error(`Error while retriving contributions ${err}`);
-    return res.boom.badImplementation(SOMETHING_WENT_WRONG);
+    return res.boom.badImplementation(INTERNAL_SERVER_ERROR);
   }
 };