Skip to content

Commit 01ad275

Browse files
author
sachin-maheshwari
authored
Merge pull request #78 from topcoder-platform/patch/auth0-proxy-server
patch for auth0 proxy server.
2 parents f209fc3 + 2288d7e commit 01ad275

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ workflows:
8282
- "build-dev":
8383
filters:
8484
branches:
85-
only: [dev, architectt1-feature/emailTemplatesClean]
85+
only: [dev]
8686
- "build-prod":
8787
filters:
8888
branches:

config/default.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,5 @@ module.exports = {
4040
TOKEN_CACHE_TIME: process.env.TOKEN_CACHE_TIME || 86400000,
4141
AUTH0_CLIENT_ID: process.env.AUTH0_CLIENT_ID,
4242
AUTH0_CLIENT_SECRET: process.env.AUTH0_CLIENT_SECRET,
43+
AUTH0_PROXY_SERVER_URL: process.env.AUTH0_PROXY_SERVER_URL || '',
4344
};

deploy.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ AUTH0_AUDIENCE=$(eval "echo \$${ENV}_AUTH0_AUDIENCE")
7474
TOKEN_CACHE_TIME=$(eval "echo \$${ENV}_TOKEN_CACHE_TIME")
7575
AUTH0_CLIENT_ID=$(eval "echo \$${ENV}_AUTH0_CLIENT_ID")
7676
AUTH0_CLIENT_SECRET=$(eval "echo \$${ENV}_AUTH0_CLIENT_SECRET")
77+
AUTH0_PROXY_SERVER_URL=$(eval "echo \$${ENV}_AUTH0_PROXY_SERVER_URL")
7778

7879
echo $APP_NAME
7980

@@ -241,6 +242,10 @@ make_task_def(){
241242
{
242243
"name": "TOKEN_CACHE_TIME",
243244
"value": "%s"
245+
},
246+
{
247+
"name": "AUTH0_PROXY_SERVER_URL",
248+
"value": "%s"
244249
}
245250
],
246251
"portMappings": [
@@ -261,7 +266,7 @@ make_task_def(){
261266
}
262267
]'
263268

264-
task_def=$(printf "$task_template" $AWS_ECS_CONTAINER_NAME $AWS_ACCOUNT_ID $AWS_REGION $AWS_REPOSITORY $TAG $ENV "$KAFKA_CLIENT_CERT" "$KAFKA_CLIENT_CERT_KEY" $KAFKA_GROUP_ID $KAFKA_URL $DATABASE_URL $AUTHSECRET $TC_API_BASE_URL $TC_API_V3_BASE_URL $TC_API_V4_BASE_URL $TC_API_V5_BASE_URL $MESSAGE_API_BASE_URL $CONNECT_URL $ENABLE_EMAILS $MENTION_EMAIL $REPLY_EMAIL_PREFIX $REPLY_EMAIL_DOMAIN $REPLY_EMAIL_FROM $DEFAULT_REPLY_EMAIL $ENABLE_DEV_MODE $DEV_MODE_EMAIL $LOG_LEVEL $VALID_ISSUERS $PORT "$API_CONTEXT_PATH" "$AUTH0_URL" "$AUTH0_AUDIENCE" $AUTH0_CLIENT_ID "$AUTH0_CLIENT_SECRET" $TOKEN_CACHE_TIME $AWS_ECS_CLUSTER $AWS_REGION $AWS_ECS_CLUSTER $ENV)
269+
task_def=$(printf "$task_template" $AWS_ECS_CONTAINER_NAME $AWS_ACCOUNT_ID $AWS_REGION $AWS_REPOSITORY $TAG $ENV "$KAFKA_CLIENT_CERT" "$KAFKA_CLIENT_CERT_KEY" $KAFKA_GROUP_ID $KAFKA_URL $DATABASE_URL $AUTHSECRET $TC_API_BASE_URL $TC_API_V3_BASE_URL $TC_API_V4_BASE_URL $TC_API_V5_BASE_URL $MESSAGE_API_BASE_URL $CONNECT_URL $ENABLE_EMAILS $MENTION_EMAIL $REPLY_EMAIL_PREFIX $REPLY_EMAIL_DOMAIN $REPLY_EMAIL_FROM $DEFAULT_REPLY_EMAIL $ENABLE_DEV_MODE $DEV_MODE_EMAIL $LOG_LEVEL $VALID_ISSUERS $PORT "$API_CONTEXT_PATH" "$AUTH0_URL" "$AUTH0_AUDIENCE" $AUTH0_CLIENT_ID "$AUTH0_CLIENT_SECRET" $TOKEN_CACHE_TIME "$AUTH0_PROXY_SERVER_URL" $AWS_ECS_CLUSTER $AWS_REGION $AWS_ECS_CLUSTER $ENV)
265270
}
266271

267272
register_definition() {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"remarkable": "^1.7.1",
5151
"sequelize": "^4.21.0",
5252
"superagent": "^3.8.0",
53-
"tc-core-library-js": "appirio-tech/tc-core-library-js.git#v2.4",
53+
"tc-core-library-js": "appirio-tech/tc-core-library-js.git#v2.6",
5454
"winston": "^2.2.0"
5555
},
5656
"engines": {

0 commit comments

Comments
 (0)