@botfabrik/engine-webclient 4.59.4 → 4.59.6

package/dist/index.js

@@ -31,6 +31,7 @@ const engine_domain_1 = require("@botfabrik/engine-domain");
 const engine_transcript_export_1 = require("@botfabrik/engine-transcript-export");
 const express = __importStar(require("express"));
 const createSessionInfo_1 = __importDefault(require("./createSessionInfo"));
+const extractLocale_1 = __importDefault(require("./extractLocale"));
 const getSupportedClientLocale_1 = __importDefault(require("./getSupportedClientLocale"));
 const loadPreviousConversation_1 = __importDefault(require("./loadPreviousConversation"));
 const middleware_1 = __importDefault(require("./middleware"));
@@ -93,11 +94,12 @@ exports.default = (clientName, environment, props) => async (bot) => {
     nsp.on('connection', async (socket) => {
         try {
             const querystrings = socket.handshake.query;
+            const locale = (0, extractLocale_1.default)(querystrings, socket.request.headers['accept-language']);
             const sessionsCollection = bot.store.db.collection('sessions');
-            const { sessionId, sessionInfo: defaultSessionInfo, isNew, } = await (0, requestSessionData_1.default)(querystrings, sessionsCollection, clientName, props);
+            const { sessionId, sessionInfo: defaultSessionInfo, isNew, } = await (0, requestSessionData_1.default)(querystrings, sessionsCollection, clientName, locale, props);
             // create a channel for each session
             socket.join(sessionId);
-            const sessionInfo = await (0, createSessionInfo_1.default)(socket, clientName, environment, defaultSessionInfo, props)();
+            const sessionInfo = await (0, createSessionInfo_1.default)(socket, clientName, environment, defaultSessionInfo, locale, props)();
             const session = await bot.createSession(sessionId, sessionInfo);
             // sending active language and translations to client
             const clientLocale = (0, getSupportedClientLocale_1.default)(session.translator.locale);

package/dist/requestSessionData.d.ts

@@ -6,5 +6,5 @@ interface SessionData {
     sessionInfo: SessionInfo<SessionInfoClientPayload, SessionInfoUserPayload>;
     isNew: boolean;
 }
-declare const requestSessionData: (querystrings: any, sessionsCollection: any, clientName: string, props: WebClientProps) => Promise<SessionData>;
+declare const requestSessionData: (querystrings: any, sessionsCollection: any, clientName: string, locale: string | undefined, props: WebClientProps) => Promise<SessionData>;
 export default requestSessionData;

package/dist/requestSessionData.js

@@ -2,19 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const uuid_1 = require("uuid");
 const index_1 = require("./index");
-const requestSessionData = async (querystrings, sessionsCollection, clientName, props) => {
+const requestSessionData = async (querystrings, sessionsCollection, clientName, locale, props) => {
     const baseQuery = {
         'sessionInfo.client.type': index_1.CLIENT_TYPE,
         'sessionInfo.client.name': clientName,
     };
-    let findSessionRecordQuery = {
-        _id: querystrings.sessionId,
-        ...baseQuery,
-    };
+    let findSessionRecordQuery;
     if (props.requestSessionRecordQuery) {
         const customQuery = await props.requestSessionRecordQuery(querystrings);
         findSessionRecordQuery = Object.assign({}, baseQuery, customQuery);
     }
+    else {
+        findSessionRecordQuery = {
+            _id: querystrings.sessionId,
+            'sessionInfo.user.locale': locale,
+            ...baseQuery,
+        };
+    }
     const sessionRecord = await sessionsCollection.findOne(findSessionRecordQuery, { _id: 1, sessionInfo: 1 });
     let sessionId;
     let sessionInfo;

package/dist/requestSessionData.test.js

@@ -19,7 +19,7 @@ const requestSessionData_1 = __importDefault(require("./requestSessionData"));
         const sessionsCollection = {
             findOne,
         };
-        const { sessionId, isNew } = await (0, requestSessionData_1.default)(querystrings, sessionsCollection, 'test-bot', {});
+        const { sessionId, isNew } = await (0, requestSessionData_1.default)(querystrings, sessionsCollection, 'test-bot', 'de_DE', {});
         (0, globals_1.expect)(findOne).toHaveBeenCalledTimes(1);
         (0, globals_1.expect)(findOne).toHaveBeenCalledWith({
             _id: 'session-id',
@@ -35,7 +35,7 @@ const requestSessionData_1 = __importDefault(require("./requestSessionData"));
         const sessionsCollection = {
             findOne,
         };
-        const { sessionId, isNew } = await (0, requestSessionData_1.default)(querystrings, sessionsCollection, 'test-bot', {});
+        const { sessionId, isNew } = await (0, requestSessionData_1.default)(querystrings, sessionsCollection, 'test-bot', 'de_DE', {});
         (0, globals_1.expect)(findOne).toHaveBeenCalledTimes(1);
         (0, globals_1.expect)(findOne).toHaveBeenCalledWith({
             _id: 'session-id',
@@ -56,7 +56,7 @@ const requestSessionData_1 = __importDefault(require("./requestSessionData"));
             requestSessionRecordQuery,
         };
         requestSessionRecordQuery.mockReturnValueOnce(Promise.resolve({ 'sessionInfo.user.id': 'hans@apptiva.ch' }));
-        const { sessionId, isNew } = await (0, requestSessionData_1.default)(querystrings, sessionsCollection, 'test-bot', props);
+        const { sessionId, isNew } = await (0, requestSessionData_1.default)(querystrings, sessionsCollection, 'test-bot', 'de_DE', props);
         (0, globals_1.expect)(requestSessionRecordQuery).toHaveBeenCalledTimes(1);
         (0, globals_1.expect)(requestSessionRecordQuery).toHaveBeenCalledWith(querystrings);
         (0, globals_1.expect)(findOne).toHaveBeenCalledTimes(1);
@@ -79,7 +79,7 @@ const requestSessionData_1 = __importDefault(require("./requestSessionData"));
             requestSessionRecordQuery,
         };
         requestSessionRecordQuery.mockReturnValueOnce(Promise.resolve({ 'sessionInfo.user.id': 'hans@apptiva.ch' }));
-        const { sessionId, isNew } = await (0, requestSessionData_1.default)(querystrings, sessionsCollection, 'test-bot', props);
+        const { sessionId, isNew } = await (0, requestSessionData_1.default)(querystrings, sessionsCollection, 'test-bot', 'de_DE', props);
         (0, globals_1.expect)(requestSessionRecordQuery).toHaveBeenCalledTimes(1);
         (0, globals_1.expect)(requestSessionRecordQuery).toHaveBeenCalledWith(querystrings);
         (0, globals_1.expect)(findOne).toHaveBeenCalledTimes(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botfabrik/engine-webclient",
-  "version": "4.59.4",
+  "version": "4.59.6",
   "description": "Webclient for Botfabriks Bot Engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -40,5 +40,5 @@
     "rimraf": "^5.0.5",
     "typescript": "5.1.6"
   },
-  "gitHead": "30478b16d1438e52ef6a686bdf47605aa8dbe4e7"
+  "gitHead": "036bdce4fb950ef45dfd5a78041cb0a0881fcb91"
 }