@websy/websy-designs 0.0.116 → 0.0.120

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

@@ -19,7 +19,11 @@ const sql = {
       id SERIAL PRIMARY KEY,
       text text,
       tags text,
-      label text
+      label text,
+      createuser text,
+      edituser text,
+      createdate timestamp without time zone DEFAULT now(),
+      editdate timestamp without time zone DEFAULT now()
     );
   `,
   translations: `
@@ -29,7 +33,11 @@ const sql = {
       entity_id integer NOT NULL,
       field_name text,
       language character varying(28),
-      text text
+      text text,
+      createuser text,
+      edituser text,
+      createdate timestamp without time zone DEFAULT now(),
+      editdate timestamp without time zone DEFAULT now()
     );
   `  
 }
@@ -93,15 +101,43 @@ class PGHelper {
       sql += `      
         LEFT JOIN (
           SELECT entity_id, json_object_agg(field_name, text) as translation
-          FROM translations
+          FROM translations as t
+          WHERE table_name = '${entity}' AND language = '${lang}'
+          GROUP BY entity_id
+        ) t2 
+        ON ${entity}.${(this.options.entityConfig[entity] && this.options.entityConfig[entity].idColumn) || 'id'} = t2.entity_id
+      `
+    }    
+    sql += `      
+      WHERE ${this.buildWhere(query.where, entity)}
+      ${this.buildOrderBy(query)}
+    `
+    if (query.limit) {
+      sql += ` LIMIT ${query.limit}`
+    }
+    if (query.offset) {
+      sql += ` OFFSET ${query.offset}`
+    }
+    return sql
+  }
+  buildSelectWithId (entity, id, query, columns, lang) {
+    let sql = `
+      SELECT ${columns || '*'}
+      FROM ${entity}
+    `
+    if ((process.env.TRANSLATE === true || process.env.TRANSLATE === 'true') && lang !== null) {
+      sql += `      
+        LEFT JOIN (
+          SELECT entity_id, json_object_agg(field_name, text) as translation
+          FROM translations as t
           WHERE table_name = '${entity}' AND language = '${lang}'
           GROUP BY entity_id
-        ) as translations 
-        ON ${entity}.${(this.options.entityConfig[entity] && this.options.entityConfig[entity].idColumn) || 'id'} = translations.entity_id
+        ) t2 
+        ON ${entity}.${(this.options.entityConfig[entity] && this.options.entityConfig[entity].idColumn) || 'id'} = t2.entity_id
       `
     }    
     sql += `      
-      WHERE ${this.buildWhere(query.where)}
+      WHERE ${this.buildWhereWithId(entity, id)}
       ${this.buildOrderBy(query)}
     `
     return sql
@@ -119,18 +155,37 @@ class PGHelper {
       WHERE ${this.buildWhere(where)}
     `
   }
-  buildWhere (input) {   
+  buildUpdateWithId (entity, id, data) {
+    let updates = []
+    for (let key in data) {
+      if (this.updateIgnores.indexOf(key) === -1) {
+        updates.push(`${key} = ${(data[key] === null ? data[key] : `'${data[key]}'`)}`)
+      }      
+    }
+    return `
+      UPDATE ${entity}
+      SET ${updates.join(',')}
+      WHERE ${this.buildWhereWithId(entity, id)}
+    `
+  }
+  buildWhere (input, entity) {   
     if (typeof input === 'undefined') {
       return '1=1'
     }
     else {
+      try {
+        input = decodeURI(input)
+      }
+      catch (error) {
+        // console.log(error)
+      }
       let list = input.split(';').map(d => {
         let parts = d.split(':')
         if (parts[1].indexOf('%') !== -1) {
-          return `${parts[0]} LIKE '${parts[1]}'`
+          return `${entity ? entity + '.' : ''}${parts[0]} LIKE '${parts[1]}'`
         }
         else {
-          return `${parts[0]} = '${parts[1]}'`
+          return `${entity ? entity + '.' : ''}${parts[0]} = '${parts[1]}'`
         }        
       })
       return `
@@ -138,6 +193,14 @@ class PGHelper {
       `
     }    
   }
+  buildWhereWithId (entity, id) {
+    if (typeof id === 'undefined') {
+      return '1=1'
+    }
+    else {
+      return `${(this.options.entityConfig[entity] && this.options.entityConfig[entity].idColumn) || 'id'} = ${id}`
+    }
+  }
   checkTables () {
     this.createContentTable().then(() => {
       this.createTranslationTable()
@@ -210,7 +273,7 @@ class PGHelper {
   rollback (err, callbackFn) {
     console.log('Rolling Back')
     console.log(err)
-    this.client.query('ROLLBACK', function (err) {
+    this.client.query('ROLLBACK', function (rollbackErr) {
       console.log(err)
       // done()
       callbackFn(err)

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

@@ -5,35 +5,32 @@ const router = express.Router()
 // const AuthHelper = require('../helpers/auth')
 
 function APIRoutes (dbHelper) {
+  router.delete('/:entity/:id', (req, res) => {
+    const sql = `DELETE FROM ${req.params.entity} WHERE ${dbHelper.buildWhereWithId(req.params.entity, req.params.id)}`
+    dbHelper.execute(sql).then(response => res.json(response), err => res.json(err))
+  })
   router.delete('/:entity', (req, res) => {
     const sql = dbHelper.buildDelete(req.params.entity, req.query.where)
     dbHelper.execute(sql).then(response => res.json(response), err => res.json(err))
   })
-  // router.get('/:entity', AuthHelper.checkPermissions, (req, res) => {
+  router.get('/:entity/:id', (req, res) => {
+    let lang = null
+    if (req.session && req.session.language && req.query.notranslate !== 'true') {
+      lang = req.session.language
+    }
+    const sql = dbHelper.buildSelectWithId(req.params.entity, req.params.id, req.query, req.query.columns, lang)
+    dbHelper.execute(sql).then(response => {      
+      res.json(translate(response))
+    }, err => res.json(err))
+  })
   router.get('/:entity', (req, res) => {
     let lang = null
-    if (req.session && req.session.language) {
+    if (req.session && req.session.language && req.query.notranslate !== 'true') {
       lang = req.session.language
     }
     const sql = dbHelper.buildSelect(req.params.entity, req.query, req.query.columns, lang)
     dbHelper.execute(sql).then(response => {
-      if (process.env.TRANSLATE && response.rows) {      
-        for (let r = 0; r < response.rows.length; r++) {
-          const row = response.rows[r]
-          for (let key in row) {          
-            try {
-              if (row.translation) {
-                row.translation = JSON.parse(row.translation)              
-                row[key] = row.translation[key] || row[key]
-              }            
-            } 
-            catch (error) {
-              row[key] = row.translation[key] || row[key]
-            }          
-          }
-        }
-      }
-      res.json(response)
+      res.json(translate(response))
     }, err => res.json(err))
   })
   router.post('/:entity', (req, res) => {
@@ -41,6 +38,13 @@ function APIRoutes (dbHelper) {
     console.log(req.body)
     const sql = dbHelper.buildInsert(req.params.entity, req.body)
     console.log(sql)
+    dbHelper.execute(sql).then(response => res.json(response), err => {
+      res.statusCode = 404
+      res.json({err})
+    })
+  })
+  router.put('/:entity/:id', (req, res) => {
+    const sql = dbHelper.buildUpdateWithId(req.params.entity, req.params.id, req.body)
     dbHelper.execute(sql).then(response => res.json(response), err => res.json(err))
   })
   router.put('/:entity', (req, res) => {
@@ -50,4 +54,24 @@ function APIRoutes (dbHelper) {
   return router
 }
 
+function translate (response) {
+  if (process.env.TRANSLATE && response.rows) {      
+    for (let r = 0; r < response.rows.length; r++) {
+      const row = response.rows[r]
+      for (let key in row) {          
+        try {
+          if (row.translation) {
+            row.translation = JSON.parse(row.translation)              
+            row[key] = row.translation[key] || row[key]
+          }            
+        } 
+        catch (error) {
+          row[key] = row.translation[key] || row[key]
+        }          
+      }
+    }
+  }
+  return response
+}
+
 module.exports = APIRoutes

package/dist/server/utils.js

@@ -7,5 +7,11 @@ module.exports = {
       text += possible.charAt(Math.floor(Math.random() * possible.length))
     }
     return text
+  },
+  getElementPos: el => {
+    const rect = el.getBoundingClientRect()
+    const scrollLeft = window.pageXOffset || document.documentElement.scrollLeft
+    const scrollTop = window.pageYOffset || document.documentElement.scrollTop
+    return { top: rect.top + scrollTop, left: rect.left + scrollLeft }
   }
 }

package/dist/server/websy-designs-server.js

@@ -8,6 +8,20 @@ const expressSession = require('express-session')
 
 module.exports = function (options) {
   return new Promise((resolve, reject) => {
+    const unless = function (middleware) {
+      let excludedPaths = ['health']
+      if (process.env.EXCLUDED_SESSION_PATHS) {
+        excludedPaths = excludedPaths.concat(process.env.EXCLUDED_SESSION_PATHS.split(','))
+      }
+      return function (req, res, next) {
+        if (excludedPaths.indexOf(req.path) !== -1) {
+          return next()
+        }
+        else {
+          return middleware(req, res, next)
+        }
+      }
+    }
     const app = express()
     app.set('trust proxy', 1)
     process.env.wdRoot = __dirname
@@ -33,6 +47,9 @@ module.exports = function (options) {
       next()
     }    
     app.use(allowCrossDomain)
+    app.get('/health', (req, res) => {
+      res.json('OK')
+    })
     app.get('/environment', (req, res) => {
       const env = {}
       for (let key in process.env) {
@@ -44,20 +61,17 @@ module.exports = function (options) {
     })    
     if (options.useRecaptcha === true) {
       app.use('/google', require(`./routes/${version}/recaptcha`))
-    }
-    console.log('setting pdf route')
+    }    
     app.use('/pdf', require(`./routes/${version}/pdf`))
     if (options.useDB === true) {      
       const dbHelper = require(`./helpers/${version}/${options.dbEngine}Helper`)
-      dbHelper.init(options.dbOptions).then(() => {        
-        console.log('initializing session')
-        console.log(dbHelper.pool)
+      dbHelper.init(options.dbOptions || {}).then(() => {        
+        console.log('initializing session')        
         // const store = new DBSession({
         //   pool: dbHelper.pool, // Connection pool, need to make dynamic to accommodate mySql
         //   tableName: 'sessions' // Use another table-name than the default "session" one
         // })
-        console.log('setting up session')
-        console.log(process.env)
+        console.log('setting up session')        
         app.set('trust proxy', 1)
         app.use(cookieParser(process.env.SESSION_SECRET))
         let cookieConfig = {
@@ -73,28 +87,27 @@ module.exports = function (options) {
         }
         if (process.env.COOKIE_SECURE === 'true' || process.env.COOKIE_SECURE === true) {
           cookieConfig.secure = true
+        }        
+        let DBSession = null
+        let store = null
+        if (options.useDBStore === true) {
+          console.log('using db store')
+          if (options.dbEngine === 'pg') {
+            DBSession = require('connect-pg-simple')(expressSession)
+            store = new DBSession({
+              pool: dbHelper.pool, // Connection pool, need to make dynamic to accommodate mySql
+              tableName: 'sessions' // Use another table-name than the default "session" one
+            })            
+          }          
         }
-        console.log(cookieConfig)
-        app.use(expressSession({
+        app.use(unless(expressSession({
           secret: process.env.SESSION_SECRET,
           resave: false,
           saveUninitialized: true,
           cookie: cookieConfig,
-          name: process.env.COOKIE_NAME
-          // store: store
-        }))         
-        // app.use(sessionHelper.checkSession(dbHelper))
-        // app.use(function (req, res, next) {
-        //   console.log('WD MIDDLEWARE')
-        //   console.log(req.session)
-        //   let cookies = {}
-        //   if (typeof req.headers.cookie === 'string') {
-        //     cookies = cookie.parse(req.headers.cookie)
-        //   }
-        //   console.log('cookies')
-        //   console.log(cookies)
-        //   next()
-        // })                 
+          name: process.env.COOKIE_NAME,
+          store: store
+        })))                                 
         if (options.uses && Array.isArray(options.uses)) {
           try {
             options.uses.forEach(u => app.use(u))