@memori.ai/memori-react 9.0.5 → 9.0.7

package/esm/components/MemoriWidget/MemoriWidget.js

@@ -35,6 +35,7 @@ import { getTTSVoice } from '../../helpers/tts/ttsVoiceUtility';
 import { getMuteSpeakerFallback, shouldPlayTtsAudio, } from '../../helpers/tts/muteSpeaker';
 import { allowedMediaTypes, anonTag, uiLanguages, } from '../../helpers/constants';
 import { getErrori18nKey } from '../../helpers/error';
+import { isEmptyPasswordError, resolveSessionPassword, } from '../../helpers/sessionPassword';
 import { CreditsCheckError, getCredits } from '../../helpers/credits';
 import { sanitizeText } from '../../helpers/sanitizer';
 import { useTTS } from '../../helpers/tts/useTTS';
@@ -419,6 +420,7 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, tenantID, memoriLang
     }, [enableAudio, integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.enableAudio]);
     const [memoriPwd, setMemoriPwd] = useState(secret);
     const [memoriTokens, setMemoriTokens] = useState();
+    const sessionPassword = (...candidates) => resolveSessionPassword(...candidates, secret, memoriPwd, memoriPassword, memori.secretToken, memori.password);
     const [authModalState, setAuthModalState] = useState(null);
     const [position, _setPosition] = useState();
     const hasUserProvidedPosition = useCallback((venue) => {
@@ -845,10 +847,9 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, tenantID, memoriLang
             setShowAgeVerification(true);
             return;
         }
+        const password = sessionPassword(params.password);
         if (memori.privacyType !== 'PUBLIC' &&
-            !params.password &&
-            !memori.secretToken &&
-            !memoriPwd &&
+            !password &&
             !((_b = params.recoveryTokens) === null || _b === void 0 ? void 0 : _b.length) &&
             !memoriTokens) {
             setAuthModalState('password');
@@ -869,6 +870,7 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, tenantID, memoriLang
             }
             const session = await initSession({
                 ...params,
+                password,
                 birthDate: userBirthDate,
                 tag: (_c = params.tag) !== null && _c !== void 0 ? _c : personification === null || personification === void 0 ? void 0 : personification.tag,
                 pin: (_d = params.pin) !== null && _d !== void 0 ? _d : personification === null || personification === void 0 ? void 0 : personification.pin,
@@ -904,9 +906,21 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, tenantID, memoriLang
                 }));
                 setGotErrorInOpening(true);
             }
-            else if ((session === null || session === void 0 ? void 0 : session.resultCode) === 403 && memori.privacyType !== 'PUBLIC') {
+            else if (memori.privacyType !== 'PUBLIC' &&
+                ((session === null || session === void 0 ? void 0 : session.resultCode) === 403 ||
+                    isEmptyPasswordError(session === null || session === void 0 ? void 0 : session.resultCode, session === null || session === void 0 ? void 0 : session.resultMessage))) {
                 setMemoriPwd(undefined);
+                memoriPassword = undefined;
                 setAuthModalState('password');
+                setLoading(false);
+                return session;
+            }
+            else if (isEmptyPasswordError(session === null || session === void 0 ? void 0 : session.resultCode, session === null || session === void 0 ? void 0 : session.resultMessage)) {
+                add(createAlertOptions({
+                    description: t('error.emptyPasswordPublic'),
+                    severity: 'error',
+                }));
+                setLoading(false);
                 return session;
             }
             else {
@@ -934,10 +948,9 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, tenantID, memoriLang
                 setLoading(false);
                 return;
             }
+            const resolvedPassword = sessionPassword(password);
             if (memori.privacyType !== 'PUBLIC' &&
-                !password &&
-                !memori.secretToken &&
-                !memoriPwd &&
+                !resolvedPassword &&
                 !(recoveryTokens === null || recoveryTokens === void 0 ? void 0 : recoveryTokens.length) &&
                 !memoriTokens) {
                 setAuthModalState('password');
@@ -958,7 +971,7 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, tenantID, memoriLang
             }
             const { sessionID, currentState, ...response } = await initSession({
                 memoriID: (_a = memori.engineMemoriID) !== null && _a !== void 0 ? _a : '',
-                password: password || memoriPwd || memori.secretToken,
+                password: resolvedPassword,
                 recoveryTokens: recoveryTokens || memoriTokens,
                 tag: tag !== null && tag !== void 0 ? tag : personification === null || personification === void 0 ? void 0 : personification.tag,
                 pin: pin !== null && pin !== void 0 ? pin : personification === null || personification === void 0 ? void 0 : personification.pin,
@@ -1056,11 +1069,19 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, tenantID, memoriLang
                 }));
                 setGotErrorInOpening(true);
             }
-            else if ((response === null || response === void 0 ? void 0 : response.resultCode) === 403 &&
-                memori.privacyType !== 'PUBLIC') {
+            else if (memori.privacyType !== 'PUBLIC' &&
+                ((response === null || response === void 0 ? void 0 : response.resultCode) === 403 ||
+                    isEmptyPasswordError(response === null || response === void 0 ? void 0 : response.resultCode, response === null || response === void 0 ? void 0 : response.resultMessage))) {
                 setMemoriPwd(undefined);
+                memoriPassword = undefined;
                 setAuthModalState('password');
             }
+            else if (isEmptyPasswordError(response === null || response === void 0 ? void 0 : response.resultCode, response === null || response === void 0 ? void 0 : response.resultMessage)) {
+                add(createAlertOptions({
+                    description: t('error.emptyPasswordPublic'),
+                    severity: 'error',
+                }));
+            }
             else {
                 console.error('[REOPEN_SESSION] Other error:', response);
                 add(createAlertOptions({
@@ -1083,7 +1104,7 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, tenantID, memoriLang
         const continueFromChatLogID = continueFromChatLogIDParam !== null && continueFromChatLogIDParam !== void 0 ? continueFromChatLogIDParam : chatLogID;
         const reopenAfterExpiry = () => {
             var _a, _b;
-            return reopenSession(true, memoriPwd || memori.secretToken, memoriTokens, undefined, undefined, {
+            return reopenSession(true, sessionPassword(), memoriTokens, undefined, undefined, {
                 LANG: userLang,
                 PATHNAME: window.location.pathname,
                 ROUTE: ((_b = (_a = window.location.pathname) === null || _a === void 0 ? void 0 : _a.split('/')) === null || _b === void 0 ? void 0 : _b.pop()) || '',
@@ -1168,7 +1189,7 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, tenantID, memoriLang
                     }
                     fetchSession({
                         memoriID: (_b = memori.engineMemoriID) !== null && _b !== void 0 ? _b : '',
-                        password: secret || memoriPwd || memori.secretToken,
+                        password: sessionPassword(),
                         tag: tag !== null && tag !== void 0 ? tag : personification === null || personification === void 0 ? void 0 : personification.tag,
                         pin: pin !== null && pin !== void 0 ? pin : personification === null || personification === void 0 ? void 0 : personification.pin,
                         initialContextVars: {
@@ -1378,7 +1399,7 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, tenantID, memoriLang
         speakerMuted,
     ]);
     const processEnterTextDialogResponse = useCallback((event, pending) => {
-        var _a, _b;
+        var _a;
         const { msg, typingText: pendingTypingText, useLoaderTextAsMsg, } = pending;
         const currentState = event.currentState;
         if (event.resultCode !== 0 || !currentState) {
@@ -1420,7 +1441,7 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, tenantID, memoriLang
         setChatLogID(undefined);
         const emission = useLoaderTextAsMsg && pendingTypingText
             ? pendingTypingText
-            : (_a = currentState.emission) !== null && _a !== void 0 ? _a : currentDialogState === null || currentDialogState === void 0 ? void 0 : currentDialogState.emission;
+            : currentState.emission;
         if (userLang.toLowerCase() !== language.toLowerCase() &&
             emission &&
             isMultilanguageEnabled) {
@@ -1440,7 +1461,7 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, tenantID, memoriLang
                 pushMessage({
                     text: emission,
                     emitter: currentState.emitter,
-                    media: (_b = currentState.emittedMedia) !== null && _b !== void 0 ? _b : currentState.media,
+                    media: (_a = currentState.emittedMedia) !== null && _a !== void 0 ? _a : currentState.media,
                     llmUsage: currentState.llmUsage,
                     fromUser: false,
                     questionAnswered: msg,
@@ -1463,7 +1484,6 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, tenantID, memoriLang
         userLang,
         language,
         isMultilanguageEnabled,
-        currentDialogState === null || currentDialogState === void 0 ? void 0 : currentDialogState.emission,
         translateDialogState,
         handleSpeak,
         shouldPlayAudio,
@@ -1855,8 +1875,7 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, tenantID, memoriLang
         }
         else if ((!sessionID &&
             memori.privacyType !== 'PUBLIC' &&
-            !memori.secretToken &&
-            !memoriPwd &&
+            !sessionPassword() &&
             !memoriTokens) ||
             (!sessionID && gotErrorInOpening)) {
             setAuthModalState('password');
@@ -1872,7 +1891,7 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, tenantID, memoriLang
             try {
                 const session = await fetchSession({
                     memoriID: memori.engineMemoriID,
-                    password: secret || memoriPwd || memori.secretToken,
+                    password: sessionPassword(),
                     tag: personification === null || personification === void 0 ? void 0 : personification.tag,
                     pin: personification === null || personification === void 0 ? void 0 : personification.pin,
                     continueFromChatLogID: chatLog === null || chatLog === void 0 ? void 0 : chatLog.chatLogID,
@@ -1986,7 +2005,7 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, tenantID, memoriLang
                     }
                 }
                 catch (_v) {
-                    reopenSession(true, memori === null || memori === void 0 ? void 0 : memori.secretToken, undefined, personification.tag, personification.pin, {
+                    reopenSession(true, sessionPassword(), undefined, personification.tag, personification.pin, {
                         LANG: userLang,
                         PATHNAME: (_j = window.location.pathname) === null || _j === void 0 ? void 0 : _j.toUpperCase(),
                         ROUTE: ((_m = (_l = (_k = window.location.pathname) === null || _k === void 0 ? void 0 : _k.split('/')) === null || _l === void 0 ? void 0 : _l.pop()) === null || _m === void 0 ? void 0 : _m.toUpperCase()) ||
@@ -2014,7 +2033,7 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, tenantID, memoriLang
                     }
                 }
                 catch (e) {
-                    reopenSession(true, memori === null || memori === void 0 ? void 0 : memori.secretToken, undefined, undefined, undefined, {
+                    reopenSession(true, sessionPassword(), undefined, undefined, undefined, {
                         LANG: userLang,
                         PATHNAME: (_o = window.location.pathname) === null || _o === void 0 ? void 0 : _o.toUpperCase(),
                         ROUTE: ((_r = (_q = (_p = window.location.pathname) === null || _p === void 0 ? void 0 : _p.split('/')) === null || _q === void 0 ? void 0 : _q.pop()) === null || _r === void 0 ? void 0 : _r.toUpperCase()) ||
@@ -2120,6 +2139,7 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, tenantID, memoriLang
             setClickedStart(false);
         }
     }, [
+        secret,
         memoriPwd,
         memori,
         memoriTokens,
@@ -2595,7 +2615,7 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, tenantID, memoriLang
                                 if (birthDate) {
                                     setBirthDate(birthDate);
                                     setLocalConfig('birthDate', birthDate);
-                                    reopenSession(!sessionId, memoriPassword || memoriPwd || (memori === null || memori === void 0 ? void 0 : memori.secretToken), memoriTokens, personification === null || personification === void 0 ? void 0 : personification.tag, personification === null || personification === void 0 ? void 0 : personification.pin, {
+                                    reopenSession(!sessionId, sessionPassword(), memoriTokens, personification === null || personification === void 0 ? void 0 : personification.tag, personification === null || personification === void 0 ? void 0 : personification.pin, {
                                         LANG: userLang,
                                         PATHNAME: (_a = window.location.pathname) === null || _a === void 0 ? void 0 : _a.toUpperCase(),
                                         ROUTE: ((_d = (_c = (_b = window.location.pathname) === null || _b === void 0 ? void 0 : _b.split('/')) === null || _c === void 0 ? void 0 : _c.pop()) === null || _d === void 0 ? void 0 : _d.toUpperCase()) || '',
@@ -2623,7 +2643,7 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, tenantID, memoriLang
                                 ? 'memori-modal--above-website-assistant'
                                 : undefined, onLogin: (user, token) => {
                                 var _a, _b, _c, _d;
-                                reopenSession(false, memoriPassword || memoriPwd || (memori === null || memori === void 0 ? void 0 : memori.secretToken), [], personification === null || personification === void 0 ? void 0 : personification.tag, personification === null || personification === void 0 ? void 0 : personification.pin, {
+                                reopenSession(false, sessionPassword(), [], personification === null || personification === void 0 ? void 0 : personification.tag, personification === null || personification === void 0 ? void 0 : personification.pin, {
                                     LANG: userLang,
                                     PATHNAME: (_a = window.location.pathname) === null || _a === void 0 ? void 0 : _a.toUpperCase(),
                                     ROUTE: ((_d = (_c = (_b = window.location.pathname) === null || _b === void 0 ? void 0 : _b.split('/')) === null || _c === void 0 ? void 0 : _c.pop()) === null || _d === void 0 ? void 0 : _d.toUpperCase()) || '',