fixes for webhook and label issue

Author: dilipkrthapa

.gitignore

@@ -0,0 +1,45 @@
+node_modules/
+.history
+.vscode
+.env
+public/
+
+# compiled output
+/tmp
+/out-tsc
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
+npm-debug.log
+testem.log
+/typings
+
+# e2e
+/e2e/*.js
+/e2e/*.map
+
+# System Files
+.DS_Store
+Thumbs.db
+
+src/public/
+.tmp

README.md

@@ -5,7 +5,7 @@
 - Nodejs 8 is required
 - MongoDB 3.2
 - kafka
-
+- nodemon (for local development)
 
 ## Install dependencies
 

package.json

@@ -16,7 +16,7 @@
         "start:be": "nodemon src/app.js",
         "start:fe": "gulp build:watch",
         "build:fe": "gulp build",
-        "build":"gulp build",
+        "build": "gulp build",
         "test": "node ./node_modules/mocha/bin/mocha --recursive --timeout 999999 --colors tests/*.test.js --bail",
         "clean": "gulp clean",
         "publish": "gulp publish",

src/app.js

@@ -42,7 +42,7 @@ _.forEach(routes, (verbs, path) => {
       if (v3jwt) {
         const decoded = jwtDecode(v3jwt);
         req.currentUser = {
-          handle: decoded.handle,
+          handle: decoded.handle.toLowerCase(),
         };
       }
       req.signature = `${def.controller}#${def.method}`;

src/front/src/app/upsertproject/upsertproject.controller.js

@@ -28,7 +28,7 @@ angular.module('topcoderX').controller('ProjectController', ['currentUser', '$sc
     if ($rootScope.project) {
       $scope.title = 'Edit a Project';
       $scope.project = $rootScope.project;
-      $scope.project.id = $rootScope.project._id;
+      $scope.project.id = $rootScope.project.id;
       $scope.editing = true;
     } else {
       $scope.title = 'Add a Project';
@@ -100,7 +100,7 @@ angular.module('topcoderX').controller('ProjectController', ['currentUser', '$sc
           'repoToken': $scope.token,
           'baseUrl': HOOK_BASE_URL,
           'repoType': $scope.repoType,
-          'challengeId': $scope.project.id
+          'projectId': $scope.project.id
         };
         ProjectService.createHooks(objc).then(function () {
           Alert.info('Webhook Added Successfully', $scope);

src/services/ProjectService.js

@@ -19,6 +19,7 @@ const Project = require('../models').Project;
 
 const projectSchema = {
   project: {
+    id: Joi.string().required(),
     title: Joi.string().required(),
     tcDirectId: Joi.number().required(),
     repoUrl: Joi.string().required(),
@@ -141,25 +142,27 @@ async function createLabel(body) {
       description: body.description,
     });
   }
+  return;
 }
 
 createLabel.schema = Joi.object().keys({
-  repoType: Joi.string().required(),
-  repoToken: Joi.string().required(),
-  repoOwner: Joi.string().required(),
-  repoName: Joi.string().required(),
-  label: Joi.string().required(),
-  description: Joi.string().required(),
-  color: Joi.string().required(),
-  baseUrl: Joi.string().required(),
+  body: Joi.object().keys({
+    repoType: Joi.string().required(),
+    repoToken: Joi.string().required(),
+    repoOwner: Joi.string().required(),
+    repoName: Joi.string().required(),
+    label: Joi.string().required(),
+    description: Joi.string().required(),
+    color: Joi.string().required(),
+  }),
 });
 
 /**
  * creates hook
  * @param {Object} body the request body
  */
 async function createHook(body) {
-  const projectDetail = await helper.ensureExists(Project, body.challengeId);
+  const projectDetail = await helper.ensureExists(Project, body.projectId);
   if (body.repoType === 'github') {
     const client = gitHubApi.client(body.repoToken);
     const ghrepo = client.repo(`${body.repoOwner}/${body.repoName}`);
@@ -201,15 +204,18 @@ async function createHook(body) {
       }
     );
   }
+  return;
 }
 
 createHook.schema = Joi.object().keys({
-  challengeId: Joi.string().required(),
-  repoType: Joi.string().required(),
-  repoOwner: Joi.string().required(),
-  repoToken: Joi.string().required(),
-  repoName: Joi.string().required(),
-  baseUrl: Joi.string().required(),
+  body: Joi.object().keys({
+    projectId: Joi.string().required(),
+    repoType: Joi.string().required(),
+    repoOwner: Joi.string().required(),
+    repoToken: Joi.string().required(),
+    repoName: Joi.string().required(),
+    baseUrl: Joi.string().required(),
+  }),
 });
 
 module.exports = {