Fix interception issue

Author: alexivsn

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@securenative/sdk",
-  "version": "0.0.0-development",
+  "version": "1.9.3",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,7 +18,7 @@
     "build": "tsc",
     "debug-inspector": "node-debug index.ts --debug-brk",
     "coverage": "codecov",
-    "test": "NODE_ENV=test nyc --reporter=lcov mocha -r ts-node/register src/**/*.spec.ts",
+    "test": "NODE_ENV=test nyc --reporter=lcov mocha -r ts-node/register './src/**/*.spec.ts'",
     "publish": "npm publish --access public",
     "semantic-release": "semantic-release"
   },

package.json

@@ -23,7 +23,7 @@ if (!config.appName) {
 ConfigurationManager.setConfigKey('hostId', hostId);
 
 const moduleManager = new ModuleManager(appPkg);
-const eventManager = new EventManager(fetch, this.options);
+const eventManager = new EventManager(fetch, config);
 const secureNative = new SecureNative(moduleManager, eventManager, config);
 
 // init logger

src/index.ts

@@ -0,0 +1,14 @@
+import chai from 'chai';
+import chaiAsPromised from 'chai-as-promised';
+import HttpServerInterceptor from './http-server-interceptor';
+import InterceptionModule from '../enums/interception-module';
+
+chai.use(chaiAsPromised);
+const expect = chai.expect;
+
+describe('HttpServerInterceptor', () => {
+  it('Should export correct module', () => {
+    const interceptor = new HttpServerInterceptor(null, null, null);
+    expect(interceptor.getModule()).to.be.eql(InterceptionModule.Http)
+  });
+});

src/interceptors/http-server-interceptor.spec.ts

@@ -7,7 +7,7 @@ import { Logger } from '../logger';
 import Hook from 'require-in-the-middle';
 import { wrap } from 'shimmer';
 import ActionsList from './../actions-list';
-import { clientIpFromRequest, contextFromRequest } from './../utils/utils';
+import { clientIpFromRequest, contextFromRequest, contextFromResponse } from './../utils/utils';
 import { SecureNativeOptions } from '../types/securenative-options';
 import { getDeviceFp } from './../utils/utils';
 import SetType from '../enums/set-type';
@@ -95,14 +95,23 @@ export default class HttpServerInterceptor extends Interceptor implements IInter
           const risk = this.apiManager.risk.bind(this);
 
           return function () {
-            if (!this && !this.sn_finished) {
-              intercept(this.req && this.req.sn_uid, 'end');
-              return original.apply(this, arguments);
+            if (this && this.sn_finished) {
+              SessionManager.cleanSession(this.req && this.req.sn_uid);
+              return;
             }
 
-            const context = contextFromRequest(this.req);
-            risk({ eventType: EventType.RISK, context: context });
-            return SessionManager.cleanSession(this.req && this.req.sn_uid);
+            intercept(this.req && this.req.sn_uid, 'end');
+            const { req, res } = SessionManager.getSession(this.req?.sn_uid);
+            if (req && res) {
+              const reqContext = contextFromRequest(req);
+              const resContext = contextFromResponse(res);
+
+              risk({ eventType: EventType.RISK, context: { reqContext, resContext } });
+            }
+
+            SessionManager.cleanSession(this.req && this.req.sn_uid);
+
+            return original.apply(this, arguments);
           };
         });
 

src/interceptors/http-server-interceptor.ts

@@ -0,0 +1,14 @@
+import chai from 'chai';
+import chaiAsPromised from 'chai-as-promised';
+import InterceptionModule from '../enums/interception-module';
+import HttpsServerInterceptor from './https-server-interceptor';
+
+chai.use(chaiAsPromised);
+const expect = chai.expect;
+
+describe('HttpServerInterceptor', () => {
+  it('Should export correct module', () => {
+    const interceptor = new HttpsServerInterceptor(null, null, null);
+    expect(interceptor.getModule()).to.be.eql(InterceptionModule.Https)
+  });
+});

src/interceptors/https-server-interceptor.spec.ts

@@ -22,7 +22,7 @@ export default class HttpsServerInterceptor extends Interceptor implements IInte
   }
 
   getModule() {
-    return InterceptionModule.Http;
+    return InterceptionModule.Https;
   }
 
   canExecute(): boolean {

src/interceptors/https-server-interceptor.ts

@@ -34,7 +34,7 @@ describe('SessionManager', () => {
 
     sessions.forEach((id) => {
       const session = SessionManager.getSession(id);
-      expect(session).to.be.undefined;
+      expect(session).to.be.eql({ req: null, res: null });
     });
   });
 

src/session-manager.spec.ts

@@ -14,7 +14,7 @@ export default class SessionManager {
   }
 
   static getSession(id: string): Session {
-    return SessionManager.session.get(id);
+    return SessionManager.session.get(id) || { req: null, res: null };
   }
 
   static setSession(id: string, session: Session) {