Merge remote-tracking branch 'origin/develop'

# Conflicts:
#	gulp/ng-config.js
#	src/front/config.json

Author: jmgasper

TopcoderXDeploy.md

@@ -61,6 +61,8 @@ KAFKA_CLIENT_CERT_KEY: <cert string>
 
 KAFKA_URL: silver-craft-01.srvs.cloudkafka.com:9093,silver-craft-01.srvs.cloudkafka.com:9094
 
+KAFKA_GROUP_ID: topcoder-x-processor
+
 TOPIC: topcoder-x
 ```
 
@@ -71,6 +73,7 @@ So it would be updated from this:
 ```
   KAFKA_OPTIONS: {
     connectionString: process.env.KAFKA_URL || 'localhost:9092',
+    groupId: process.env.KAFKA_GROUP_ID || 'topcoder-x-processor',
     ssl: {
       cert: process.env.KAFKA_CLIENT_CERT || fs.readFileSync('./kafka_client.cer'), // eslint-disable-line no-sync
       key: process.env.KAFKA_CLIENT_CERT_KEY || fs.readFileSync('./kafka_client.key'), // eslint-disable-line no-sync
@@ -82,7 +85,8 @@ To this:
 
 ```
   KAFKA_OPTIONS: {
-    connectionString: process.env.KAFKA_URL || 'localhost:9092'
+    connectionString: process.env.KAFKA_URL || 'localhost:9092',
+    groupId: process.env.KAFKA_GROUP_ID || 'topcoder-x-processor'
   },
 ```
 
@@ -188,6 +192,7 @@ ISSUE_BID_EMAIL_RECEIVER:     [email protected]
 KAFKA_CLIENT_CERT: <cert>
 KAFKA_CLIENT_CERT_KEY: <key>
 KAFKA_URL:                   silver-craft-01.srvs.cloudkafka.com:9093,silver-craft-01.srvs.cloudkafka.com:9094
+KAFKA_GROUP_ID                topcoder-x-processor
 LOG_LEVEL:                    debug
 MAILGUN_API_KEY:              key-5ebe7a0fae37a9008721ec0bfe5bdd95
 MAILGUN_DOMAIN:               sandbox3fcf4920781449f2a5293f8ef18e4bb6.mailgun.org

gulp/build.js

@@ -113,5 +113,5 @@ gulp.task('lint', () => {
     .pipe(eslint.failAfterError());
 });
 
-gulp.task('build', ['ng-config', 'lint', 'html', 'images', 'fonts', 'fontawesome', 'misc']);
+gulp.task('build', ['lint', 'html', 'images', 'fonts', 'fontawesome', 'misc']);
 gulp.task('build:watch', ['watch:build']);

gulp/ng-config.js

@@ -121,7 +121,6 @@
         "gulp-load-plugins": "^2.0.1",
         "gulp-minify-html": "~1.0.6",
         "gulp-ng-annotate": "~1.0.0",
-        "gulp-ng-config": "^1.5.1",
         "gulp-protractor": "^4.1.1",
         "gulp-rename": "~1.2.0",
         "gulp-replace": "~0.5.0",

package.json

@@ -148,6 +148,50 @@ process.on('unhandledRejection', (err) => {
   logger.logFullError(err, 'system');
 });
 
+// dump the configuration to logger
+const ignoreConfigLog = [
+  'cert',
+  'key',
+  'AWS_ACCESS_KEY_ID',
+  'AWS_SECRET_ACCESS_KEY',
+  'AUTH0_CLIENT_ID',
+  'AUTH0_CLIENT_SECRET',
+  'GITHUB_CLIENT_ID',
+  'GITHUB_CLIENT_SECRET',
+  'GITLAB_CLIENT_ID',
+  'GITLAB_CLIENT_SECRET'
+];
+/**
+ * Print configs to logger
+ * @param {Object} params the config params
+ * @param {Number} level the level of param object
+ */
+function dumpConfigs(params, level) {
+  Object.keys(params).forEach((key) => {
+    if (_.includes(ignoreConfigLog, key)) {
+      return;
+    }
+    const item = params[key];
+    let str = '';
+    let n = 0;
+    while (n < level) { // eslint-disable-line no-restricted-syntax
+      n++;
+      str += '  ';
+    }
+    if (item && _.isObject(item)) {
+      str += `${key}=`;
+      logger.debug(str);
+      dumpConfigs(item, level + 1);
+    } else {
+      str += `${key}=${item}`;
+      logger.debug(str);
+    }
+  });
+}
+logger.debug('--- List of Configurations ---');
+dumpConfigs(config, 0);
+logger.debug('--- End of List of Configurations ---');
+
 const port = config.PORT;
 app.listen(port, '0.0.0.0');
 logger.info('Topcoder X server listening on port %d', port);

src/app.js

@@ -68,3 +68,108 @@ module.exports = {
     },
   },
 };
+
+const frontendConfigs = {
+  "local":{
+      "JWT_V3_NAME":"v3jwt",
+      "JWT_V2_NAME":"tcjwt",
+      "COOKIES_SECURE":false,
+      "TC_LOGIN_URL": "https://accounts.topcoder-dev.com/member",
+      "TC_USER_PROFILE_URL": "http://api.topcoder-dev.com/v2/user/profile",
+      "API_URL": "https://127.0.0.1:8443",
+      "ADMIN_TOOL_URL": "http://localhost:8080/api/v2",
+      "ACCOUNTS_CONNECTOR_URL": "https://accounts.topcoder-dev.com/connector.html",
+      "DIRECT_URL_BASE": "https://www.topcoder-dev/direct/projectOverview?formData.projectId=",
+      "OWNER_LOGIN_GITHUB_URL":"/api/v1/github/owneruser/login",
+      "OWNER_LOGIN_GITLAB_URL":"/api/v1/gitlab/owneruser/login",
+      "TOPCODER_URL": "https://topcoder-dev.com",
+      "GITHUB_TEAM_URL": "https://github.com/orgs/",
+      "GITLAB_GROUP_URL": "https://gitlab.com/groups/"
+
+  },
+  "heroku":{
+      "JWT_V3_NAME":"v3jwt",
+      "JWT_V2_NAME":"tcjwt",
+      "COOKIES_SECURE":false,
+      "TC_LOGIN_URL": "https://accounts.topcoder-dev.com/member",
+      "TC_USER_PROFILE_URL": "https://api.topcoder-dev.com/v2/user/profile",
+      "API_URL": "https://api.topcoder-dev.com",
+      "ADMIN_TOOL_URL": "https://api.topcoder-dev.com/v2",
+      "ACCOUNTS_CONNECTOR_URL": "https://accounts.topcoder-dev.com/connector.html",
+      "DIRECT_URL_BASE": "https://www.topcoder-dev.com/direct/projectOverview?formData.projectId=",
+      "OWNER_LOGIN_GITHUB_URL":"/api/v1/github/owneruser/login",
+      "OWNER_LOGIN_GITLAB_URL":"/api/v1/gitlab/owneruser/login",
+      "TOPCODER_URL": "https://topcoder-dev.com",
+      "GITHUB_TEAM_URL": "https://github.com/orgs/",
+      "GITLAB_GROUP_URL": "https://gitlab.com/groups/"
+  },
+  "dev":{
+      "JWT_V3_NAME":"v3jwt",
+      "JWT_V2_NAME":"tcjwt",
+      "COOKIES_SECURE":false,
+      "TC_LOGIN_URL": "https://accounts.topcoder-dev.com/member",
+      "TC_USER_PROFILE_URL": "https://api.topcoder-dev.com/v2/user/profile",
+      "API_URL": "https://api.topcoder-dev.com",
+      "ADMIN_TOOL_URL": "https://api.topcoder-dev.com/v2",
+      "ACCOUNTS_CONNECTOR_URL": "https://accounts.topcoder-dev.com/connector.html",
+      "DIRECT_URL_BASE": "https://www.topcoder-dev.com/direct/projectOverview?formData.projectId=",
+      "OWNER_LOGIN_GITHUB_URL":"/api/v1/github/owneruser/login",
+      "OWNER_LOGIN_GITLAB_URL":"/api/v1/gitlab/owneruser/login",
+      "TOPCODER_URL": "https://topcoder-dev.com",
+      "GITHUB_TEAM_URL": "https://github.com/orgs/",
+      "GITLAB_GROUP_URL": "https://gitlab.com/groups/"
+  },
+  "qa":{
+      "JWT_V3_NAME":"v3jwt",
+      "JWT_V2_NAME":"tcjwt",
+      "COOKIES_SECURE":false,
+      "TC_LOGIN_URL": "https://accounts.topcoder-dev.com/member",
+      "TC_USER_PROFILE_URL": "https://api.topcoder-dev.com/v2/user/profile",
+      "API_URL": "https://api.topcoder-qa.com",
+      "ADMIN_TOOL_URL": "https://api.topcoder-qa.com/v2",
+      "ACCOUNTS_CONNECTOR_URL": "https://accounts.topcoder-qa.com/connector.html",
+      "DIRECT_URL_BASE": "https://www.topcoder-dev.com/direct/projectOverview?formData.projectId=",
+      "OWNER_LOGIN_GITHUB_URL":"/api/v1/github/owneruser/login",
+      "OWNER_LOGIN_GITLAB_URL":"/api/v1/gitlab/owneruser/login",
+      "TOPCODER_URL": "https://topcoder-dev.com",
+      "GITHUB_TEAM_URL": "https://github.com/orgs/",
+      "GITLAB_GROUP_URL": "https://gitlab.com/groups/"
+  },
+  "prod":{
+      "JWT_V3_NAME":"v3jwt",
+      "JWT_V2_NAME":"tcjwt",
+      "COOKIES_SECURE":false,
+      "TC_LOGIN_URL": "https://accounts.topcoder.com/member",
+      "TC_USER_PROFILE_URL": "https://api.topcoder.com/v2/user/profile",
+      "API_URL": "https://api.topcoder.com",
+      "ADMIN_TOOL_URL": "https://api.topcoder.com/v2",
+      "ACCOUNTS_CONNECTOR_URL": "https://accounts.topcoder.com/connector.html",
+      "DIRECT_URL_BASE": "https://www.topcoder.com/direct/projectOverview?formData.projectId=",
+      "OWNER_LOGIN_GITHUB_URL":"/api/v1/github/owneruser/login",
+      "OWNER_LOGIN_GITLAB_URL":"/api/v1/gitlab/owneruser/login",
+      "TOPCODER_URL": "https://topcoder-dev.com",
+      "GITHUB_TEAM_URL": "https://github.com/orgs/",
+      "GITLAB_GROUP_URL": "https://gitlab.com/groups/"
+  }
+};
+
+const activeEnv = module.exports.TOPCODER_ENV;
+module.exports.frontendConfigs = {
+  helpLink: module.exports.HELP_LINK,
+  copilotRole: module.exports.COPILOT_ROLE,
+  administratorRoles: module.exports.ADMINISTRATOR_ROLES,
+  JWT_V3_NAME: process.env.JWT_V3_NAME || frontendConfigs[activeEnv].JWT_V3_NAME,
+  JWT_V2_NAME: process.env.JWT_V2_NAME || frontendConfigs[activeEnv].JWT_V2_NAME,
+  COOKIES_SECURE: process.env.COOKIES_SECURE || frontendConfigs[activeEnv].COOKIES_SECURE,
+  TC_LOGIN_URL: process.env.TC_LOGIN_URL || frontendConfigs[activeEnv].TC_LOGIN_URL,
+  TC_USER_PROFILE_URL: process.env.TC_USER_PROFILE_URL || frontendConfigs[activeEnv].TC_USER_PROFILE_URL,
+  API_URL: process.env.API_URL || frontendConfigs[activeEnv].API_URL,
+  ADMIN_TOOL_URL: process.env.ADMIN_TOOL_URL || frontendConfigs[activeEnv].ADMIN_TOOL_URL,
+  ACCOUNTS_CONNECTOR_URL: process.env.ACCOUNTS_CONNECTOR_URL || frontendConfigs[activeEnv].ACCOUNTS_CONNECTOR_URL,
+  DIRECT_URL_BASE: process.env.DIRECT_URL_BASE || frontendConfigs[activeEnv].DIRECT_URL_BASE,
+  OWNER_LOGIN_GITHUB_URL: process.env.OWNER_LOGIN_GITHUB_URL || frontendConfigs[activeEnv].OWNER_LOGIN_GITHUB_URL,
+  OWNER_LOGIN_GITLAB_URL: process.env.OWNER_LOGIN_GITLAB_URL || frontendConfigs[activeEnv].OWNER_LOGIN_GITLAB_URL,
+  TOPCODER_URL: process.env.TOPCODER_URL || frontendConfigs[activeEnv].TOPCODER_URL,
+  GITHUB_TEAM_URL: process.env.GITHUB_TEAM_URL || frontendConfigs[activeEnv].GITHUB_TEAM_URL,
+  GITLAB_GROUP_URL: process.env.GITLAB_GROUP_URL || frontendConfigs[activeEnv].GITLAB_GROUP_URL
+};

src/config.js

@@ -11,7 +11,6 @@ angular.module('topcoderX', [
   'ngResource',
   'ui.router',
   'ui.bootstrap',
-  'app.constants',
   'angular-clipboard',
   'angular-jwt'])
   // In the run phase of your Angular application
@@ -52,7 +51,9 @@ angular.module('topcoderX', [
               });
             }],
             currentUser: ['AuthService', function (AuthService) {
-              return AuthService.getCurrentUser();
+              return AuthService.getAppConfig().then(function () {
+                return AuthService.getCurrentUser();
+              });
             }],
 
           }
@@ -63,11 +64,10 @@ angular.module('topcoderX', [
           templateUrl: 'components/common/content.html',
           resolve: {
             currentUser: ['AuthService', function (AuthService) {
-              return AuthService.getCurrentUser();
-            }],
-            AppConfig: ['AuthService', function (AuthService) {
-              return AuthService.getAppConfig();
-            }],
+              return AuthService.getAppConfig().then(function () {
+                return AuthService.getCurrentUser();
+              });
+            }]
           },
         })
         .state('app.main', {

src/front/config.json

@@ -31,8 +31,9 @@ angular.module('topcoderX')
     jwtInterceptorProvider.tokenGetter = [
       'AuthService', '$http', 'Helper', '$rootScope', 'config',
       function (AuthService, $http, Helper, $rootScope, config) {
+        if (!$rootScope.appConfig) return;
         // token V2 for API V2
-        if (config.url.indexOf(Helper.config().ADMIN_TOOL_URL) > -1) {
+        if (config.url.indexOf($rootScope.appConfig.ADMIN_TOOL_URL) > -1) {
           if (AuthService.getTokenV2()) {
             return AuthService.getTokenV2();
           }
@@ -45,7 +46,7 @@ angular.module('topcoderX')
             if (refreshingToken === null) {
               refreshingToken = $http({
                 method: 'GET',
-                url: Helper.config().API_URL + "/v3/authorizations/1",
+                url: $rootScope.appConfig.API_URL + "/v3/authorizations/1",
                 headers: {
                   'Authorization': "Bearer " + currentToken
                 }