@smarter.sh/ui-chat 0.2.5 → 0.2.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smarter.sh/ui-chat",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "description": "chatbot React.js component for the https://smarter.sh no-code, plugin based AI platform",
   "homepage": "https://smarter.sh",
   "main": "dist/smarter-chat-library.umd.js",

package/src/components/SmarterChat/Component.jsx

@@ -7,8 +7,8 @@
 
 // React stuff
 import React, { useRef, useState, useEffect } from "react";
-import PropTypes from 'prop-types';
-import ConfigPropTypes from '../../types/propTypes.js';
+import PropTypes from "prop-types";
+import ConfigPropTypes from "../../types/propTypes.js";
 
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faCheckCircle, faTimesCircle, faRocket } from "@fortawesome/free-solid-svg-icons";
@@ -29,18 +29,16 @@ import {
 
 // this repo
 import { ErrorModal } from "../ErrorModal/ErrorModal.jsx";
-import { Console} from "../Console/index.js";
+import { Console } from "../Console/index.js";
 
 // This component
 import "./styles.css";
-import { ContainerLayout, ContentLayout, WorkbenchLayout, ChatAppLayout, ConsoleLayout} from "./Layout.js"
+import { ContainerLayout, ContentLayout, WorkbenchLayout, ChatAppLayout, ConsoleLayout } from "./Layout.js";
 import { MessageDirectionEnum, SenderRoleEnum } from "./enums.js";
 import { setCookie, fetchConfig, fetchPrompt } from "./api.js";
 import { cookieMetaFactory, messageFactory, chatMessages2RequestMessages, chatInit } from "./utils.jsx";
 import { ErrorBoundary } from "./ErrorBoundary.jsx";
 
-
-
 const DEBUG_MODE = false;
 
 // The main chat component. This is the top-level component that
@@ -48,19 +46,18 @@ const DEBUG_MODE = false;
 // managing the chat message thread, sending messages to the backend
 // Api, and rendering the chat UI.
 function SmarterChat({
-  apiUrl,                   // the URL of the Smarter chatbot API. example: https://smarter.3141-5926-5359.beta.api.smarter.sh/
-  apiKey,                   // NOT USED. TO DELETE.
-  toggleMetadata,           // show/hide toggle button to show/hide the chat thread metadata
-  csrfCookieName,           // the Django CSRF cookie.
-  debugCookieName,          // the Smarter chat debug cookie. Set here.
-  debugCookieExpiration,    // the Smarter chat debug cookie. Set here.
-  sessionCookieName,        // the Smarter chat session cookie. Set here, where the user creates a new chat session.
-  sessionCookieExpiration,  // the Smarter chat session cookie. Set here, where the user creates a new chat session.
-  authSessionCookieName,    // the Django session cookie. Set when the user logs in to the Smarter web console app.
-  showConsole=true,         // show the server console log component
-  cookieDomain              // the domain of the cookie. This is added to the cookie meta data, but it is not used.
+  apiUrl, // the URL of the Smarter chatbot API. example: https://smarter.3141-5926-5359.beta.api.smarter.sh/
+  apiKey, // NOT USED. TO DELETE.
+  toggleMetadata, // show/hide toggle button to show/hide the chat thread metadata
+  csrfCookieName = "csrftoken", // the Django CSRF cookie.
+  debugCookieName, // the Smarter chat debug cookie. Set here.
+  debugCookieExpiration, // the Smarter chat debug cookie. Set here.
+  sessionCookieName = "session_key", // the Smarter chat session cookie. Set here, where the user creates a new chat session.
+  sessionCookieExpiration, // the Smarter chat session cookie. Set here, where the user creates a new chat session.
+  authSessionCookieName = "sessionid", // the Django session cookie. Set when the user logs in to the Smarter web console app.
+  showConsole = true, // show the server console log component
+  cookieDomain, // the domain of the cookie. This is added to the cookie meta data to restrict the domain that this component will read cookie data.
 }) {
-
   const [configApiUrl, setConfigApiUrl] = useState(apiUrl);
 
   const [showMetadata, setShowMetadata] = useState(toggleMetadata);
@@ -97,16 +94,15 @@ function SmarterChat({
   const sessionCookie = cookieMetaFactory(sessionCookieName, sessionCookieExpiration, cookieDomain);
   const debugCookie = cookieMetaFactory(debugCookieName, debugCookieExpiration, cookieDomain);
   const cookies = {
-    authTokenCookie: authTokenCookie,   // the Django session cookie. Set when the user logs in to the Smarter web console app.
-                                        // typically this is not required for the chat app when running inside the
-                                        // Smarter web console workbench, since it is already authenticated.
+    authTokenCookie: authTokenCookie, // the Django session cookie. Set when the user logs in to the Smarter web console app.
+    // typically this is not required for the chat app when running inside the
+    // Smarter web console workbench, since it is already authenticated.
 
-    csrfCookie: csrfCookie,             // the Django CSRF cookie. This is required for requests to the Smarter web console workbench.
-    sessionCookie: sessionCookie,       // the Smarter chat session cookie. Set here, where the user creates a new chat session.
-    debugCookie: debugCookie,           // the Smarter chat debug cookie. Set here. Controls browser console logging.
+    csrfCookie: csrfCookie, // the Django CSRF cookie. This is required for requests to the Smarter web console workbench.
+    sessionCookie: sessionCookie, // the Smarter chat session cookie. Set here, where the user creates a new chat session.
+    debugCookie: debugCookie, // the Smarter chat debug cookie. Set here. Controls browser console logging.
   };
 
-
   const refetchConfig = async () => {
     const newConfig = await fetchConfig(configApiUrl, cookies);
 
@@ -115,7 +111,7 @@ function SmarterChat({
       console.log("fetchAndSetConfig() config:", newConfig);
     }
 
-    PropTypes.checkPropTypes(ConfigPropTypes, newConfig, 'prop', 'SmarterChat');
+    PropTypes.checkPropTypes(ConfigPropTypes, newConfig, "prop", "SmarterChat");
     setConfig(newConfig);
     return newConfig;
   };
@@ -369,12 +365,20 @@ function SmarterChat({
                   <ChatContainer style={chatContainerStyleOverrides}>
                     <ConversationHeader>
                       <ConversationHeader.Content
-                        userName={isReady ? <AppTitle title={title} isValid={isValid} isDeployed={isDeployed}/>: "Configuring workbench..."}
-                        info={isReady ? info: ""}
+                        userName={
+                          isReady ? (
+                            <AppTitle title={title} isValid={isValid} isDeployed={isDeployed} />
+                          ) : (
+                            "Configuring workbench..."
+                          )
+                        }
+                        info={isReady ? info : ""}
                       />
                       <ConversationHeader.Actions>
                         <AddUserButton onClick={handleAddUserButtonClick} title="Start a new chat" />
-                        {toggleMetadata && <InfoButton onClick={handleInfoButtonClick} title="Toggle system meta data" />}
+                        {toggleMetadata && (
+                          <InfoButton onClick={handleInfoButtonClick} title="Toggle system meta data" />
+                        )}
                       </ConversationHeader.Actions>
                     </ConversationHeader>
                     <MessageList
@@ -408,9 +412,9 @@ function SmarterChat({
               </div>
             </ChatAppLayout>
             {showConsole && (
-            <ConsoleLayout>
-              <Console config={config} />
-            </ConsoleLayout>
+              <ConsoleLayout>
+                <Console config={config} />
+              </ConsoleLayout>
             )}
           </WorkbenchLayout>
         </ContentLayout>

package/src/components/SmarterChat/api.js

@@ -29,23 +29,23 @@ const userAgent = "SmarterChat/1.0";
 const applicationJson = "application/json";
 
 function getCookie(cookie, defaultValue = null) {
+  console.log("getCookie(): cookie", cookie);
   let cookieValue = null;
-  if (document.cookie && document.cookie !== "") {
+  const expectedDomain = cookie.domain;
+
+  // Check if the cookie is set for the expected domain. example: alpha.platform.smarter.sh
+  if (window.location.hostname === expectedDomain && document.cookie && document.cookie !== "") {
     const cookies = document.cookie.split(";");
     for (let i = 0; i < cookies.length; i++) {
       const thisCookie = cookies[i].trim();
       if (thisCookie.substring(0, cookie.name.length + 1) === cookie.name + "=") {
         cookieValue = decodeURIComponent(thisCookie.substring(cookie.name.length + 1));
-        if (developerMode) {
-          console.log("getCookie(): found ", cookieValue, "for cookie", cookie.name);
-        }
+        console.log("getCookie(): ", cookie.domain, cookie.name, cookieValue);
         break;
       }
     }
   }
-  if (developerMode && !cookieValue) {
-    console.warn("getCookie(): no value found for", cookie.name);
-  }
+
   return cookieValue || defaultValue;
 }