Merge branch 'develop' of https://github.com/Real-Dev-Squad/website-backend into bugfix/issue957

Author: shubham-y

config/default.js

@@ -86,6 +86,10 @@ module.exports = {
     ttl: 60,
   },
 
+  cronJobHandler: {
+    publicKey: "CRON_JOB_PUBLIC_KEY",
+  },
+
   integrations: {
     newrelic: {
       appName: "RDS_API_production",

config/test.js

@@ -149,6 +149,47 @@ module.exports = {
     ttl: 60,
   },
 
+  cronJobHandler: {
+    privateKey:
+      "-----BEGIN RSA PRIVATE KEY-----\n" +
+      "MIIEowIBAAKCAQEAqjkUS3EGyuh64eITS/n5MX7G4z5MIv99DNqZezqCSRD/QIXO\n" +
+      "1QtDrj/OKAB5a+4GAJSxIO8HgRFocdiKauxako3UagNSabiI+/H5zXjtnbPKwMBd\n" +
+      "CoJ3r1+OzyMT4zL+SVlIMHkxYbRgMYJvNTyie/rIpjcpQhaBJxyBkaT2Imy9luGC\n" +
+      "Rhd5wupx9+rhd8xOYu+hqSWfP4zIcEGCs86OXFFmNp6sqcQD1P15HkJtleodzcKg\n" +
+      "msqo8RTk8t+urdWIdoLFAugwqFE9jor8UxApwT5xr8c84VDfbPgc10V2XTda4SXa\n" +
+      "IRP7QY+9agGmZIYp0LWxUOhB37PNFDhUEw9dVwIDAQABAoIBAH9rJJ7oJz6B0WH+\n" +
+      "WZV4s6jyDiySOGnGNzQE+fh9LoNFHtyMjOt6eBoaFtZorHs2+/U5WHGfm01o23bE\n" +
+      "sbAh5hZn5kXI4MrUYG2/js7Yo3111OJ92+d/C9oRvJOe3Ucnp6L+GwR145oQbCUD\n" +
+      "Tv1ZuwL1EXciOVcIA3tkYjTEd54B8UTfEMpRMdlkPohYL96kizqbe6peG9hlLMXS\n" +
+      "AeVr2y0ueDR+fYte6TmejpfxnD16/PksMGH5ALHQ6AonCngvDO3mnGLaFuwHkRnY\n" +
+      "1vMkni+6J57MQz+GAWI7p1EKbEzl9Z+1a6NDxALabVxYuQFc5pa7wXr97/9SAC5x\n" +
+      "NvZ/EekCgYEA1CcCDXhi6ztK+BhnYCKZKR9GxP9CReNm9FVIB4cVGKduCuaJrcGk\n" +
+      "qKPSGkaMaJat23WDxr9GUhR1IThK+/dLg+Ud9GPvWN710LT+Wm9cuwuyPbyAet8J\n" +
+      "2G+IKbCsr62okI/XVBnfPrGA2tQZRMgia7lEz/ZKx/7oOpN/FyPpG+UCgYEAzWeV\n" +
+      "k12md1YIJcPHfVofsnqpy22PIhLJgN3LgM2aubPQoYg1LBwBwRWLU16zNLFhbsyx\n" +
+      "leMA3OsyLFzw7NmsCpXE7SB1nH0xFmTi/ONqiN4Hx0w+72kG3LLcVWDwqGF3zj+x\n" +
+      "v/75dYgWW1SeofwgkkDnmnqMuESnprojyRzk2IsCgYAb3lftrw/HeM17U7FYtpLK\n" +
+      "DRq9zA5HofynQgCpRHxn9a6F7gzN728S3BpAa14MaybBemlqFTxGkftk9sEa4jxg\n" +
+      "QhuyO+J4GSnPVcdH1/Mlev7aD0YNXfksHlKTr2qv1S8cdljB6ngiAy07EbuUBnpH\n" +
+      "DlpUuzTNmtWkxDVgs83uZQKBgQCbo+Cv4Gdxx2u3CelQL4kTGWUtct/hJrEvB2Db\n" +
+      "QW/7RKhSrb30pWgi4WtICdrqk3nLlij99RtDSqgi+23HWozFHIUyVMUphac7W8iv\n" +
+      "bLbd7LeiKUEK8d80Pgc8Xo8cV3aLfrH2VIK7rxmZrL3i6gPYLnwQDsowGj2a1TKm\n" +
+      "glFZTwKBgDr/Lf4P8V7s+RyIKea0AKMM9xAqbvZRdKFFNTq5SXUtVFi130F3ozHV\n" +
+      "o6x/R8X3QuyNeyZ8SI7eKJ+oo1jF97WgRWBiE66IHGziUZc4+gFAmHzdeZft0xtJ\n" +
+      "AIvluPVA3HOHFj4US3LMxbxDsPr+gkTpkVGIfK0rk8Za3dN3mZJw\n" +
+      "-----END RSA PRIVATE KEY-----",
+    publicKey:
+      "-----BEGIN PUBLIC KEY-----\n" +
+      "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqjkUS3EGyuh64eITS/n5\n" +
+      "MX7G4z5MIv99DNqZezqCSRD/QIXO1QtDrj/OKAB5a+4GAJSxIO8HgRFocdiKauxa\n" +
+      "ko3UagNSabiI+/H5zXjtnbPKwMBdCoJ3r1+OzyMT4zL+SVlIMHkxYbRgMYJvNTyi\n" +
+      "e/rIpjcpQhaBJxyBkaT2Imy9luGCRhd5wupx9+rhd8xOYu+hqSWfP4zIcEGCs86O\n" +
+      "XFFmNp6sqcQD1P15HkJtleodzcKgmsqo8RTk8t+urdWIdoLFAugwqFE9jor8UxAp\n" +
+      "wT5xr8c84VDfbPgc10V2XTda4SXaIRP7QY+9agGmZIYp0LWxUOhB37PNFDhUEw9d\n" +
+      "VwIDAQAB\n" +
+      "-----END PUBLIC KEY-----",
+  },
+
   Event100ms: {
     APP_ACCESS_KEY: "EVENT_100MS_APP_ACCESS_KEY",
     APP_SECRET: "EVENT_100MS_APP_SECREt",

constants/bot.js

@@ -1,4 +1,5 @@
 const CLOUDFLARE_WORKER = "Cloudflare Worker";
 const BAD_TOKEN = "BAD.JWT.TOKEN";
+const CRON_JOB_HANDLER = "Cron Job Handler";
 
-module.exports = { CLOUDFLARE_WORKER, BAD_TOKEN };
+module.exports = { CLOUDFLARE_WORKER, BAD_TOKEN, CRON_JOB_HANDLER };

constants/cacheKeys.js

@@ -0,0 +1,3 @@
+const ALL_TASKS = "cache:ALL-TASKS";
+
+module.exports = { ALL_TASKS };

constants/errorMessages.js

@@ -3,5 +3,9 @@ module.exports = {
   SOMETHING_WENT_WRONG: "Something went wrong. Please try again or contact admin",
   ONLY_IMAGE_SUPPORTED: "Only image/jpeg, image/png supported",
   ONLY_ONE_FILE_ALLOWED: "Only one file allowed",
+  DATA_ADDED_SUCCESSFULLY: "User Device Info added successfully!",
+  USER_DATA_ALREADY_PRESENT: "The authentication document has already been created",
+  BAD_REQUEST: "BAD_REQUEST",
+  INVALID_QUERY_PARAM: "Invalid Query Parameters Passed",
   FILE_TOO_LARGE: (size) => `File too large, max accepted size is ${size} MB`,
 };

constants/tasks.js

@@ -30,4 +30,12 @@ const TASK_STATUS_OLD = {
   OLD_COMPLETED: "completed",
 };
 
-module.exports = { TASK_TYPE, TASK_STATUS, TASK_STATUS_OLD };
+const MAPPED_TASK_STATUS = {
+  ...TASK_STATUS,
+  UNASSIGNED: "AVAILABLE",
+  DONE: "COMPLETED",
+};
+
+const TASK_SIZE = 5;
+
+module.exports = { TASK_TYPE, TASK_STATUS, TASK_STATUS_OLD, MAPPED_TASK_STATUS, TASK_SIZE };

constants/userStatus.js

@@ -5,4 +5,6 @@ const userState = {
   ONBOARDING: "ONBOARDING",
 };
 
-module.exports = { userState };
+const CANCEL_OOO = "cancelOoo";
+
+module.exports = { userState, CANCEL_OOO };

constants/users.js

@@ -4,10 +4,13 @@ const profileStatus = {
   NOT_APPROVED: "NOT APPROVED",
 };
 
+const USER_SENSITIVE_DATA = ["phone", "email", "chaincode", "tokens"];
+
 const USER_STATUS = {
   OOO: "ooo",
   IDLE: "idle",
   ACTIVE: "active",
+  ONBOARDING: "onboarding",
 };
 
 const ALLOWED_FILTER_PARAMS = {
@@ -16,4 +19,9 @@ const ALLOWED_FILTER_PARAMS = {
   ROLE: ["role"],
 };
 
-module.exports = { profileStatus, USER_STATUS, ALLOWED_FILTER_PARAMS };
+module.exports = {
+  profileStatus,
+  USER_STATUS,
+  ALLOWED_FILTER_PARAMS,
+  USER_SENSITIVE_DATA,
+};

controllers/auth.js

@@ -1,6 +1,8 @@
 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");
 
 /**
  * Fetches the user info from GitHub and authenticates User
@@ -24,9 +26,6 @@ const githubAuth = (req, res, next) => {
       userData = {
         github_id: user.username,
         github_display_name: user.displayName,
-        tokens: {
-          githubAccessToken: accessToken,
-        },
         github_user_id: user.id,
       };
 
@@ -67,7 +66,81 @@ const signout = (req, res) => {
   });
 };
 
+/**
+ * Stores user-device data inside the DB for mobile auth
+ *
+ * @param req {Object} - Express request object
+ * @param res {Object} - Express response object
+ */
+
+const storeUserDeviceInfo = async (req, res) => {
+  try {
+    const userJson = {
+      user_id: req.body.user_id,
+      device_info: req.body.device_info,
+      device_id: req.body.device_id,
+      authorization_status: "NOT_INIT",
+    };
+
+    const userInfo = await QrCodeAuthModel.storeUserDeviceInfo(userJson);
+
+    if (!userInfo) {
+      return res.status(404).json({
+        message: BAD_REQUEST,
+      });
+    }
+
+    return res.status(201).json({
+      ...userInfo,
+      message: DATA_ADDED_SUCCESSFULLY,
+    });
+  } catch (err) {
+    logger.error(`Error while storing user device info : ${err}`);
+    return res.boom.badImplementation(SOMETHING_WENT_WRONG);
+  }
+};
+
+const updateAuthStatus = async (req, res) => {
+  try {
+    const userId = req.userData.id;
+    const authStatus = req.params.authorization_status;
+    const result = await QrCodeAuthModel.updateStatus(userId, authStatus);
+
+    if (!result.userExists) {
+      return res.boom.notFound("Document not found!");
+    }
+
+    return res.json({
+      message: `Authentication document for user ${userId} updated successfully`,
+      data: { ...result.data },
+    });
+  } catch (error) {
+    logger.error(`Error while fetching user: ${error}`);
+    return res.boom.badImplementation(SOMETHING_WENT_WRONG);
+  }
+};
+
+const fetchUserDeviceInfo = async (req, res) => {
+  try {
+    const deviceId = req.query.device_id;
+    const userDeviceInfoData = await QrCodeAuthModel.retrieveUserDeviceInfo(deviceId);
+    if (!userDeviceInfoData.userExists) {
+      return res.boom.notFound(`User with id ${deviceId} does not exist.`);
+    }
+    return res.json({
+      message: "Authentication document retrieved successfully.",
+      data: { ...userDeviceInfoData.data },
+    });
+  } catch (error) {
+    logger.error(`Error while fetching user: ${error}`);
+    return res.boom.badImplementation(SOMETHING_WENT_WRONG);
+  }
+};
+
 module.exports = {
   githubAuth,
   signout,
+  storeUserDeviceInfo,
+  updateAuthStatus,
+  fetchUserDeviceInfo,
 };

controllers/badges.js

@@ -2,7 +2,7 @@ const { ERROR_MESSAGES, SUCCESS_MESSAGES } = require("../constants/badges");
 const { CONTROLLERS: CONTROLLERS_ERROR_MESSAGES } = ERROR_MESSAGES;
 const { CONTROLLERS: CONTROLLERS_SUCCESS_MESSAGES } = SUCCESS_MESSAGES;
 const badgeQuery = require("../models/badges");
-const { fetchUser } = require("../models/users");
+const dataAccess = require("../services/dataAccessLayer");
 const imageService = require("../services/imageService");
 
 /**
@@ -76,7 +76,7 @@ async function postBadge(req, res) {
 async function postUserBadges(req, res) {
   try {
     const { badgeIds, userId } = req.body;
-    const { userExists } = await fetchUser({ userId });
+    const { userExists } = await dataAccess.retrieveUsers({ id: userId });
     if (!userExists) {
       throw Error(ERROR_MESSAGES.MISC.USER_ID_DOES_NOT_EXIST);
     }