From 262a015eea6e4cd291d8331cc7a73e4cb64c4526 Mon Sep 17 00:00:00 2001 From: Sachin Maheshwari Date: Mon, 3 Dec 2018 19:26:15 +0530 Subject: [PATCH 1/4] adding auth0 proxy server support --- .circleci/config.yml | 2 +- config/custom-environment-variables.js | 1 + config/default.js | 1 + deploy.sh | 7 ++++++- package.json | 2 +- 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6f20ad5..ea9e3a7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -89,4 +89,4 @@ workflows: - test filters: branches: - only: [dev, dev-circleci2] + only: [dev, 'feature/auth0-proxy-server'] diff --git a/config/custom-environment-variables.js b/config/custom-environment-variables.js index 07e29b9..b6c21ac 100644 --- a/config/custom-environment-variables.js +++ b/config/custom-environment-variables.js @@ -23,4 +23,5 @@ module.exports = { TOKEN_CACHE_TIME: 'TOKEN_CACHE_TIME', AUTH0_CLIENT_ID: 'AUTH0_CLIENT_ID', AUTH0_CLIENT_SECRET: 'AUTH0_CLIENT_SECRET', + AUTH0_PROXY_SERVER_URL: 'AUTH0_PROXY_SERVER_URL', }; diff --git a/config/default.js b/config/default.js index 62b9fd8..abd130f 100644 --- a/config/default.js +++ b/config/default.js @@ -44,4 +44,5 @@ module.exports = { SLACK_ICON_URL: 'https://emoji.slack-edge.com/T03R80JP7/coder-grinning/a3b7f3fe9e838377.png', SLACK_USERNAME: 'Coder', TOPCODER_ICON_URL: 'https://emoji.slack-edge.com/T03R80JP7/topcoder/7c68acd90a6b6d77.png', + AUTH0_PROXY_SERVER_URL: "", }; diff --git a/deploy.sh b/deploy.sh index 48bfa5a..d59a533 100755 --- a/deploy.sh +++ b/deploy.sh @@ -82,6 +82,10 @@ make_task_def(){ { "name": "TOKEN_CACHE_TIME", "value": "%s" + }, + { + "name": "AUTH0_PROXY_SERVER_URL", + "value": "%s" } ], "logConfiguration": { @@ -103,6 +107,7 @@ make_task_def(){ TOKEN_CACHE_TIME=$(eval "echo \$${ENV}_TOKEN_CACHE_TIME") AUTH0_CLIENT_ID=$(eval "echo \$${ENV}_AUTH0_CLIENT_ID") AUTH0_CLIENT_SECRET=$(eval "echo \$${ENV}_AUTH0_CLIENT_SECRET") + AUTH0_PROXY_SERVER_URL=$(eval "echo \$${ENV}_AUTH0_PROXY_SERVER_URL") if [ "$ENV" = "PROD" ]; then NODE_ENV=production @@ -110,7 +115,7 @@ make_task_def(){ NODE_ENV=development fi - task_def=$(printf "$task_template" $ACCOUNT_ID $AWS_REGION $AWS_REPOSITORY $CIRCLE_SHA1 $NODE_ENV $LOG_LEVEL $CAPTURE_LOGS $LOGENTRIES_TOKEN $RABBITMQ_URL $TC_SLACK_WEBHOOK_URL "$AUTH0_URL" "$AUTH0_AUDIENCE" $AUTH0_CLIENT_ID "$AUTH0_CLIENT_SECRET" $TOKEN_CACHE_TIME $AWS_ECS_CLUSTER $AWS_REGION $NODE_ENV) + task_def=$(printf "$task_template" $ACCOUNT_ID $AWS_REGION $AWS_REPOSITORY $CIRCLE_SHA1 $NODE_ENV $LOG_LEVEL $CAPTURE_LOGS $LOGENTRIES_TOKEN $RABBITMQ_URL $TC_SLACK_WEBHOOK_URL "$AUTH0_URL" "$AUTH0_AUDIENCE" $AUTH0_CLIENT_ID "$AUTH0_CLIENT_SECRET" $TOKEN_CACHE_TIME "$AUTH0_PROXY_SERVER_URL" $AWS_ECS_CLUSTER $AWS_REGION $NODE_ENV) } push_ecr_image(){ diff --git a/package.json b/package.json index 3672438..24f02ab 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "jackrabbit": "^4.3.0", "lodash": "^4.16.6", "request": "^2.78.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.6" }, "devDependencies": { "babel-cli": "^6.9.0", From 8be02920c9787fcdc6e6a9b68a5b4cabbaf3620e Mon Sep 17 00:00:00 2001 From: Sachin Maheshwari Date: Mon, 3 Dec 2018 20:00:24 +0530 Subject: [PATCH 2/4] changing node version for unit testing enviorment --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 64d8950..cfb4c25 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:6 +FROM node:8.2.1 LABEL version="1.0" LABEL description="Connect Messages Serivce" From 646fd69533607423daeea1eb6c1cee352e5cc204 Mon Sep 17 00:00:00 2001 From: Sachin Maheshwari Date: Mon, 3 Dec 2018 20:16:34 +0530 Subject: [PATCH 3/4] partially reverting for analysing issue.. --- Dockerfile | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index cfb4c25..64d8950 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:8.2.1 +FROM node:6 LABEL version="1.0" LABEL description="Connect Messages Serivce" diff --git a/package.json b/package.json index 24f02ab..3672438 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "jackrabbit": "^4.3.0", "lodash": "^4.16.6", "request": "^2.78.0", - "tc-core-library-js": "appirio-tech/tc-core-library-js.git#v2.6" + "tc-core-library-js": "appirio-tech/tc-core-library-js.git#v2.3" }, "devDependencies": { "babel-cli": "^6.9.0", From b526976d97e94b06463a2a4b068e7cd618d158ce Mon Sep 17 00:00:00 2001 From: Sachin Maheshwari Date: Mon, 3 Dec 2018 20:20:42 +0530 Subject: [PATCH 4/4] fixing lint issue.. --- Dockerfile | 2 +- config/default.js | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 64d8950..cfb4c25 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:6 +FROM node:8.2.1 LABEL version="1.0" LABEL description="Connect Messages Serivce" diff --git a/config/default.js b/config/default.js index abd130f..8b79921 100644 --- a/config/default.js +++ b/config/default.js @@ -44,5 +44,5 @@ module.exports = { SLACK_ICON_URL: 'https://emoji.slack-edge.com/T03R80JP7/coder-grinning/a3b7f3fe9e838377.png', SLACK_USERNAME: 'Coder', TOPCODER_ICON_URL: 'https://emoji.slack-edge.com/T03R80JP7/topcoder/7c68acd90a6b6d77.png', - AUTH0_PROXY_SERVER_URL: "", + AUTH0_PROXY_SERVER_URL: '', }; diff --git a/package.json b/package.json index 3672438..24f02ab 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "jackrabbit": "^4.3.0", "lodash": "^4.16.6", "request": "^2.78.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.6" }, "devDependencies": { "babel-cli": "^6.9.0",