session management fix and reload code after a change fix

Author: nuwan-samarasinghe

.run/DOCKER-DEBUG.run.xml

@@ -0,0 +1,6 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="DOCKER-DEBUG" type="ChromiumRemoteDebugType" factoryName="Chromium Remote" port="9228" restartOnDisconnect="true">
+    <mapping url="/usr/src/app/digital-form-builder-adapter/runner" local-file="$PROJECT_DIR$/runner" />
+    <method v="2" />
+  </configuration>
+</component>

runner/package.json

@@ -11,8 +11,7 @@
     "scss:build": "node compile-scss.js",
     "copy-forms": "node copy-form-json.js",
     "clean:build": "rm -rf dist",
-    "dev": "yarn build && yarn start:local",
-    "start:local": "NODE_ENV=development nodemon --inspect=0.0.0.0:9228 --watch src --ext js,json,ts,html,scss dist/digital-form-builder-adapter/runner/index.js",
+    "dev": "NODE_ENV=development nodemon --watch src --ext js,json,ts,html,scss --exec 'yarn build && node --inspect=0.0.0.0:9228 dist/digital-form-builder-adapter/runner/index.js'",
     "start:server": "node dist/digital-form-builder-adapter/runner/index.js",
     "production": "NODE_ENV=production npm run start:server",
     "start:test": "NODE_ENV=development npm run start:server",

runner/src/server/services/AdapterCacheService.ts

@@ -105,8 +105,13 @@ export class AdapterCacheService extends CacheService {
      */
     //@ts-ignore
     Key(request: HapiRequest, additionalIdentifier?: ADDITIONAL_IDENTIFIER) {
-        let id = `${request.yar.id}:${request.params.id}`;
-
+        let id: string;
+        if (request.auth && request.auth.credentials && request.auth.credentials.accountId) {
+            id = `${request.auth.credentials.accountId}:${request.params.id}`;
+            request.logger.info(`[ACTIVATE-SESSION] get user account id for the session key ${id}`);
+        } else {
+            id = `${request.yar.id}:${request.params.id}`;
+        }
         if (request.query.form_session_identifier) {
             id = `${id}:${request.query.form_session_identifier}`;
         }