mv ./lib/session ./lib/user/session

Author: msimerson

lib/session/store/mysql.js

@@ -1,5 +1,10 @@
+<<<<<<<< HEAD:lib/session/store/mysql.js
 import Mysql from '../../mysql.js'
 import { mapToDbColumn } from '../../util.js'
+========
+import Mysql from '../mysql.js'
+import { mapToDbColumn } from '../util.js'
+>>>>>>>> a2746b1 (mv ./lib/session ./lib/user/session):lib/user/session.js
 
 const sessionDbMap = {
   id: 'nt_user_session_id',

lib/session/test/index.js

@@ -1,9 +1,15 @@
 import assert from 'node:assert/strict'
 import { describe, it, after, before } from 'node:test'
 
+<<<<<<<< HEAD:lib/session/test/index.js
 import User from '../../user/index.js'
 import Session from '../index.js'
 import userCase from '../../user/test/user.json' with { type: 'json' }
+========
+import User from '../index.js'
+import Session from '../session.js'
+import userCase from './user.json' with { type: 'json' }
+>>>>>>>> a2746b1 (mv ./lib/session ./lib/user/session):lib/user/test/session.js
 
 const sessionUser = {
   ...userCase,

lib/user/session.js

@@ -0,0 +1,82 @@
+<<<<<<<< HEAD:lib/session/store/mysql.js
+import Mysql from '../../mysql.js'
+import { mapToDbColumn } from '../../util.js'
+========
+import Mysql from '../mysql.js'
+import { mapToDbColumn } from '../util.js'
+>>>>>>>> a2746b1 (mv ./lib/session ./lib/user/session):lib/user/session.js
+
+const sessionDbMap = {
+  id: 'nt_user_session_id',
+  uid: 'nt_user_id',
+  session: 'nt_user_session',
+}
+
+class SessionRepoMySQL {
+  constructor() {
+    this.mysql = Mysql
+  }
+
+  async create(args) {
+    const r = await this.get(args)
+    if (r) return r.id
+
+    const id = await Mysql.execute(...Mysql.insert(`nt_user_session`, mapToDbColumn(args, sessionDbMap)))
+    return id
+  }
+
+  async get(args) {
+    let query = `SELECT s.nt_user_session_id AS id
+    , s.nt_user_id AS uid
+    , s.nt_user_session AS session
+  FROM nt_user_session s
+    LEFT JOIN nt_user u ON s.nt_user_id = u.nt_user_id
+  WHERE u.deleted=0`
+
+    const params = []
+    for (const f of ['nt_user_session_id', 'nt_user_id', 'nt_user_session']) {
+      if (args[f] !== undefined) {
+        query += ` AND s.${f} = ?`
+        params.push(args[f])
+      }
+    }
+    for (const g of ['id', 'uid', 'session']) {
+      if (args[g] !== undefined) {
+        query += ` AND s.${sessionDbMap[g]} = ?`
+        params.push(args[g])
+      }
+    }
+
+    const sessions = await Mysql.execute(query, params)
+    return sessions[0]
+  }
+
+  async put(args) {
+    if (!args.id) return false
+
+    if (args.last_access) {
+      const p = await this.get({ id: args.id })
+      if (!p) return false
+
+      // update only when +1 minute old (save DB writes)
+      const now = parseInt(Date.now() / 1000, 10)
+      const oneMinuteAgo = now - 60
+      if (p.last_access > oneMinuteAgo) return true
+      args.last_access = now
+    }
+
+    const id = args.id
+    delete args.id
+    const r = await Mysql.execute(
+      ...Mysql.update(`nt_user_session`, `nt_user_session_id=${id}`, mapToDbColumn(args, sessionDbMap)),
+    )
+    return r.changedRows === 1
+  }
+
+  async delete(args) {
+    const r = await Mysql.execute(...Mysql.delete(`nt_user_session`, mapToDbColumn(args, sessionDbMap)))
+    return r.affectedRows === 1
+  }
+}
+
+export default SessionRepoMySQL

lib/user/test/session.js

@@ -0,0 +1,71 @@
+import assert from 'node:assert/strict'
+import { describe, it, after, before } from 'node:test'
+
+<<<<<<<< HEAD:lib/session/test/index.js
+import User from '../../user/index.js'
+import Session from '../index.js'
+import userCase from '../../user/test/user.json' with { type: 'json' }
+========
+import User from '../index.js'
+import Session from '../session.js'
+import userCase from './user.json' with { type: 'json' }
+>>>>>>>> a2746b1 (mv ./lib/session ./lib/user/session):lib/user/test/session.js
+
+const sessionUser = {
+  ...userCase,
+  id: userCase.id + 100,
+  username: `${userCase.username}-session`,
+  email: `session-${userCase.email}`,
+}
+
+before(async () => {
+  await User.create(sessionUser)
+})
+
+after(async () => {
+  await Session.delete({ uid: sessionUser.id })
+  await User.destroy({ id: sessionUser.id })
+  await User.mysql.disconnect()
+})
+
+describe('session', function () {
+  let sessionId
+
+  describe('create', () => {
+    it('creates a login session', async () => {
+      sessionId = await Session.create({
+        nt_user_id: sessionUser.id,
+        session: '3.0.0',
+        last_access: parseInt(Date.now() / 1000, 10),
+      })
+      assert.ok(sessionId)
+    })
+  })
+
+  describe('get', () => {
+    it('finds a session by id', async () => {
+      const s = await Session.get({ id: sessionId })
+      assert.ok(s?.id)
+    })
+
+    it('finds a session by nt_user_session_id', async () => {
+      const s = await Session.get({ nt_user_session_id: sessionId })
+      assert.ok(s?.id)
+    })
+
+    it('finds a session by session', async () => {
+      const s = await Session.get({ nt_user_session: '3.0.0' })
+      assert.ok(s?.id)
+    })
+  })
+
+  describe('delete', () => {
+    it('deletes a session by ID', async () => {
+      assert.ok(await Session.delete({ id: sessionId }))
+    })
+
+    it('does not find a deleted session', async () => {
+      assert.equal(await Session.get({ id: sessionId }), undefined)
+    })
+  })
+})

test.sh

@@ -30,5 +30,5 @@ else
 		# npm i --no-save node-test-github-reporter
 		# $NODE --test --test-reporter=node-test-github-reporter
 	# fi
-	$NODE --test --test-reporter=spec lib/*/test/index.js lib/*.test.js routes/*.test.js
+	$NODE --test --test-reporter=spec lib/*/test/*.js lib/*.test.js routes/*.test.js
 fi