Refactor code structure for improved readability and maintainability

Author: Artuomka

backend/.development.env

@@ -57,11 +57,6 @@ JWT_SECRET=MySuperSecretJwtSecret
 
 TEMPORARY_JWT_SECRET=MySuperSecretTemporaryJwtSecret
 
-# session secret for storing ai history
-# you need it if you want to use openai service
-# required if OPENAI_API_KEY is set
-SESSION_SECRET=MySuperSecretSessionSecret
-
 # for authorization with google
 GOOGLE_CLIENT_ID=
 

backend/package.json

@@ -48,7 +48,6 @@
     "@sentry/minimal": "^6.19.7",
     "@sentry/node": "8.52.0",
     "@types/crypto-js": "^4.2.2",
-    "@types/express-session": "^1.18.2",
     "@types/jsonwebtoken": "^9.0.10",
     "@types/multer": "^2.0.0",
     "@types/nodemailer": "^6.4.17",
@@ -71,7 +70,6 @@
     "eslint-plugin-security": "3.0.1",
     "express": "5.1.0",
     "express-rate-limit": "7.5.1",
-    "express-session": "^1.18.1",
     "fetch-blob": "^4.0.0",
     "helmet": "8.1.0",
     "ip-range-check": "0.2.0",

backend/src/entities/ai/application/data-structures/request-info-from-table.ds.ts

@@ -9,4 +9,5 @@ export class RequestInfoFromTableDS {
 
 export class RequestInfoFromTableDSV2 extends RequestInfoFromTableDS {
   response: Response;
+  previous_response_id?: string | null;
 }

backend/src/entities/ai/use-cases/request-info-from-table-with-ai-v4.use.case.ts

@@ -19,13 +19,6 @@ import { Response } from 'express';
 import { ConnectionEntity } from '../../connection/connection.entity.js';
 import { IDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/interfaces/data-access-object.interface.js';
 import { IDataAccessObjectAgent } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/interfaces/data-access-object-agent.interface.js';
-
-declare module 'express-session' {
-  interface Session {
-    lastResponseId?: string | null;
-  }
-}
-
 @Injectable({ scope: Scope.REQUEST })
 export class RequestInfoFromTableWithAIUseCaseV4
   extends AbstractUseCase<RequestInfoFromTableDSV2, void>
@@ -41,8 +34,8 @@ export class RequestInfoFromTableWithAIUseCaseV4
   }
 
   public async implementation(inputData: RequestInfoFromTableDSV2): Promise<void> {
-    const { connectionId, tableName, user_message, master_password, user_id, response } = inputData;
-    this.initializeSession(response);
+    const { connectionId, tableName, user_message, master_password, user_id, response, previous_response_id } =
+      inputData;
     this.setupResponseHeaders(response);
 
     const { foundConnection, dataAccessObject, databaseType, isMongoDb, userEmail } = await this.setupConnection(
@@ -60,7 +53,7 @@ export class RequestInfoFromTableWithAIUseCaseV4
       system_prompt,
       user_id,
       tools,
-      response,
+      previous_response_id,
     );
     const currentDepth = 0;
     await this.handleStreamRecursively(
@@ -230,7 +223,6 @@ export class RequestInfoFromTableWithAIUseCaseV4
         }
         response.write(chunk.delta);
       }
-      response.req.session.lastResponseId = current_response_id;
     }
   }
 
@@ -387,16 +379,6 @@ export class RequestInfoFromTableWithAIUseCaseV4
     response.setHeader('Connection', 'keep-alive');
   }
 
-  private initializeSession(response: any): void {
-    if (!response.req.session) {
-      (response.req as any).session = {
-        lastResponseId: null,
-      };
-    } else if (response.req.session.lastResponseId === undefined) {
-      response.req.session.lastResponseId = null;
-    }
-  }
-
   private async setupConnection(connectionId: string, master_password: string, user_id: string) {
     const foundConnection = await this._dbContext.connectionRepository.findAndDecryptConnection(
       connectionId,
@@ -481,7 +463,7 @@ Remember that all responses should be clear and user-friendly, explaining techni
     system_prompt: string,
     user_id: string,
     tools: any[],
-    response: any,
+    previous_response_id: string | null = null,
   ) {
     const openApiKey = getRequiredEnvVariable('OPENAI_API_KEY');
     const openai = new OpenAI({ apiKey: openApiKey });
@@ -493,7 +475,7 @@ Remember that all responses should be clear and user-friendly, explaining techni
       user: user_id,
       stream: true,
       tools: tools,
-      previous_response_id: response.req.session.lastResponseId || undefined,
+      previous_response_id: previous_response_id || undefined,
     });
   }
 

backend/src/helpers/validators/required-environment-variables.validator.ts

@@ -3,10 +3,6 @@ import { Messages } from '../../exceptions/text/messages.js';
 export function requiredEnvironmentVariablesValidator(): void {
   const requiredParameterNames: Array<string> = ['DATABASE_URL', 'PRIVATE_KEY', 'JWT_SECRET'];
 
-  if (process.env.OPENAI_API_KEY && process.env.OPENAI_API_KEY.length) {
-    requiredParameterNames.push('SESSION_SECRET');
-  }
-
   const requiredParameters: Array<{ [k: string]: string | null }> = requiredParameterNames.map((paramName) => {
     const paramValue = getEnvironmentVariable(paramName);
     return {

backend/src/main.ts

@@ -7,7 +7,6 @@ import bodyParser from 'body-parser';
 import { ValidationError } from 'class-validator';
 import cookieParser from 'cookie-parser';
 import rateLimit from 'express-rate-limit';
-import session from 'express-session';
 import helmet from 'helmet';
 import { ApplicationModule } from './app.module.js';
 import { WinstonLogger } from './entities/logging/winston-logger.js';
@@ -42,26 +41,6 @@ async function bootstrap() {
 
     app.use(cookieParser());
 
-    const cookieDomain = process.env.ROCKETADMIN_COOKIE_DOMAIN || undefined;
-    const sessionSecret = process.env.SESSION_SECRET || undefined;
-    if (sessionSecret) {
-      app.use(
-        session({
-          secret: sessionSecret,
-          resave: false,
-          saveUninitialized: false,
-          cookie: {
-            secure: true,
-            domain: cookieDomain,
-            maxAge: 2 * 60 * 60 * 1000,
-            httpOnly: true,
-            path: '/',
-          },
-          name: 'rocketadmin.sid',
-        }),
-      );
-    }
-
     app.enableCors({
       origin: [
         'https://app.autoadmin.org',