Merge pull request #106 from topcoder-platform/dev

Dry Release v0.2

Author: nkumar-topcoder

README.md

@@ -22,7 +22,7 @@ The following parameters can be set in config files or in env variables:
 
 - `AUTH0_URL`: Auth0 URL, used to get TC M2M token
 - `AUTH0_AUDIENCE`: Auth0 audience, used to get TC M2M token
-- `AUTH0_AUDIENCE_FOR_BUS_API`: Auth0 audience, used to get TC M2M token to be used in bus api client
+- `AUTH0_AUDIENCE_UBAHN`: Auth0 audience for U-Bahn
 - `TOKEN_CACHE_TIME`: Auth0 token cache time, used to get TC M2M token
 - `AUTH0_CLIENT_ID`: Auth0 client id, used to get TC M2M token
 - `AUTH0_CLIENT_SECRET`: Auth0 client secret, used to get TC M2M token
@@ -36,6 +36,7 @@ The following parameters can be set in config files or in env variables:
 - `PROJECT_API_URL`: the project service url
 - `TC_API`: the Topcoder v5 url
 - `ORG_ID`: the organization id
+- `TOPCODER_SKILL_PROVIDER_ID`: the referenced skill provider id
 
 - `esConfig.HOST`: the elasticsearch host
 - `esConfig.ES_INDEX_JOB`: the job index
@@ -66,6 +67,19 @@ The following parameters can be set in config files or in env variables:
 - Modify `DATABASE_URL` under `config/default.js` to meet your environment.
 - Run `npm run init-db` to create table(run `npm run init-db force` to force creating table)
 
+## DB Migration
+- `npm run migrate`: run any migration files which haven't run yet.
+- `npm run migrate:undo`: revert most recent migration.
+
+Configuration for migration is at `./config/config.json`.
+
+The following parameters can be set in the config file or via env variables:
+
+- `username`: set via env `DB_USERNAME`; datebase username
+- `password`: set via env `DB_PASSWORD`; datebase password
+- `database`: set via env `DB_NAME`; datebase name
+- `host`: set via env `DB_HOST`; datebase host name
+
 ## ElasticSearch Setup
 - Go to https://www.elastic.co/downloads/ download and install the elasticsearch.
 - Modify `esConfig` under `config/default.js` to meet your environment.

app-constants.js

@@ -3,9 +3,16 @@
  */
 
 const UserRoles = {
-  BookingManager: 'bookingmanager'
+  BookingManager: 'bookingmanager',
+  Administrator: 'administrator',
+  ConnectManager: 'Connect Manager'
 }
 
+const FullManagePermissionRoles = [
+  UserRoles.BookingManager,
+  UserRoles.Administrator
+]
+
 const Scopes = {
   // job
   READ_JOB: 'read:taas-jobs',
@@ -31,5 +38,6 @@ const Scopes = {
 
 module.exports = {
   UserRoles,
+  FullManagePermissionRoles,
   Scopes
 }

app-routes.js

@@ -49,8 +49,12 @@ module.exports = (app) => {
             }
           } else {
             req.authUser.jwtToken = req.headers.authorization
-            if (_.includes(req.authUser.roles, constants.UserRoles.BookingManager)) {
-              req.authUser.isBookingManager = true
+            // check if user has full manage permission
+            if (_.intersection(req.authUser.roles, constants.FullManagePermissionRoles).length) {
+              req.authUser.hasManagePermission = true
+            }
+            if (_.includes(req.authUser.roles, constants.UserRoles.ConnectManager)) {
+              req.authUser.isConnectManager = true
             }
             next()
           }

app.js

@@ -10,6 +10,7 @@ const cors = require('cors')
 const HttpStatus = require('http-status-codes')
 const interceptor = require('express-interceptor')
 const logger = require('./src/common/logger')
+const eventHandlers = require('./src/eventHandlers')
 
 // setup express app
 const app = express()
@@ -91,6 +92,7 @@ app.use((err, req, res, next) => {
 
 const server = app.listen(app.get('port'), () => {
   logger.info({ component: 'app', message: `Express server listening on port ${app.get('port')}` })
+  eventHandlers.init()
 })
 
 if (process.env.NODE_ENV === 'test') {

config/config.js

@@ -0,0 +1,27 @@
+/*
+ * Configuration for DB migration.
+ */
+
+module.exports = {
+  development: {
+    username: process.env.DB_USERNAME || 'postgres',
+    password: process.env.DB_PASSWORD || 'postgres',
+    database: process.env.DB_NAME || 'postgres',
+    host: process.env.DB_HOST || '127.0.0.1',
+    dialect: 'postgres'
+  },
+  test: {
+    username: process.env.DB_USERNAME || 'postgres',
+    password: process.env.DB_PASSWORD || 'postgres',
+    database: process.env.DB_NAME || 'postgres',
+    host: process.env.DB_HOST || '127.0.0.1',
+    dialect: 'postgres'
+  },
+  production: {
+    username: process.env.DB_USERNAME,
+    password: process.env.DB_PASSWORD,
+    database: process.env.DB_NAME,
+    host: process.env.DB_HOST,
+    dialect: 'postgres'
+  }
+}

config/config.json

@@ -0,0 +1,23 @@
+{
+  "development": {
+    "username": "postgres",
+    "password": "postgres",
+    "database": "postgres",
+    "host": "127.0.0.1",
+    "dialect": "postgres"
+  },
+  "test": {
+    "username": "root",
+    "password": null,
+    "database": "database_test",
+    "host": "127.0.0.1",
+    "dialect": "mysql"
+  },
+  "production": {
+    "username": "root",
+    "password": null,
+    "database": "database_production",
+    "host": "127.0.0.1",
+    "dialect": "mysql"
+  }
+}

config/default.js

@@ -8,7 +8,7 @@ module.exports = {
   VALID_ISSUERS: process.env.VALID_ISSUERS || '["https://api.topcoder-dev.com", "https://api.topcoder.com", "https://topcoder-dev.auth0.com/", "https://auth.topcoder-dev.com/"]',
   AUTH0_URL: process.env.AUTH0_URL,
   AUTH0_AUDIENCE: process.env.AUTH0_AUDIENCE,
-  AUTH0_AUDIENCE_FOR_BUS_API: process.env.AUTH0_AUDIENCE_FOR_BUS_API,
+  AUTH0_AUDIENCE_UBAHN: process.env.AUTH0_AUDIENCE_UBAHN,
   TOKEN_CACHE_TIME: process.env.TOKEN_CACHE_TIME,
   AUTH0_CLIENT_ID: process.env.AUTH0_CLIENT_ID,
   AUTH0_CLIENT_SECRET: process.env.AUTH0_CLIENT_SECRET,
@@ -21,6 +21,7 @@ module.exports = {
 
   TC_API: process.env.TC_API || 'https://api.topcoder-dev.com/v5',
   ORG_ID: process.env.ORG_ID || '36ed815b-3da1-49f1-a043-aaed0a4e81ad',
+  TOPCODER_SKILL_PROVIDER_ID: process.env.TOPCODER_SKILL_PROVIDER_ID || '9cc0795a-6e12-4c84-9744-15858dba1861',
 
   TOPCODER_USERS_API: process.env.TOPCODER_USERS_API || 'https://api.topcoder-dev.com/v3/users',
 

config/test.js

@@ -2,7 +2,7 @@ module.exports = {
   LOG_LEVEL: process.env.LOG_LEVEL || 'info',
   AUTH0_URL: 'http://example.com',
   AUTH0_AUDIENCE: 'http://example.com',
-  AUTH0_AUDIENCE_FOR_BUS_API: 'http://example.com',
+  AUTH0_AUDIENCE_UBAHN: 'http://example.com',
   AUTH0_CLIENT_ID: 'fake_id',
   AUTH0_CLIENT_SECRET: 'fake_secret'
 }

docker/sample.api.env

@@ -3,7 +3,7 @@ ES_HOST=<ES Host Endpoint>
 
 AUTH0_URL=<AUTH0 URL>
 AUTH0_AUDIENCE=<AUTH0 Audience>
-AUTH0_AUDIENCE_FOR_BUS_API=<AUTH0 Audience For Bus Api>
+AUTH0_AUDIENCE_UBAHN=<AUTH0 Audience For Bus Api>
 TOKEN_CACHE_TIME=500000
 AUTH0_CLIENT_ID=<AUTH0 Client ID>
 AUTH0_CLIENT_SECRET=<AUTH0 Client Secret>