Merge pull request #79 from topcoder-platform/revert-77-revert-75-revert-74-feature/m2m-token

Revert "Reapplying  "m2m token support""

Author: vikasrohit

config/custom-environment-variables.json

@@ -1,5 +1,5 @@
 {
-  "AUTH_SECRET": "AUTH_SECRET",
+  "authSecret": "AUTH_SECRET",
   "logLevel": "LOG_LEVEL",
   "version": "APP_VERSION",
   "captureLogs": "CAPTURE_LOGS",
@@ -37,7 +37,7 @@
     "minPoolSize": "DB_MIN_POOL_SIZE"
   },
   "analyticsKey": "ANALYTICS_KEY",
-  "VALID_ISSUERS": "VALID_ISSUERS",
+  "validIssuers": "VALID_ISSUERS",
   "jwksUri": "JWKS_URI",
   "busApiUrl": "BUS_API_URL",
   "busApiToken": "BUS_API_TOKEN"

config/default.json

@@ -1,5 +1,6 @@
 {
-  "AUTH_SECRET": "secret",
+  "authSecret": "secret",
+  "authDomain": "topcoder-dev.com",
   "logLevel": "info",
   "version": "v4",
   "captureLogs": "false",
@@ -41,7 +42,8 @@
     "idleTimeout": 1000
   },
   "analyticsKey": "",
-  "VALID_ISSUERS": "[\"https:\/\/topcoder-newauth.auth0.com\/\",\"https:\/\/api.topcoder-dev.com\"]",
+  "validIssuers": "[\"https:\/\/topcoder-newauth.auth0.com\/\",\"https:\/\/api.topcoder-dev.com\"]",
+  "jwksUri": "",
   "busApiUrl": "http://api.topcoder-dev.com",
   "busApiToken": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYW1lIjoicHJvamVjdC1zZXJ2aWNlIiwiaWF0IjoxNTEyNzQ3MDgyLCJleHAiOjE1MjEzODcwODJ9.PHuNcFDaotGAL8RhQXQMdpL8yOKXxjB5DbBIodmt7RE",
   "HEALTH_CHECK_URL": "_health"

config/development.json

@@ -1,4 +1,5 @@
 {
+  "authDomain": "topcoder-dev.com",
   "pubsubQueueName": "dev.project.service",
   "pubsubExchangeName": "dev.projects",
   "attachmentsS3Bucket": "topcoder-dev-media"

config/test.json

@@ -1,5 +1,6 @@
 {
-    "AUTH_SECRET": "secret",
+    "authSecret": "secret",
+    "authDomain": "topcoder-dev.com",
     "logLevel": "debug",
     "captureLogs": "false",
     "logentriesToken": "",

package.json

@@ -55,7 +55,7 @@
     "pg": "^4.5.5",
     "pg-native": "^1.10.0",
     "sequelize": "^3.23.0",
-    "tc-core-library-js": "appirio-tech/tc-core-library-js.git#v2.3",
+    "tc-core-library-js": "appirio-tech/tc-core-library-js.git#v2.2",
     "traverse": "^0.6.6",
     "urlencode": "^1.1.0"
   },

src/util.js

@@ -70,8 +70,6 @@ _.assignIn(util, {
    * @return {boolean}      true/false
    */
   hasRole: (req, role) => {
-    const isMachineToken = _.get(req, 'authUser.isMachine', false);
-    if (isMachineToken) return true;
     let roles = _.get(req, 'authUser.roles', []);
     roles = roles.map(s => s.toLowerCase());
     return _.indexOf(roles, role.toLowerCase()) >= 0;
@@ -83,8 +81,6 @@ _.assignIn(util, {
    * @return {boolean}      true/false
    */
   hasRoles: (req, roles) => {
-    const isMachineToken = _.get(req, 'authUser.isMachine', false);
-    if (isMachineToken) return true;
     let authRoles = _.get(req, 'authUser.roles', []);
     authRoles = authRoles.map(s => s.toLowerCase());
     return _.intersection(authRoles, roles.map(r => r.toLowerCase())).length > 0;
@@ -105,8 +101,6 @@ _.assignIn(util, {
    * @return {boolean}      true/false
    */
   hasAdminRole: (req) => {
-    const isMachineToken = _.get(req, 'authUser.isMachine', false);
-    if (isMachineToken) return true;
     let roles = _.get(req, 'authUser.roles', []);
     roles = roles.map(s => s.toLowerCase());
     return _.intersection(roles, ADMIN_ROLES.map(r => r.toLowerCase())).length > 0;