fix(pencil): Correct session extraction

Author: alexivsn

src/interceptors/http-server-interceptor.ts

@@ -42,7 +42,7 @@ export default class HttpServerInterceptor extends Interceptor implements IInter
             return true;
           }
           const snuid = v4();
-          Logger.debug(`Url is: ${req.url}, method: ${req.method}`);
+          Logger.debug(`Intercept request: ${req.url}, method: ${req.method}`);
           SessionManager.setSession(snuid, { req, res });
           const url = req.url;
           const clientIp = clientIpFromRequest(req);
@@ -98,7 +98,6 @@ export default class HttpServerInterceptor extends Interceptor implements IInter
           const risk = this.apiManager.risk.bind(this.apiManager);
           return function () {
             if (this && this.sn_finished) {
-              Logger.debug(new Error()?.stack);
               SessionManager.cleanSession(this.req && this.req.sn_uid);
               return;
             }
@@ -109,7 +108,6 @@ export default class HttpServerInterceptor extends Interceptor implements IInter
               if (req && res) {
                 risk({ event: EventType.RISK, context: { req: contextFromRequest(req), res: contextFromResponse(res) } });
               }
-              Logger.debug(new Error().stack);
               SessionManager.cleanSession(this.req.sn_uid);
             }
             return original.apply(this, arguments);

src/session-manager.spec.ts

@@ -6,11 +6,16 @@ chai.use(chaiAsPromised);
 const expect = chai.expect;
 
 describe('SessionManager', () => {
+  beforeEach(() => {
+    SessionManager.cleanAllSessions();
+  });
+
   it('Should have all public methods defined', () => {
     expect(SessionManager).to.have.property('getLastSession');
     expect(SessionManager).to.have.property('getSession');
     expect(SessionManager).to.have.property('setSession');
     expect(SessionManager).to.have.property('cleanSession');
+    expect(SessionManager).to.have.property('cleanAllSessions');  
   });
 
   it('Should set and get sesssion', () => {
@@ -40,7 +45,7 @@ describe('SessionManager', () => {
 
   it('Should set multiple sessions and get latest session', () => {
     const sessions = ['1111', '2222', '3333', '4444'];
-    const [last] = sessions.slice(-1);
+    const [last] = sessions;
 
     sessions.forEach((id) => {
       SessionManager.setSession(id, { req: {}, res: {} });

src/session-manager.ts

@@ -6,31 +6,36 @@ export interface Session {
 }
 
 export default class SessionManager {
-  private static lastSessionId = '';
-  private static session: Map<string, Session> = new Map<string, Session>();
+  private static stack: Array<Session> = [];
 
   static getLastSession(): Session {
-    const session = SessionManager.session.get(SessionManager.lastSessionId) || { req: null, res: null };
-    Logger.debug(`[SessionManager] Getting last session by: ${SessionManager.lastSessionId}, is: ${session.req?.sn_uid}`);
+    const [session = { req: null, res: null }] = SessionManager.stack;
     return session;
   }
 
   static getSession(id: string): Session {
-    return SessionManager.session.get(id) || { req: null, res: null };
+    return SessionManager.stack.find((s) => s.req.sn_uid === id) || { req: null, res: null };
   }
 
   static setSession(id: string, session: Session) {
     Logger.debug(`[SessionManager] Setting session: ${id}`);
     session.req.sn_uid = id;
     session.res.sn_uid = id;
-    SessionManager.session.set(id, session);
-
-    //save last session
-    SessionManager.lastSessionId = id;
+    //add session
+    SessionManager.stack.push(session);
   }
 
   static cleanSession(id: string) {
     Logger.debug(`[SessionManager] Cleaning session: ${id}`);
-    SessionManager.session.delete(id);
+    // delete item
+    const inx = SessionManager.stack.findIndex((s) => s.req.sn_uid === id);
+    if (inx !== -1) {
+      SessionManager.stack.splice(inx, 1);
+    }
+  }
+
+  static cleanAllSessions() {
+    Logger.debug(`[SessionManager] Cleaning all sessions`);
+    SessionManager.stack = [];
   }
 }