Merge branch 'develop'

James Cori · James Cori · commit 7b7aad5e7fd2 · 2021-01-21T18:38:05.000-05:00
diff --git a/app.js b/app.js
@@ -8,6 +8,8 @@
  * @version 1.0
  */
 'use strict';
+const config = require('config');
+const _ = require('lodash');
 const express = require('express');
 const cookieParser = require('cookie-parser');
 const bodyParser = require('body-parser');
@@ -72,4 +74,37 @@ process.on('unhandledRejection', (err) => {
   logger.logFullError(err, 'system');
 });
 
+// dump the configuration to logger
+const ignoreConfigLog = ['cert', 'key', 'AWS_ACCESS_KEY_ID', 'AWS_SECRET_ACCESS_KEY', 'AUTH0_CLIENT_ID', 'AUTH0_CLIENT_SECRET'];
+/**
+ * Print configs to logger
+ * @param {Object} params the config params
+ * @param {Number} level the level of param object
+ */
+function dumpConfigs(params, level) {
+  Object.keys(params).forEach((key) => {
+    if (_.includes(ignoreConfigLog, key)) {
+      return;
+    }
+    const item = params[key];
+    let str = '';
+    let n = 0;
+    while (n < level) { // eslint-disable-line no-restricted-syntax
+      n++;
+      str += '  ';
+    }
+    if (item && _.isObject(item)) {
+      str += `${key}=`;
+      logger.debug(str);
+      dumpConfigs(item, level + 1);
+    } else {
+      str += `${key}=${item}`;
+      logger.debug(str);
+    }
+  });
+}
+logger.debug('--- List of Configurations ---');
+dumpConfigs(config, 0);
+logger.debug('--- End of List of Configurations ---');
+
 module.exports = app;
diff --git a/config/default.js b/config/default.js
@@ -15,7 +15,7 @@ const fs = require('fs');
 
 module.exports = {
   PORT: process.env.PORT || 3000, // eslint-disable-line no-magic-numbers
-  LOG_LEVEL: process.env.LOG_LEVEL || 'info',
+  LOG_LEVEL: process.env.LOG_LEVEL || 'debug',
   TOPIC: process.env.TOPIC || 'tc-x-events',
   KAFKA_OPTIONS: {
     connectionString: process.env.KAFKA_URL || 'localhost:9092',
diff --git a/models/CommentCreatedEvent.js b/models/CommentCreatedEvent.js
@@ -21,7 +21,7 @@ CommentCreatedEvent.schema = Joi.object().keys({
     id: Joi.number().required(),
     body: Joi.string().allow(''),
     user: Joi.object().keys({
-      id: Joi.number().required()
+      id: Joi.alternatives().try(Joi.string(), Joi.number()).required()
     }).required()
   }),
   repository: repositorySchema.required()
diff --git a/models/IssueClosedEvent.js b/models/IssueClosedEvent.js
@@ -18,7 +18,7 @@ const IssueClosedEvent = {
     issue: issueSchema.required(),
     repository: repositorySchema.required(),
     assignee: Joi.object().keys({
-      id: Joi.number().allow(null)
+      id: Joi.alternatives().try(Joi.string(), Joi.number()).allow(null)
     }).required()
   })
 };
diff --git a/models/Project.js b/models/Project.js
@@ -30,11 +30,14 @@ const schema = new Schema({
     }
   },
   repoUrl: {type: String, required: true},
+  repoId: {type: String, required: false},
   rocketChatWebhook: {type: String, required: false},
   rocketChatChannelName: {type: String, required: false},
   archived: {type: String, required: true},
   owner: {type: String, required: true},
-  secretWebhookKey: {type: String, required: true}
+  secretWebhookKey: {type: String, required: true},
+  createCopilotPayments: {type: String, required: false},
+  isConnect: {type: Boolean, required: false, default: true}
 });
 
 module.exports = schema;
diff --git a/models/UserAssignedEvent.js b/models/UserAssignedEvent.js
@@ -19,7 +19,7 @@ UserAssignedEvent.schema = Joi.object().keys({
   issue: issueSchema.required(),
   repository: repositorySchema.required(),
   assignee: Joi.object().keys({
-    id: Joi.number().required()
+    id: Joi.alternatives().try(Joi.string(), Joi.number()).required()
   }).required()
 });
 
diff --git a/models/common.js b/models/common.js
@@ -16,7 +16,7 @@ const Joi = require('joi');
 
 // the repository schema
 const repositorySchema = Joi.object().keys({
-  id: Joi.number().required(),
+  id: Joi.alternatives().try(Joi.string(), Joi.number()).required(),
   name: Joi.string().required(),
   full_name: Joi.string().required()
 });
@@ -28,10 +28,10 @@ const issueSchema = Joi.object().keys({
   body: Joi.string().allow(''),
   labels: Joi.array().items(Joi.string()),
   assignees: Joi.array().items(Joi.object().keys({
-    id: Joi.number().required()
+    id: Joi.alternatives().try(Joi.string(), Joi.number()).required()
   })),
   owner: Joi.object().keys({
-    id: Joi.number().required()
+    id: Joi.alternatives().try(Joi.string(), Joi.number()).required()
   }).required()
 });
 
@@ -43,10 +43,10 @@ const pullRequestSchema = Joi.object().keys({
   body: Joi.string().allow(''),
   title: Joi.string().required(),
   user: Joi.object().keys({
-    id: Joi.number().required()
+    id: Joi.alternatives().try(Joi.string(), Joi.number()).required()
   }),
   assignees: Joi.array().items({
-    id: Joi.number().required()
+    id: Joi.alternatives().try(Joi.string(), Joi.number()).required()
   })
 });
 
diff --git a/models/index.js b/models/index.js
@@ -28,6 +28,13 @@ dynamoose.setDefaults({
   update: false
 });
 
+if (process.env.CREATE_DB) {
+  dynamoose.setDefaults({
+    create: true,
+    update: true
+  });
+}
+
 const IssueCreatedEvent = require('./IssueCreatedEvent');
 const IssueUpdatedEvent = require('./IssueUpdatedEvent');
 const IssueClosedEvent = require('./IssueClosedEvent');
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -4,7 +4,8 @@
   "private": true,
   "scripts": {
     "start": "node ./bin/www",
-    "lint": "eslint . --ignore-pattern 'public/*' --ext .js --fix || true"
+    "lint": "eslint . --ignore-pattern 'public/*' --ext .js --fix || true",
+    "create-tables": "CREATE_DB=true node scripts/create-update-tables.js"
   },
   "engines": {
     "node": "~8.6.0"
diff --git a/routes/middlewares/SecurityChecker.js b/routes/middlewares/SecurityChecker.js
@@ -9,6 +9,7 @@
  */
 'use strict';
 const crypto = require('crypto');
+const _ = require('lodash');
 const logger = require('../../utils/logger');
 const Project = require('../../models').Project;
 const dbHelper = require('../../utils/db-helper');
@@ -17,17 +18,24 @@ module.exports = (provider) => async (req, res, next) => {
   let isValid = false;
   const params = req.body;
   if (provider === 'github') {
-    const projectDetail = await dbHelper.scanOne(Project, {
+    const projectDetails = await dbHelper.scan(Project, {
       repoUrl: params.repository.html_url
     });
-
-    const hash = crypto.createHmac('sha1', projectDetail.secretWebhookKey).update(req.rawBody).digest('hex');
-    isValid = `sha1=${hash}` === req.header('X-Hub-Signature');
+    _.forEach(projectDetails, (projectDetail) => {
+      const hash = crypto.createHmac('sha1', projectDetail.secretWebhookKey).update(req.rawBody).digest('hex');
+      if (`sha1=${hash}` === req.header('X-Hub-Signature')) {
+        isValid = true;
+      }
+    });
   } else if (provider === 'gitlab') {
-    const projectDetail = await dbHelper.scanOne(Project, {
+    const projectDetails = await dbHelper.scan(Project, {
       repoUrl: params.project.web_url
     });
-    isValid = projectDetail.secretWebhookKey === req.header('X-Gitlab-Token');
+    _.forEach(projectDetails, (projectDetail) => { // eslint-disable-line lodash/prefer-filter
+      if (projectDetail.secretWebhookKey === req.header('X-Gitlab-Token')) {
+        isValid = true;
+      }
+    });
   } else {
     // unknown provider
     return next();
diff --git a/scripts/create-update-tables.js b/scripts/create-update-tables.js
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2017 TopCoder, Inc. All rights reserved.
+ */
+'use strict';
+
+/**
+ * Script to sync DB model to dynamodb service.
+ * @author TCSCODER
+ * @version 1.1
+ */
+
+(async () => {
+  try {
+    console.log('Syncing database tables and indexes...');
+    const models = require('../models');
+    for (const key in models) {
+      await pingTable(models[key]);
+    }
+    console.log('Remote tables is up to date.');
+  } catch (e) {
+    console.error(e);
+  }
+})();
+
+/**
+ * Check if the table is exist
+ * @param {Model} model the db model
+ * @returns {Promise} the promise object
+ */
+async function pingTable(model) {
+  return new Promise((resolve, reject) => {
+    if (!(model.scan && typeof model.scan == 'function' && model.scan({}).exec)) {
+      return resolve();
+    }
+    model.scan({id: 0}).exec((err, result) => {
+      if (err) {
+        console.log(`Table is not exists ${err}`);
+        return reject(err);
+      }
+      return resolve();
+    });
+  });
+}
diff --git a/utils/EventDetector.js b/utils/EventDetector.js
diff --git a/utils/db-helper.js b/utils/db-helper.js
