Merge remote-tracking branch 'github/develop'

Author: jmgasper

src/routes.js

@@ -95,6 +95,7 @@ module.exports = {
     get: {
       controller: 'TCUserController',
       method: 'login',
+      allowNormalUser: true,
     },
   },
   '/admin/tcuser': {

src/services/GithubService.js

@@ -10,6 +10,7 @@
  */
 const GitHub = require('github-api');
 const Joi = require('joi');
+const _ = require('lodash');
 const config = require('../config');
 const constants = require('../common/constants');
 const helper = require('../common/helper');
@@ -173,22 +174,27 @@ getTeamRegistrationUrl.schema = Joi.object().keys({
  * @returns {Promise} the promise result
  */
 async function addTeamMember(teamId, ownerUserToken, normalUserToken) {
+  let username;
+  let id;
   try {
     // get normal user name
     const githubNormalUser = new GitHub({ token: normalUserToken });
     const normalUser = await githubNormalUser.getUser().getProfile();
-    const username = normalUser.data.login;
-    const id = normalUser.data.id;
+    username = normalUser.data.login;
+    id = normalUser.data.id;
 
     // add normal user to team
     const github = new GitHub({ token: ownerUserToken });
     const team = github.getTeam(teamId);
     await team.addMembership(username);
-    // return github username
-    return { username, id };
   } catch (err) {
-    throw helper.convertGitHubError(err, 'Failed to add team member');
+    // if error is already exists discard
+    if (_.chain(err).get('body.errors').countBy({ code: 'already_exists' }).get('true').isUndefined().value()) {
+      throw helper.convertGitHubError(err, 'Failed to add team member');
+    }
   }
+  // return github username
+  return {username, id};
 }
 
 addTeamMember.schema = Joi.object().keys({

src/services/GitlabService.js

@@ -11,6 +11,7 @@
 const Joi = require('joi');
 const superagent = require('superagent');
 const superagentPromise = require('superagent-promise');
+const _ = require('lodash');
 const config = require('../config');
 const constants = require('../common/constants');
 const helper = require('../common/helper');
@@ -167,13 +168,16 @@ getGroupRegistrationUrl.schema = Joi.object().keys({
  * @returns {Promise} the promise result
  */
 async function addGroupMember(groupId, ownerUserToken, normalUserToken) {
+  let username;
+  let userId;
   try {
     // get normal user id
     const res = await request
       .get(`${config.GITLAB_API_BASE_URL}/api/v4/user`)
       .set('Authorization', `Bearer ${normalUserToken}`)
       .end();
-    const userId = res.body.id;
+    userId = res.body.id;
+    username = res.body.username;
     if (!userId) {
       throw new errors.UnauthorizedError('Can not get user id from the normal user access token.');
     }
@@ -187,10 +191,13 @@ async function addGroupMember(groupId, ownerUserToken, normalUserToken) {
     // return gitlab username
     return { username: res.body.username, id: res.body.id };
   } catch (err) {
-    if (err instanceof errors.ApiError) {
-      throw err;
+    if (_.get(JSON.parse(err.response.text), 'message') !== 'Member already exists') {
+      if (err instanceof errors.ApiError) {
+        throw err;
+      }
+      throw helper.convertGitLabError(err, 'Failed to add group member');
     }
-    throw helper.convertGitLabError(err, 'Failed to add group member');
+    return {username, id: userId};
   }
 }