Skip to content

Commit c673cba

Browse files
author
sachin-maheshwari
authored
Merge pull request #77 from topcoder-platform/feature/auth0-proxy-server
m2m token through auth0-proxy server.
2 parents fb15cd5 + 8256041 commit c673cba

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]
85+
only: [dev, 'feature/auth0-proxy-server']
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
@@ -75,6 +75,7 @@ AUTH0_AUDIENCE=$(eval "echo \$${ENV}_AUTH0_AUDIENCE")
7575
TOKEN_CACHE_TIME=$(eval "echo \$${ENV}_TOKEN_CACHE_TIME")
7676
AUTH0_CLIENT_ID=$(eval "echo \$${ENV}_AUTH0_CLIENT_ID")
7777
AUTH0_CLIENT_SECRET=$(eval "echo \$${ENV}_AUTH0_CLIENT_SECRET")
78+
AUTH0_PROXY_SERVER_URL=$(eval "echo \$${ENV}_AUTH0_PROXY_SERVER_URL")
7879

7980
echo $APP_NAME
8081

@@ -243,6 +244,10 @@ make_task_def(){
243244
{
244245
"name": "TOKEN_CACHE_TIME",
245246
"value": "%s"
247+
},
248+
{
249+
"name": "AUTH0_PROXY_SERVER_URL",
250+
"value": "%s"
246251
}
247252
],
248253
"portMappings": [
@@ -263,7 +268,7 @@ make_task_def(){
263268
}
264269
]'
265270

266-
task_def=$(printf "$task_template" $1 $AWS_ACCOUNT_ID $AWS_REGION $AWS_REPOSITORY $TAG $2 $3 $4 $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)
271+
task_def=$(printf "$task_template" $1 $AWS_ACCOUNT_ID $AWS_REGION $AWS_REPOSITORY $TAG $2 $3 $4 $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)
267272
}
268273

269274
register_definition() {

package.json

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

0 commit comments

Comments
 (0)