session-sync-auth-site 0.5.3 → 0.5.5

package/README.md

@@ -88,6 +88,12 @@ setUpSessionSyncAuthRoutes({
       // typically coincide with `extraUserTableSelectValues` above.
     }
   },
+  mergeUser: async ({ userId, mergeToUserId }) => {  // optional (when absent, merge requests will succeed even though no data is merged for this site)
+    // move all of userId's data to mergeToUserId
+  },
+  deleteUser: async ({ id, email }) => {  // optional (when absent, the appropriate rows from users and sessions are deleted)
+    // delete all of userId's data, including appropriate rows from users and sessions tables
+  },
   protocol: 'https',
   paths: {
     getUser: '/get-user',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "session-sync-auth-site",
-  "version": "0.5.3",
+  "version": "0.5.5",
   "main": "src/index.js",
   "repository": {
     "type": "git",

package/src/createUser.js

@@ -11,7 +11,7 @@ const createUser = async ({
     siteId,
     authDomain,
     jwtSecret,
-    protocol=req.sessionSyncAuthProtocol || `https`,
+    protocol=(setup || req).sessionSyncAuthProtocol || `https`,
   } = setup || await req.getSessionSyncAuthSetupInfo()
 
   const createUserResult = await fetch(

package/src/setUpSessionSyncAuthRoutes.js

@@ -8,6 +8,8 @@ const setUpSessionSyncAuthRoutes = ({
   authDomain,
   jwtSecret,
   getSetupInfo,  // for multi-tenancy setup; sent req and must return the siteId, authDomain, and jwtSecret
+  mergeUser,
+  deleteUser,
   protocol='https',
   paths: {
     getUser='/get-user',
@@ -105,13 +107,11 @@ const setUpSessionSyncAuthRoutes = ({
         sessionTableColNameMap,
       } = req.sessionSyncAuthSiteOptions
 
-      const { users } = jwt.verify(payload, jwtSecret)
+      const { users, usersToDelete } = jwt.verify(payload, jwtSecret)
 
-      if(!users) throw "Invalid payload. Missing `payload.user`."
-      if(!(users instanceof Array)) throw "Invalid payload. `payload.users` must be an array."
-
-      const queries = []
-      const variables = {}
+      if(!users && !usersToDelete) throw "Invalid payload. Missing `payload.user`."
+      if(users && !(users instanceof Array)) throw "Invalid payload. `payload.users` must be an array."
+      if(usersToDelete && !(usersToDelete instanceof Array)) throw "Invalid payload. `payload.usersToDelete` must be an array."
 
       const getSnakeCaseOfKeys = (obj, allowedKeys) => {
         const newObj = {}
@@ -143,91 +143,149 @@ const setUpSessionSyncAuthRoutes = ({
         })
       }
 
-      users.forEach(user => {
-        const { id, sessions, createdAt, updatedAt } = user
+      if(users) {
 
-        if(!id) throw "Invalid payload. Item in `payload.users` missing `id` key."
-        if(!sessions) throw "Invalid payload. Item in `payload.users` missing `sessions` key."
-        if(!(sessions instanceof Array)) throw "Invalid payload. `payload.users[].sessions` must be an array."
-        if(!createdAt) throw "Invalid payload. Item in `payload.users` missing `createdAt` key."
-        if(!updatedAt) throw "Invalid payload. Item in `payload.users` missing `updatedAt` key."
+        const queries = []
+        const variables = {}
 
-        convertMsTimestampsToDateTimeStrings(user)
+        users.forEach(user => {
+          const { id, sessions, createdAt, updatedAt } = user
 
-        // add/update the user
+          if(!id) throw "Invalid payload. Item in `payload.users` missing `id` key."
+          if(!sessions) throw "Invalid payload. Item in `payload.users` missing `sessions` key."
+          if(!(sessions instanceof Array)) throw "Invalid payload. `payload.users[].sessions` must be an array."
+          if(!createdAt) throw "Invalid payload. Item in `payload.users` missing `createdAt` key."
+          if(!updatedAt) throw "Invalid payload. Item in `payload.users` missing `updatedAt` key."
 
-        variables[`user__${id}`] = getSnakeCaseOfKeys(
-          user,
-          [ 'id', 'email', 'name', 'image', 'language', 'gender', 'created_at', 'updated_at' ],
-        )
+          convertMsTimestampsToDateTimeStrings(user)
 
-        if(languageColType !== 'IETF') {
-          variables[`user__${id}`].language = variables[`user__${id}`].language.split('-')[0]
-        }
+          // add/update the user
 
-        if(languageColType === '639-1') {
-          variables[`user__${id}`].language = iso6393To1[variables[`user__${id}`].language] || 'en'
-        }
+          variables[`user__${id}`] = getSnakeCaseOfKeys(
+            user,
+            [ 'id', 'email', 'name', 'image', 'language', 'gender', 'created_at', 'updated_at' ],
+          )
 
-        if(extraUserTableValues) {
-          variables[`user__${id}`] = {
-            ...extraUserTableValues,
-            ...variables[`user__${id}`],
+          if(languageColType !== 'IETF') {
+            variables[`user__${id}`].language = variables[`user__${id}`].language.split('-')[0]
           }
-        }
 
-        mapKeys(variables[`user__${id}`], 'user')
+          if(languageColType === '639-1') {
+            variables[`user__${id}`].language = iso6393To1[variables[`user__${id}`].language] || 'en'
+          }
 
-        queries.push(`
-          INSERT INTO \`${userTableName}\` SET :user__${id}
-          ON DUPLICATE KEY UPDATE :user__${id}
-        `)
+          if(extraUserTableValues) {
+            variables[`user__${id}`] = {
+              ...extraUserTableValues,
+              ...variables[`user__${id}`],
+            }
+          }
 
-        // add the sessions
+          mapKeys(variables[`user__${id}`], 'user')
 
-        sessions.forEach(session => {
-          const { accessToken, createdAt } = session
+          queries.push(`
+            INSERT INTO \`${userTableName}\` SET :user__${id}
+            ON DUPLICATE KEY UPDATE :user__${id}
+          `)
 
-          if(!accessToken) throw "Invalid payload. Item in `payload.users[].sessions` missing `accessToken` key."
-          if(!createdAt) throw "Invalid payload. Item in `payload.users[].sessions` missing `createdAt` key."
+          // add the sessions
 
-          convertMsTimestampsToDateTimeStrings(session)
+          sessions.forEach(session => {
+            const { accessToken, createdAt } = session
 
-          variables[`session__${accessToken}`] = {
-            ...getSnakeCaseOfKeys(
-              session,
-              [ 'created_at', 'access_token' ],
-            ),
-            user_id: id,
-          }
-          mapKeys(variables[`session__${accessToken}`], 'session')
+            if(!accessToken) throw "Invalid payload. Item in `payload.users[].sessions` missing `accessToken` key."
+            if(!createdAt) throw "Invalid payload. Item in `payload.users[].sessions` missing `createdAt` key."
+
+            convertMsTimestampsToDateTimeStrings(session)
+
+            variables[`session__${accessToken}`] = {
+              ...getSnakeCaseOfKeys(
+                session,
+                [ 'created_at', 'access_token' ],
+              ),
+              user_id: id,
+            }
+            mapKeys(variables[`session__${accessToken}`], 'session')
+
+            queries.push(`
+              INSERT IGNORE INTO \`${sessionTableName}\` SET :session__${accessToken}
+            `)
+
+          })
+
+          // delete old sessions
+
+          variables[`userId__${id}`] = id
+          variables[`accessTokens__${id}`] = [
+            'dummy_token',  // so the SQL is still valid even if there are no sessions
+            ...sessions.map(({ accessToken }) => accessToken),
+          ]
 
           queries.push(`
-            INSERT IGNORE INTO \`${sessionTableName}\` SET :session__${accessToken}
+            DELETE FROM \`${sessionTableName}\`
+            WHERE \`${(sessionTableColNameMap.user_id || `user_id`).replace(/`/g, '')}\` = :userId__${id}
+              AND \`${(sessionTableColNameMap.access_token || `access_token`).replace(/`/g, '')}\` NOT IN (:accessTokens__${id})
           `)
 
         })
 
-        // delete old sessions
+        await global.sessionSyncAuthSiteConnection.asyncQuery(
+          queries.join(';'),
+          variables,
+        )
 
-        variables[`userId__${id}`] = id
-        variables[`accessTokens__${id}`] = [
-          'dummy_token',  // so the SQL is still valid even if there are no sessions
-          ...sessions.map(({ accessToken }) => accessToken),
-        ]
+      }
 
-        queries.push(`
-          DELETE FROM \`${sessionTableName}\`
-          WHERE \`${(sessionTableColNameMap.user_id || `user_id`).replace(/`/g, '')}\` = :userId__${id}
-            AND \`${(sessionTableColNameMap.access_token || `access_token`).replace(/`/g, '')}\` NOT IN (:accessTokens__${id})
-        `)
+      if(usersToDelete) {
+
+        await Promise.all(usersToDelete.map(async user => {
+          const { id, email, mergeToUserId } = user
+
+          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 [ user ] = await global.sessionSyncAuthSiteConnection.asyncQuery(
+            `
+              SELECT email
+              FROM \`${userTableName}\`
+              WHERE \`${(userTableColNameMap.id || `id`).replace(/`/g, '')}\` = :userId
+            `,
+            {
+              userId: id,
+            },
+          )
+
+          if(!user) return  // gracefully handle non-existent user
+          if(user.email !== email) throw "The `id` and `email` passed in do not coorespond."
+
+          if(mergeToUserId && mergeUser) {
+            await mergeUser({
+              id,
+              mergeToUserId,
+            })
+          }
 
-      })
+          if(deleteUser) {
+            await deleteUser({ id })
+          } else {
+            await global.sessionSyncAuthSiteConnection.asyncQuery(
+              `
+                DELETE FROM \`${sessionTableName}\`
+                WHERE \`${(sessionTableColNameMap.user_id || `user_id`).replace(/`/g, '')}\` = :userId
+                ;
+  
+                DELETE FROM \`${userTableName}\`
+                WHERE \`${(userTableColNameMap.id || `id`).replace(/`/g, '')}\` = :userId
+              `,
+              {
+                userId: id,
+              },
+            )
+          }
 
-      await global.sessionSyncAuthSiteConnection.asyncQuery(
-        queries.join(';'),
-        variables,
-      )
+        }))
+
+      }
 
       res.json({ success: true })