0.6.11 release (#248)

* initial commit

* update deps

* update deps add postgres docker compose

* update docs

* update deps

* update deps

* update deps

* update deps

* updzte deps

* update deps

* update deps

* update deps

* update deps and docs

* update markdowns

* update deps

* update deps

* update deps

* update deps

* updated deps

* config refactor

* update deps

* update deps

* update deps

* remove nestjs and reactjs

* fix bugs

* fix bugs

* update deps

* update libs

* update deps

* update deps

* fix jest tests

* update test fixes

* update knex version

* update jest

* update deps

* update deps

* update deps

* update deps

* update deps

* replace cypress with playwright

* update readme

* 0.6.11 release

* 0.6.11 release update

Author: ais-one

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @ais-one

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,53 @@
+<!--
+ATTENTION! WE WILL HAVE TO CLOSE THIS ISSUE if you don't provide the needed information.
+Please read https://github.com/ais-one/cookbook/blob/master/.github/CONTRIBUTING.md before opening an issue.
+-->
+
+## Description
+
+**Environment:**
+<!-- Describe your environment in detail. e.g. OS, application (e.g. chrome) type and version, library versions -->
+
+**Current behavior:**
+<!-- Describe how the bug manifests. -->
+
+**Expected behavior:**
+<!-- Describe what the behavior would be without the bug. -->
+
+**Steps to reproduce:**
+<!--  Please explain the steps required to duplicate the issue, especially if you are able to provide a sample application -->
+
+**Related code:**
+<!-- 
+If you are able to illustrate the bug or feature request with an example, please provide a sample application via one of the following means:
+
+A sample application via GitHub
+
+StackBlitz (https://stackblitz.com)
+
+Plunker (http://plnkr.co/edit/cpeRJs?p=preview)
+
+Codesandbox (https://codesandbox.io/)
+-->
+
+```
+insert short code snippets here
+```
+
+## Other information
+
+**npm, node, OS, Browser**
+```
+<!--
+Node, npm: `node --version` and `npm --version`
+OS: Windows (7/8/10). Linux (incl. distribution). macOS (El Capitan? Sierra?)
+Browser: Chrome/Safari/Firefox/etc?
+-->
+```
+
+**Angular, Nebular**
+```
+<!--
+Check your `package-lock.json` or locate a `package.json` in the `node_modules` folder.
+-->
+```

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,19 @@
+---
+name: Feature Request
+about: Suggest new idea
+labels: feature
+---
+
+## Summary
+
+Brief explanation of the feature
+
+### Basic example
+
+Include specs, document, code examples, screenshots, etc.
+
+### Motivation
+
+- Why is this needed?
+- What use cases does it support?
+- What is the expected outcome?

.github/ISSUE_TEMPLATE.md .github/NOTUSED-ISSUE_TEMPLATE.md.github/ISSUE_TEMPLATE.md renamed to .github/NOTUSED-ISSUE_TEMPLATE.md

@@ -1,6 +1,6 @@
 {
   "name": "@es-labs/esm",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "author": "Aaron Gong",
   "license": "MIT",
   "repository": {

@es-labs/esm/package.json

@@ -6,31 +6,35 @@ const jwt = require('jsonwebtoken')
 
 //NOSONAR const uuid = require('uuid/v4')
 //NOSONAR const qrcode = require('qrcode')
-let COOKIE_HTTPONLY, COOKIE_SAMESITE, COOKIE_SECURE, COOKIE_MAXAGE, COOKIE_DOMAIN,
-  USE_OTP, OTP_EXPIRY, CORS_OPTIONS,
-  AUTH_REFRESH_URL, AUTH_USER_FIELD_LOGIN, AUTH_USER_FIELD_PASSWORD, AUTH_USER_FIELD_GAKEY, AUTH_USER_FIELD_ID_FOR_JWT, AUTH_USER_FIELDS_JWT_PAYLOAD,
-  JWT_ALG, JWT_SECRET, JWT_REFRESH_SECRET, JWT_EXPIRY, JWT_REFRESH_EXPIRY, JWT_CERTS, JWT_REFRESH_CERTS,
-  JWT_REFRESH_STORE, AUTH_USER_STORE, AUTH_USER_STORE_NAME, JWT_REFRESH_STORE_NAME,
-  setRefreshToken, getRefreshToken, revokeRefreshToken, setRefreshTokenStoreName, setTokenService, setUserService,
+
+//TOREMOVE let COOKIE_HTTPONLY, COOKIE_SAMESITE, COOKIE_SECURE, COOKIE_MAXAGE, COOKIE_DOMAIN,
+//   AUTH_REFRESH_URL, AUTH_USER_FIELD_LOGIN, AUTH_USER_FIELD_PASSWORD, AUTH_USER_FIELD_GAKEY, AUTH_USER_FIELD_ID_FOR_JWT, AUTH_USER_FIELDS_JWT_PAYLOAD,
+//   JWT_REFRESH_STORE, AUTH_USER_STORE, AUTH_USER_STORE_NAME, JWT_REFRESH_STORE_NAME,
+
+let setRefreshToken, getRefreshToken, revokeRefreshToken, setRefreshTokenStoreName, setTokenService, setUserService,
   findUser, updateUser,
   setAuthUserStoreName
 
+const {
+  COOKIE_HTTPONLY, COOKIE_SAMESITE, COOKIE_SECURE, COOKIE_MAXAGE, COOKIE_DOMAIN,
+  AUTH_REFRESH_URL, AUTH_USER_FIELD_LOGIN, AUTH_USER_FIELD_PASSWORD, AUTH_USER_FIELD_GAKEY, AUTH_USER_FIELD_ID_FOR_JWT, AUTH_USER_FIELDS_JWT_PAYLOAD = '',
+  JWT_REFRESH_STORE='keyv',
+  AUTH_USER_STORE,
+  AUTH_USER_STORE_NAME,
+  JWT_REFRESH_STORE_NAME,
+
+  USE_OTP,
+  JWT_ALG, JWT_EXPIRY, JWT_REFRESH_EXPIRY,
+  JWT_PRIVATE_KEY, JWT_CERTIFICATE, JWT_REFRESH_PRIVATE_KEY, JWT_REFRESH_CERTIFICATE, JWT_SECRET, JWT_REFRESH_SECRET
+} = process.env
+
 const userOps = {
   findUser: null,
   updateUser: null
 }
 
-const setupAuth = (tokenService, userService, options = global.CONFIG) => {
-  ({
-    COOKIE_HTTPONLY, COOKIE_SAMESITE, COOKIE_SECURE, COOKIE_MAXAGE, COOKIE_DOMAIN,
-    USE_OTP, OTP_EXPIRY, CORS_OPTIONS,
-    AUTH_REFRESH_URL, AUTH_USER_FIELD_LOGIN, AUTH_USER_FIELD_PASSWORD, AUTH_USER_FIELD_GAKEY, AUTH_USER_FIELD_ID_FOR_JWT, AUTH_USER_FIELDS_JWT_PAYLOAD = '',
-    JWT_ALG, JWT_SECRET, JWT_REFRESH_SECRET, JWT_EXPIRY, JWT_REFRESH_EXPIRY, JWT_CERTS, JWT_REFRESH_CERTS,
-
-    JWT_REFRESH_STORE ='keyv', AUTH_USER_STORE,
-    AUTH_USER_STORE_NAME, JWT_REFRESH_STORE_NAME
-  } = options || {});
-
+const setupAuth = (tokenService, userService) => {
+  //NOSONAR ({ } = process.env);
   ({ setRefreshToken, getRefreshToken, revokeRefreshToken, setRefreshTokenStoreName, setTokenService } = require('./' + JWT_REFRESH_STORE)); // keyv, redis, mongo, knex
   ({ findUser, updateUser, setAuthUserStoreName, setUserService } = require('./' + AUTH_USER_STORE)); // mongo, knex
   userOps.findUser = findUser
@@ -62,9 +66,9 @@ const httpOnlyCookie = () => `HttpOnly;SameSite=${COOKIE_SAMESITE};`
 const getSecret = (mode, type) => {
   if (JWT_ALG.substring(0,2) === 'RS') {
     if (mode === 'sign') {
-      return type === 'refresh' ? JWT_REFRESH_CERTS.key : JWT_CERTS.key
+      return type === 'refresh' ? JWT_REFRESH_PRIVATE_KEY : JWT_PRIVATE_KEY
     } else {
-      return type === 'refresh' ? JWT_REFRESH_CERTS.cert : JWT_CERTS.cert
+      return type === 'refresh' ? JWT_REFRESH_CERTIFICATE : JWT_CERTIFICATE
     }
   }
   return type === 'refresh' ? JWT_REFRESH_SECRET : JWT_SECRET
@@ -100,13 +104,12 @@ const createToken = async (user) => { // Create a tokens & data from user
 
   options.expiresIn = JWT_REFRESH_EXPIRY
   const refresh_token = jwt.sign({ id }, getSecret('sign', 'refresh'), options) // store only ID in refresh token?
-
   await setRefreshToken(id, refresh_token) // store in DB or Cache
   return {
     access_token,
     refresh_token,
     user_meta
-  }  
+  }
 }
 
 const setTokensToHeader = (res, {access_token, refresh_token}) => {

@es-labs/node/auth/index.js

@@ -1,19 +1,12 @@
 'use strict'
 
 const axios = require('axios')
-let key
-let sender
+const { SENDGRID_KEY, SENDGRID_SENDER } = process.env
 
-function setupSendGrid(options = global.CONFIG) {
-  const { SENDGRID_KEY, SENDGRID_SENDER } = options || {}
-  key = SENDGRID_KEY
-  sender = SENDGRID_SENDER
-}
-
-async function sendSendGrid(to, from, subject, text, html) {
+exports.send = async (to, from, subject, text, html) => {
   try {
-    if (!key) return
-    if (!from) from = sender
+    if (!SENDGRID_KEY) return
+    if (!from) from = SENDGRID_SENDER
     const body = {
       personalizations: [
         { to: [{ email: to }] }
@@ -22,16 +15,11 @@ async function sendSendGrid(to, from, subject, text, html) {
       subject,
       content: [{"type": "text/plain", "value": text}]
     }
-    await axios.post('https://api.sendgrid.com/v3/mail/send', body, { headers: { Authorization: 'Bearer ' + key } })
+    await axios.post('https://api.sendgrid.com/v3/mail/send', body, { headers: { Authorization: 'Bearer ' + SENDGRID_KEY } })
     console.log('sendMail ok', to, from, subject, text)
   } catch (e) {
-    console.log('sendMail err', e.toString(), key)
+    console.log('sendMail err', e.toString(), SENDGRID_KEY)
   }
 }
 
-// sendSendGrid('aaronjxz@gmail.com', 'eslabs.com@gmail.com', 'Subj', 'Test Message').then(a => console.log('ok', a)).catch(e => console.log('fail', e))
-
-module.exports = {
-  setupSendGrid,
-  sendSendGrid
-}
+// send('aaronjxz@gmail.com', 'eslabs.com@gmail.com', 'Subj', 'Test Message').then(a => console.log('ok', a)).catch(e => console.log('fail', e))

@es-labs/node/comms/email.js

@@ -1,12 +1,6 @@
 'use strict'
 
 const axios = require('axios')
-let key
-
-exports.setup = (options = global.CONFIG) => {
-  const { FCM_SERVER_KEY } = options || {}
-  key = FCM_SERVER_KEY
-}
 
 exports.send = async (to, title, body) => { // send firebase push notification
   // console.log('FCM TEST @es-labs/node/fcm.js', to, body, title, key)
@@ -22,7 +16,7 @@ exports.send = async (to, title, body) => { // send firebase push notification
       }
     },{
       headers: {
-        Authorization: 'key=' + key,
+        Authorization: 'key=' + process.env.FCM_SERVER_KEY,
         'Content-Type': 'application/json'
       }
     })

@es-labs/node/comms/fcm.js

@@ -1,57 +1,46 @@
 'use strict'
 
 const axios = require('axios')
-let key
-let api_secret
-let sender
 
 //NOSONAR
 // nexmo.isms('6596935500', 'Blah ' + new Date())
 // nexmo.ismsSend('6596935500', 'Blah ' + new Date())
+const { NEXMO_KEY, NEXMO_SECRET, NEXMO_SENDER = 'SMSnotice' } = process.env
 
-const nexmo = {
-  setup: function(options=global.CONFIG) {
-    const { NEXMO_KEY, NEXMO_SECRET, NEXMO_SENDER = 'SMSnotice' } = options || {}
-    key = NEXMO_KEY
-    api_secret = NEXMO_SECRET
-    sender = NEXMO_SENDER
-  },
-  // sms = 6511112222
-  // one at a time...
-  send: async function (sms, message, from) {
-    try {
-      if (!from) from = sender
-      if (sms && message) {
-        return await axios.get(`https://rest.nexmo.com/sms/json?api_key=${key}&api_secret=${api_secret}&to=${sms}&from=${from}&text=${message}`)
-      }
-    } catch (e) {
-      console.log('send', e.toString())      
+// sms = 6511112222
+// one at a time...
+exports.send = async (sms, message, from) => {
+  try {
+    if (!from) from = NEXMO_SENDER
+    if (sms && message) {
+      return await axios.get(`https://rest.nexmo.com/sms/json?api_key=${NEXMO_KEY}&api_secret=${NEXMO_SECRET}&to=${sms}&from=${from}&text=${message}`)
     }
-    return null
-  },
-  // sms = 6511112222
-  // one at a time...
-  ismsSend: async function (sms, message, from) {
-    const url = 'https://sms.era.sg/isms_mt.php?'
-    try {
-      if (sms && message) {
-        const options = { 
-          params: {
-            uid: key,
-            pwd: require('crypto').createHash('md5').update( api_secret ).digest('hex'),
-            dnr: sms,
-            snr: from || sender,
-            msg: message,
-            split: 5
-          }
+  } catch (e) {
+    console.log('send', e.toString())      
+  }
+  return null
+}
+
+// sms = 6511112222
+// one at a time...
+exports.ismsSend = async (sms, message, from) => {
+  const url = 'https://sms.era.sg/isms_mt.php?'
+  try {
+    if (sms && message) {
+      const options = { 
+        params: {
+          uid: NEXMO_KEY,
+          pwd: require('crypto').createHash('md5').update( NEXMO_SECRET ).digest('hex'),
+          dnr: sms,
+          snr: from || NEXMO_SENDER,
+          msg: message,
+          split: 5
         }
-        return await axios.get(url, options)
       }
-    } catch (e) {
-      console.log('ismsSend', e.toString())      
+      return await axios.get(url, options)
     }
-    return null
+  } catch (e) {
+    console.log('ismsSend', e.toString())      
   }
+  return null
 }
-
-module.exports = nexmo

@es-labs/node/comms/nexmo.js

@@ -1,19 +1,11 @@
 'use strict'
 
 const axios = require('axios')
-let apiKey
-let channelId
-
-function setup(options = global.CONFIG) {
-  const { TELEGRAM_API_KEY, TELEGRAM_CHANNEL_ID } = options || {}
-  // console.log('TELEGRAM_API_KEY, TELEGRAM_CHANNEL_ID', TELEGRAM_API_KEY, TELEGRAM_CHANNEL_ID)
-  apiKey = TELEGRAM_API_KEY
-  channelId = TELEGRAM_CHANNEL_ID
-}
+const { TELEGRAM_API_KEY, TELEGRAM_CHANNEL_ID } = process.env
 
 async function sendChannelMsg(text) {
   try {
-    return await axios.get('https://api.telegram.org/bot' + apiKey + '/sendMessage?chat_id=' + channelId + '&text=' + text) //NOSONAR { id, date, pts, seq }
+    return await axios.get('https://api.telegram.org/bot' + TELEGRAM_API_KEY + '/sendMessage?chat_id=' + TELEGRAM_CHANNEL_ID + '&text=' + text) //NOSONAR { id, date, pts, seq }
   } catch (e) {
     return { err: e.toString() }
   }
@@ -22,7 +14,7 @@ async function sendChannelMsg(text) {
 async function sendChatMsg(chatId, text) {
   try {
     // console.log('chatId, text', chatId, text)
-    return await axios.get('https://api.telegram.org/bot' + apiKey + '/sendMessage?chat_id=' + chatId + '&text=' + text) //NOSONAR { id, date, pts, seq }
+    return await axios.get('https://api.telegram.org/bot' + TELEGRAM_API_KEY + '/sendMessage?chat_id=' + chatId + '&text=' + text) //NOSONAR { id, date, pts, seq }
   } catch (e) {
     return { err: e.toString() }
   }