Merge pull request #12 from topcoder-platform/feature/m2mtoken-support

Feature/m2mtoken support

Author: sachin-maheshwari

common/helper.js

@@ -129,12 +129,10 @@ function signJwtToken (payload) {
 /**
  * Validate the event based on the source service, type, and message.
  *
- * @param {String} sourceServiceName the source service name
  * @param {Object} event the event
  */
-function validateEvent (sourceServiceName, event) {
+function validateEvent (event) {
   const schema = Joi.object().keys({
-    sourceServiceName: Joi.string().required(),
     event: Joi.object().keys({
       type: Joi
         .string()
@@ -146,7 +144,7 @@ function validateEvent (sourceServiceName, event) {
     })
   })
 
-  const { error } = Joi.validate({sourceServiceName, event}, schema)
+  const { error } = Joi.validate({event}, schema)
   if (error) {
     throw error
   }

config/default.js

@@ -7,14 +7,23 @@ module.exports = {
   LOG_LEVEL: process.env.LOG_LEVEL || 'debug',
   CONTEXT_PATH: process.env.API_VERSION || '/eventbus/',
   PORT: process.env.PORT || '3000',
-  authSecret: process.env.JWT_TOKEN_SECRET,
-  authDomain: process.env.AUTH_DOMAIN,
-  validIssuers: process.env.VALID_ISSUERS ? process.env.VALID_ISSUERS.replace(/\\"/g, '') : null,
+  AUTH_SECRET: process.env.JWT_TOKEN_SECRET,
+  VALID_ISSUERS: process.env.VALID_ISSUERS ? process.env.VALID_ISSUERS.replace(/\\"/g, '') : null,
   JWT_TOKEN_SECRET: process.env.JWT_TOKEN_SECRET || '',
   JWT_TOKEN_EXPIRES_IN: process.env.JWT_TOKEN_EXPIRES_IN || '100 days',
   KAFKA_TOPIC_PREFIX: process.env.KAFKA_TOPIC_PREFIX || '',
   ALLOWED_SERVICES: process.env.ALLOWED_SERVICES || ['project-service', 'message-service'],
   TC_EMAIL_SERVICE_URL: process.env.TC_EMAIL_SERVICE_URL,
   TC_EMAIL_SERVICE_TOKEN: process.env.TC_EMAIL_SERVICE_TOKEN,
-  TC_EMAIL_SERVICE_CACHE_PERIOD: process.env.TC_EMAIL_SERVICE_CACHE_PERIOD || (3600 * 1000)
+  TC_EMAIL_SERVICE_CACHE_PERIOD: process.env.TC_EMAIL_SERVICE_CACHE_PERIOD || (3600 * 1000),
+  
+  // Configuration for generating machine to machine auth0 token.
+  // The token will be used for calling another internal API.
+  AUTH0_URL: process.env.AUTH0_URL || '',
+  AUTH0_AUDIENCE: process.env.AUTH0_AUDIENCE || '',
+  // The token will be cached.
+  // We define the time period of the cached token.
+  TOKEN_CACHE_TIME: process.env.TOKEN_CACHE_TIME || 86400000,
+  AUTH0_CLIENT_ID: process.env.AUTH0_CLIENT_ID,
+  AUTH0_CLIENT_Secret: process.env.AUTH0_CLIENT_SECRET,
 }

controllers/EventController.js

@@ -11,7 +11,7 @@ const MessageBusService = require('../services/MessageBusService')
  * @param {Function} next the next middleware
  */
 async function create (req, res, next) {
-  await MessageBusService.postEvent(req.authUser.name, req.body)
+  await MessageBusService.postEvent(req.body)
   res.status(204).end()
   next()
 }

deploy.sh

@@ -51,6 +51,12 @@ VALID_ISSUERS=$(eval "echo \$${ENV}_VALID_ISSUERS")
 TC_EMAIL_SERVICE_URL=$(eval "echo \$${ENV}_TC_EMAIL_SERVICE_URL")
 TC_EMAIL_SERVICE_TOKEN=$(eval "echo \$${ENV}_TC_EMAIL_SERVICE_TOKEN")
 
+AUTH0_URL=$(eval "echo \$${ENV}_AUTH0_UR")
+AUTH0_AUDIENCE=$(eval "echo \$${ENV}_AUTH0_AUDIENCE")
+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")
+
 echo $APP_NAME
 
 configure_aws_cli() {
@@ -147,14 +153,34 @@ make_task_def(){
 								"name": "VALID_ISSUERS",
 								"value": "%s"
 						},
-            {
-                "name": "TC_EMAIL_SERVICE_URL",
-                "value": "%s"
-            },
-            {
-                "name": "TC_EMAIL_SERVICE_TOKEN",
-                "value": "%s"
-            }
+					    {
+						"name": "TC_EMAIL_SERVICE_URL",
+						"value": "%s"
+					    },
+{
+						"name": "TC_EMAIL_SERVICE_TOKEN",
+						"value": "%s"
+					    },
+					    {
+						"name": "AUTH0_URL",
+						"value": "%s"
+					    },
+					    {
+						"name": "AUTH0_AUDIENCE",
+						"value": "%s"
+					    },
+					    {
+						"name": "AUTH0_CLIENT_ID",
+						"value": "%s"
+					    },
+					    {
+						"name": "AUTH0_CLIENT_SECRET",
+						"value": "%s"
+					    },
+					    {
+						"name": "TOKEN_CACHE_TIME",
+						"value": "%s"
+					    }
 				],
 				"portMappings": [
 						{
@@ -174,7 +200,7 @@ make_task_def(){
 		}
 	]'
 
-	task_def=$(printf "$task_template" $AWS_ECS_CONTAINER_NAME $AWS_ACCOUNT_ID $AWS_REGION $AWS_REPOSITORY $TAG $ENV $KAFKA_URL "$KAFKA_CLIENT_CERT" "$KAFKA_CLIENT_CERT_KEY" $LOG_LEVEL $JWT_TOKEN_SECRET "$KAFKA_TOPIC_PREFIX" "$ALLOWED_SERVICES" $JWT_TOKEN_EXPIRES_IN "$API_VERSION" $PORT "$AUTH_DOMAIN" "$VALID_ISSUERS" $TC_EMAIL_SERVICE_URL $TC_EMAIL_SERVICE_TOKEN $AWS_ECS_CLUSTER $AWS_REGION $AWS_ECS_CLUSTER $ENV)
+	task_def=$(printf "$task_template" $AWS_ECS_CONTAINER_NAME $AWS_ACCOUNT_ID $AWS_REGION $AWS_REPOSITORY $TAG $ENV $KAFKA_URL "$KAFKA_CLIENT_CERT" "$KAFKA_CLIENT_CERT_KEY" $LOG_LEVEL $JWT_TOKEN_SECRET "$KAFKA_TOPIC_PREFIX" "$ALLOWED_SERVICES" $JWT_TOKEN_EXPIRES_IN "$API_VERSION" $PORT "$AUTH_DOMAIN" "$VALID_ISSUERS" $TC_EMAIL_SERVICE_URL $TC_EMAIL_SERVICE_TOKEN "$AUTH0_URL" "$AUTH0_AUDIENCE" $AUTH0_CLIENT_ID "$AUTH0_CLIENT_SECRET" $TOKEN_CACHE_TIME $AWS_ECS_CLUSTER $AWS_REGION $AWS_ECS_CLUSTER $ENV)
 }
 
 register_definition() {