From 5f6d2c6b5edc97887be58bdc9efd6c9e232d933d Mon Sep 17 00:00:00 2001 From: Sachin Maheshwari Date: Thu, 6 Dec 2018 15:05:35 +0530 Subject: [PATCH 1/5] patch auth0 proxy server for m2m token. --- config/custom-environment-variables.json | 3 ++- config/default.json | 3 ++- deploy.sh | 8 +++++++- package.json | 2 +- src/routes/index.js | 2 +- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/config/custom-environment-variables.json b/config/custom-environment-variables.json index 59814a2c..6620f43c 100644 --- a/config/custom-environment-variables.json +++ b/config/custom-environment-variables.json @@ -46,5 +46,6 @@ "AUTH0_CLIENT_SECRET": "AUTH0_CLIENT_SECRET", "AUTH0_AUDIENCE": "AUTH0_AUDIENCE", "TOKEN_CACHE_TIME" : "TOKEN_CACHE_TIME", - "whitelistedOriginsForUserIdAuth": "WHITELISTED_ORIGINS_FOR_USERID_AUTH" + "whitelistedOriginsForUserIdAuth": "WHITELISTED_ORIGINS_FOR_USERID_AUTH", + "AUTH0_PROXY_SERVER_URL" : "AUTH0_PROXY_SERVER_URL" } diff --git a/config/default.json b/config/default.json index da84855b..a23a86e8 100644 --- a/config/default.json +++ b/config/default.json @@ -50,5 +50,6 @@ "AUTH0_AUDIENCE": "", "AUTH0_URL": "", "TOKEN_CACHE_TIME": "", - "whitelistedOriginsForUserIdAuth": "[\"https:\/\/topcoder-newauth.auth0.com\/\",\"https:\/\/api.topcoder-dev.com\"]" + "whitelistedOriginsForUserIdAuth": "[\"https:\/\/topcoder-newauth.auth0.com\/\",\"https:\/\/api.topcoder-dev.com\"]", + "AUTH0_PROXY_SERVER_URL" : "" } diff --git a/deploy.sh b/deploy.sh index 1d4ea007..bf254ed1 100755 --- a/deploy.sh +++ b/deploy.sh @@ -196,6 +196,10 @@ make_task_def(){ { "name": "KAFKA_URL", "value": "%s" + }, + { + "name": "AUTH0_PROXY_SERVER_URL", + "value": "%s" } ], "portMappings": [ @@ -252,8 +256,10 @@ make_task_def(){ KAFKA_GROUP_ID=$(eval "echo \$${ENV}_KAFKA_GROUP_ID") KAFKA_URL=$(eval "echo \$${ENV}_KAFKA_URL") + AUTH0_PROXY_SERVER_URL=$(eval "echo \$${ENV}_AUTH0_PROXY_SERVER_URL") + - task_def=$(printf "$task_template" $family $ACCOUNT_ID $AWS_ECS_CONTAINER_NAME $ACCOUNT_ID $AWS_REGION $AWS_REPOSITORY $CIRCLE_SHA1 $NODE_ENV $ENABLE_FILE_UPLOAD $LOG_LEVEL $CAPTURE_LOGS $LOGENTRIES_TOKEN $API_VERSION $AWS_REGION $AWS_ACCESS_KEY_ID $AWS_SECRET_ACCESS_KEY $AUTH_DOMAIN $AUTH_SECRET $VALID_ISSUERS $DB_MASTER_URL $MEMBER_SERVICE_ENDPOINT $IDENTITY_SERVICE_ENDPOINT $BUS_API_URL $MESSAGE_SERVICE_URL $SYSTEM_USER_CLIENT_ID $SYSTEM_USER_CLIENT_SECRET $PROJECTS_ES_URL $PROJECTS_ES_INDEX_NAME $RABBITMQ_URL $DIRECT_PROJECT_SERVICE_ENDPOINT $FILE_SERVICE_ENDPOINT $CONNECT_PROJECTS_URL $SEGMENT_ANALYTICS_KEY "$AUTH0_URL" "$AUTH0_AUDIENCE" $AUTH0_CLIENT_ID "$AUTH0_CLIENT_SECRET" $TOKEN_CACHE_TIME "$KAFKA_CLIENT_CERT" "$KAFKA_CLIENT_CERT_KEY" $KAFKA_GROUP_ID $KAFKA_URL $PORT $PORT $AWS_ECS_CLUSTER $AWS_REGION $NODE_ENV) + task_def=$(printf "$task_template" $family $ACCOUNT_ID $AWS_ECS_CONTAINER_NAME $ACCOUNT_ID $AWS_REGION $AWS_REPOSITORY $CIRCLE_SHA1 $NODE_ENV $ENABLE_FILE_UPLOAD $LOG_LEVEL $CAPTURE_LOGS $LOGENTRIES_TOKEN $API_VERSION $AWS_REGION $AWS_ACCESS_KEY_ID $AWS_SECRET_ACCESS_KEY $AUTH_DOMAIN $AUTH_SECRET $VALID_ISSUERS $DB_MASTER_URL $MEMBER_SERVICE_ENDPOINT $IDENTITY_SERVICE_ENDPOINT $BUS_API_URL $MESSAGE_SERVICE_URL $SYSTEM_USER_CLIENT_ID $SYSTEM_USER_CLIENT_SECRET $PROJECTS_ES_URL $PROJECTS_ES_INDEX_NAME $RABBITMQ_URL $DIRECT_PROJECT_SERVICE_ENDPOINT $FILE_SERVICE_ENDPOINT $CONNECT_PROJECTS_URL $SEGMENT_ANALYTICS_KEY "$AUTH0_URL" "$AUTH0_AUDIENCE" $AUTH0_CLIENT_ID "$AUTH0_CLIENT_SECRET" $TOKEN_CACHE_TIME "$KAFKA_CLIENT_CERT" "$KAFKA_CLIENT_CERT_KEY" $KAFKA_GROUP_ID $KAFKA_URL "$AUTH0_PROXY_SERVER_URL" $PORT $PORT $AWS_ECS_CLUSTER $AWS_REGION $NODE_ENV) } push_ecr_image(){ diff --git a/package.json b/package.json index 008d7ad1..c11b8b8b 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "pg": "^4.5.5", "pg-native": "^1.10.1", "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.6", "traverse": "^0.6.6", "urlencode": "^1.1.0" }, diff --git a/src/routes/index.js b/src/routes/index.js index 7dcba789..5af5ff89 100644 --- a/src/routes/index.js +++ b/src/routes/index.js @@ -52,7 +52,7 @@ router.route('/v4/projects/metadata') router.all( RegExp(`\\/${apiVersion}\\/(projects|timelines)(?!\\/health).*`), (req, res, next) => ( // JWT authentication - jwtAuth()(req, res, next) + jwtAuth(config)(req, res, next) ), ); From bdff1fd0f27fb23f12e37fac669cb3cd2a69a2c0 Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Tue, 11 Dec 2018 11:12:53 +0530 Subject: [PATCH 2/5] trying compression with metadata list endpoint --- package.json | 1 + src/routes/index.js | 3 +++ 2 files changed, 4 insertions(+) diff --git a/package.json b/package.json index c11b8b8b..76a0a1df 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,7 @@ "bluebird": "^3.4.1", "body-parser": "^1.15.0", "co": "^4.6.0", + "compression": "^1.7.3", "config": "^1.20.1", "continuation-local-storage": "^3.1.7", "cors": "^2.8.4", diff --git a/src/routes/index.js b/src/routes/index.js index 5af5ff89..5c7f3b9f 100644 --- a/src/routes/index.js +++ b/src/routes/index.js @@ -3,6 +3,7 @@ import _ from 'lodash'; import config from 'config'; import validate from 'express-validation'; import { Router } from 'express'; +import compression from 'compression'; const router = Router(); @@ -46,6 +47,8 @@ router.route('/v4/projects/metadata/productCategories') router.route('/v4/projects/metadata/productCategories/:key') .get(require('./productCategories/get')); + +router.use(`/v4/projects/metadata`, compression()); router.route('/v4/projects/metadata') .get(require('./metadata/list')); From 188ba438190bbb73af784a0e48c85727527b3387 Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Tue, 11 Dec 2018 11:13:42 +0530 Subject: [PATCH 3/5] making hot fix branch deployable to test in dev --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 459ec723..2b1bc644 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -76,7 +76,7 @@ workflows: - test filters: branches: - only: ['dev'] + only: ['dev', 'hotfix/gzip_compression'] - deployProd: requires: - test From 9f81b6e8559b9057e5b92b403ea666e61af233b1 Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Tue, 11 Dec 2018 11:18:21 +0530 Subject: [PATCH 4/5] lint fix --- src/routes/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/index.js b/src/routes/index.js index 5c7f3b9f..469c2c2f 100644 --- a/src/routes/index.js +++ b/src/routes/index.js @@ -48,7 +48,7 @@ router.route('/v4/projects/metadata/productCategories/:key') .get(require('./productCategories/get')); -router.use(`/v4/projects/metadata`, compression()); +router.use('/v4/projects/metadata', compression()); router.route('/v4/projects/metadata') .get(require('./metadata/list')); From 2945905457c076b1119eadbfd1084db54813836a Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Tue, 11 Dec 2018 11:32:42 +0530 Subject: [PATCH 5/5] Removed temporary deployable hot fix branch --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2b1bc644..459ec723 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -76,7 +76,7 @@ workflows: - test filters: branches: - only: ['dev', 'hotfix/gzip_compression'] + only: ['dev'] - deployProd: requires: - test