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/users.js

@@ -17,8 +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,
+  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/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

@@ -87,18 +87,13 @@ const archiveMembers = async (req, res) => {
     const superUserId = req.userData.id;
     const { reason } = req.body;
     const roles = req?.userData?.roles;
-    const isReasonNullOrUndefined = !reason;
-    const isReasonEmptyOrWhitespace = /^\s*$/.test(reason);
-    if (isReasonNullOrUndefined || isReasonEmptyOrWhitespace) {
-      return res.boom.badRequest("Reason is required");
-    }
     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,
+        reason: reason || "",
         archived_user: {
           user_id: user.user.id,
           username: user.user.username,

controllers/users.js

@@ -15,6 +15,11 @@ const { addRoleToUser, getDiscordMembers } = require("../services/discordService
 const { fetchAllUsers } = require("../models/users");
 const { getQualifiers } = require("../utils/helper");
 const { getFilteredPRsOrIssues } = require("../utils/pullRequests");
+const {
+  USERS_PATCH_HANDLER_ACTIONS,
+  USERS_PATCH_HANDLER_ERROR_MESSAGES,
+  USERS_PATCH_HANDLER_SUCCESS_MESSAGES,
+} = require("../constants/users");
 
 const verifyUser = async (req, res) => {
   const userId = req.userData.id;
@@ -570,9 +575,9 @@ const filterUsers = async (req, res) => {
   }
 };
 
-const nonVerifiedDiscordUsers = async (req, res) => {
+const nonVerifiedDiscordUsers = async () => {
   const data = await dataAccess.retrieveDiscordUsers();
-  return res.json(data);
+  return data;
 };
 
 const setInDiscordScript = async (req, res) => {
@@ -626,6 +631,58 @@ const updateRoles = async (req, res) => {
   }
 };
 
+const archiveUserIfNotInDiscord = async () => {
+  try {
+    const data = await userQuery.archiveUserIfNotInDiscord();
+
+    if (data.totalUsers === 0) {
+      return {
+        message: USERS_PATCH_HANDLER_ERROR_MESSAGES.ARCHIVE_USERS.NO_USERS_DATA_TO_UPDATE,
+        summary: data,
+      };
+    }
+
+    return {
+      message: USERS_PATCH_HANDLER_SUCCESS_MESSAGES.ARCHIVE_USERS.SUCCESSFULLY_UPDATED_DATA,
+      summary: data,
+    };
+  } catch (error) {
+    logger.error(`Error while updating the archived role: ${error}`);
+    throw Error(INTERNAL_SERVER_ERROR);
+  }
+};
+
+async function usersPatchHandler(req, res) {
+  try {
+    const { action } = req.body;
+    let response;
+
+    if (action === USERS_PATCH_HANDLER_ACTIONS.NON_VERFIED_DISCORD_USERS) {
+      const data = await nonVerifiedDiscordUsers();
+      response = data;
+    }
+
+    if (action === USERS_PATCH_HANDLER_ACTIONS.ARCHIVE_USERS) {
+      const debugQuery = req.query.debug?.toLowerCase();
+      const data = await archiveUserIfNotInDiscord();
+
+      if (debugQuery === "true") {
+        data.summary.updatedUserDetails = data.summary.updatedUserDetails.slice(-3);
+        response = data;
+      } else {
+        delete data.summary.updatedUserDetails;
+        delete data.summary.failedUserDetails;
+        response = data;
+      }
+    }
+
+    return res.status(200).json(response);
+  } catch (error) {
+    logger.error("Error while handling the users common patch route:", error);
+    return res.boom.badImplementation(INTERNAL_SERVER_ERROR);
+  }
+}
+
 module.exports = {
   verifyUser,
   generateChaincode,
@@ -652,4 +709,6 @@ module.exports = {
   markUnverified,
   removeTokens,
   updateRoles,
+  archiveUserIfNotInDiscord,
+  usersPatchHandler,
 };

middlewares/validators/qrCodeAuth.js

@@ -12,6 +12,7 @@ const storeUserDeviceInfo = async (req, res, next) => {
     next();
   } catch (error) {
     logger.error(`Error validating newDeviceInfo payload : ${error}`);
+    res.boom.badRequest(error.details[0].message);
   }
 };
 
@@ -41,8 +42,8 @@ const validateFetchingUserDocument = async (req, res, next) => {
     await schema.validateAsync(req.query);
     next();
   } catch (error) {
-    logger.error(`Invalid Query Parameters Passed`);
-    res.boom.badRequest(`Invalid Query Parameters Passed`);
+    logger.error("Invalid Query Parameters Passed");
+    res.boom.badRequest("Invalid Query Parameters Passed");
   }
 };
 

middlewares/validators/tasks.js

@@ -84,7 +84,7 @@ const updateTask = async (req, res, next) => {
         .string()
         .valid(...TASK_STATUS_ENUM, ...Object.values(TASK_STATUS_OLD))
         .optional(),
-      assignee: joi.string().optional(),
+      assignee: joi.alternatives().try(joi.string().optional(), joi.valid(null)),
       percentCompleted: joi.number().integer().min(0).max(100).optional(),
       dependsOn: joi.array().items(joi.string()).optional(),
       participants: joi.array().items(joi.string()).optional(),

middlewares/validators/user.js

@@ -1,7 +1,11 @@
 const { customWordCountValidator } = require("../../utils/customWordCountValidator");
 
 const joi = require("joi");
-const { USER_STATUS } = require("../../constants/users");
+const {
+  USER_STATUS,
+  USERS_PATCH_HANDLER_ACTIONS,
+  USERS_PATCH_HANDLER_ERROR_MESSAGES,
+} = require("../../constants/users");
 const ROLES = require("../../constants/roles");
 const { IMAGE_VERIFICATION_TYPES } = require("../../constants/imageVerificationTypes");
 const { userState } = require("../../constants/userStatus");
@@ -256,6 +260,23 @@ async function validateUpdateRoles(req, res, next) {
   }
 }
 
+async function validateUsersPatchHandler(req, res, next) {
+  const requestBodySchema = joi.object({
+    action: joi
+      .string()
+      .valid(USERS_PATCH_HANDLER_ACTIONS.ARCHIVE_USERS, USERS_PATCH_HANDLER_ACTIONS.NON_VERFIED_DISCORD_USERS)
+      .required(),
+  });
+
+  try {
+    await requestBodySchema.validateAsync(req.body);
+    next();
+  } catch (error) {
+    logger.error("Error in validating action payload", error);
+    res.boom.badRequest(`${USERS_PATCH_HANDLER_ERROR_MESSAGES.VALIDATE_PAYLOAD}: ${error.message}`);
+  }
+}
+
 module.exports = {
   updateUser,
   updateProfileURL,
@@ -264,4 +285,5 @@ module.exports = {
   validateUserQueryParams,
   validateImageVerificationQuery,
   validateUpdateRoles,
+  validateUsersPatchHandler,
 };