From a74da99c6a1fe18f7a71efde32f903b795401307 Mon Sep 17 00:00:00 2001
From: Sachin Maheshwari <sachin.maheshwari@topcoder.com>
Date: Fri, 11 May 2018 16:00:06 +0530
Subject: [PATCH 1/2] m2m changes and testing..

---
 .circleci/config.yml |  2 +-
 config/default.js    |  6 ++----
 deploy.sh            | 16 +++-------------
 package.json         |  2 +-
 4 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index fb0e6ab..c937acc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -82,7 +82,7 @@ workflows:
       - "build-dev":
           filters:
             branches:
-              only: "dev"
+              only: ["dev", 'feature/m2m-support']
       # Production builds are executed on "master" branch only.
       - "build-prod":
           filters:
diff --git a/config/default.js b/config/default.js
index fb0a9fa..97737d2 100644
--- a/config/default.js
+++ b/config/default.js
@@ -4,9 +4,7 @@
 module.exports = {
   LOG_LEVEL: process.env.LOG_LEVEL,
   PORT: process.env.PORT,
-  authSecret: process.env.authSecret,
-  authDomain: process.env.authDomain,
-  jwksUri: process.env.jwksUri,
+  AUTH_SECRET: process.env.AUTH_SECRET,
   DATABASE_URL: process.env.DATABASE_URL,
   DATABASE_OPTIONS: {
     dialect: 'postgres',
@@ -21,7 +19,7 @@ module.exports = {
   },
   DISABLE_LOGGING: process.env.DISABLE_LOGGING || 'false',
 
-  validIssuers: process.env.validIssuers ? process.env.validIssuers.replace(/\\"/g, '') : null,
+  VALID_ISSUERS: process.env.VALID_ISSUERS,
   KAFKA_URL: process.env.KAFKA_URL,
   KAFKA_TOPIC_IGNORE_PREFIX: process.env.KAFKA_TOPIC_IGNORE_PREFIX,
   KAFKA_GROUP_ID: process.env.KAFKA_GROUP_ID,
diff --git a/deploy.sh b/deploy.sh
index a833097..299c852 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -34,7 +34,6 @@ family=$(eval "echo \$${ENV}_AWS_ECS_TASK_FAMILY")
 AWS_ECS_CONTAINER_NAME=$(eval "echo \$${ENV}_AWS_ECS_CONTAINER_NAME")
 
 
-AUTH_DOMAIN=$(eval "echo \$${ENV}_AUTHDOMAIN")
 AUTH_SECRET=$(eval "echo \$${ENV}_AUTHSECRET")
 VALID_ISSUERS=$(eval "echo \$${ENV}_VALIDISSUERS")
 
@@ -58,7 +57,6 @@ EMAIL_FROM=$(eval "echo \$${ENV}_EMAIL_FROM")
 LOG_LEVEL=$(eval "echo \$${ENV}_LOG_LEVEL")
 NODE_ENV=$(eval "echo \$${ENV}_NODE_ENV")
 PORT=$(eval "echo \$${ENV}_NODE_PORT")
-JWKS_URI=$(eval "echo \$${ENV}_JWKSURI")
 TEMPLATE_MAP=$(eval "echo \$${ENV}_TEMPLATE_MAP")
 
 EMAIL_MAX_ERRORS=$(eval "echo \$${ENV}_EMAIL_MAX_ERRORS")
@@ -120,11 +118,7 @@ make_task_def(){
           "value" : "%s"
         },
         {
-          "name": "authDomain",
-          "value": "%s"
-        },
-        {
-          "name": "authSecret",
+          "name": "AUTH_SECRET",
           "value": "%s"
         },
         {
@@ -135,10 +129,6 @@ make_task_def(){
           "name": "EMAIL_FROM",
           "value": "%s"
         },
-        {
-          "name": "jwksUri",
-          "value": "%s"
-        },
         {
           "name": "KAFKA_CLIENT_CERT",
           "value": "%s"
@@ -172,7 +162,7 @@ make_task_def(){
           "value": "%s"
         },
         {
-          "name": "validIssuers",
+          "name": "VALID_ISSUERS",
           "value": "%s"
         },
         {
@@ -215,7 +205,7 @@ make_task_def(){
   ]
   }'
 	
-  task_def=$(printf "$task_template" $family $AWS_ACCOUNT_ID $AWS_ECS_CONTAINER_NAME $AWS_ACCOUNT_ID $AWS_REGION $AWS_REPOSITORY $TAG $ENV $AUTH_DOMAIN $AUTH_SECRET $DATABASE_URL $EMAIL_FROM "$JWKS_URI" "$KAFKA_CLIENT_CERT" "$KAFKA_CLIENT_CERT_KEY" $KAFKA_GROUP_ID $KAFKA_URL $LOG_LEVEL $PORT $SENDGRID_API_KEY "$TEMPLATE_MAP" "$VALID_ISSUERS" $EMAIL_MAX_ERRORS $EMAIL_PAUSE_TIME "$EMAIL_RETRY_SCHEDULE" "$DISABLE_LOGGING" "$API_CONTEXT_PATH" $PORT $PORT $AWS_ECS_CLUSTER $AWS_REGION $ENV)
+  task_def=$(printf "$task_template" $family $AWS_ACCOUNT_ID $AWS_ECS_CONTAINER_NAME $AWS_ACCOUNT_ID $AWS_REGION $AWS_REPOSITORY $TAG $ENV $AUTH_SECRET $DATABASE_URL $EMAIL_FROM "$KAFKA_CLIENT_CERT" "$KAFKA_CLIENT_CERT_KEY" $KAFKA_GROUP_ID $KAFKA_URL $LOG_LEVEL $PORT $SENDGRID_API_KEY "$TEMPLATE_MAP" "$VALID_ISSUERS" $EMAIL_MAX_ERRORS $EMAIL_PAUSE_TIME "$EMAIL_RETRY_SCHEDULE" "$DISABLE_LOGGING" "$API_CONTEXT_PATH" $PORT $PORT $AWS_ECS_CLUSTER $AWS_REGION $ENV)
 
 }
 
diff --git a/package.json b/package.json
index e18dbec..fb70227 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "pg": "^7.3.0",
     "sequelize": "^4.21.0",
     "superagent": "^3.8.0",
-    "tc-core-library-js": "appirio-tech/tc-core-library-js.git#v2.2",
+    "tc-core-library-js": "appirio-tech/tc-core-library-js.git#v2.3",
     "winston": "^2.4.0"
   },
   "engines": {

From fa3ef610e6d6c4c130ada1999bc181687f5944a1 Mon Sep 17 00:00:00 2001
From: Sachin Maheshwari <sachin.maheshwari@rediffmail.com>
Date: Mon, 11 Jun 2018 12:49:26 +0530
Subject: [PATCH 2/2] circleci clean-up.

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c937acc..13f2110 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -82,7 +82,7 @@ workflows:
       - "build-dev":
           filters:
             branches:
-              only: ["dev", 'feature/m2m-support']
+              only: ["dev"]
       # Production builds are executed on "master" branch only.
       - "build-prod":
           filters: