Merge branch 'fixes_30065364' into 'develop'

Fixes 30065364

See merge request luettich/website!1

Author: jmgasper

.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
 
@@ -67,12 +67,12 @@ The following config parameters are supported, they are defined in `config.js` a
 | GITHUB_CLIENT_SECRET                   | the GitHub client secret                   |                                  |
 | GITLAB_CLIENT_ID                       | the GitLab client id                       |                                  |
 | GITLAB_CLIENT_SECRET                   | the GitLab client secret                   |                                  |
-| WEBSITE                                | used as base to construct various URLs     | http://topcoderx.topcoder.com/ |
+| WEBSITE                                | used as base to construct various URLs     | http://topcoderx.topcoder-dev.com/ |
 
 | GITLAB_API_BASE_URL                    | The Gitlab API base URL                    | https://gitlab.com/api/v4        |
 
 | TC_LOGIN_URL                           | URL to do TopCoder login |                      |
-| TC_USER_PROFILE_URL                    | URL to to call TopCoder API to get profile from token    | https://accounts.topcoder.com/member?retUrl=http:%2F%2Ftopcoderx.topcoder.com%2Fapi%2Fv1%2Ftclogin |
+| TC_USER_PROFILE_URL                    | URL to to call TopCoder API to get profile from token    | https://accounts.topcoder-dev.com/member?retUrl=http:%2F%2Ftopcoderx.topcoder-dev.com%2Fapi%2Fv1%2Ftclogin |
 |TOPIC | kafka topic| |
 |KAFKA_OPTIONS | kafka options| |
 
@@ -102,7 +102,7 @@ The frontend config file contains following variables to be configured in `src/f
 - click the left panel --> Developer settings --> OAuth Apps
 - click the `Register a new application`, fill in the fields,
   note that the `Authorization callback URL` should be the deployed web site,
-  for local deployment, it should be `http://topcoderx.topcoder.com`
+  for local deployment, it should be `http://topcoderx.topcoder-dev.com`
 - after creating the OAuth app, you can see its client id and client secret,
   these should be set to GITHUB_CLIENT_ID and GITHUB_CLIENT_SECRET environment variables
 
@@ -113,8 +113,8 @@ The frontend config file contains following variables to be configured in `src/f
 - click the `Applications` tab
 - enter application name, e.g. `Topcoder-x`
 - for Redirect URI, enter two callback URLs, one callback URL per line, so there are two lines:
-  http://topcoderx.topcoder.com/api/v1/gitlab/owneruser/callback
-  http://topcoderx.topcoder.com/api/v1/gitlab/normaluser/callback
+  http://topcoderx.topcoder-dev.com/api/v1/gitlab/owneruser/callback
+  http://topcoderx.topcoder-dev.com/api/v1/gitlab/normaluser/callback
 - for Scopes, check the `api` and `read_user`, the `api` is for owner user, the `read_user` is for normal user
 - finally click `Save application` to save the OAuth app, then you will see its generated Application Id and Secret,
   these should be set to GITLAB_CLIENT_ID and GITLAB_CLIENT_SECRET environment variables
@@ -134,12 +134,12 @@ Import docs/Ragnar.postman_collection.json and docs/Ragnar.postman_environment.j
 After admin login, the admin token is automatically set to ADMIN-TOKEN environment variable,
 then you may run the `Save GitHub User` and `Save GitLab User` tests to create owner user of your GitHub/GitLab usernames,
 note that you must modify the request body username to use your GitHub/GitLab user names.
-For the `Get User Mapping` test, you may quety mapping by providing either topcoderUsername, githubUsername or gitlabUsername.
+For the `Get User Mapping` test, you may query mapping by providing either topcoderUsername, githubUsername or gitlabUsername.
 
 ## Verification
 
 - run `npm serve` to start the app
-- go to topcoderx.topcoder.com and it will redirect to Topcoder login page, after successful login it will redirect back to Topcoder x app.
+- go to topcoderx.topcoder-dev.com and it will redirect to Topcoder login page, after successful login it will redirect back to Topcoder x app.
 - go to settings by clicking username at top right corner
 - setup both git provider to authorize topcoder-x to manage your repo on behalf of you
 - go to project management and create/edit projects, create hook and label
@@ -149,10 +149,11 @@ For the `Get User Mapping` test, you may quety mapping by providing either topco
 ## Heroku Deployment
 Follow the below steps to deploy the app to heroku
 1. `heroku login`
-2. `heroku create`
-3. `heroku config:set NPM_CONFIG_PRODUCTION=false` so that heroku will install dev dependencies
-5. `git push heroku master` or `git push heroku develop:master` to deploy develop branch
-6. `heroku open` to load the app on browser
+1. `heroku create`
+1. `heroku addons:create mongolab`
+1. `heroku config:set NPM_CONFIG_PRODUCTION=false` so that heroku will install dev dependencies
+1. `git push heroku master` or `git push heroku develop:master` to deploy develop branch
+1. `heroku open` to load the app on browser
 
 NOTE: Once environment variable are changed in heroku please run 
 `heroku run npm run build` 

package.json

@@ -15,14 +15,12 @@
         "serve": "./node_modules/.bin/concurrently \"npm run start:be\" \"npm run start:fe\"",
         "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",
         "test:fe": "gulp protractor",
         "lint": "gulp lint",
-        "serve:dist": "gulp serve:dist",
         "heroku-postbuild": "gulp build"
     },
     "dependencies": {

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

@@ -20,7 +20,7 @@ module.exports = {
   GITLAB_CLIENT_ID: process.env.GITLAB_CLIENT_ID || '',
   GITLAB_CLIENT_SECRET: process.env.GITLAB_CLIENT_SECRET || '',
   // used as base to construct various URLs
-  WEBSITE: process.env.WEBSITE || 'http://topcoderx.topcoder.com',
+  WEBSITE: process.env.WEBSITE || 'http://topcoderx.topcoder-dev.com',
 
   GITHUB_OWNER_CALLBACK_URL: '/api/v1/github/owneruser/callback',
   GITLAB_OWNER_CALLBACK_URL: '/api/v1/gitlab/owneruser/callback',
@@ -29,9 +29,9 @@ module.exports = {
   USER_ADDED_TO_TEAM_SUCCESS_URL: '/#/app/members',
 
   GITLAB_API_BASE_URL: process.env.GITLAB_API_BASE_URL || 'https://gitlab.com/api/v4',
-  TC_LOGIN_URL: process.env.TC_LOGIN_URL || 'https://accounts.topcoder.com/member',
+  TC_LOGIN_URL: process.env.TC_LOGIN_URL || 'https://accounts.topcoder-dev.com/member',
   TC_LOGIN_CALLBACK_URL: '/api/v1/tclogin',
-  TC_USER_PROFILE_URL: process.env.TC_USER_PROFILE_URL || 'http://api.topcoder.com/v2/user/profile',
+  TC_USER_PROFILE_URL: process.env.TC_USER_PROFILE_URL || 'http://api.topcoder-dev.com/v2/user/profile',
 
   // kafka configuration
   TOPIC: process.env.TOPIC || 'tc-x-events',

src/front/src/app/app.js

@@ -120,18 +120,11 @@ angular.module('topcoderX', [
         })
         .state('app.membersAdded', {
           url: '/members',
-          templateUrl: 'app/members/members.html',
-          controller: 'MemberConroller',
+          templateUrl: 'app/members/member.html',
+          controller: 'MemberController',
           controllerAs: 'vm',
         });
 
       $urlRouterProvider.otherwise('/app/main');
       $compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|ftp|mailto|tel|file|blob):/);
-      // use the HTML5 History API
-      // $locationProvider.html5Mode(true);
-      // $locationProvider.html5Mode({
-      //   enabled: true,
-      //   requireBase: false,
-      //   hashPrefix:'!'
-      // });
     }]);

src/front/src/app/members/member.controller.js

@@ -1,6 +1,6 @@
 'use strict';
 
 angular.module('topcoderX')
-    .controller('MainController', ['$scope', function ($scope) {
+    .controller('MemberController', ['$scope', function ($scope) {
         $scope.title = 'Members';
     }]);

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 = {