Git link fixes

https://software.topcoder.com/review/actions/ViewProjectDetails?pid=30184796

Author: jmgasper

.DS_Store

@@ -34,6 +34,8 @@ The following config parameters are supported, they are defined in `src/config.j
 |IS_LOCAL | Use Amazon DynamoDB Local or server. |true |
 |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 |
+
 
 ## GitHub OAuth App Setup
 

configuration.md

@@ -80,7 +80,7 @@
         "parse-domain": "^2.1.2",
         "shortid": "^2.2.8",
         "ssl-express-www": "^3.0.3",
-        "superagent": "^3.6.0",
+        "superagent": "^6.1.0",
         "superagent-promise": "^1.1.0",
         "typescript": "~2.3.3",
         "uuid": "^3.3.2",

package.json

@@ -16,6 +16,7 @@ const Joi = require('joi');
 const getParams = require('get-parameter-names');
 const bluebird = require('bluebird');
 const bcrypt = require('bcryptjs');
+const moment = require('moment');
 const parseDomain = require('parse-domain');
 const config = require('../config');
 const logger = require('./logger');
@@ -147,9 +148,9 @@ function convertGitHubError(err, message) {
  */
 function convertGitLabError(err, message) {
   let resMsg = `${message}. ${err.message}.\n`;
-  const detail = _.get(err, 'response.body.message');
+  const detail = _.get(err, 'response.body.message') || _.get(err, 'response.text');
   if (detail) {
-    resMsg += ` Detail: ${detail}`;
+    resMsg += ` Detail: ${JSON.stringify(detail)}`;
   }
   const apiError = new errors.ApiError(
     err.status || _.get(err, 'response.status', constants.SERVICE_ERROR_STATUS),
@@ -252,6 +253,16 @@ function hashCode(s) {
   }, 0);
 }
 
+/**
+ * Check if expires_at is valid
+ *
+ * @param {String} expiresAt the date str yyyy-MM-dd
+ * @returns {Boolean} valid or not
+ */
+function isValidGitlabExpiresDate(expiresAt) {
+  return moment(expiresAt, 'YYYY-MM-DD', true).isValid();
+}
+
 module.exports = {
   buildService,
   buildController,
@@ -261,5 +272,6 @@ module.exports = {
   generateIdentifier,
   getProviderType,
   getProjectCopilotOrOwner,
-  hashCode
+  hashCode,
+  isValidGitlabExpiresDate
 };

src/common/helper.js

@@ -65,6 +65,7 @@ module.exports = {
       TC_LOGIN_URL: process.env.TC_LOGIN_URL || 'https://accounts.topcoder.com/member',
     },
   },
+  DYNAMODB_WAIT_TABLE_FOR_ACTIVE_TIMEOUT: process.env.DYNAMODB_WAIT_TABLE_FOR_ACTIVE_TIMEOUT || 1000 * 60 * 10 // eslint-disable-line no-magic-numbers
 };
 
 module.exports.frontendConfigs = {

src/config.js

@@ -17,7 +17,7 @@ <h2>Git Access Control</h2>
                                 <div ng-if="settings.github==true">
                                     <div ng-show="tableConfig.github.initialized">
                                         <div ng-if="tableConfig.github.items.length!=0 || tableConfig.github.allItems.length!=0" class="row">
-                                            <div class="col-lg-3">
+                                            <div class="col-lg-4">
                                                 <div class="input-group custom-search-form">
                                                     <input ng-model="searchText" type="text" class="form-control" placeholder="Find teams" ng-change="onSearchChange('github', this)">
                                                     <span class="input-group-btn">
@@ -27,6 +27,7 @@ <h2>Git Access Control</h2>
                                                     </span>
                                                 </div>
                                             </div>
+                                            <div class="col-lg-6 h5">Don't see your team? Make sure you have 'Maintainer' rights.</div>
                                         </div>
                                         <table ng-if="tableConfig.github.items.length!=0 || tableConfig.github.allItems.length!=0" class="footable table table-stripped toggle-arrow-tiny">
                                             <thead>
@@ -39,8 +40,14 @@ <h2>Git Access Control</h2>
                                             </thead>
                                             <tbody>
                                                 <tr ng-repeat="item in tableConfig.github.items" ng-class-even="'footable-even'" ng-class-odd="'footable-odd'">
-                                                    <td class="col-lg-2">{{item.name}}</td>
-                                                    <td class="col-lg-2">{{item.organization.login}}</td>
+                                                    <td class="col-lg-2">
+                                                        <a href="{{item.html_url}}"
+                                                        target="_blank">{{item.name}}</a>
+                                                    </td>
+                                                    <td class="col-lg-2">
+                                                        <a href="{{item.organization.html_url}}"
+                                                        target="_blank">{{item.organization.login}}</a>
+                                                    </td>
                                                     <td class="col-lg-2">
                                                         <button class="btn btn-sm btn-success" ng-hide="item.gettingLink" ng-click="getSharableLink(item, 'github')">
                                                             <strong>Get Link</strong>
@@ -116,7 +123,7 @@ <h2>Git Access Control</h2>
                                 <div ng-if="settings.gitlab==true">
                                     <div ng-show="tableConfig.gitlab.initialized">
                                         <div ng-if="tableConfig.gitlab.items.length!=0 || tableConfig.gitlab.allItems.length!=0" class="row">
-                                            <div class="col-lg-3">
+                                            <div class="col-lg-4">
                                                 <div class="input-group custom-search-form">
                                                     <input ng-model="searchText" type="text" class="form-control" placeholder="Find groups"  ng-change="onSearchChange('gitlab', this)">
                                                     <span class="input-group-btn">
@@ -126,6 +133,7 @@ <h2>Git Access Control</h2>
                                                     </span>
                                                 </div>
                                             </div>
+                                            <div class="col-lg-6 h5">Don't see your group? Make sure you have 'Owner' rights.</div>
                                         </div>
                                         <table ng-show="tableConfig.gitlab.items.length!=0 || tableConfig.gitlab.allItems.length!=0" class="footable table table-stripped toggle-arrow-tiny">
                                             <thead>
@@ -136,7 +144,10 @@ <h2>Git Access Control</h2>
                                             </thead>
                                             <tbody>
                                                 <tr ng-repeat="item in tableConfig.gitlab.items" ng-class-even="'footable-even'" ng-class-odd="'footable-odd'">
-                                                    <td class="col-lg-2">{{item.name}}</td>
+                                                    <td class="col-lg-2">
+                                                        <a href="{{item.web_url}}"
+                                                        target="_blank">{{item.name}}</a>
+                                                    </td>
                                                     <td class="col-lg-2">
                                                         <button class="btn btn-sm btn-success" ng-hide="item.gettingLink" ng-click="getSharableLink(item, 'gitlab')">
                                                             <strong>Get Link</strong>

src/front/src/app/git-access-control/access-control.html

@@ -13,6 +13,7 @@ angular.module('topcoderX').controller('GitAccessDialogController', [
     $scope.provider = provider;
     $scope.accessLevel = '';
     $scope.expiredAt = '';
+    $scope.invalidExpiredAt = false;
     if ($scope.provider === 'github') {
       $scope.accessLevel = 'member';
     } else {
@@ -38,10 +39,15 @@ angular.module('topcoderX').controller('GitAccessDialogController', [
      * Set changes to father controller
      */
     $scope.setChanges = function () {
-      $uibModalInstance.close({
-        accessLevel: $scope.accessLevel,
-        expiredAt: $scope.expiredAt
-      });
+      if ($scope.expiredAt && !isValidDate($scope.expiredAt)) {
+        $scope.invalidExpiredAt = true
+      }
+      else {
+        $uibModalInstance.close({
+          accessLevel: $scope.accessLevel,
+          expiredAt: $scope.expiredAt
+        });
+      }
     };
 
     /**
@@ -50,5 +56,10 @@ angular.module('topcoderX').controller('GitAccessDialogController', [
     $scope.close = function () {
       $uibModalInstance.close();
     };
+
+    // Validates that the input string is a valid date formatted as "yyyy-MM-dd"
+    function isValidDate(dateString) {
+      return /^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$/.test(dateString)
+    };
   },
 ]);

src/front/src/app/git-access-control/git-access-dialog.controller.js

@@ -24,6 +24,7 @@ <h4 class="modal-title" id="reg-dialog-label">Configure Access Level and Valid P
             <datepicker ng-if="provider === 'gitlab'" date-format="yyyy-MM-dd" date-min-limit="{{dateLimit}}">
                 <input class="form-control" ng-model="expiredAt" type="text" ng-change="updateExpired(expiredAt)"/>
             </datepicker>
+            <div ng-if="invalidExpiredAt === true">Invalid Expired At. Correct format is yyyy-MM-dd</div>
         </div>
     </div>
     <div class="modal-footer">

src/front/src/app/git-access-control/git-access-dialog.html

@@ -24,12 +24,14 @@ if (config.DYNAMODB.IS_LOCAL === 'true') {
 dynamoose.setDefaults({
   create: false,
   update: false,
+  waitForActiveTimeout: config.DYNAMODB_WAIT_TABLE_FOR_ACTIVE_TIMEOUT
 });
 
 if (process.env.CREATE_DB) {
   dynamoose.setDefaults({
     create: true,
     update: true,
+    waitForActiveTimeout: config.DYNAMODB_WAIT_TABLE_FOR_ACTIVE_TIMEOUT
   });
 }
 

src/models/index.js

@@ -200,13 +200,14 @@ async function addGroupMember(groupId, ownerUserToken, normalUserToken, accessLe
     }
 
     let body = `user_id=${userId}&access_level=${accessLevel}`;
-    if (expiredAt) {
-      body = body + `&expires_at=${expiredAt} `;
+    if (expiredAt && helper.isValidGitlabExpiresDate(expiredAt)) {
+      body = body + `&expires_at=${expiredAt}`;
     }
     // add user to group
     await request
       .post(`${config.GITLAB_API_BASE_URL}/api/v4/groups/${groupId}/members`)
       .set('Authorization', `Bearer ${ownerUserToken}`)
+      .set('Content-Type', 'application/x-www-form-urlencoded')
       .send(body)
       .end();
     // return gitlab username
@@ -219,7 +220,8 @@ async function addGroupMember(groupId, ownerUserToken, normalUserToken, accessLe
       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 userId=${userId} accessLevel=${accessLevel} expiredAt=${expiredAt}`);
     }
     return {username, id: userId};
   }