@openeventkit/event-site 2.1.35 → 2.1.37

package/env.template

@@ -35,3 +35,4 @@ GATSBY_CMS_BACKEND_BRANCH=
 GATSBY_SITE_URL=
 GATSBY_GOOGLE_TAGMANAGER_ID=
 GATSBY_HASH_SANITIZE_TOKENS=
+GATSBY_TENANT_ID=

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openeventkit/event-site",
   "description": "Event Site",
-  "version": "2.1.35",
+  "version": "2.1.37",
   "author": "Tipit LLC",
   "dependencies": {
     "@emotion/server": "^11.11.0",
@@ -45,7 +45,7 @@
     "classnames": "^2.3.1",
     "cross-env": "^7.0.3",
     "crypto-js": "^4.1.1",
-    "decap-cms-app": "^3.1.10",
+    "decap-cms-app": "3.6.4",
     "decap-cms-lib-widgets": "^3.0.2",
     "disqus-react": "1.0.10",
     "dotenv": "^8.2.0",
@@ -87,9 +87,9 @@
     "markdown-it": "^12.0.0",
     "moment": "^2.27.0",
     "moment-timezone": "^0.5.31",
-    "my-orders-tickets-widget": "1.0.0-beta.61",
+    "my-orders-tickets-widget": "1.0.3",
     "object.assign": "^4.1.5",
-    "openstack-uicore-foundation": "4.2.14",
+    "openstack-uicore-foundation": "4.2.16",
     "path-browserify": "^1.0.1",
     "prop-types": "^15.6.0",
     "react": "^18.2.0",

package/src/actions/base-actions.js

@@ -10,6 +10,8 @@ import {RELOAD_SCHED_DATA, RELOAD_USER_PROFILE} from "./schedule-actions";
 
 import {RESET_STATE, SYNC_DATA, GET_THIRD_PARTY_PROVIDERS, UPDATE_LAST_CHECK_FOR_NOVELTIES } from './base-actions-definitions';
 
+import { getEnvVariableAsQueryParam, TENANT_ID } from "../utils/envVariables";
+
 export const resetState = () => (dispatch) => {
   dispatch(createAction(RESET_STATE)({}));
 };
@@ -58,7 +60,7 @@ export const getThirdPartyProviders = () => (dispatch) => {
   return getRequest(
     null,
     createAction(GET_THIRD_PARTY_PROVIDERS),
-    `${window.IDP_BASE_URL}/oauth2/.well-known/openid-configuration`,
+    `${window.IDP_BASE_URL}/oauth2/.well-known/openid-configuration${getEnvVariableAsQueryParam(TENANT_ID, "tenant")}`,
     customErrorHandler
   )({})(dispatch).then(payload => {
     dispatch(stopLoading());

package/src/cms/config/collections/configurationsCollection/siteSettings/index.js

@@ -18,7 +18,9 @@ import {
 
 import {
   getEnvVariable,
-  IDP_BASE_URL
+  getEnvVariableAsQueryParam,
+  IDP_BASE_URL,
+  TENANT_ID
 } from "@utils/envVariables";
 
 import { mapObjectToSelectOptions } from "../../../utils";
@@ -221,7 +223,7 @@ const siteSettings = {
           widget: "identityProviderParam",
           label: "Provider Param",
           name: "providerParam",
-          endpoint: `${getEnvVariable(IDP_BASE_URL)}/oauth2/.well-known/openid-configuration`,
+          endpoint: `${getEnvVariable(IDP_BASE_URL)}/oauth2/.well-known/openid-configuration${getEnvVariableAsQueryParam(TENANT_ID, "tenant")}`,
           required: false
         },
         imageField({

package/src/components/AuthComponent.js

@@ -20,6 +20,7 @@ import { getDefaultLocation, validateIdentityProviderButtons } from "@utils/logi
 import { userHasAccessLevel, VIRTUAL_ACCESS_LEVEL } from "@utils/authorizedGroups";
 import useSiteSettings from "@utils/useSiteSettings";
 import { PHASES } from "@utils/phasesUtils";
+import { getEnvVariable, TENANT_ID } from "@utils/envVariables";
 
 import styles from "../styles/auth-component.module.scss";
 
@@ -81,7 +82,7 @@ const AuthComponent = ({
     };
 
     const onClickLogin = (provider) => {
-        doLogin(getBackURL(), provider, null, initialEmailValue || null);
+        doLogin(getBackURL(), provider, null, initialEmailValue || null, null, getEnvVariable(TENANT_ID));
     };
 
     const handleClosePopup = () => {

package/src/components/RegistrationLiteComponent.js

@@ -24,7 +24,7 @@ import "summit-registration-lite/dist/index.css";
 import useSiteSettings from "@utils/useSiteSettings";
 import usePaymentSettings from "@utils/usePaymentSettings";
 import useMarketingSettings, { MARKETING_SETTINGS_KEYS }  from "@utils/useMarketingSettings";
-import { getEnvVariable, SUMMIT_API_BASE_URL, OAUTH2_CLIENT_ID, REGISTRATION_BASE_URL, SUPPORT_EMAIL } from "@utils/envVariables";
+import { getEnvVariable, SUMMIT_API_BASE_URL, OAUTH2_CLIENT_ID, REGISTRATION_BASE_URL, SUPPORT_EMAIL, TENANT_ID } from "@utils/envVariables";
 import { userHasAccessLevel, VIRTUAL_ACCESS_LEVEL } from "@utils/authorizedGroups";
 import { validateIdentityProviderButtons } from "@utils/loginUtils";
 import { triggerTagManagerTrackEvent } from "@utils/eventTriggers";
@@ -83,7 +83,7 @@ const RegistrationLiteComponent = ({
     }
 
     const onClickLogin = (provider) => {
-        doLogin(getBackURL(), provider);
+        doLogin(getBackURL(), provider, null, null, null, getEnvVariable(TENANT_ID));
     };
 
     const handleCompanyError = () => {

package/src/routes/login-callback-route.js

@@ -13,6 +13,7 @@
 import URI from "urijs"
 import React from 'react'
 import {connect} from "react-redux";
+import { getEnvVariable, TENANT_ID } from "@utils/envVariables";
 
 /**
  * class LogInCallbackRoute
@@ -47,7 +48,7 @@ class LogInCallbackRoute extends React.Component {
             otpLoginHint = encodeURI(query["otp_login_hint"]);
         }
 
-        doLogin(backUrl, loginHint, otpLoginHint);
+        doLogin(backUrl, loginHint, otpLoginHint, null, null, getEnvVariable(TENANT_ID));
     }
 
 

package/src/templates/token-expire-page.js

@@ -7,6 +7,7 @@ import { handleResetReducers } from "../actions/event-actions";
 import Interstitial from "../components/Interstitial";
 import { userHasAccessLevel, VIRTUAL_ACCESS_LEVEL } from "@utils/authorizedGroups";
 import { getDefaultLocation } from "@utils/loginUtils";
+import { getEnvVariable, TENANT_ID } from "@utils/envVariables";
 
 export const TokenExpirePageTemplate = class extends React.Component {
 
@@ -27,7 +28,7 @@ export const TokenExpirePageTemplate = class extends React.Component {
 
       setTimeout(() => {
         handleResetReducers();
-        doLogin(backUrl);
+        doLogin(backUrl, null, null, null, null, getEnvVariable(TENANT_ID));
       }, 1500);
     }
   }

package/src/utils/alerts.js

@@ -2,6 +2,7 @@ import Swal from "sweetalert2";
 import { doLogin } from 'openstack-uicore-foundation/lib/security/methods'
 import URI from "urijs"
 import { savePendingAction } from "./schedule";
+import { getEnvVariable, TENANT_ID } from "@utils/envVariables";
 
 export const alertPopup = (title, html, confirmLabel, confirmAction, cancelLabel = 'Dismiss') => {
     Swal.fire({
@@ -38,7 +39,7 @@ export const needsLogin = (action, msg = null) => {
         let backUrl = window?.location?.href ?? '/a';
         let encodedBackUrl = URI.encode(backUrl);
         if (action) savePendingAction(action);
-        return doLogin(encodedBackUrl);
+        return doLogin(encodedBackUrl, null, null, null, null, getEnvVariable(TENANT_ID));
     }
 
     alertPopup('Login', msg || defaultMessage, 'Login', login, 'OK');

package/src/utils/envVariables.js

@@ -27,6 +27,7 @@ export const TIMEINTERVALSINCE1970_API_URL = "TIMEINTERVALSINCE1970_API_URL";
 export const ABLY_API_KEY = "ABLY_API_KEY";
 export const GOOGLE_TAGMANAGER_ID = "GOOGLE_TAGMANAGER_ID";
 export const HASH_SANITIZE_TOKENS = "HASH_SANITIZE_TOKENS";
+export const TENANT_ID = "TENANT_ID";
 
 const processEnv = {
   /**
@@ -64,7 +65,8 @@ const processEnv = {
   TIMEINTERVALSINCE1970_API_URL: process.env.GATSBY_TIMEINTERVALSINCE1970_API_URL,
   ABLY_API_KEY: process.env.GATSBY_ABLY_API_KEY,
   GOOGLE_TAGMANAGER_ID: process.env.GATSBY_GOOGLE_TAGMANAGER_ID,
-  HASH_SANITIZE_TOKENS: process.env.GATSBY_HASH_SANITIZE_TOKENS
+  HASH_SANITIZE_TOKENS: process.env.GATSBY_HASH_SANITIZE_TOKENS,
+  TENANT_ID: process.env.GATSBY_TENANT_ID
 }
 
 export const getEnvVariable = (name) => {
@@ -75,6 +77,10 @@ export const getEnvVariable = (name) => {
   return res;
 }
 
+export const getEnvVariableAsQueryParam = (env, param) => {
+  return `${getEnvVariable(env) ? `?${param}=${getEnvVariable(env)}` : ""}`;
+}
+
 if (typeof window === "object") {
   window.SITE_URL = processEnv[SITE_URL];
   window.OAUTH2_FLOW = processEnv[OAUTH2_FLOW];

package/src/utils/real_time_updates/withRealTimeUpdates.js

@@ -62,6 +62,11 @@ const withRealTimeUpdates = WrappedComponent => {
             );
         }
 
+        getCurrentLocation() {
+            const { location } = this.props;
+            return location?.pathname || '';
+        }
+
         /**
          *
          * @param updates
@@ -92,6 +97,7 @@ const withRealTimeUpdates = WrappedComponent => {
                 allIDXEvents: JSON.stringify(allIDXEvents),
                 allSpeakers: JSON.stringify(allSpeakers),
                 allIDXSpeakers: JSON.stringify(allIDXSpeakers),
+                currentLocation: this.getCurrentLocation()
             });
 
             this._worker.onmessage = ({

package/src/workers/sync_strategies/activity_synch_strategy.js

@@ -104,6 +104,13 @@ class ActivitySynchStrategy extends AbstractSynchStrategy{
         if (entity?.moderator) this._upsertSpeaker(entity.moderator);
     }
 
+    /** only fetch streaming info based on event detail page */
+    _shouldFetchStreamingInfo(currentLocation) {
+        if (!currentLocation) return false;
+        const streamingPages = ['/a/event/'];
+        return streamingPages.some(page => currentLocation.includes(page));
+    }
+
     async _handleUpsert(entity, payload, eventsData) {
         console.log("ActivitySynchStrategy::process upsert", { id: entity?.id });
 
@@ -155,6 +162,11 @@ class ActivitySynchStrategy extends AbstractSynchStrategy{
             case 'INSERT':
             case 'UPDATE':{
                 let entity = await fetchEventById(this.summit.id, entity_id, this.accessToken);
+                if(this.accessToken && this._shouldFetchStreamingInfo(this.currentLocation)) {
+                    const streaming_info = await fetchStreamingInfoByEventId(this.summit.id, entity_id, this.accessToken);
+                    if(streaming_info) entity = {...entity, ...streaming_info};
+                }
+
                 if(!entity){
                     // was deleted ( un - published)
                     return this._handleDeleteOrUnpublish(entity_id, payload, eventsData);

package/src/workers/sync_strategies/synch_strategy_factory.js

@@ -18,12 +18,13 @@ class SynchStrategyFactory {
      * @param allIDXSpeakers
      * @param accessToken
      * @param payload
+     * @param currentLocation
      * @returns {null|*}
      */
-    static build(summit, allEvents, allIDXEvents, allSpeakers, allIDXSpeakers, accessToken, payload) {
+    static build(summit, allEvents, allIDXEvents, allSpeakers, allIDXSpeakers, accessToken, payload, currentLocation) {
         const {entity_type} = payload;
         if (isSummitEventDataUpdate(entity_type)) {
-            return new ActivitySynchStrategy(summit, allEvents, allIDXEvents, allSpeakers, allIDXSpeakers, accessToken);
+            return new ActivitySynchStrategy(summit, allEvents, allIDXEvents, allSpeakers, allIDXSpeakers, accessToken, currentLocation);
         }
         if (isSummitEventTypeDataUpdate(entity_type)) {
             return new ActivityTypeSynchStrategy(summit, allEvents, allIDXEvents, allSpeakers, allIDXSpeakers, accessToken);

package/src/workers/synch.worker.js

@@ -8,6 +8,7 @@ let localAllIDXEvents = null;
 let localAllSpeakers = null;
 let localAllIDXSpeakers = null;
 let currentAccessToken = null;
+let currentLocation = '';
 
 // Dedup/backpressure pool: key -> { payload, seq }
 const pool = new Map();
@@ -68,6 +69,7 @@ self.onmessage = (e) => {
         allIDXEvents,
         allSpeakers,
         allIDXSpeakers,
+        currentLocation: location
     } = e.data || {};
 
     // Initialize persistent state once
@@ -77,6 +79,8 @@ self.onmessage = (e) => {
     if (localAllSpeakers === null) localAllSpeakers  = maybeParseJSON(allSpeakers);
     if (localAllIDXSpeakers === null) localAllIDXSpeakers = maybeParseJSON(allIDXSpeakers);
 
+    currentLocation = location ?? currentLocation;
+
     currentAccessToken = accessToken ?? currentAccessToken;
 
     // Coalesce incoming payloads into the pool (backpressure)
@@ -150,7 +154,8 @@ async function runBatch(batch) {
             localAllSpeakers,
             localAllIDXSpeakers,
             currentAccessToken,
-            payload
+            payload,
+            currentLocation
         );
 
         lastPayload = payload;