@smarter.sh/ui-chat 0.2.7 → 0.2.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smarter.sh/ui-chat",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "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

@@ -50,6 +50,7 @@ function SmarterChat({
   apiKey, // NOT USED. TO DELETE.
   toggleMetadata, // show/hide toggle button to show/hide the chat thread metadata
   csrfCookieName = "csrftoken", // the Django CSRF cookie.
+  csrftoken,      // the Django CSRF token. Passed from the Django template in the Smarter web console workbench.
   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.
@@ -89,10 +90,10 @@ function SmarterChat({
   const fileInputRef = useRef(null);
 
   // cookie management
-  const csrfCookie = cookieMetaFactory(csrfCookieName, null, cookieDomain); // we read this but never set it.
-  const authTokenCookie = cookieMetaFactory(authSessionCookieName, null, cookieDomain); // we read this but never set it.
-  const sessionCookie = cookieMetaFactory(sessionCookieName, sessionCookieExpiration, cookieDomain);
-  const debugCookie = cookieMetaFactory(debugCookieName, debugCookieExpiration, cookieDomain);
+  const csrfCookie = cookieMetaFactory(csrfCookieName, null, cookieDomain, csrftoken); // we read this but never set it.
+  const authTokenCookie = cookieMetaFactory(authSessionCookieName, null, cookieDomain, null); // we read this but never set it.
+  const sessionCookie = cookieMetaFactory(sessionCookieName, sessionCookieExpiration, cookieDomain, null);
+  const debugCookie = cookieMetaFactory(debugCookieName, debugCookieExpiration, cookieDomain, null);
   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

package/src/components/SmarterChat/api.js

@@ -30,15 +30,17 @@ const applicationJson = "application/json";
 
 function getCookie(cookie, defaultValue = null) {
   console.log("getCookie(): cookie", cookie);
+  if (cookie.value !== null) {
+    console.log("getCookie(): ", cookie.domain, cookie.name, cookie.value);
+    return cookie.value;
+  }
   let cookieValue = null;
-  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(";");
+  if (window.location.hostname.endsWith(cookie.domain) && document.cookie && document.cookie !== "") {
+    const cookies = document.cookie.split(";").map(cookie => cookie.trim());
     for (let i = 0; i < cookies.length; i++) {
-      const thisCookie = cookies[i].trim();
-      if (thisCookie.substring(0, cookie.name.length + 1) === cookie.name + "=") {
+      const thisCookie = cookies[i];
+      if (thisCookie.startsWith(`${cookie.name}=`)) {
         cookieValue = decodeURIComponent(thisCookie.substring(cookie.name.length + 1));
         console.log("getCookie(): ", cookie.domain, cookie.name, cookieValue);
         break;
@@ -46,6 +48,7 @@ function getCookie(cookie, defaultValue = null) {
     }
   }
 
+
   return cookieValue || defaultValue;
 }
 
@@ -96,6 +99,8 @@ function requestHeadersFactory(cookies) {
       return !trimmedCookie.startsWith(`${cookies.csrfCookie.name}=`);
     });
     const selectedCookies = cookiesArray.join("; ");
+
+    // example return value: "_ga=GA1.1.1244182935.1742308279;  _ga_SK81M5HQYS=GS1.1.1742316653.3.1.1742320251.0.0.0"
     return selectedCookies;
   }
 

package/src/components/SmarterChat/utils.jsx

@@ -1,6 +1,6 @@
 import { MessageDirectionEnum, SenderRoleEnum, ValidMessageRolesEnum } from "./enums.js";
 
-export function cookieMetaFactory(cookieName, cookieExpiration, cookieDomain) {
+export function cookieMetaFactory(cookieName, cookieExpiration, cookieDomain, cookieValue = null) {
   /*
   Create a cookie object.
    */
@@ -8,6 +8,7 @@ export function cookieMetaFactory(cookieName, cookieExpiration, cookieDomain) {
     name: cookieName,
     expiration: cookieExpiration,
     domain: cookieDomain,
+    value: cookieValue,
   };
 }