fix: dependencies upgraded

README.md

@@ -31,9 +31,9 @@ Components Control. Can be configured to do one o more things (or nothing)
 | Variable Name | Usage |
 | ----- | ----- |
 | COMMANDER_DISABLED | disable internal commander api |
-| MONITORING_DISABLED | disable monitoring system. system monitors will not be checked anymore. will only change when bots and agents send updates |
+| MONITORING_DISABLED | disable monitoring system. The core will stop checking monitors status. Events for monitor status will be triggered on API updates |
 | API_DISABLED | disable rest api |
-| SCHEDULER_JOBS_DISABLED | disable internal scheduler execution. scheduler-jobs will be created using the rest api but task will never be executed. theeye-jobs execution timeout will be never checked. |
+| SCHEDULER_JOBS_DISABLED | disable internal scheduler execution. scheduled jobs can be created but jobs will not be created. |
 
 ### Start development sample
 

config/default.js

@@ -13,6 +13,7 @@ module.exports = {
     file_upload_folder: join(__dirname , '..', 'uploads'),
     view_teamplates_path: __dirname + '/../core/view/template',
     secret: 'b28d9f2a4d52ace6e5d3ac1dd3e5c2a0e7e66472ec7276ca501b8c4fa1f07679',
+    secret_uuid: 'a2a29a19-aba1-412b-a9ba-c29668e3c17b',
     user: {
       username: 'theeye-automatic',
       email: 'info@theeye.io',

core/app/api.js

@@ -56,17 +56,17 @@ module.exports = function () {
 
   // respond with error middleware
   server.use((req, res, next) => {
-    res.sendError = (error, next) => {
-      if (error.statusCode < 500) {
-        res.send(error.statusCode || 400, {
-          statusCode: error.statusCode,
-          message: error.message,
-          errors: error.errors
+    res.sendError = (err, next) => {
+      if (err instanceof ErrorHandler.ClientError || err.statusCode < 500) {
+        res.send(err.statusCode || 400, {
+          statusCode: err.statusCode,
+          message: err.message,
+          errors: err.errors
         })
       } else {
-        logger.error(error)
+        logger.error(err)
         const handler = new ErrorHandler()
-        handler.sendExceptionAlert(error, req)
+        handler.sendExceptionAlert(err, req)
         res.send(500, 'Internal Server Error')
       }
       if (next) { next() }

core/constants/indicator.js

@@ -1,10 +1,12 @@
 
-const SHORT_TYPE_CHART = 'chart'
-const SHORT_TYPE_TEXT = 'text'
+const SHORT_TYPE_CHART    = 'chart'
+const SHORT_TYPE_TEXT     = 'text'
 const SHORT_TYPE_PROGRESS = 'progress'
-const SHORT_TYPE_COUNTER = 'counter'
+const SHORT_TYPE_COUNTER  = 'counter'
+const SHORT_TYPE_FILE     = 'file'
 
-exports.SHORT_TYPE_CHART     = SHORT_TYPE_CHART
+exports.SHORT_TYPE_CHART    = SHORT_TYPE_CHART
 exports.SHORT_TYPE_TEXT     = SHORT_TYPE_TEXT
 exports.SHORT_TYPE_PROGRESS = SHORT_TYPE_PROGRESS
 exports.SHORT_TYPE_COUNTER  = SHORT_TYPE_COUNTER 
+exports.SHORT_TYPE_FILE     = SHORT_TYPE_FILE

core/controllers/file.js

@@ -22,33 +22,39 @@ module.exports = (server) => {
     }
   })
 
-  const middlewares = [
-    server.auth.bearerMiddleware,
-    router.resolve.customerNameToEntity({ required: true }),
-    router.ensureCustomer
-  ]
-
   // FETCH
-  server.get('/:customer/file', middlewares, fetchFiles)
+  server.get('/:customer/file',
+    server.auth.bearerMiddleware,
+    router.resolve.customerSessionToEntity(),
+    router.ensureCustomer,
+    fetchFiles
+    )
 
   // GET
   server.get('/:customer/file/:file',
-    middlewares,
+    server.auth.bearerMiddleware,
+    router.resolve.customerSessionToEntity(),
+    router.ensureCustomer,
     router.resolve.idToEntity({ param: 'file', required: true }),
     getFile
   )
 
   // CREATE
   server.post('/:customer/file',
-    middlewares.concat(router.requireCredential('admin')),
+    server.auth.bearerMiddleware,
+    router.resolve.customerSessionToEntity(),
+    router.ensureCustomer,
+    router.requireCredential('admin'),
     upload.single('file'),
     createFile,
     audit.afterCreate('file', { display: 'filename' })
   )
 
   // UPDATE
   server.put('/:customer/file/:file',
-    middlewares,
+    server.auth.bearerMiddleware,
+    router.resolve.customerSessionToEntity(),
+    router.ensureCustomer,
     router.requireCredential('admin'),
     router.resolve.idToEntity({ param:'file', required:true }),
     upload.single('file'),
@@ -59,7 +65,9 @@ module.exports = (server) => {
 
   // DELETE
   server.del('/:customer/file/:file',
-    middlewares,
+    server.auth.bearerMiddleware,
+    router.resolve.customerSessionToEntity(),
+    router.ensureCustomer,
     router.requireCredential('admin'),
     router.resolve.idToEntity({ param: 'file', required: true }),
     removeFile,
@@ -70,15 +78,17 @@ module.exports = (server) => {
   server.get('/:customer/file/:file/download',
     server.auth.bearerMiddleware,
     router.requireCredential('user'),
-    router.resolve.customerNameToEntity({required:true}),
+    router.resolve.customerSessionToEntity(),
     router.ensureCustomer,
     router.resolve.idToEntity({param:'file',required:true}),
     downloadFile
   )
 
   // GET LINKED MODELS
   server.get('/:customer/file/:file/linkedmodels',
-    middlewares,
+    server.auth.bearerMiddleware,
+    router.resolve.customerSessionToEntity(),
+    router.ensureCustomer,
     router.resolve.idToEntity({ param:'file', required:true }),
     getLinkedModels
   )