@websy/websy-designs 0.0.129 → 1.0.2

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

@@ -39,7 +39,19 @@ const sql = {
       createdate timestamp without time zone DEFAULT now(),
       editdate timestamp without time zone DEFAULT now()
     );
-  `  
+  `,
+  sessions: `
+    CREATE TABLE "sessions" (
+      "sid" varchar NOT NULL COLLATE "default",
+      "sess" json NOT NULL,
+      "expire" timestamp(6) NOT NULL
+    )
+    WITH (OIDS=FALSE);
+    
+    ALTER TABLE "sessions" ADD CONSTRAINT "sessions_pkey" PRIMARY KEY ("sid") NOT DEFERRABLE INITIALLY IMMEDIATE;
+    
+    CREATE INDEX "IDX_sessions_expire" ON "sessions" ("expire");
+  `
 }
 
 class PGHelper {
@@ -203,7 +215,9 @@ class PGHelper {
   }
   checkTables () {
     this.createContentTable().then(() => {
-      this.createTranslationTable()
+      this.createTranslationTable().then(() => {
+        this.createSessionTable()
+      })
     })
   }
   createContentTable () {
@@ -223,6 +237,28 @@ class PGHelper {
       })
     })
   }
+  createSessionTable () {
+    return new Promise((resolve, reject) => {
+      if (process.env.SESSION_TABLE) {
+        resolve()
+      }
+      else {
+        this.execute(`
+          SELECT COUNT(*) AS tableexists FROM information_schema.tables 
+          WHERE  table_name   = 'sessions'
+        `).then(result => {
+          if (result.rows && result.rows[0] && +result.rows[0].tableexists === 0) {
+            this.execute(sql.sessions).then(() => {
+              resolve()
+            })
+          }
+          else {
+            resolve()
+          }
+        })
+      }
+    })
+  }
   createTranslationTable () {
     return new Promise((resolve, reject) => {
       this.execute(`
@@ -239,7 +275,7 @@ class PGHelper {
         }
       })
     })
-  }
+  }  
   execute (query) {
     console.log(query)    
     return new Promise((resolve, reject) => {

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

@@ -14,7 +14,7 @@ function APIRoutes (dbHelper) {
     dbHelper.execute(sql).then(response => res.json(response), err => res.json(err))
   })
   router.get('/:entity/:id', (req, res) => {
-    let lang = null
+    let lang = process.env.DEFAULT_LANGUAGE
     if (req.session && req.session.language && req.query.notranslate !== 'true') {
       lang = req.session.language
     }
@@ -24,10 +24,11 @@ function APIRoutes (dbHelper) {
     }, err => res.json(err))
   })
   router.get('/:entity', (req, res) => {
-    let lang = null
+    let lang = process.env.DEFAULT_LANGUAGE
     if (req.session && req.session.language && req.query.notranslate !== 'true') {
       lang = req.session.language
     }
+    console.log(`lang is ${lang}`)
     const sql = dbHelper.buildSelect(req.params.entity, req.query, req.query.columns, lang)
     dbHelper.execute(sql).then(response => {
       res.json(translate(response))

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

@@ -172,7 +172,17 @@ function ShopRoutes (dbHelper, engine, app) {
         dbHelper.execute(sql).then(result => {
           if (result.rows.length > 0) {
             let basket = result.rows[0] 
-            basket.items = JSON.parse(basket.items)            
+            try {
+              basket.items = JSON.parse(JSONSafeRead(basket.items))            
+            }
+            catch (error) {
+              if (basket.items) {
+                basket.items = JSON.parse(basket.items) 
+              }              
+              else {
+                basket.items = []
+              }
+            }
             try {
               basket.meta = JSON.parse(JSONSafeRead(basket.meta))
             }
@@ -230,10 +240,10 @@ function ShopRoutes (dbHelper, engine, app) {
   }
 
   function JSONSafeWrite (v) {    
-    return v.replace(/'/g, '\'\'').replace(/\\(?=[bfnrtv0'"])/g, '\\\\').replace(/\t/)
+    return v.replace(/'/g, '\'\'').replace(/\\(?=[bfnrtv0'"])/g, '\\\\').replace(/\t/g, '')
   }
   function JSONSafeRead (v) {    
-    return v.replace(/''/g, '\'').replace(/\\(?=[^bfnrtv0'"])/g, '\\\\')
+    return v.replace(/''/g, '\'').replace(/\\(?=[^bfnrtv0'"])/g, '\\\\').replace(/\t/g, '')
   }
 
   function readyCallback () {

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

@@ -96,7 +96,7 @@ module.exports = function (options) {
             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
+              tableName: process.env.SESSION_TABLE || 'sessions' // Use another table-name than the default "session" one
             })            
           }          
         }
@@ -107,7 +107,21 @@ module.exports = function (options) {
           cookie: cookieConfig,
           name: process.env.COOKIE_NAME,
           store: store
-        })))                                 
+        })))    
+        if (process.env.TRANSLATE === true || process.env.TRANSLATE === 'true') {      
+          app.use((req, res, next) => {            
+            console.log(req.session)
+            if (req.query.lang && req.session) {              
+              req.session.language = req.query.lang
+              req.session.save(() => {
+                next()
+              })
+            }
+            else {
+              next()
+            }
+          })
+        }                             
         if (options.uses && Array.isArray(options.uses)) {
           try {
             options.uses.forEach(u => app.use(u))