Fix hapi issues and auth issues

app-bootstrap.js

@@ -1,7 +1,31 @@
 /**
- * App bootstrap
+ * add logger and joi to services
  */
+
+const fs = require('fs')
+const path = require('path')
+const logger = require('./src/common/logger')
+
 global.Promise = require('bluebird')
 const Joi = require('joi')
 
 Joi.id = () => Joi.string().uuid().required()
+
+/**
+ * add logger and joi schema to service
+ * @param dir
+ */
+function buildServices (dir) {
+  const files = fs.readdirSync(dir)
+  files.forEach((file) => {
+    const curPath = path.join(dir, file)
+    const stats = fs.statSync(curPath)
+    if (stats.isDirectory()) {
+      buildServices(curPath)
+    } else if (path.extname(file) === '.js') {
+      logger.buildService(require(curPath)); // eslint-disable-line
+    }
+  })
+}
+
+buildServices(path.join(__dirname, 'src', 'services'))

app.js

@@ -4,7 +4,6 @@
 
 require('./app-bootstrap')
 
-const path = require('path')
 const config = require('config')
 const express = require('express')
 const interceptor = require('express-interceptor')

package.json

@@ -19,7 +19,6 @@
     "url": ""
   },
   "dependencies": {
-    "@hapi/joi": "^16.1.8",
     "aws-sdk": "^2.627.0",
     "axios": "^0.19.2",
     "bluebird": "^3.5.1",
@@ -33,6 +32,7 @@
     "file-type": "^14.6.2",
     "get-parameter-names": "^0.3.0",
     "http-status-codes": "^1.3.0",
+    "joi": "^17.2.1",
     "js-yaml": "^3.14.0",
     "lodash": "^4.17.19",
     "multer": "^1.4.2",

src/common/helper.js

@@ -5,9 +5,6 @@ const _ = require('lodash')
 const config = require('config')
 const AWS = require('aws-sdk')
 const path = require('path')
-const axios = require('axios')
-const querystring = require('querystring')
-const NodeCache = require('node-cache')
 const models = require('../models')
 const errors = require('./errors')
 const logger = require('./logger')

src/common/logger.js

@@ -119,7 +119,7 @@ logger.decorateWithValidators = function (service) {
     service[name] = async function () {
       const args = Array.prototype.slice.call(arguments)
       const value = _combineObject(params, args)
-      const normalized = Joi.attempt(value, method.schema)
+      const normalized = Joi.attempt(value, Joi.object(method.schema))
 
       const newArgs = []
       // Joi will normalize values

src/consts.js → src/constants.js

@@ -26,8 +26,20 @@ const AllAuthenticatedUsers = [
  */
 const AdminUser = [UserRoles.admin, UserRoles.administrator]
 
+const Scopes = {
+  CreateUpload: 'create:upload',
+  GetUpload: 'read:upload',
+  UpdateUpload: 'update:upload',
+  AllUpload: 'all:upload',
+  CreateTemplate: 'create:template',
+  GetTemplate: 'read:template',
+  AllTemplate: 'all:template',
+  GetSkill: 'read:skill',
+  AllSkill: 'all:skill'
+}
+
 module.exports = {
-  UserRoles,
   AllAuthenticatedUsers,
-  AdminUser
+  AdminUser,
+  Scopes
 }

src/routes.js

@@ -4,7 +4,7 @@
 const multer = require('multer')
 const config = require('config')
 const _ = require('lodash')
-const constants = require('../app-constants')
+const constants = require('./constants')
 const fileUpload = multer({ storage: multer.memoryStorage() })
 
 // config template upload properties

src/services/UploadService.js

@@ -14,12 +14,12 @@ const logger = require('../common/logger')
  * Checks the type of uploaded file and ensures it's allowed.
  * @param {Object} upload The uploaded file
  */
-async function ensureFileTypeIsValid(upload) {
+async function ensureFileTypeIsValid (upload) {
   const allowedExtensions = ['xls', 'xlsx', 'csv']
   const allowedMimeTypes = [
     'application/vnd.ms-excel',
     'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-    'text/csv',
+    'text/csv'
   ]
   const fileType = await FileType.fromBuffer(upload.buffer)
   const fileExt = upload.originalname.split('.').pop().toLowerCase()
@@ -30,7 +30,7 @@ async function ensureFileTypeIsValid(upload) {
   if (isAllowed === false) {
     throw new errors.ForbiddenError(`You are allowed to upload only ${_.join(allowedExtensions, ',')} types.`)
   }
-} 
+}
 
 /**
  * Get upload entity by id.
@@ -117,7 +117,7 @@ partiallyUpdate.schema = {
   id: Joi.id(),
   authUser: Joi.object().required(),
   data: Joi.object().keys({
-    status: Joi.string().valid(['pending', 'completed', 'failed']).required(),
+    status: Joi.string().valid('pending', 'completed', 'failed').required(),
     info: Joi.string()
   }).required()
 }