session-sync-auth-site 0.5.10 → 3.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "session-sync-auth-site",
-  "version": "0.5.10",
+  "version": "3.0.0",
   "main": "src/index.js",
   "repository": {
     "type": "git",
@@ -47,6 +47,6 @@
   "dependencies": {
     "connection-string": "^4.3.2",
     "jsonwebtoken": "^8.5.1",
-    "mysql": "^2.18.1"
+    "mysql2": "^3.16.0"
   }
 }

package/src/authenticate.js

@@ -54,7 +54,7 @@ const authenticate = ({
     const sessionTableUserId = (sessionTableColNameMap.user_id || 'user_id').replace(/`/g, '')
     const sessionTableAccessToken = (sessionTableColNameMap.access_token || 'access_token').replace(/`/g, '')
 
-    req.user = (await global.sessionSyncAuthSiteConnection.asyncQuery(
+    req.user = (await global.sessionSyncAuthSiteConnection.query(
       `
 
         SELECT
@@ -81,8 +81,10 @@ const authenticate = ({
 
       `,
       {
-        ...extraUserTableSelectValues,
-        accessToken,
+        replacements: {
+          ...extraUserTableSelectValues,
+          accessToken,
+        },
       },
     ))[0]
 

package/src/createDBTables.js

@@ -24,7 +24,7 @@ const setUpConnection = require('./setUpConnection')
 
     setUpConnection({ connectionStr })
 
-    await global.sessionSyncAuthSiteConnection.asyncQuery(
+    await global.sessionSyncAuthSiteConnection.query(
       `
 
         CREATE TABLE \`${userTableName}\` (
@@ -49,7 +49,6 @@ const setUpConnection = require('./setUpConnection')
         ) CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
       `,
-      {},
     )
 
     console.log(``)

package/src/setUpConnection.js

@@ -1,34 +1,17 @@
-const mysql = require('mysql')
-const SqlString = require('mysql/lib/protocol/SqlString')
+const mysql = require('mysql2/promise')
 const { ConnectionString } = require('connection-string')
-const util = require('util')
 
-const setUpConnection = ({
+const setUpConnection = async ({
   connectionStr=`mysql://root@localhost/SessionSyncAuthSite`,
   connectionObj,
 }={}) => {
 
   connectionObj = connectionObj || new ConnectionString(connectionStr)
 
-  global.sessionSyncAuthSiteConnection = mysql.createConnection({
+  global.sessionSyncAuthSiteConnection = await mysql.createConnection({
     multipleStatements: true,
     dateStrings: true,
     charset : 'utf8mb4',
-    queryFormat: function (query, values) {
-      if(!values) return query
-
-      if(/\:(\w+)/.test(query)) {
-        return query.replace(/\:(\w+)/g, (txt, key) => {
-          if(values.hasOwnProperty(key)) {
-            return this.escape(values[key])
-          }
-          return txt
-        })
-
-      } else {
-        return SqlString.format(query, values, this.config.stringifyObjects, this.config.timezone)
-      }
-    },
     // debug: true,
     host: connectionObj.host || connectionObj.hosts[0].name,
     user: connectionObj.user || connectionObj.username,
@@ -37,8 +20,6 @@ const setUpConnection = ({
     port: connectionObj.port,
   })
 
-  global.sessionSyncAuthSiteConnection.asyncQuery = util.promisify(global.sessionSyncAuthSiteConnection.query).bind(global.sessionSyncAuthSiteConnection)
-
 }
 
 module.exports = setUpConnection

package/src/setUpSessionSyncAuthRoutes.js

@@ -229,9 +229,11 @@ const setUpSessionSyncAuthRoutes = ({
 
         })
 
-        await global.sessionSyncAuthSiteConnection.asyncQuery(
+        await global.sessionSyncAuthSiteConnection.query(
           queries.join(';'),
-          variables,
+          {
+            replacements: variables,
+          },
         )
 
       }
@@ -244,14 +246,16 @@ const setUpSessionSyncAuthRoutes = ({
           if(!id) throw "Invalid payload. Item in `payload.usersToDelete` missing `id` key."
           if(!email) throw "Invalid payload. Item in `payload.usersToDelete` missing `email` key."
 
-          const [ userRow ] = await global.sessionSyncAuthSiteConnection.asyncQuery(
+          const [ userRow ] = await global.sessionSyncAuthSiteConnection.query(
             `
               SELECT \`${(userTableColNameMap.email || `email`).replace(/`/g, '')}\` AS email
               FROM \`${userTableName}\`
               WHERE \`${(userTableColNameMap.id || `id`).replace(/`/g, '')}\` = :userId
             `,
             {
-              userId: id,
+              replacements: {
+                userId: id,
+              },
             },
           )
 
@@ -269,7 +273,7 @@ const setUpSessionSyncAuthRoutes = ({
           if(deleteUser) {
             await deleteUser({ id, isAfterAMerge: !!mergeToUserId, req })
           } else {
-            await global.sessionSyncAuthSiteConnection.asyncQuery(
+            await global.sessionSyncAuthSiteConnection.query(
               `
                 DELETE FROM \`${sessionTableName}\`
                 WHERE \`${(sessionTableColNameMap.user_id || `user_id`).replace(/`/g, '')}\` = :userId
@@ -279,7 +283,9 @@ const setUpSessionSyncAuthRoutes = ({
                 WHERE \`${(userTableColNameMap.id || `id`).replace(/`/g, '')}\` = :userId
               `,
               {
-                userId: id,
+                replacements: {
+                  userId: id,
+                },
               },
             )
           }