@websy/websy-designs 1.9.14 → 1.10.1

package/dist/server/helpers/v1/authHelper.js

@@ -8,7 +8,7 @@ class AuthHelper {
       loginType: 'email'
     }
     this.options = Object.assign({}, DEFAULTS, options)
-    console.log(this.options)
+    // console.log(this.options)
   }
   login (req, res) {
     return new Promise((resolve, reject) => {
@@ -16,25 +16,25 @@ class AuthHelper {
         return (md5(md5(password) + user.salt)) === user.pepper
       }
       // check in mongo if a user with username exists or not
-      console.log(req.body)
+      // console.log(req.body)
       const email = req.body[this.options.loginType].toLowerCase()
       const userQuery = `
         SELECT *
         FROM users
         WHERE ${this.options.loginType} = '${email}'
       `  
-      console.log(userQuery)  
+      // console.log(userQuery)  
       this.dbHelper.execute(userQuery).then(result => {      
         // Username does not exist, log the error and redirect back
         if (result.rows.length === 0) {
-          console.log('No User')
+          // console.log('No User')
           reject(`User not found with ${this.options.loginType} ${email}`)
           return
         }
         const user = result.rows[0]
         // User exists but wrong password, log the error
         if (!isValidPassword(user, req.body.password)) {    
-          console.log('Invalid Password')
+          // console.log('Invalid Password')
           reject('Invalid Password')
           return
         }
@@ -46,10 +46,10 @@ class AuthHelper {
           WHERE id = ${user.id}
         `
         this.dbHelper.execute(userUpdateQuery).then(result => {
-          console.log('yes')          
+          // console.log('yes')          
           resolve(user)
         }, err => {
-          console.log('no')
+          // console.log('no')
           reject(err)
         })
         // LogonHistory.create({
@@ -121,18 +121,18 @@ class AuthHelper {
     })    
   }
   isLoggedIn (req, res, next) {
-    console.log(req.session)
+    // console.log(req.session)
     if (req.session && req.session.user && req.session.user.isAnonymous !== true) {      
-      console.log('in condition D')
+      // console.log('in condition D')
       next()
     }
     else {
-      console.log('in condition E')
+      // console.log('in condition E')
       res.redirect('/login')
     }      
   }
   checkPermissions (req, res, next) {
-    console.log('hello')
+    // console.log('hello')
     if (process.env.USE_PERMISSIONS === 'true' || process.env.USE_PERMISSIONS === true) {
       const permissions = {
         entities: {

package/dist/server/helpers/v1/pgHelper.js

@@ -117,11 +117,27 @@ class PGHelper {
     if (process.env.EDIT_DATE_FIELD) {
       data[process.env.EDIT_DATE_FIELD] = (new Date()).toISOString()
     }
-    return `
+    let sql = `
       INSERT INTO ${entity} (${Object.keys(data).join(',')})
-      VALUES (${Object.values(data).map(d => (d === null ? `${d}` : `'${d}'`)).join(',')})
+      VALUES (
+    `
+    sql += Object.values(data).map(d => {
+      if (d === null) {
+        return d
+      }
+      else {
+        if (typeof d === 'string') { 
+          d = d.replace(/'/g, `''`)
+        }
+        return `'${d}'`
+        // (d === null ? `${d}` : `'${d.replace(/'/)}'`)
+      }
+    }).join(',')
+    sql += `
+      )
       RETURNING ${(this.options.entityConfig[entity] && this.options.entityConfig[entity].idColumn) || 'id'}
     `
+    return sql
   }
   buildOrderBy (query) {
     return `
@@ -178,7 +194,7 @@ class PGHelper {
     `
     return sql
   }
-  buildUpdate (entity, where, data) {
+  buildUpdate (entity, where, data, user) {
     let updates = []
     for (let key in data) {
       if (this.updateIgnores.indexOf(key) === -1) {
@@ -186,7 +202,14 @@ class PGHelper {
           data[key] = data[key].replace(/''/gm, `'`).replace(/'/gm, `''`).replace(/\\\\/gm, '\\')
         }
         updates.push(`${key} = ${(data[key] === null ? data[key] : `'${data[key]}'`)}`)
-      }      
+      } 
+    }
+    if (process.env.CREATE_USER_FIELD && process.env.USERID_FIELD && user) {
+      let userId = user[process.env.USERID_FIELD || 'id']
+      updates.push(`${process.env.EDIT_USER_FIELD} = '${userId}'`)            
+    }
+    if (process.env.EDIT_DATE_FIELD) {
+      updates.push(`${process.env.EDIT_DATE_FIELD} = '${(new Date()).toISOString()}'`)
     }
     return `
       UPDATE ${entity}
@@ -194,19 +217,67 @@ class PGHelper {
       WHERE ${this.buildWhere(where)}
     `
   }
-  buildUpdateWithId (entity, id, data) {
+  buildUpdateWithId (entity, id, data, user) {
     let updates = []
     for (let key in data) {
       if (this.updateIgnores.indexOf(key) === -1) {
         updates.push(`${key} = ${(data[key] === null ? data[key] : `'${data[key]}'`)}`)
       }      
     }
+    if (process.env.CREATE_USER_FIELD && process.env.USERID_FIELD && user) {
+      let userId = user[process.env.USERID_FIELD || 'id']
+      updates.push(`${process.env.EDIT_USER_FIELD} = '${userId}'`)        
+    }
+    if (process.env.EDIT_DATE_FIELD) {
+      updates.push(`${process.env.EDIT_DATE_FIELD} = '${(new Date()).toISOString()}'`)
+    }
     return `
       UPDATE ${entity}
       SET ${updates.join(',')}
       WHERE ${this.buildWhereWithId(entity, id)}
     `
   }
+  buildUpsert (entity, data, user) {    
+    // delete data[(this.options.entityConfig[entity] && this.options.entityConfig[entity].idColumn) || 'id']
+    // data.create_user = user
+    let sql = ``
+    data.forEach(row => {
+      if (process.env.CREATE_USER_FIELD && process.env.USERID_FIELD && user) {
+        row[process.env.CREATE_USER_FIELD] = user[process.env.USERID_FIELD || 'id']
+        row[process.env.EDIT_USER_FIELD] = user[process.env.USERID_FIELD || 'id']      
+      }
+      if (process.env.EDIT_DATE_FIELD) {
+        row[process.env.EDIT_DATE_FIELD] = (new Date()).toISOString()
+      }
+      if (typeof row[(this.options.entityConfig[entity] && this.options.entityConfig[entity].idColumn) || 'id'] !== 'undefined') {        
+        let id = row[(this.options.entityConfig[entity] && this.options.entityConfig[entity].idColumn) || 'id']    
+        delete row[(this.options.entityConfig[entity] && this.options.entityConfig[entity].idColumn) || 'id']    
+        let updates = []
+        for (let key in row) {
+          if (this.updateIgnores.indexOf(key) === -1) {
+            if (typeof row[key] === 'string') {
+              row[key] = row[key].replace(/''/gm, `'`).replace(/'/gm, `''`).replace(/\\\\/gm, '\\')
+            }
+            updates.push(`${key} = ${(row[key] === null ? row[key] : `'${row[key]}'`)}`)
+          }      
+        }
+        sql += `
+          UPDATE ${entity}
+          SET ${updates.join(',')}
+          WHERE ${this.buildWhereWithId(entity, id)};
+        `
+      }
+      else {    
+        delete row[(this.options.entityConfig[entity] && this.options.entityConfig[entity].idColumn) || 'id']    
+        sql += `
+          INSERT INTO ${entity} (${Object.keys(row).join(',')})
+          VALUES (${Object.values(row).map(d => (d === null ? `${d}` : `'${d}'`)).join(',')})
+          RETURNING ${(this.options.entityConfig[entity] && this.options.entityConfig[entity].idColumn) || 'id'};
+        `
+      }
+    })
+    return sql
+  }
   buildWhere (input, entity) {   
     if (typeof input === 'undefined') {
       return '1=1'
@@ -218,8 +289,8 @@ class PGHelper {
       catch (error) {
         // console.log(error)
       }
-      console.log('where input', input)
-      console.log('splitter is', this.options.fieldValueSeparator)
+      // console.log('where input', input)
+      // console.log('splitter is', this.options.fieldValueSeparator)
       let list = input.split(';').map(d => {
         let parts = d.split(this.options.fieldValueSeparator)
         if (parts.length === 2) {

package/dist/server/routes/v1/api.js

@@ -43,29 +43,45 @@ function APIRoutes (dbHelper, authHelper) {
       }      
     }, err => res.json(err))
   })
+  router.post('/:entity/upsert', authHelper.checkPermissions, (req, res) => {
+    let user
+    if (req.session && req.session.user) {
+      user = req.session.user
+    }
+    const sql = dbHelper.buildUpsert(req.params.entity, req.body, user)
+    console.log('upsert sql', sql)
+    dbHelper.execute(sql).then(response => res.json(response), err => res.json(err))
+  })
   router.post('/:entity', authHelper.checkPermissions, (req, res) => {
     // const sql = dbHelper.buildInsert(req.params.entity, req.body, req.session.passport.user.id)
-    console.log(req.body)
-    console.log(req.session)
+    // console.log(req.body)
+    // console.log(req.session)
     let user
     if (req.session && req.session.user) {
       user = req.session.user
     }
     const sql = dbHelper.buildInsert(req.params.entity, req.body, user)
-    console.log(sql)
+    // console.log(sql)
     dbHelper.execute(sql).then(response => res.json(response), err => {
       res.statusCode = 404
       res.json({err})
     })
-  })
-  console.log('defining put endpoint for /:entity/:id')
-  router.put('/:entity/:id', (req, res) => {
-    console.log('executing put')
-    const sql = dbHelper.buildUpdateWithId(req.params.entity, req.params.id, req.body)
+  })  
+  // console.log('defining put endpoint for /:entity/:id')
+  router.put('/:entity/:id', authHelper.checkPermissions, (req, res) => {
+    let user
+    if (req.session && req.session.user) {
+      user = req.session.user
+    }
+    const sql = dbHelper.buildUpdateWithId(req.params.entity, req.params.id, req.body, user)
     dbHelper.execute(sql).then(response => res.json(response), err => res.json(err))
   })
-  router.put('/:entity', (req, res) => {
-    const sql = dbHelper.buildUpdate(req.params.entity, req.query.where, req.body)
+  router.put('/:entity', authHelper.checkPermissions, (req, res) => {
+    let user
+    if (req.session && req.session.user) {
+      user = req.session.user
+    }
+    const sql = dbHelper.buildUpdate(req.params.entity, req.query.where, req.body, user)
     dbHelper.execute(sql).then(response => res.json(response), err => res.json(err))
   })
   return router