Fixes

Author: aacic

server/routes/wsimages.ts

@@ -42,13 +42,13 @@ function init({ genomes }) {
 			const getCookieString = promisify(cookieJar.getCookieString.bind(cookieJar))
 			let sessionManager
 			let sessionData
+			let userSessionId: string | undefined = undefined
 
 			if (serverconfig.redis) {
 				sessionManager = SessionManager.getInstance(serverconfig.redis.url)
-				if (!req.session.user) {
-					const userSessionId = crypto.createHash('sha256').update(crypto.randomBytes(32).toString('hex')).digest('hex')
-					req.session.user = { id: userSessionId }
-				}
+
+				userSessionId = crypto.createHash('sha256').update(crypto.randomBytes(32).toString('hex')).digest('hex')
+
 				sessionData = await sessionManager.getSession(wsimage)
 			}
 
@@ -57,15 +57,15 @@ function init({ genomes }) {
 				: await getSessionId(cookieJar, getCookieString, setCookie, wsimage, ds, sampleId)
 
 			if (serverconfig.redis && sessionManager) {
-				await manageUserSession(sessionManager, sessionData, wsimage, req.session.user.id, sessionId)
+				await manageUserSession(sessionManager, sessionData, wsimage, userSessionId, sessionId)
 			}
 
 			const getWsiImageResponse: any = await getWsiImageDimensions(sessionId, getCookieString)
 
 			const payload: WSImagesResponse = {
 				status: 'ok',
 				wsiSessionId: sessionId,
-				browserImageInstanceId: serverconfig.redis ? req.session.user.id : undefined,
+				browserImageInstanceId: serverconfig.redis ? userSessionId : undefined,
 				slide_dimensions: getWsiImageResponse.slide_dimensions
 			}
 

server/src/app.middlewares.js

@@ -10,35 +10,10 @@ import { authApi } from './auth.js'
 import * as validator from './validator.js'
 import { decode as urlJsonDecode } from '#shared/urljson.js'
 import jsonwebtoken from 'jsonwebtoken'
-import session from 'express-session'
-import connectRedis from 'connect-redis'
-import RedisClientHolder from '#src/redis/RedisClientHolder'
 
 const basepath = serverconfig.basepath || ''
 
 export function setAppMiddlewares(app) {
-	if (serverconfig.redis) {
-		const RedisStore = connectRedis(session)
-
-		const redisClientHolder = RedisClientHolder.getInstance(serverconfig.redis.url)
-		// Create a Redis client
-		const redisClient = redisClientHolder.getClient()
-
-		// Configure session middleware with Redis store
-		const redisStore = new RedisStore({
-			client: redisClient
-		})
-
-		app.use(
-			session({
-				store: redisStore,
-				secret: serverconfig.redis.secret,
-				resave: false,
-				saveUninitialized: false,
-				cookie: { maxAge: 0 } // Prevent cookies from being set
-			})
-		)
-	}
 	app.use(setHeaders)
 
 	if (serverconfig.users) {

server/src/app.routes.js

@@ -9,6 +9,7 @@ export const routeFiles = [
 	import('../routes/brainImaging.ts'),
 	import('../routes/brainImagingSamples.ts'),
 	import('../routes/burden.ts'),
+	import('../routes/clearwsisession.ts'),
 	import('../routes/correlationVolcano.ts'),
 	import('../routes/dataset.ts'),
 	import('../routes/dsdata.ts'),

server/src/redis/RedisClientHolder.ts

@@ -11,8 +11,7 @@ export default class RedisClientHolder {
 
 	private constructor(redisUrl: string) {
 		this.client = createClient({
-			url: redisUrl,
-			legacyMode: true // Required if using connect-redis
+			url: redisUrl
 		})
 
 		this.client.on('error', (err: any) => {

shared/types/checkers/clearwsisession.ts

@@ -0,0 +1,7 @@
+import { createValidate } from 'typia'
+import type { ClearWSImagesSessionsRequest, ClearWSImagesSessionsResponse } from '../src/routes/clearwsisessions.ts'
+
+export { clearWSImagesSessionsPayload } from '../src/routes/clearwsisessions.ts'
+
+export const validClearWSImagesSessionsRequest = createValidate<ClearWSImagesSessionsRequest>()
+export const validClearWSImagesSessionsResponse = createValidate<ClearWSImagesSessionsResponse>()

shared/types/src/index.ts

@@ -8,6 +8,7 @@ export * from './routes/routeApi.ts'
 export * from './routes/brainImaging.ts'
 export * from './routes/brainImagingSamples.ts'
 export * from './routes/burden.ts'
+export * from './routes/clearwsisessions.ts'
 export * from './routes/correlationVolcano.ts'
 export * from './routes/dataset.ts'
 export * from './routes/dsdata.ts'

shared/types/src/routes/wsimages.ts

@@ -12,7 +12,7 @@ export type WSImagesResponse = {
 	wsiSessionId?: string
 	// Identifier for the image instance displayed in the browser
 	// In case the same image is displayed in multiple browser windows, a new id is generated
-	browserImageInstanceId: string
+	browserImageInstanceId?: string
 	slide_dimensions: number[]
 	status: string
 }