From 090e8fef40a37c1e81f5a5215c698a44f896fd8a Mon Sep 17 00:00:00 2001 From: Brian Bolt Date: Wed, 15 Jan 2025 10:41:10 -0800 Subject: [PATCH] Revert "ACAS-828 Use postgres for session management" --- app_template.coffee | 12 ++++-------- conf/config.properties.example | 2 -- package.json | 2 +- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/app_template.coffee b/app_template.coffee index e66db39f4..a00c348cb 100644 --- a/app_template.coffee +++ b/app_template.coffee @@ -15,7 +15,7 @@ startApp = -> logger = require('morgan') methodOverride = require('method-override') session = require('express-session') - PostgresqlStore = require('connect-pg-simple')(session) + MemoryStore = require('memorystore')(session) bodyParser = require('body-parser') errorHandler = require('errorhandler') cookieParser = require('cookie-parser') @@ -78,9 +78,7 @@ startApp = -> console.error("NOT USING SSO configs! config.all.server.security.saml.use is set true but CustomerSpecificServerFunction 'ssoLoginStrategy' is not defined.") loginRoutes = require './routes/loginRoutes' - sessionStore = new PostgresqlStore( - conString: "postgres://#{config.all.server.database.username}:#{config.all.server.database.password}@#{config.all.server.database.host}:#{config.all.server.database.port}/#{config.all.server.database.name}" - ) + sessionStore = new MemoryStore(); global.app = express() app.set 'port', config.all.client.port app.set 'listenHost', config.all.client.listenHost @@ -119,14 +117,12 @@ startApp = -> # added for login support app.use cookieParser() - console.log "Session timeout set to #{config.all.server.sessionTimeOutMinutes} minutes" - sessionTimeOutMilliseconds = config.all.server.sessionTimeOutMinutes * 60 * 1000 app.use session secret: 'acas needs login' - cookie: maxAge: sessionTimeOutMilliseconds + cookie: maxAge: 365 * 24 * 60 * 60 * 1000 resave: true saveUninitialized: true, - store: sessionStore + store: sessionStore # MemoryStore is used automatically if no "store" field is set, but we need a handle on the sessionStore object for Socket.IO, so we'll manually create the store so we have a handle on the object app.use flash() app.use passport.initialize() diff --git a/conf/config.properties.example b/conf/config.properties.example index 3c7a19313..e39831864 100644 --- a/conf/config.properties.example +++ b/conf/config.properties.example @@ -768,8 +768,6 @@ client.cmpdreg.serverSettings.liveDesign.url=http://localhost:8010/ld-chem client.cmpdreg.serverSettings.maxStandardizationDisplay=20000 -# Sets cookie maxAge to 1440 minutes = 24 hours -server.sessionTimeOutMinutes=1440 # About configs client.about.acas.version=0.0.0 diff --git a/package.json b/package.json index fb2cb838f..81ad0e64a 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "less": "^3.12.2", "lodash": "^4.17.20", "marked": "4.0.10", - "connect-pg-simple": "10.0.0", + "memorystore": "1.6.4", "method-override": "^3.0.0", "mocha": "8.2.1", "mochawesome": "^6.2.1",