From 436cbb031d95998595a98d796186a327a109745b Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Mon, 21 Sep 2020 17:07:56 -0400
Subject: [PATCH] SessionStore: Avoid early DB.db dereference

Avoid dereferencing `DB.db` until it is used so that it is possible to
`require('SessionStore')` before calling `DB.init()`. (This is useful
when writing tests.)
---
 src/node/db/SessionStore.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/node/db/SessionStore.js b/src/node/db/SessionStore.js
index bf278b48b..601b73b06 100644
--- a/src/node/db/SessionStore.js
+++ b/src/node/db/SessionStore.js
@@ -7,8 +7,8 @@
  *      express-session, which can't actually use promises anyway.
  */
 
+const DB = require('ep_etherpad-lite/node/db/DB');
 const Store = require('ep_etherpad-lite/node_modules/express-session').Store;
-const db = require('ep_etherpad-lite/node/db/DB').db;
 const log4js = require('ep_etherpad-lite/node_modules/log4js');
 
 const logger = log4js.getLogger('SessionStore');
@@ -16,7 +16,7 @@ const logger = log4js.getLogger('SessionStore');
 module.exports = class SessionStore extends Store {
   get(sid, fn) {
     logger.debug('GET ' + sid);
-    db.get('sessionstorage:' + sid, (err, sess) => {
+    DB.db.get('sessionstorage:' + sid, (err, sess) => {
       if (sess) {
         sess.cookie.expires = ('string' == typeof sess.cookie.expires
                                ? new Date(sess.cookie.expires) : sess.cookie.expires);
@@ -33,13 +33,13 @@ module.exports = class SessionStore extends Store {
 
   set(sid, sess, fn) {
     logger.debug('SET ' + sid);
-    db.set('sessionstorage:' + sid, sess);
+    DB.db.set('sessionstorage:' + sid, sess);
     if (fn) process.nextTick(fn);
   }
 
   destroy(sid, fn) {
     logger.debug('DESTROY ' + sid);
-    db.remove('sessionstorage:' + sid);
+    DB.db.remove('sessionstorage:' + sid);
     if (fn) process.nextTick(fn);
   }
 };