Merge pull request #17 from topcoder-platform/feature/auth0-proxy-server-ms13

MS v1.3 and Auth0 proxy changes

Author: sachin-maheshwari

.circleci/config.yml

@@ -5,10 +5,17 @@ defaults: &defaults
 install_dependency: &install_dependency
           name: Installation of build and deployment dependencies.
           command: |
-            apk add --no-cache bash
+            apk add --no-cache bash curl
             apk add --no-cache jq py-pip sudo
             sudo pip install awscli --upgrade
             sudo pip install docker-compose
+install_deploysuite: &install_deploysuite
+          name: Installation of install_deploysuite.
+          command: |
+            git clone --branch v1.3 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
+            cp ./../buildscript/master_deploy.sh .
+            cp ./../buildscript/buildenv.sh .
+            cp ./../buildscript/awsconfiguration.sh .
 restore_cache_settings_for_build: &restore_cache_settings_for_build
   key: docker-node-modules-lp-{{ checksum "package-lock.json" }}
 
@@ -25,15 +32,21 @@ jobs:
       - checkout
       - setup_remote_docker
       - run: *install_dependency
+      - run: *install_deploysuite
       - restore_cache: *restore_cache_settings_for_build
       - run: ./build.sh
       - save_cache: *save_cache_settings
       - deploy:
           name: Running MasterScript.
           command: |
-            git clone --branch v1.1 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
-            cp ./../buildscript/master_deploy.sh .
-            ./master_deploy.sh -d ECS -e DEV -t latest -s leaderboard-processor -i leaderboard-processor
+            #git clone --branch v1.1 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
+            #cp ./../buildscript/master_deploy.sh .
+            #./master_deploy.sh -d ECS -e DEV -t latest -s leaderboard-processor -i leaderboard-processor
+            ./awsconfiguration.sh DEV
+            source awsenvconf
+            ./buildenv.sh -e DEV -b dev-leaderboard-processor-deployvar
+            source buildenvvar
+            ./master_deploy.sh -d ECS -e DEV -t latest -s dev-global-appvar,dev-leaderboard-processor-appvar -i leaderboard-processor
 
   # Build & Deploy against production backend
   "build-prod":
@@ -42,28 +55,35 @@ jobs:
       - checkout
       - setup_remote_docker
       - run: *install_dependency
+      - run: *install_deploysuite      
       - restore_cache: *restore_cache_settings_for_build
       - run: ./build.sh
       - save_cache: *save_cache_settings
       - deploy:
           name: Running MasterScript.
           command: |
-            git clone --branch v1.1 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
-            cp ./../buildscript/master_deploy.sh .
-            ./master_deploy.sh -d ECS -e PROD  -t latest -s leaderboard-processor -i leaderboard-processor
+            #git clone --branch v1.1 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
+            #cp ./../buildscript/master_deploy.sh .
+            #./master_deploy.sh -d ECS -e PROD  -t latest -s leaderboard-processor -i leaderboard-processor
+            ./awsconfiguration.sh PROD
+            source awsenvconf
+            ./buildenv.sh -e PROD -b prod-leaderboard-processor-deployvar
+            source buildenvvar
+            ./master_deploy.sh -d ECS -e PROD -t latest -s prod-global-appvar,prod-leaderboard-processor-appvar -i leaderboard-processor
 
 workflows:
   version: 2
   build:
     jobs:
       # Development builds are executed on "develop" branch only.
       - "build-dev":
+          context : org-global 
           filters:
             branches:
               only:
-                - circleci
                 - develop
       - "build-prod":
+          context : org-global 
           filters:
             branches:
               only:

config/default.js

@@ -29,5 +29,6 @@ module.exports = {
   TOKEN_CACHE_TIME: process.env.TOKEN_CACHE_TIME,
   AUTH0_CLIENT_ID: process.env.AUTH0_CLIENT_ID,
   AUTH0_CLIENT_SECRET: process.env.AUTH0_CLIENT_SECRET,
+  AUTH0_PROXY_SERVER_URL: process.env.AUTH0_PROXY_SERVER_URL,
   MONGODB_URL: process.env.MONGODB_URL || 'mongodb://localhost:27017/leaderboardDB'
 }

package.json

@@ -29,7 +29,7 @@
     "mongoose": "^5.3.3",
     "no-kafka": "^3.2.4",
     "superagent": "^3.8.3",
-    "tc-core-library-js": "appirio-tech/tc-core-library-js.git#feature/m2mtoken",
+    "tc-core-library-js": "appirio-tech/tc-core-library-js.git#v2.6",
     "topcoder-healthcheck-dropin": "^1.0.3",
     "winston": "^3.1.0"
   },

src/common/helper.js

@@ -7,7 +7,7 @@ const _ = require('lodash')
 const request = require('superagent')
 const m2mAuth = require('tc-core-library-js').auth.m2m
 
-const m2m = m2mAuth(_.pick(config, ['AUTH0_URL', 'AUTH0_AUDIENCE', 'TOKEN_CACHE_TIME']))
+const m2m = m2mAuth(_.pick(config, ['AUTH0_URL', 'AUTH0_AUDIENCE', 'TOKEN_CACHE_TIME', 'AUTH0_PROXY_SERVER_URL']))
 
 /*
  * Check if the Group ID is configured to be processed