logger updated, better transports, creating logfiles. 🧦 upgrading 🧦 w…

…ebsockets 🧦 - allowing for rooms based on any resource id + type - backwards compat for existing streamId based approaches
speckleworks · Nov 21, 2018 · f091c37 · f091c37
1 parent 3fbb851
commit f091c37
Show file tree

Hide file tree

Showing 50 changed files with 203 additions and 150 deletions.
diff --git a/app/api/accounts/UserCreate.js b/app/api/accounts/UserCreate.js
@@ -1,4 +1,4 @@
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 const jwt = require( 'jsonwebtoken' )
 
 const User = require( '../../../models/User' )

diff --git a/app/api/accounts/UserGet.js b/app/api/accounts/UserGet.js
@@ -1,4 +1,4 @@
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 
 const User = require( '../../../models/User' )
 

diff --git a/app/api/accounts/UserLogin.js b/app/api/accounts/UserLogin.js
@@ -1,32 +1,36 @@
 const jwt = require( 'jsonwebtoken' )
 
+const winston = require( '../../../config/logger' )
 const User = require( '../../../models/User' )
 
-module.exports = function ( req, res ) {
-  if ( !req.body.email ) return res.send( { success: false, message: 'Do not fuck with us' } )
-  if ( !req.body.password ) return res.send( { success: false, message: 'Do not fuck with us' } )
+module.exports = function( req, res ) {
+  if ( !req.body.email ) return res.status( 401 ).send( { success: false, message: 'Invalid credentials.' } )
+  if ( !req.body.password ) return res.status( 401 ).send( { success: false, message: 'Invalid credentials.' } )
 
   let sessionSecret = process.env.SESSION_SECRET
 
-  User.findOne( { 'email': req.body.email.toLowerCase() } )
+  User.findOne( { 'email': req.body.email.toLowerCase( ) } )
     .then( myUser => {
-      if ( !myUser ) throw new Error( 'Invalid credentials.' )
+      if ( !myUser ) {
+        winston.error( 'Invalid credentials.' )
+        return res.status( 401 ).send( { success: false, message: 'Invalid credentials.' } )
+      }
       myUser.validatePassword( req.body.password, myUser.password, match => {
         if ( match === false ) {
-          res.status( 401 )
-          return res.send( { success: false, message: 'Invalid credentials.' } )
+          winston.error( 'Invalid credentials.' )
+          return res.status( 401 ).send( { success: false, message: 'Invalid credentials.' } )
         }
-        myUser.logins.push( { date: Date.now() } )
-        myUser.save()
+        myUser.logins.push( { date: Date.now( ) } )
+        myUser.save( )
         let token = 'JWT ' + jwt.sign( { _id: myUser._id, name: myUser.name }, sessionSecret, { expiresIn: '24h' } )
-        let userObject = myUser.toObject()
+        let userObject = myUser.toObject( )
         userObject.token = token
         delete userObject[ 'password' ]
         res.send( { success: true, message: 'You have logged in.', resource: userObject } )
       } )
     } )
     .catch( err => {
-      res.status( 401 )
-      res.send( { success: false, message: err } )
+      winston.error( err )
+      res.status( 401 ).send( { success: false, message: err } )
     } )
 }
diff --git a/app/api/accounts/UserProfile.js b/app/api/accounts/UserProfile.js
@@ -1,5 +1,5 @@
 'use strict'
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 
 const User = require( '../../../models/User' )
 

diff --git a/app/api/accounts/UserPut.js b/app/api/accounts/UserPut.js
@@ -1,5 +1,5 @@
 'use strict'
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 
 const User = require( '../../../models/User' )
 

diff --git a/app/api/accounts/UserSearch.js b/app/api/accounts/UserSearch.js
@@ -1,27 +1,33 @@
 'use strict'
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 
 const User = require( '../../../models/User' )
 
 // from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions
 const escapeRegExp = ( string ) => string.replace( /[.*+?^${}()|[\]\\]/g, '\\$&' ) // $& means the whole matched string
 
-module.exports = function ( req, res ) {
-  let conditions = {}
-  if ( req.body.name ) conditions.name = { '$regex': escapeRegExp( req.body.name ), '$options': 'i' }
-  if ( req.body.surname ) conditions.surname = { '$regex': escapeRegExp( req.body.surname ), '$options': 'i' }
-  if ( req.body.company ) conditions.company = { '$regex': escapeRegExp( req.body.company ), '$options': 'i' }
+module.exports = function( req, res ) {
+  let conditions = [ ]
+  if ( !req.body.searchString || req.body.searchString === '' || req.body.searchString.length < 3 ) {
+    return res.status( 400 ).send( { success: false, message: 'no search criteria present, or too short search string (must be > 2).' } )
+  }
 
-  let projection = '_id name surname company' + ( req.app.get( 'expose emails' ) ? ' email' : '' )
+  if ( req.body.searchString ) {
+    conditions.push( { name: { '$regex': escapeRegExp( req.body.searchString ), '$options': 'i' } } )
+    conditions.push( { surname: { '$regex': escapeRegExp( req.body.searchString ), '$options': 'i' } } )
+    conditions.push( { company: { '$regex': escapeRegExp( req.body.searchString ), '$options': 'i' } } )
+  }
 
-  User.find( conditions, projection ).limit( 5 )
+  let projection = '_id name surname company' + ( process.env.EXPOSE_EMAILS ? ' email' : '' )
+
+  User.find( { $or: conditions }, projection ).limit( 10 )
     .then( myUsers => {
       if ( !myUsers ) throw new Error( 'no users found.' )
       res.send( { success: true, resources: myUsers } )
     } )
     .catch( err => {
       winston.error( err )
       res.status( 400 )
-      res.send( { success: false, message: err.toString() } )
+      res.send( { success: false, message: err.toString( ) } )
     } )
 }
diff --git a/app/api/clients/ClientDelete.js b/app/api/clients/ClientDelete.js
@@ -1,5 +1,5 @@
 'use strict'
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 
 const Client = require( '../../../models/UserAppClient' )
 const PermissionCheck = require( '../middleware/PermissionCheck' )

diff --git a/app/api/clients/ClientGet.js b/app/api/clients/ClientGet.js
@@ -1,4 +1,4 @@
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 
 const Client = require( '../../../models/UserAppClient' )
 const PermissionCheck = require( '../middleware/PermissionCheck' )

diff --git a/app/api/clients/ClientGetAll.js b/app/api/clients/ClientGetAll.js
@@ -1,5 +1,5 @@
 'use strict'
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 
 const UserAppClient = require( '../../../models/UserAppClient' )
 

diff --git a/app/api/clients/ClientPost.js b/app/api/clients/ClientPost.js
@@ -1,4 +1,4 @@
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 const Client = require( '../../../models/UserAppClient' )
 
 module.exports = ( req, res ) => {

diff --git a/app/api/clients/ClientPut.js b/app/api/clients/ClientPut.js
@@ -1,4 +1,4 @@
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 
 const Client = require( '../../../models/UserAppClient' )
 const PermissionCheck = require( '../middleware/PermissionCheck' )

diff --git a/app/api/comments/CommentDelete.js b/app/api/comments/CommentDelete.js
@@ -1,4 +1,4 @@
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 
 const Comment = require( '../../../models/Comment' )
 const PermissionCheck = require( '../middleware/PermissionCheck' )

diff --git a/app/api/comments/CommentGet.js b/app/api/comments/CommentGet.js
@@ -1,4 +1,4 @@
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 
 const Comment = require( '../../../models/Comment' )
 

diff --git a/app/api/comments/CommentGetAll.js b/app/api/comments/CommentGetAll.js
@@ -1,4 +1,4 @@
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 
 const Comment = require( '../../../models/Comment' )
 

diff --git a/app/api/comments/CommentGetAssigned.js b/app/api/comments/CommentGetAssigned.js
@@ -1,4 +1,4 @@
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 
 const Comment = require( '../../../models/Comment' )
 

diff --git a/app/api/comments/CommentGetFromResource.js b/app/api/comments/CommentGetFromResource.js
@@ -1,4 +1,4 @@
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 
 const PermissionCheck = require( '../middleware/PermissionCheck' )
 const GetResource = require( '../middleware/GetResourceByType' )

diff --git a/app/api/comments/CommentPost.js b/app/api/comments/CommentPost.js
@@ -1,4 +1,4 @@
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 
 const Comment = require( '../../../models/Comment' )
 

diff --git a/app/api/comments/CommentPut.js b/app/api/comments/CommentPut.js
@@ -1,4 +1,4 @@
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 
 const Comment = require( '../../../models/Comment' )
 const PermissionCheck = require( '../middleware/PermissionCheck' )

diff --git a/app/api/middleware/BulkObjectSave.js b/app/api/middleware/BulkObjectSave.js
@@ -1,4 +1,4 @@
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 const chalk = require( 'chalk' )
 const crypto = require( 'crypto' )
 const SpeckleObject = require( '../../../models/SpeckleObject' )

diff --git a/app/api/middleware/GetResourceByType.js b/app/api/middleware/GetResourceByType.js
@@ -1,9 +1,11 @@
+const winston = require( '../../../config/logger' )
 const Comment = require( '../../../models/Comment' )
 const DataStream = require( '../../../models/DataStream' )
 const SpeckleObject = require( '../../../models/SpeckleObject' )
 const Project = require( '../../../models/Project' )
 
 module.exports = ( type, id, populateFields ) => {
+  populateFields = populateFields ? populateFields : ''
   switch ( type ) {
     case 'stream':
     case 'streams':
@@ -18,6 +20,7 @@ module.exports = ( type, id, populateFields ) => {
     case 'comments':
       return Comment.findOne( { _id: id } ).populate( populateFields )
     default:
+      winston.error( `Dunno what resource that is, eh? ${type}` )
       break
   }
 }
diff --git a/app/api/middleware/PermissionCheck.js b/app/api/middleware/PermissionCheck.js
@@ -1,5 +1,5 @@
 'use strict'
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 const chalk = require( 'chalk' )
 
 const ProtectedFields = require( './ProtectedFields' )

diff --git a/app/api/middleware/TokenCheck.js b/app/api/middleware/TokenCheck.js
@@ -1,5 +1,5 @@
 'use strict'
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 const chalk = require( 'chalk' )
 const User = require( '../../../models/User' )
 

diff --git a/app/api/objects/ObjectDelete.js b/app/api/objects/ObjectDelete.js
@@ -1,5 +1,5 @@
 'use strict'
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 
 const SpeckleObject = require( '../../../models/SpeckleObject' )
 const PermissionCheck = require( '../middleware/PermissionCheck' )

diff --git a/app/api/objects/ObjectGet.js b/app/api/objects/ObjectGet.js
@@ -1,4 +1,4 @@
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 
 const SpeckleObject = require( '../../../models/SpeckleObject' )
 const PrepareQuery = require( '../middleware/PrepareQuery' )

diff --git a/app/api/objects/ObjectPost.js b/app/api/objects/ObjectPost.js
@@ -1,4 +1,4 @@
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 
 const BulkObjectSave = require( '../middleware/BulkObjectSave' )
 

diff --git a/app/api/objects/ObjectPut.js b/app/api/objects/ObjectPut.js
@@ -1,4 +1,4 @@
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 
 const SpeckleObject = require( '../../../models/SpeckleObject' )
 const PermissionCheck = require( '../middleware/PermissionCheck' )

diff --git a/app/api/objects/ObjectPutProperties.js b/app/api/objects/ObjectPutProperties.js
@@ -1,4 +1,4 @@
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 const _ = require( 'lodash' )
 
 const SpeckleObject = require( '../../../models/SpeckleObject' )

diff --git a/app/api/objects/ObjectsGetBulk.js b/app/api/objects/ObjectsGetBulk.js
@@ -1,5 +1,5 @@
 'use strict'
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 
 const SpeckleObject = require( '../../../models/SpeckleObject' )
 const PermissionCheck = require( '../middleware/PermissionCheck' )

diff --git a/app/api/projects/ProjectDelete.js b/app/api/projects/ProjectDelete.js
@@ -1,4 +1,4 @@
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 
 const Project = require( '../../../models/Project' )
 const PermissionCheck = require( '../middleware/PermissionCheck' )

diff --git a/app/api/projects/ProjectGet.js b/app/api/projects/ProjectGet.js
@@ -1,4 +1,4 @@
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 
 const Project = require( '../../../models/Project' )
 const PermissionCheck = require( '../middleware/PermissionCheck' )

diff --git a/app/api/projects/ProjectGetAll.js b/app/api/projects/ProjectGetAll.js
@@ -1,4 +1,4 @@
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 
 const Project = require( '../../../models/Project' )
 

diff --git a/app/api/projects/ProjectPost.js b/app/api/projects/ProjectPost.js
@@ -1,4 +1,4 @@
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 
 const Project = require( '../../../models/Project' )
 

diff --git a/app/api/projects/ProjectPut.js b/app/api/projects/ProjectPut.js
@@ -1,4 +1,4 @@
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 
 const Project = require( '../../../models/Project' )
 const PermissionCheck = require( '../middleware/PermissionCheck' )
@@ -13,7 +13,7 @@ module.exports = ( req, res ) => {
     .then( resource => PermissionCheck( req.user, 'read', resource ) )
     .then( resource => resource.set( req.body ).save() )
     .then( resource => {
-      res.send( { success: true, resource: resource } )
+      res.send( { success: true, message: `Patched ${Object.keys(req.body)} for ${req.params.projectId}.` } )
     } )
     .catch( err => {
       winston.error( err )

diff --git a/app/api/streams/StreamClientsGet.js b/app/api/streams/StreamClientsGet.js
@@ -1,4 +1,4 @@
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 const q2m = require( 'query-to-mongo' )
 
 const DataStream = require( '../../../models/DataStream' )

diff --git a/app/api/streams/StreamDelete.js b/app/api/streams/StreamDelete.js
@@ -1,5 +1,5 @@
 'use strict'
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 
 const DataStream = require( '../../../models/DataStream' )
 const PermissionCheck = require( '../middleware/PermissionCheck' )

diff --git a/app/api/streams/StreamDiff.js b/app/api/streams/StreamDiff.js
@@ -1,4 +1,4 @@
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 const _ = require( 'lodash' )
 const DataStream = require( '../../../models/DataStream' )
 const PermissionCheck = require( '../middleware/PermissionCheck' )

diff --git a/app/api/streams/StreamDuplicate.js b/app/api/streams/StreamDuplicate.js
@@ -1,4 +1,4 @@
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 const mongoose = require( 'mongoose' )
 const shortId = require( 'shortid' )
 

diff --git a/app/api/streams/StreamGet.js b/app/api/streams/StreamGet.js
@@ -1,4 +1,4 @@
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 const uuid = require( 'uuid/v4' )
 
 const DataStream = require( '../../../models/DataStream' )

diff --git a/app/api/streams/StreamGetAll.js b/app/api/streams/StreamGetAll.js
@@ -1,4 +1,4 @@
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 const chalk = require( 'chalk' )
 const mongoose = require( 'mongoose' )
 
@@ -25,7 +25,7 @@ module.exports = ( req, res ) => {
           stream.canWrite = stream.canWrite.map( u => u._id )
         } )
       }
-      res.send( { success: true, message: 'Stream list for user ' + req.user._id, resources: resources } )
+      res.send( { success: true, message: 'Stream list returned. Contains both owned and shared with streams.', resources: resources } )
     } )
     .catch( err => {
       winston.error( err )

diff --git a/app/api/streams/StreamObjectsGet.js b/app/api/streams/StreamObjectsGet.js
@@ -1,5 +1,5 @@
 'use strict'
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 const q2m = require( 'query-to-mongo' )
 
 const DataStream = require( '../../../models/DataStream' )

diff --git a/app/api/streams/StreamPost.js b/app/api/streams/StreamPost.js
@@ -1,4 +1,4 @@
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 const shortId = require( 'shortid' )
 
 const DataStream = require( '../../../models/DataStream' )

diff --git a/app/api/streams/StreamPut.js b/app/api/streams/StreamPut.js
@@ -1,4 +1,4 @@
-const winston = require( 'winston' )
+const winston = require( '../../../config/logger' )
 const chalk = require( 'chalk' )
 
 const DataStream = require( '../../../models/DataStream' )

diff --git a/app/ws/ClientStore.js b/app/ws/ClientStore.js
@@ -1,5 +1,4 @@
-'use strict'
-const winston = require( 'winston' )
+const winston = require( '../../config/logger' )
 const chalk = require( 'chalk' )
 
 // this is where we keep track on each process what clients are connected.