Skip to content
This repository was archived by the owner on Mar 13, 2025. It is now read-only.

Feature/auth0 proxy server #96

Merged
merged 4 commits into from
Dec 5, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,4 +89,4 @@ workflows:
- test
filters:
branches:
only: [dev, dev-circleci2]
only: [dev, 'feature/auth0-proxy-server']
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:6
FROM node:8.2.1
LABEL version="1.0"
LABEL description="Connect Messages Serivce"

Expand Down
1 change: 1 addition & 0 deletions config/custom-environment-variables.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
};
1 change: 1 addition & 0 deletions config/default.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: '',
};
7 changes: 6 additions & 1 deletion deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ make_task_def(){
{
"name": "TOKEN_CACHE_TIME",
"value": "%s"
},
{
"name": "AUTH0_PROXY_SERVER_URL",
"value": "%s"
}
],
"logConfiguration": {
Expand All @@ -103,14 +107,15 @@ 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
elif [ "$ENV" = "DEV" ]; then
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(){
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down