@fluid-app/portal-sdk 0.1.524 → 0.1.526

package/dist/{MessagingScreen-CPbJ2scr.mjs → MessagingScreen-8OZSwMYW.mjs}

@@ -5,8 +5,8 @@ import "./account-api-context-8vg35E7d.mjs";
 import "./use-optional-store-DpB_jK4Q.mjs";
 import "./use-mysite-portal-BlOgU7cc.mjs";
 import "./Combobox-D8ukt9Tb.mjs";
-import "./FluidProvider-BnzzWdqN.mjs";
-import "./ContactsTranslationBridge-7hUvizHe.mjs";
+import "./FluidProvider-CqFIXA9E.mjs";
+import "./ContactsTranslationBridge-B4SlrRSR.mjs";
 import "./prop-types-CwLyDfek.mjs";
 import "./MobileBottomSheet-BKm3ysnd.mjs";
 import "./registry-context-DeQRPEBN.mjs";
@@ -33,7 +33,7 @@ import "./BulletListWidget-DvYksMFr.mjs";
 import "./preview-context-BWmZf_Qw.mjs";
 import "./CalendarWidget-XcCCAFsM.mjs";
 import "./error-state-Vy3ZKhKa.mjs";
-import { n as messagingScreenPropertySchema, t as MessagingScreen } from "./MessagingScreen-D0elghP1.mjs";
+import { n as messagingScreenPropertySchema, t as MessagingScreen } from "./MessagingScreen-DwU7sqzj.mjs";
 import "./WidgetLoadingSkeleton-VmD6A-rW.mjs";
 import "./CardWidget-BeTseq2w.mjs";
 import "./helpers-BmP1pE-e.mjs";

package/dist/{MessagingScreen-Dn4YnN6I.cjs → MessagingScreen-CY8VbrOx.cjs}

@@ -5,8 +5,8 @@ require("./account-api-context-CrShCYnN.cjs");
 require("./use-optional-store-CIM4spDu.cjs");
 require("./use-mysite-portal-BCcNoszb.cjs");
 require("./Combobox-CReJLJfk.cjs");
-require("./FluidProvider-BsFKQnUK.cjs");
-require("./ContactsTranslationBridge-MTW9WS-j.cjs");
+require("./FluidProvider-B4msuwpR.cjs");
+require("./ContactsTranslationBridge-C7Q9rpKH.cjs");
 require("./prop-types-B7bFaw8n.cjs");
 require("./MobileBottomSheet-HzfAr8dE.cjs");
 require("./registry-context-DLWP4Bzy.cjs");
@@ -66,7 +66,7 @@ require("./translation-adapter-Dw2qIlJq.cjs");
 require("./translation-adapter-DoSZB36K.cjs");
 require("./translation-adapter-D_fMLp4u.cjs");
 require("./sidebar-zkV-HxHW.cjs");
-const require_MessagingScreen = require("./MessagingScreen-CkTXrFJI.cjs");
+const require_MessagingScreen = require("./MessagingScreen-D_Y3Coa6.cjs");
 require("./ScreenHeaderContext-Df1DvpEW.cjs");
 require("./dist-ZqdCmmRH.cjs");
 require("./es-BF8O5PvG.cjs");

package/dist/{MessagingScreen-CkTXrFJI.cjs → MessagingScreen-D_Y3Coa6.cjs}

@@ -1,7 +1,7 @@
 const require_chunk = require("./chunk-9hOWP6kD.cjs");
-const require_FluidProvider = require("./FluidProvider-BsFKQnUK.cjs");
+const require_FluidProvider = require("./FluidProvider-B4msuwpR.cjs");
 const require_fetch_client = require("./fetch-client-wO-vh6_f.cjs");
-const require_ContactsTranslationBridge = require("./ContactsTranslationBridge-MTW9WS-j.cjs");
+const require_ContactsTranslationBridge = require("./ContactsTranslationBridge-C7Q9rpKH.cjs");
 const require_static_dict_adapter = require("./static-dict-adapter-BCgoKiVT.cjs");
 const require_translation_api_context_factory = require("./translation-api-context-factory-mbsJk2UU.cjs");
 const require_use_account = require("./use-account-BRzw_4Wp.cjs");
@@ -176,7 +176,7 @@ async function fetchMessaging(config, options) {
 	} : headers;
 	let response;
 	try {
-		response = await fetch(url, {
+		response = await (config.fetch ?? fetch)(url, {
 			method,
 			headers: requestHeaders,
 			body: hasBody ? JSON.stringify(input) : void 0
@@ -1059,7 +1059,7 @@ function createMessagingApi(config) {
 function deriveWebsocketUrl(baseUrl) {
 	return `${baseUrl.replace(/\/+$/, "").replace(/\/api$/, "")}/cable`;
 }
-function useMessagingConfig() {
+function useMessagingConfig(apiConfigOverride) {
 	const { config } = require_ContactsTranslationBridge.useFluidContext();
 	const getHeaders = (0, react.useCallback)(async () => {
 		return {
@@ -1071,7 +1071,7 @@ function useMessagingConfig() {
 		const base = config.baseUrl.replace(/\/+$/, "");
 		return base.endsWith("/api") ? base : `${base}/api`;
 	}, [config.baseUrl]);
-	const apiConfig = (0, react.useMemo)(() => ({
+	const defaultApiConfig = (0, react.useMemo)(() => ({
 		baseUrl: apiBaseUrl,
 		getHeaders,
 		...config.onAuthError != null && { onAuthError: config.onAuthError }
@@ -1080,6 +1080,7 @@ function useMessagingConfig() {
 		config.onAuthError,
 		getHeaders
 	]);
+	const apiConfig = apiConfigOverride ?? defaultApiConfig;
 	return {
 		apiConfig,
 		messagingApi: (0, react.useMemo)(() => createMessagingApi(apiConfig), [apiConfig]),
@@ -2314,6 +2315,20 @@ const memberSettingsSchema = zod.z.object({
 });
 channelDetailsSchema.extend(memberSettingsSchema.shape);
 //#endregion
+//#region ../../messaging/core/src/cable/cable-url.ts
+/** Builds a Cable URL without exposing credentials for storefront sessions. */
+function messagingCableUrl(url, origin, token, sessionAuthentication) {
+	const address = new URL(url, origin);
+	if (sessionAuthentication) {
+		const storefront = new URL(origin);
+		const protocol = storefront.protocol === "https:" ? "wss:" : "ws:";
+		if (address.host !== storefront.host || ![storefront.protocol, protocol].includes(address.protocol)) throw new Error("Member session WebSocket must use the storefront origin");
+		address.searchParams.delete("token");
+		address.searchParams.set("member_storefront", "true");
+	} else if (token) address.searchParams.set("token", token);
+	return address.toString();
+}
+//#endregion
 //#region ../../../node_modules/.pnpm/@rails+actioncable@7.2.300/node_modules/@rails/actioncable/app/assets/javascripts/actioncable.js
 var require_actioncable = /* @__PURE__ */ require_chunk.__commonJSMin(((exports, module) => {
 	(function(global, factory) {
@@ -2884,7 +2899,7 @@ const NotificationEventSchema = zod.z.strictObject({
 var import_actioncable = /* @__PURE__ */ require_chunk.__toESM(require_actioncable(), 1);
 const APPEARANCE_LOG_BATCH_MS = 1200;
 function useMessagingCable(options) {
-	const { websocketUrl, token, recipientId, companyId, onAppearanceChange } = options;
+	const { websocketUrl, token, recipientId, companyId, onAppearanceChange, sessionAuthentication = false } = options;
 	const queryClient = (0, _tanstack_react_query.useQueryClient)();
 	const appearanceLogBufferRef = (0, react.useRef)(/* @__PURE__ */ new Map());
 	const appearanceLogTimerRef = (0, react.useRef)(null);
@@ -2930,7 +2945,7 @@ function useMessagingCable(options) {
 		}, APPEARANCE_LOG_BATCH_MS);
 	});
 	(0, react.useEffect)(() => {
-		if (!token || !websocketUrl) return;
+		if (!token && !sessionAuthentication || !websocketUrl) return;
 		flushAppearanceLogs();
 		appearanceLogBufferRef.current.clear();
 		let consumer = null;
@@ -3126,7 +3141,7 @@ function useMessagingCable(options) {
 		};
 		const connectAt = (url) => {
 			try {
-				consumer = import_actioncable.createConsumer(`${url}?token=${token}`);
+				consumer = import_actioncable.createConsumer(messagingCableUrl(url, window.location.origin, token, sessionAuthentication));
 			} catch (err) {
 				console.error("[ws] failed to create consumer", err);
 				return;
@@ -3177,7 +3192,7 @@ function useMessagingCable(options) {
 						console.error("[ws] appearance subscription rejected");
 					}
 				});
-				notificationsSub = consumer.subscriptions.create({ channel: "NotificationsChannel" }, {
+				if (!sessionAuthentication) notificationsSub = consumer.subscriptions.create({ channel: "NotificationsChannel" }, {
 					connected: report,
 					disconnected: () => handleDisconnect("notifications channel"),
 					received: (data) => {
@@ -3206,6 +3221,7 @@ function useMessagingCable(options) {
 		};
 	}, [
 		token,
+		sessionAuthentication,
 		recipientId,
 		companyId,
 		websocketUrl,
@@ -56514,7 +56530,7 @@ function ScheduledMessagesView({ onToast }) {
 }
 //#endregion
 //#region ../../messaging/ui/src/app/MessagingApp.tsx
-function MessagingApp({ translationAdapter, api, auth, websocketUrl, token, renderImage, renderProfileTrigger, onNavigate, initialRoute, renderLockedDownlineItem, renderNewChannelSidebar, showAdminFeatures, canUseMyDownline, downlineData, topBar, messagesViewProps, newMessageViewProps, onToast, getMessageLink, renderProfileContent, hideTopBar, hideMobileBackButton, children }) {
+function MessagingApp({ translationAdapter, api, auth, websocketUrl, token, sessionAuthentication = false, renderImage, renderProfileTrigger, onNavigate, initialRoute, renderLockedDownlineItem, renderNewChannelSidebar, showAdminFeatures, canUseMyDownline, downlineData, topBar, messagesViewProps, newMessageViewProps, onToast, getMessageLink, renderProfileContent, hideTopBar, hideMobileBackButton, children }) {
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(MessagingTranslationProvider, {
 		value: translationAdapter,
 		children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(MessagingAppProvider, {
@@ -56527,9 +56543,10 @@ function MessagingApp({ translationAdapter, api, auth, websocketUrl, token, rend
 			onNavigate,
 			initialRoute,
 			children: [
-				websocketUrl && token && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(CableBootstrap, {
+				websocketUrl && (token || sessionAuthentication) && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(CableBootstrap, {
 					websocketUrl,
-					token,
+					token: token ?? null,
+					sessionAuthentication,
 					recipientId: auth.recipientId,
 					companyId: auth.companyId
 				}),
@@ -56674,9 +56691,9 @@ function defaultToast(message, type) {
 		type
 	});
 }
-function MessagingScreenContent({ translationAdapter, onToast, fileUploader, websocketUrl: websocketUrlOverride, ...divProps }) {
+function MessagingScreenContent({ translationAdapter, onToast, fileUploader, websocketUrl: websocketUrlOverride, apiConfig: apiConfigOverride, websocketSession, hideMobileBackButton = true, ...divProps }) {
 	const { t } = useMessagingTranslation();
-	const { apiConfig, messagingApi, websocketUrl } = useMessagingConfig();
+	const { apiConfig, messagingApi, websocketUrl } = useMessagingConfig(apiConfigOverride);
 	const messagingAuth = useMessagingAuth();
 	const { currentSlug, navigate } = require_AppNavigationContext.useAppNavigation();
 	const uploader = fileUploader ?? disabledFileUploader;
@@ -56770,13 +56787,14 @@ function MessagingScreenContent({ translationAdapter, onToast, fileUploader, web
 			auth: messagingAuth,
 			websocketUrl: effectiveWsUrl,
 			token: null,
+			sessionAuthentication: websocketSession,
 			initialRoute,
 			onNavigate: handleMessagingNavigate,
 			renderImage,
 			showAdminFeatures: false,
 			onToast: effectiveToast,
 			hideTopBar: true,
-			hideMobileBackButton: true,
+			hideMobileBackButton,
 			messagesViewProps: {
 				uploader,
 				saveDrafts: true,
@@ -56790,7 +56808,7 @@ function MessagingScreenContent({ translationAdapter, onToast, fileUploader, web
 		})
 	});
 }
-function MessagingScreen({ onToast, fileUploader, websocketUrl, background, textColor, accentColor, padding, borderRadius, ...divProps }) {
+function MessagingScreen({ onToast, fileUploader, websocketUrl, apiConfig, websocketSession, hideMobileBackButton, background, textColor, accentColor, padding, borderRadius, ...divProps }) {
 	const translationAdapter = useMessagingTranslationAdapter();
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(MessagingTranslationProvider, {
 		value: translationAdapter,
@@ -56799,6 +56817,9 @@ function MessagingScreen({ onToast, fileUploader, websocketUrl, background, text
 			onToast,
 			fileUploader,
 			websocketUrl,
+			apiConfig,
+			websocketSession,
+			hideMobileBackButton,
 			...divProps
 		})
 	});
@@ -56850,4 +56871,4 @@ Object.defineProperty(exports, "useMessagingConfig", {
 	}
 });
 
-//# sourceMappingURL=MessagingScreen-CkTXrFJI.cjs.map
+//# sourceMappingURL=MessagingScreen-D_Y3Coa6.cjs.map