@websy/websy-designs 1.1.11 → 1.2.0

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

@@ -2,8 +2,13 @@ const bCrypt = require('bcrypt-nodejs')
 const md5 = require('md5')
 
 class AuthHelper {
-  constructor (dbHelper) {
+  constructor (dbHelper, options) {
     this.dbHelper = dbHelper    
+    const DEFAULTS = {
+      loginType: 'email'
+    }
+    this.options = Object.assign({}, DEFAULTS, options)
+    console.log(this.options)
   }
   login (req, res) {
     return new Promise((resolve, reject) => {
@@ -11,17 +16,19 @@ class AuthHelper {
         return (md5(md5(password) + user.salt)) === user.pepper
       }
       // check in mongo if a user with username exists or not
-      const email = req.body.email.toLowerCase()
+      console.log(req.body)
+      const email = req.body[this.options.loginType].toLowerCase()
       const userQuery = `
         SELECT *
         FROM users
-        WHERE email = '${email}'
-      `    
+        WHERE ${this.options.loginType} = '${email}'
+      `  
+      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')
-          reject(`User not found with email ${email}`)
+          reject(`User not found with ${this.options.loginType} ${email}`)
           return
         }
         const user = result.rows[0]
@@ -38,7 +45,13 @@ class AuthHelper {
           SET lastlogon = now()
           WHERE id = ${user.id}
         `
-        this.dbHelper.execute(userUpdateQuery).then(result => resolve(user), err => reject(err))
+        this.dbHelper.execute(userUpdateQuery).then(result => {
+          console.log('yes')          
+          resolve(user)
+        }, err => {
+          console.log('no')
+          reject(err)
+        })
         // LogonHistory.create({
         //   userid: user.userid
         // }, function(err, result) {
@@ -65,11 +78,11 @@ class AuthHelper {
           return v.toString(16)
         })
       }    
-      const email = req.body.email.toLowerCase()
+      const email = req.body[this.options.loginType].toLowerCase()
       const userQuery = `
         SELECT *
         FROM users
-        WHERE email = '${email}'
+        WHERE ${this.options.loginType} = '${email}'
       `    
       this.dbHelper.execute(userQuery).then(result => {
         if (result.rows.length > 0) {          
@@ -77,7 +90,7 @@ class AuthHelper {
         }
         else {          
           const newUser = {}            
-          newUser.email = email            
+          newUser[this.options.loginType] = email            
           if (req.body.optedin === 'on') {
             newUser.optedin = true
           }
@@ -107,18 +120,15 @@ class AuthHelper {
       }
     })    
   }
-  isLoggedIn (req, res, next) {
-    if (req.isAuthenticated) {
-      if (req.isAuthenticated()) {
-        next()
-      }
-      else {
-        res.redirect('/login')
-      } 
+  isLoggedIn (req, res, next) {    
+    if (req.session && req.session.user) {      
+      console.log('in condition D')
+      next()
     }
     else {
-      next()
-    }  
+      console.log('in condition E')
+      res.redirect('/login')
+    }      
   }
 }
 

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

@@ -47,10 +47,29 @@ const sql = {
       "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");
+
+    ALTER TABLE "session" ADD CONSTRAINT "session_pkey" PRIMARY KEY ("sid") NOT DEFERRABLE INITIALLY IMMEDIATE;
+
+    CREATE INDEX "IDX_session_expire" ON "session" ("expire");
+  `,
+  users: `
+    CREATE TABLE users (
+      id SERIAL PRIMARY KEY,
+      username character varying(128),
+      salt character varying(128) UNIQUE,
+      pepper character varying(128) UNIQUE,
+      created timestamp without time zone DEFAULT now(),
+      edited timestamp without time zone,
+      email character varying(256),      
+      role character varying(50) DEFAULT 'User'::character varying,
+      lastlogon timestamp without time zone,      
+      activated boolean DEFAULT false,
+      activationcode uuid,
+      activationexpiry bigint,      
+      optedin boolean DEFAULT false,      
+      language character varying(5) DEFAULT 'en'::character varying,      
+      referredby character varying(128)      
+    );
   `
 }
 
@@ -193,12 +212,20 @@ class PGHelper {
       }
       let list = input.split(';').map(d => {
         let parts = d.split(':')
-        if (parts[1].indexOf('%') !== -1) {
-          return `${entity ? entity + '.' : ''}${parts[0]} LIKE '${parts[1]}'`
-        }
+        if (parts.length === 2) {
+          if (parts[1].indexOf('%') !== -1) {
+            return `${entity ? entity + '.' : ''}${parts[0]} LIKE '${parts[1]}'`
+          }
+          else {
+            return `${entity ? entity + '.' : ''}${parts[0]} = '${parts[1]}'`
+          } 
+        }  
         else {
-          return `${entity ? entity + '.' : ''}${parts[0]} = '${parts[1]}'`
-        }        
+          parts = d.split('!')
+          if (parts.length === 2) {
+            return `${entity ? entity + '.' : ''}${parts[0]} <> '${parts[1]}'`
+          }
+        }              
       })
       return `
         ${list.join(' AND ')}
@@ -216,7 +243,9 @@ class PGHelper {
   checkTables () {
     this.createContentTable().then(() => {
       this.createTranslationTable().then(() => {
-        this.createSessionTable()
+        this.createSessionTable().then(() => {
+          this.createUserTable()
+        })
       })
     })
   }
@@ -276,8 +305,25 @@ class PGHelper {
       })
     })
   }  
+  createUserTable () {
+    return new Promise((resolve, reject) => {
+      this.execute(`
+        SELECT COUNT(*) AS tableexists FROM information_schema.tables 
+        WHERE  table_name   = 'users'
+      `).then(result => {
+        if (result.rows && result.rows[0] && +result.rows[0].tableexists === 0) {
+          this.execute(sql.users).then(() => {
+            resolve()
+          })
+        }
+        else {
+          resolve()
+        }
+      })
+    })
+  }
   execute (query) {
-    // console.log(query)    
+    console.log(query)    
     return new Promise((resolve, reject) => {
       if (query !== null) {
         this.client.query(query, (err, queryResponse) => {

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

@@ -2,14 +2,16 @@ const cookieParser = require('cookie-parser')
 const cookie = require('cookie')
 
 module.exports = {
-  createSession: function (dbHelper, sId, data) {
+  createSession: function (dbHelper, data) {
     return new Promise((resolve, reject) => {
+      const sId = createIdentity()
       const dataString = JSON.stringify(data)
+      const expire = new Date(new Date().getTime() + (24 * 60 * 60 * 1000)).toISOString()
       const sql = `
-        INSERT INTO sessions (sId, session)
-        VALUES ('${sId}', '${dataString}')
+        INSERT INTO sessions (sId, sess, expire)
+        VALUES ('${sId}', '${dataString}', '${expire}')
       `
-      dbHelper.execute(sql).then(result => resolve(), err => reject(err))
+      dbHelper.execute(sql).then(result => resolve({sessionId: sId}), err => reject(err))
     })
   },
   saveSession: function (dbHelper, sId, data) {
@@ -17,7 +19,7 @@ module.exports = {
       const dataString = JSON.stringify(data)
       const sql = `
         UPDATE sessions
-        SET session = '${dataString}'
+        SET sess = '${dataString}'
         WHERE sId = '${sId}'
       `
       dbHelper.execute(sql).then(result => resolve(), err => reject(err))

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

@@ -3,6 +3,7 @@ const router = express.Router()
 const expressSession = require('express-session')
 const DBSession = require('connect-pg-simple')(expressSession)
 const cookieParser = require('cookie-parser')
+const cookie = require('cookie')
 const sessionHelper = require('../../helpers/v1/sessionHelper')
 
 const sql = {
@@ -39,13 +40,13 @@ const sql = {
 }
 
 function AuthRoutes (dbHelper, engine, app, Strategy) {  
-  const AuthHelper = require('../../helpers/v1/authHelper')  
+  // const AuthHelper = require('../../helpers/v1/authHelper')  
   if (typeof Strategy !== 'undefined') {
     app.authHelper = new Strategy(dbHelper)
   }
-  else {
-    app.authHelper = new AuthHelper(dbHelper)
-  }
+  // else {
+  //   app.authHelper = new AuthHelper(dbHelper)
+  // }
   if (dbHelper && !dbHelper.client) {
     dbHelper.onReadyAuthCallbackFn = readyCallback
   }
@@ -54,11 +55,32 @@ function AuthRoutes (dbHelper, engine, app, Strategy) {
   }   
   router.post('/login', (req, res) => {
     app.authHelper.login(req, res).then(user => {
+      console.log('after login')
       if (!req.session) {
         req.session = {}
       }
-      req.session.user = user
-      res.json(req.session.user)
+      console.log(user)
+      req.session.user = user      
+      if (dbHelper) {
+        const sId = sessionHelper.getSessionId(req)
+        let method = 'saveSession'
+        let params = [dbHelper, sId, req.session]
+        if (!sId) {
+          method = 'createSession'
+          params = [dbHelper, req.session]
+        }
+        // sessionHelper[method](...params).then((response) => {
+        // res.setHeader('Set-Cookie', cookie.serialize(process.env.COOKIE_NAME, String(response.sessionId), {
+        //   httpOnly: true,
+        //   sameSite: 'none',
+        //   secure: true,
+        //   maxAge: (1000 * 60 * 60 * 24)
+        // }))                    
+        res.json(req.session.user)
+        // }, err => {
+        // res.json({err})
+        // }) 
+      }
     }, err => {
       console.log('in auth route', err)
       res.json({err})

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

@@ -10,12 +10,14 @@ router.post('/checkrecaptcha', function (req, res) {
   if (req.headers['x-appengine-user-ip']) {
     body.remoteip = req.headers['x-appengine-user-ip']
   }
-  request.post('https://www.google.com/recaptcha/api/siteverify', { form: body }, (err, response, body) => {
+  console.log('recaptcha body')
+  console.log(body)
+  request.post(`https://www.google.com/recaptcha/api/siteverify?secret=${process.env.RECAPTCHA_SECRET}&response=${req.body.grecaptcharesponse}`, body, (err, response, body) => {
     if (err) {
       res.json({ err: err })
     }
     else {
-      res.json(response.body)
+      res.json(JSON.parse(response.body))
     }
   })
 })

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

@@ -29,6 +29,7 @@ module.exports = function (options) {
     app.use(bodyParser.json({limit: '5mb'}))
     app.use(bodyParser.urlencoded({limit: '5mb', extended: true}))
     app.use(bodyParser.raw({limit: '5mb'}))
+    const AuthHelper = require(`./helpers/${version}/authHelper`)
     const allowCrossDomain = (req, res, next) => {
       // console.log(req.url);
       // const allowedOrigins = ['https://www.google.com', 'http://localhost:4000', 'https://localhost:4000', 'http://ec2-3-92-185-52.compute-1.amazonaws.com', 'https://ec2-3-92-185-52.compute-1.amazonaws.com']
@@ -38,7 +39,7 @@ module.exports = function (options) {
       }
       const origin = req.headers.origin
       // console.log(allowedOrigins.indexOf(origin))
-      if (allowedOrigins.indexOf(origin) !== -1) {        
+      if (allowedOrigins.indexOf(origin) !== -1 || allowedOrigins[0] === '*') {        
         res.header('Access-Control-Allow-Origin', origin)
       }
       res.header('Access-Control-Allow-Methods', 'GET,PUT,POST,DELETE,OPTIONS')
@@ -46,6 +47,7 @@ module.exports = function (options) {
       res.header('Access-Control-Allow-Headers', 'Access-Control-Allow-Origin, Access-Control-Allow-Credentials, Content-Type, Authorization, X-Requested-With, Set-Cookie')
       next()
     }    
+    // IMPLEMENT SESSION LOGIC HERE
     app.use(allowCrossDomain)
     app.get('/health', (req, res) => {
       res.json('OK')
@@ -59,11 +61,11 @@ module.exports = function (options) {
       }
       res.json(env)
     })    
-    if (options.useRecaptcha === true) {
+    if (options.useRecaptcha === true && process.env.RECAPTCHA_SECRET) {
       app.use('/google', require(`./routes/${version}/recaptcha`))
     }    
     app.use('/pdf', require(`./routes/${version}/pdf`))
-    if (options.useDB === true) {      
+    if (options.useDB === true) {            
       const dbHelper = require(`./helpers/${version}/${options.dbEngine}Helper`)
       dbHelper.init(options.dbOptions || {}).then(() => {                       
         app.set('trust proxy', 1)
@@ -72,7 +74,7 @@ module.exports = function (options) {
           maxAge: 7 * 24 * 60 * 60 * 1000,
           httpOnly: false,
           domain: process.env.COOKIE_DOMAIN || 'localhost',
-          // secure: process.env.COOKIE_SECURE || true,
+          secure: process.env.COOKIE_SECURE === 'true' || process.env.COOKIE_SECURE === true,
           sameSite: process.env.COOKIE_SAMESITE || 'none',
           credentials: 'include'
         }
@@ -122,7 +124,10 @@ module.exports = function (options) {
             console.log(error)
           }          
         }        
-        if (options.useAuth === true) {          
+        if (options.useAuth === true) {      
+          if (typeof app.authHelper === 'undefined') {
+            app.authHelper = new AuthHelper(dbHelper, options.authOptions || {})
+          }    
           app.use('/auth', require(`./routes/${version}/auth`)(dbHelper, options.dbEngine, app, options.strategy))
         }
         const protectedRoutes = function (req, res, next) {
@@ -131,19 +136,41 @@ module.exports = function (options) {
             secureRoutes = process.env.SECURE_ROUTES === 'true' || process.env.SECURE_ROUTES === true
           }
           if (app.authHelper && app.authHelper.isLoggedIn) {
-            if (typeof process.env.EXCLUDED_ROUTES === 'undefined') {              
-              app.authHelper.isLoggedIn(req, res, next)
+            if (typeof process.env.EXCLUDED_ROUTES === 'undefined') {    
+              if (secureRoutes === false) {
+                next()
+              }          
+              else {
+                app.authHelper.isLoggedIn(req, res, next)
+              }              
             } 
             else {
               let excludedRoutes = process.env.EXCLUDED_ROUTES.split(',')
-              secureRoutes === false && excludedRoutes.indexOf(req.path) !== -1 && app.authHelper.isLoggedIn(req, res, next)
-              secureRoutes === true && excludedRoutes.indexOf(req.path) === -1 && app.authHelper.isLoggedIn(req, res, next)
+              // console.log('secure routes', secureRoutes)
+              // console.log('excluded routes', excludedRoutes)
+              console.log('path', req.path)
+              // console.log('index of', excludedRoutes.indexOf(req.path))              
+              if (secureRoutes === false && excludedRoutes.indexOf(req.path) !== -1) {         
+                console.log('in condition A')       
+                app.authHelper.isLoggedIn(req, res, next)
+              }
+              else if (secureRoutes === true && excludedRoutes.indexOf(req.path) === -1) {
+                console.log('in condition B')
+                app.authHelper.isLoggedIn(req, res, next)
+              }
+              else {
+                console.log('in condition C')
+                next()
+              }
+              // secureRoutes === false && excludedRoutes.indexOf(req.path) !== -1 && app.authHelper.isLoggedIn(req, res, next)
+              // secureRoutes === true && excludedRoutes.indexOf(req.path) === -1 && app.authHelper.isLoggedIn(req, res, next)
             }            
           }
           else {
             next()
           }         
         }
+        app.use(protectedRoutes)
         if (options.useAPI === true) {
           app.use('/api', protectedRoutes, require(`./routes/${version}/api`)(dbHelper)) 
         }