Merge pull request #461 from topcoder-platform/develop

Version 1.2.2

Author: jmgasper

.DS_Store

@@ -8,13 +8,25 @@ install_dependency: &install_dependency
     sudo apt install jq
     sudo pip install awscli --upgrade
     sudo pip install docker-compose
+  no_output_timeout: 30m
+
+
 install_deploysuite: &install_deploysuite
   name: Installation of install_deploysuite.
   command: |
     git clone --branch v1.4.1 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
     cp ./../buildscript/master_deploy.sh .
     cp ./../buildscript/buildenv.sh .
     cp ./../buildscript/awsconfiguration.sh .
+  no_output_timeout: 30m
+
+build_app: &build_app
+  name: Build the app
+  command: |
+    ./build.sh
+  no_output_timeout: 30m
+
+
 restore_cache_settings_for_build: &restore_cache_settings_for_build
   key: docker-node-modules-{{ checksum "package-lock.json" }}
 
@@ -29,7 +41,7 @@ builddeploy_steps: &builddeploy_steps
       - run: *install_dependency
       - run: *install_deploysuite
       - restore_cache: *restore_cache_settings_for_build
-      - run: ./build.sh
+      - run: *build_app
       - save_cache: *save_cache_settings
       - deploy:
           name: Running MasterScript.
@@ -39,6 +51,7 @@ builddeploy_steps: &builddeploy_steps
             ./buildenv.sh -e $DEPLOY_ENV -b ${DEPLOY_ENV}-${APPNAME}-deployvar
             source buildenvvar
             ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${DEPLOY_ENV}-global-appvar,${DEPLOY_ENV}-${APPNAME}-appvar -i ${APPNAME}
+      
 
 
 jobs:
@@ -66,7 +79,7 @@ workflows:
           context : org-global
           filters:
             branches:
-              only: [develop, "feature/Auth0-RS256-Token"]
+              only: [develop, "issue_443"]
 
       # Production builds are exectuted only on tagged commits to the
       # master branch.

.circleci/config.yml

@@ -35,6 +35,7 @@ The following config parameters are supported, they are defined in `src/config.j
 |AWS_CONNECTION_TIMEOUT | The timeout used to check if the app is healthy. |10000 |
 |TC_LOGIN_URL | TC login url | |
 |DYNAMODB_WAIT_TABLE_FOR_ACTIVE_TIMEOUT | Dynamodb wait for active timeout |10 minutes |
+|TC_API_V5_URL | Topcoder API v5 url for retrieving list of Connect Projects | |
 
 
 ## GitHub OAuth App Setup

configuration.md

@@ -87,6 +87,7 @@
         "superagent-promise": "^1.1.0",
         "typescript": "~2.3.3",
         "uuid": "^3.3.2",
+        "ui-select": "~0.19.8",
         "winston": "^2.3.1",
         "tc-auth-lib": "topcoder-platform/tc-auth-lib#1.0.1"
     },

package.json

@@ -43,10 +43,10 @@ const GITLAB_MAX_PER_PAGE = Number.MAX_SAFE_INTEGER;
 // the access level can be: 10 - GUEST, 20 - REPORTER, 30 - DEVELOPER, 40 - MASTER, 50 - OWNER
 const GITLAB_DEFAULT_GROUP_ACCESS_LEVEL = 30;
 
-// The Gitlab access token default expiration in seconds
-const GITLAB_ACCESS_TOKEN_DEFAULT_EXPIRATION = 3600 * 24 * 14;
+// The Gitlab access token default expiration in seconds (2 hours expiration)
+const GITLAB_ACCESS_TOKEN_DEFAULT_EXPIRATION = 3600 * 2;
 
-// The Gitlab refresh token time in seconds before expiration
+// The Gitlab refresh token time in seconds before expiration (5 minute before expiration)
 const GITLAB_REFRESH_TOKEN_BEFORE_EXPIRATION = 300;
 
 const GITHUB_OWNER_CALLBACK_URL = '/api/v1/github/owneruser/callback';

src/common/constants.js

@@ -179,6 +179,43 @@ async function queryOneIssue(model, repositoryId, number, provider) {
   });
 }
 
+/**
+ * Get Issue's id and challengeUUID by repoUrl
+ * @param {String} repoUrl The repo url
+ * @returns {Promise<Object>}
+ */
+async function queryIssueIdChallengeUUIDByRepoUrl(repoUrl) {
+  return await new Promise((resolve, reject) => {
+    models.Issue.scan('repoUrl').eq(repoUrl)
+      .attributes(['id', 'challengeUUID'])
+      .exec((err, result) => {
+        if (err) {
+          return reject(err);
+        }
+        return resolve(result);
+      });
+  });
+}
+
+
+/**
+ * Get CopilotPayment's id by challengeUUID
+ * @param {String} challengeUUID The challengeUUID
+ * @returns {Promise<String>}
+ */
+async function queryPaymentIdByChallengeUUID(challengeUUID) {
+  return await new Promise((resolve, reject) => {
+    models.CopilotPayment.scan('challengeUUID').eq(challengeUUID)
+      .attributes(['id'])
+      .exec((err, result) => {
+        if (err) {
+          return reject(err);
+        }
+        return resolve(result.id);
+      });
+  });
+}
+
 /**
  * Get single data by query parameters
  * @param {Object} model The dynamoose model to query
@@ -248,6 +285,27 @@ async function queryOneUserMappingByTCUsername(model, tcusername) {
   });
 }
 
+/**
+ * Get single data by query parameters
+ * @param {Object} model The dynamoose model to query
+ * @param {String} provider The git provider
+ * @param {String} gitUsername The git username
+ * @returns {Promise<void>}
+ */
+async function queryTCUsernameByGitUsername(model, provider, gitUsername) {
+  return await new Promise((resolve, reject) => {
+    model.queryOne(`${provider}Username`).eq(gitUsername)
+    .all()
+    .exec((err, result) => {
+      if (err) {
+        logger.debug(`queryTCUsernameByGitUsername. Error. ${err}`);
+        return reject(err);
+      }
+      return resolve(result.topcoderUsername);
+    });
+  });
+}
+
 /**
  * Get single data by query parameters
  * @param {Object} model The dynamoose model to query
@@ -257,7 +315,7 @@ async function queryOneUserMappingByTCUsername(model, tcusername) {
 async function queryOneActiveProject(model, repoUrl) {
   return await new Promise((resolve, reject) => {
     queryOneActiveRepository(models.Repository, repoUrl).then((repo) => {
-      if (!repo) resolve(null);
+      if (!repo || repo.length === 0) resolve(null);
       else model.queryOne('id').eq(repo.projectId).consistent()
         .exec((err, result) => {
           if (err) {
@@ -470,6 +528,35 @@ async function queryOneOrganisation(model, organisation) {
   });
 }
 
+/**
+ * Query one active repository
+ * @param {String} url the repository url
+ * @returns {Promise<Object>}
+ */
+async function queryOneRepository(url) {
+  return await new Promise((resolve, reject) => {
+    models.Repository.query({
+      url,
+    })
+    .all()
+    .exec((err, repos) => {
+      if (err) {
+        return reject(err);
+      }
+      if (!repos || repos.length === 0) resolve(null);
+      if (repos.length > 1) {
+        let error = `Repository's url is unique in this version.
+          This Error must be caused by old data in the Repository table.
+          The old version can only guarrentee that the active Repository's url is unique.
+          Please migrate the old Repository table.`;
+        logger.debug(`queryOneRepository. Error. ${error}`);
+        reject(error);
+      }
+      return resolve(repos[0]);
+    });
+  });
+}
+
 /**
  * Query one active repository
  * @param {Object} model the dynamoose model
@@ -480,8 +567,8 @@ async function queryOneActiveRepository(model, url) {
   return await new Promise((resolve, reject) => {
     model.queryOne({
       url,
-      archived: 'false'
     })
+    .filter('archived').eq('false')
     .all()
     .exec((err, result) => {
       if (err) {
@@ -502,8 +589,8 @@ async function queryActiveRepositoriesExcludeByProjectId(url, projectId) {
   return await new Promise((resolve, reject) => {
     models.Repository.query({
       url,
-      archived: 'false'
     })
+    .filter('archived').eq('false')
     .filter('projectId')
     .not().eq(projectId)
     .all()
@@ -580,6 +667,8 @@ async function populateRepoUrls(projectId) {
 }
 
 module.exports = {
+  queryIssueIdChallengeUUIDByRepoUrl,
+  queryPaymentIdByChallengeUUID,
   getById,
   getByKey,
   scan,
@@ -597,13 +686,15 @@ module.exports = {
   queryOneActiveProject,
   queryOneActiveProjectWithFilter,
   queryOneActiveRepository,
+  queryOneRepository,
   queryOneOrganisation,
   queryOneIssue,
   queryOneUserByType,
   queryOneUserByTypeAndRole,
   queryOneUserGroupMapping,
   queryOneUserTeamMapping,
   queryOneUserMappingByTCUsername,
+  queryTCUsernameByGitUsername,
   queryRepositoriesByProjectId,
   queryRepositoryByProjectIdFilterUrl
 };

src/common/db-helper.js

@@ -19,6 +19,8 @@ const bcrypt = require('bcryptjs');
 const moment = require('moment');
 const parseDomain = require('parse-domain');
 const config = require('../config');
+const kafka = require('../utils/kafka');
+const models = require('../models');
 const logger = require('./logger');
 const errors = require('./errors');
 const constants = require('./constants');
@@ -120,6 +122,52 @@ function buildController(controller) {
   });
 }
 
+/**
+ * Convert github api error.
+ * @param {String} copilotHandle the copilot handle
+ * @param {String} provider the git provider
+ */
+async function sendTokenExpiredEvent(copilotHandle, provider) {
+  const notificationTokenExpiredEvent = {
+    event: 'notification.tokenExpired',
+    data: {
+      copilotHandle,
+      provider,
+    },
+  };
+  await kafka.send(JSON.stringify(notificationTokenExpiredEvent));
+}
+
+/**
+ * Convert github api error.
+ * @param {Error} err the github api error
+ * @param {String} message the error message
+ * @param {String} gitUsername the git username
+ * @returns {Error} converted error
+ */
+async function convertGitHubErrorAsync(err, message, gitUsername) {
+  if (err.statusCode === 401 && gitUsername) { // eslint-disable-line no-magic-numbers
+    const copilotHandle = await dbHelper.queryTCUsernameByGitUsername(models.GithubUserMapping, 'github', gitUsername);
+    await sendTokenExpiredEvent(copilotHandle, 'Github');
+  }
+  return convertGitHubError(err, message);
+}
+
+/**
+ * Convert gitlab api error.
+ * @param {Error} err the gitlab api error
+ * @param {String} message the error message
+ * @param {String} gitUsername the git username
+ * @returns {Error} converted error
+ */
+async function convertGitLabErrorAsync(err, message, gitUsername) {
+  if (err.statusCode === 401 && gitUsername) { // eslint-disable-line no-magic-numbers
+    const copilotHandle = await dbHelper.queryTCUsernameByGitUsername(models.GitlabUserMapping, 'gitlab', gitUsername);
+    await sendTokenExpiredEvent(copilotHandle, 'Gitlab');
+  }
+  return convertGitLabError(err, message);
+}
+
 /**
  * Convert github api error.
  * @param {Error} err the github api error
@@ -209,24 +257,23 @@ async function getProviderType(repoUrl) {
 
 /**
  * gets the git username of copilot/owner for a project
- * @param {Object} models the db models
  * @param {Object} project the db project detail
  * @param {String} provider the git provider
  * @param {Boolean} isCopilot if true, then get copilot, otherwise get owner
  * @returns {Object} the owner/copilot for the project
  */
-async function getProjectCopilotOrOwner(models, project, provider, isCopilot) {
+async function getProjectCopilotOrOwner(project, provider, isCopilot) {
   const userMapping = await dbHelper.queryOneUserMappingByTCUsername(
-    provider === 'github' ? models.GithubUserMapping : models.GitlabUserMapping, 
+    provider === 'github' ? models.GithubUserMapping : models.GitlabUserMapping,
     isCopilot ? project.copilot : project.owner);
 
-  if (!userMapping || 
-    (provider === 'github' && !userMapping.githubUserId) 
+  if (!userMapping ||
+    (provider === 'github' && !userMapping.githubUserId)
     || (provider === 'gitlab' && !userMapping.gitlabUserId)) {
     throw new Error(`Couldn't find ${isCopilot ? 'copilot' : 'owner'} username for '${provider}' for this repository.`);
   }
 
-  let user = await dbHelper.queryOneUserByType(models.User, 
+  let user = await dbHelper.queryOneUserByType(models.User,
       provider === 'github' ? userMapping.githubUsername : // eslint-disable-line no-nested-ternary
       userMapping.gitlabUsername, provider);
 
@@ -270,6 +317,8 @@ module.exports = {
   buildController,
   convertGitHubError,
   convertGitLabError,
+  convertGitHubErrorAsync,
+  convertGitLabErrorAsync,
   ensureExists,
   ensureExistsWithKey,
   generateIdentifier,

src/common/helper.js

@@ -83,4 +83,14 @@ module.exports.frontendConfigs = {
   TOPCODER_URL: process.env.TOPCODER_URL || 'https://topcoder-dev.com',
   GITHUB_TEAM_URL: process.env.GITHUB_TEAM_URL || 'https://github.com/orgs/',
   GITLAB_GROUP_URL: process.env.GITLAB_GROUP_URL || 'https://gitlab.com/groups/',
+  TC_API_V5_URL: process.env.TC_API_V5_URL || 'https://api.topcoder-dev.com/v5',
+  TOPCODER_VALUES: {
+    dev: {
+      TC_API_V4_URL: process.env.TC_API_V4_URL || 'https://api.topcoder-dev.com/v4',
+    },
+    prod: {
+      TC_API_V4_URL: process.env.TC_API_V4_URL || 'https://api.topcoder.com/v4',
+    },
+  },
+  TOPCODER_ENV: process.env.TOPCODER_ENV || 'dev',
 };

src/config.js

@@ -160,7 +160,7 @@ async function addUserToTeamCallback(req, res) {
   const token = result.body.access_token;
 
   // get team details
-  const teamDetails = await GithubService.getTeamDetails(team.ownerToken, team.teamId);
+  const teamDetails = await GithubService.getTeamDetails(team.ownerUsername, team.ownerToken, team.teamId);
   const organisation = teamDetails.organization.login;
 
   // Add member to organisation
@@ -173,7 +173,8 @@ async function addUserToTeamCallback(req, res) {
 
   // add user to team
   console.log(`adding ${token} to ${team.teamId} with ${team.ownerToken}`); /* eslint-disable-line no-console */
-  const githubUser = await GithubService.addTeamMember(team.teamId, team.ownerToken, token, team.accessLevel);
+  const githubUser = await GithubService.addTeamMember(
+    team.ownerUsername, team.teamId, team.ownerToken, token, team.accessLevel);
   // associate github username with TC username
   const mapping = await dbHelper.queryOneUserMappingByTCUsername(GithubUserMapping, req.session.tcUsername);
 
@@ -247,7 +248,8 @@ async function deleteUsersFromTeam(req, res) {
       });
       // eslint-disable-next-line no-restricted-syntax
       for (const userTeamMapItem of userTeamMappings) {
-        await GithubService.deleteUserFromGithubTeam(token, teamId, githubOrgId, userTeamMapItem.githubUserName);
+        await GithubService.deleteUserFromGithubTeam(
+          teamInDB.ownerUsername, token, teamId, githubOrgId, userTeamMapItem.githubUserName);
         await dbHelper.removeById(UserTeamMapping, userTeamMapItem.id);
       }
     } catch (err) {