Merge branch 'dev' of https://github.com/topcoder-platform/taas-apis into dev

Author: veshu

src/common/helper.js

@@ -11,7 +11,9 @@ const errors = require('../common/errors')
 
 const m2mAuth = require('tc-core-library-js').auth.m2m
 
-const m2m = m2mAuth(_.pick(config, ['AUTH0_URL', 'AUTH0_AUDIENCE', 'TOKEN_CACHE_TIME', 'AUTH0_PROXY_SERVER_URL']))
+//const m2m = m2mAuth(_.pick(config, ['AUTH0_URL', 'AUTH0_AUDIENCE', 'TOKEN_CACHE_TIME', 'AUTH0_PROXY_SERVER_URL']))
+const m2m = m2mAuth(_.pick(config, ['AUTH0_URL', 'AUTH0_AUDIENCE', 'AUTH0_CLIENT_ID','AUTH0_CLIENT_SECRET', 'AUTH0_PROXY_SERVER_URL']))
+
 
 // ES Client mapping
 const esClients = {}