@openeventkit/event-site 2.0.150 → 2.0.152

package/gatsby-config.mjs

@@ -4,6 +4,7 @@ import { createRequire } from "module";
 import { fileURLToPath } from "url";
 import webpack from "webpack";
 import remarkGfm from "remark-gfm";
+import rehypeExternalLinks from "rehype-external-links";
 import rehypeMdxImportMedia from "rehype-mdx-import-media";
 
 const require = createRequire(import.meta.url);
@@ -154,7 +155,9 @@ const plugins = [
             // It's important to specify the maxWidth (in pixels) of
             // the content container as this plugin uses this as the
             // base for generating different widths of each image.
-            maxWidth: 2048
+            maxWidth: 2048,
+            linkImagesToOriginal: false,
+            wrapperStyle: fluidResult => "margin-left: 0; margin-right: auto;"
           }
         }
       ],
@@ -164,6 +167,7 @@ const plugins = [
           remarkGfm
         ],
         rehypePlugins: [
+          rehypeExternalLinks,
           rehypeMdxImportMedia
         ]
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openeventkit/event-site",
   "description": "Event Site",
-  "version": "2.0.150",
+  "version": "2.0.152",
   "author": "Tipit LLC",
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^6.5.2",
@@ -116,6 +116,7 @@
     "redux": "^4.1.2",
     "redux-persist": "^6.0.0",
     "redux-thunk": "^2.4.1",
+    "rehype-external-links": "^3.0.0",
     "rehype-mdx-import-media": "^1.2.0",
     "remark-gfm": "^4.0.0",
     "sass": "^1.49.9",
@@ -129,7 +130,7 @@
     "stream-browserify": "^3.0.0",
     "stream-chat": "^2.7.2",
     "stream-chat-react": "3.1.7",
-    "summit-registration-lite": "5.0.43",
+    "summit-registration-lite": "5.0.44",
     "superagent": "8.0.9",
     "sweetalert2": "^9.17.0",
     "upcoming-events-widget": "3.0.7",

package/src/components/LogoutButton.js

@@ -1,17 +1,11 @@
 import React from "react";
-import { navigate } from "gatsby";
-import { triggerLogoutEvent } from "@utils/eventTriggers";
+import {onLogOut} from "../utils/loginUtils";
 
 export default class
   LogoutButton extends React.Component {
 
   onClickLogout() {
-    triggerLogoutEvent();
-    navigate("/auth/logout", {
-      state: {
-        backUrl: window.location.pathname
-      }
-    })
+    onLogOut();
   }
 
   render() {
@@ -29,4 +23,4 @@ export default class
       return null;
     }
   }
-}
+}

package/src/components/MyOrdersTicketsComponent.js

@@ -1,12 +1,12 @@
 import React from 'react';
 import * as Sentry from "@sentry/react";
 import { useDispatch, useSelector } from 'react-redux';
-import { getAccessToken } from 'openstack-uicore-foundation/lib/security/methods';
 import { getEnvVariable, IDP_BASE_URL, SUMMIT_API_BASE_URL, OAUTH2_CLIENT_ID, SUPPORT_EMAIL } from '../utils/envVariables';
 import { MyOrdersTicketsWidget } from './summit-my-orders-tickets';
 import { getUserProfile, ticketOwnerChange } from '../actions/user-actions';
 
 import { SentryFallbackFunction } from "./SentryErrorComponent";
+import {getAccessTokenSafely} from "../utils/loginUtils";
 
 export const MyOrdersTicketsComponent = () => {
     const dispatch = useDispatch();
@@ -21,7 +21,7 @@ export const MyOrdersTicketsComponent = () => {
         idpBaseUrl: getEnvVariable(IDP_BASE_URL),
         supportEmail: summit.support_email || getEnvVariable(SUPPORT_EMAIL),
         loginUrl: '/',
-        getAccessToken,
+        getAccessToken: getAccessTokenSafely,
         getUserProfile: async () => await dispatch(getUserProfile()),
         summit,
         user,

package/src/components/summit-my-orders-tickets/store/actions/order-actions.js

@@ -19,7 +19,6 @@ import {
     stopLoading,
     startLoading
 } from 'openstack-uicore-foundation/lib/utils/actions';
-import history from '../history';
 
 export const GET_USER_ORDERS = 'GET_ORDERS';
 export const REFUND_ORDER = 'REFUND_ORDER';
@@ -28,7 +27,11 @@ export const SET_ACTIVE_ORDER_ID = 'SET_ACTIVE_ORDER_ID';
 export const getUserOrders = ({ page = 1, perPage = 5 }) => async (dispatch, getState, { getAccessToken, apiBaseUrl, loginUrl }) => {
     const { summitState: { summit } } = getState();
 
-    const accessToken = await getAccessToken().catch(_ => history.replace(loginUrl));
+    const accessToken = await getAccessToken().catch(() => {
+        dispatch(stopLoading());
+        console.log('REJECTING PROMISE AFTER STOP LOADING')
+        return Promise.reject();
+    });
 
     if (!accessToken) return Promise.reject();
 
@@ -59,9 +62,13 @@ export const getUserOrders = ({ page = 1, perPage = 5 }) => async (dispatch, get
 export const cancelOrder = ({ order }) => async (dispatch, getState, { getAccessToken, apiBaseUrl, loginUrl }) => {
     const { orderState: { current_page } } = getState();
 
-    const accessToken = await getAccessToken().catch(_ => history.replace(loginUrl));
+    const accessToken = await getAccessToken().catch(() => {
+        dispatch(stopLoading());
+        console.log('REJECTING PROMISE AFTER STOP LOADING')
+        return Promise.reject();
+    });
 
-    if (!accessToken) return;
+    if (!accessToken) return Promise.reject();
 
     dispatch(startLoading());
 
@@ -86,4 +93,4 @@ export const cancelOrder = ({ order }) => async (dispatch, getState, { getAccess
 
 export const setActiveOrderId = (orderId) => async (dispatch, getState) => {
     return dispatch(createAction(SET_ACTIVE_ORDER_ID)(orderId));
-}
+}

package/src/components/summit-my-orders-tickets/store/actions/summit-actions.js

@@ -19,7 +19,6 @@ import {
     startLoading,
     authErrorHandler,
 } from 'openstack-uicore-foundation/lib/utils/actions';
-import history from "../history";
 
 export const SET_SUMMIT = 'SET_SUMMIT';
 export const GET_MAIN_EXTRA_QUESTIONS = 'GET_MAIN_EXTRA_QUESTIONS';
@@ -32,7 +31,11 @@ export const getMainOrderExtraQuestions = ({ summit, attendeeId }) => async (dis
 
     if (!summit || !attendeeId) return Promise.reject();
 
-    const accessToken = await getAccessToken().catch(_ => history.replace(loginUrl));
+    const accessToken = await getAccessToken().catch(() => {
+        dispatch(stopLoading());
+        console.log('REJECTING PROMISE AFTER STOP LOADING')
+        return Promise.reject();
+    });
 
     if (!accessToken) return Promise.reject();
 

package/src/components/summit-my-orders-tickets/store/actions/ticket-actions.js

@@ -14,7 +14,6 @@
 import i18n from '../../i18n';
 import IdTokenVerifier from 'idtoken-verifier';
 import Swal from 'sweetalert2';
-import history from '../history';
 import {
     authErrorHandler,
     getRequest,
@@ -100,7 +99,11 @@ export const getUserTickets = ({ page = 1, perPage = 5 }) => async (dispatch, ge
 
     if (!summit) return Promise.reject();
 
-    const accessToken = await getAccessToken().catch(_ => history.replace(loginUrl));
+    const accessToken = await getAccessToken().catch(() => {
+        dispatch(stopLoading());
+        console.log('REJECTING PROMISE AFTER STOP LOADING')
+        return Promise.reject();
+    });
 
     if (!accessToken) return Promise.reject();
 
@@ -142,9 +145,13 @@ export const getTicketById = ({order, ticket}) => async (dispatch, getState, { g
 
     if (!summit) return
 
-    const accessToken = await getAccessToken().catch(_ => history.replace(loginUrl));
+    const accessToken = await getAccessToken().catch(() => {
+        dispatch(stopLoading());
+        console.log('REJECTING PROMISE AFTER STOP LOADING')
+        return Promise.reject();
+    });
 
-    if (!accessToken) return;
+    if (!accessToken) return Promise.reject();
 
     dispatch(startLoading());
 
@@ -171,9 +178,13 @@ export const getTicketsByOrder = ({ orderId, page = 1, perPage = 5 }) => async (
 
     dispatch(startLoading());
 
-    const accessToken = await getAccessToken().catch(_ => history.replace(loginUrl));
+    const accessToken = await getAccessToken().catch(() => {
+        dispatch(stopLoading());
+        console.log('REJECTING PROMISE AFTER STOP LOADING')
+        return Promise.reject();
+    });
 
-    if (!accessToken) return;
+    if (!accessToken) return Promise.reject();
 
     const params = {
         access_token: accessToken,
@@ -212,9 +223,13 @@ export const assignAttendee = ({
         reassignOrderId = null
     }
 }) => async (dispatch, getState, { getAccessToken, apiBaseUrl, loginUrl }) => {
-    const accessToken = await getAccessToken().catch(_ => history.replace(loginUrl));
+    const accessToken = await getAccessToken().catch(() => {
+        dispatch(stopLoading());
+        console.log('REJECTING PROMISE AFTER STOP LOADING')
+        return Promise.reject();
+    });
 
-    if (!accessToken) return;
+    if (!accessToken) return Promise.reject();
 
     dispatch(startLoading());
 
@@ -274,9 +289,13 @@ export const editOwnedTicket = ({
         extra_questions,
     }
 }) => async (dispatch, getState, { getAccessToken, getUserProfile, apiBaseUrl, loginUrl }) => {
-    const accessToken = await getAccessToken().catch(_ => history.replace(loginUrl));
+    const accessToken = await getAccessToken().catch(() => {
+        dispatch(stopLoading());
+        console.log('REJECTING PROMISE AFTER STOP LOADING')
+        return Promise.reject();
+    });
 
-    if (!accessToken) return;
+    if (!accessToken) return Promise.reject();
 
     dispatch(startLoading());
 
@@ -357,9 +376,13 @@ export const editOwnedTicket = ({
 };
 
 export const resendNotification = (ticket) => async (dispatch, getState, { getAccessToken, apiBaseUrl, loginUrl }) => {
-    const accessToken = await getAccessToken().catch(_ => history.replace(loginUrl));
+    const accessToken = await getAccessToken().catch(() => {
+        dispatch(stopLoading());
+        console.log('REJECTING PROMISE AFTER STOP LOADING')
+        return Promise.reject();
+    });
 
-    if (!accessToken) return;
+    if (!accessToken) return Promise.reject();
 
     const { message } = ticket;
 
@@ -392,9 +415,13 @@ export const changeTicketAttendee = ({
     context,
     data: { attendee_email }
 }) => async (dispatch, getState, { getAccessToken, apiBaseUrl, loginUrl }) => {
-    const accessToken = await getAccessToken().catch(_ => history.replace(loginUrl));
+    const accessToken = await getAccessToken().catch(() => {
+        dispatch(stopLoading());
+        console.log('REJECTING PROMISE AFTER STOP LOADING')
+        return Promise.reject();
+    });
 
-    if (!accessToken) return;
+    if (!accessToken) return Promise.reject();
 
     dispatch(startLoading());
 
@@ -439,9 +466,13 @@ export const removeAttendee = ({ticket, context}) => async (dispatch, getState,
         ticketState: { current_page: ticketPage, orderTickets: { current_page : orderTicketsCurrentPage } }
     } = getState();
 
-    const accessToken = await getAccessToken().catch(_ => history.replace(loginUrl));
+    const accessToken = await getAccessToken().catch(() => {
+        dispatch(stopLoading());
+        console.log('REJECTING PROMISE AFTER STOP LOADING')
+        return Promise.reject();
+    });
 
-    if (!accessToken) return;
+    if (!accessToken) return Promise.reject();
 
     dispatch(startLoading());
 
@@ -474,9 +505,13 @@ export const removeAttendee = ({ticket, context}) => async (dispatch, getState,
 };
 
 export const getTicketPDF = ({ ticket }) => async (dispatch, getState, { getAccessToken, apiBaseUrl, loginUrl }) => {
-    const accessToken = await getAccessToken().catch(_ => history.replace(loginUrl));
+    const accessToken = await getAccessToken().catch(() => {
+        dispatch(stopLoading());
+        console.log('REJECTING PROMISE AFTER STOP LOADING')
+        return Promise.reject();
+    });
 
-    if (!accessToken) return;
+    if (!accessToken) return Promise.reject();
 
     dispatch(startLoading());
 
@@ -510,9 +545,13 @@ export const getTicketPDF = ({ ticket }) => async (dispatch, getState, { getAcce
 };
 
 export const refundTicket = ({ ticket, order }) => async (dispatch, getState, { getAccessToken, apiBaseUrl, loginUrl }) => {
-    const accessToken = await getAccessToken().catch(_ => history.replace(loginUrl));
+    const accessToken = await getAccessToken().catch(() => {
+        dispatch(stopLoading());
+        console.log('REJECTING PROMISE AFTER STOP LOADING')
+        return Promise.reject();
+    });
 
-    if (!accessToken) return;
+    if (!accessToken) return Promise.reject();
 
     dispatch(startLoading());
 
@@ -559,9 +598,13 @@ export const delegateTicket = ({
         extra_questions,
     }
 }) => async (dispatch, getState, { getAccessToken, apiBaseUrl, loginUrl }) => {
-    const accessToken = await getAccessToken().catch(_ => history.replace(loginUrl));
+    const accessToken = await getAccessToken().catch(() => {
+        dispatch(stopLoading());
+        console.log('REJECTING PROMISE AFTER STOP LOADING')
+        return Promise.reject();
+    });
 
-    if (!accessToken) return;
+    if (!accessToken) return Promise.reject();
 
     dispatch(startLoading());
 

package/src/components/summit-my-orders-tickets/store/actions/user-actions.js

@@ -5,7 +5,6 @@ import {
     stopLoading,
     startLoading
 } from 'openstack-uicore-foundation/lib/utils/actions';
-import history from '../history';
 
 export const START_LOADING_IDP_PROFILE = 'START_LOADING_IDP_PROFILE';
 export const STOP_LOADING_IDP_PROFILE = 'STOP_LOADING_IDP_PROFILE';
@@ -15,9 +14,13 @@ export const SET_USER = 'SET_USER';
 export const setUser = (user) => (dispatch) => dispatch(createAction(SET_USER)(user));
 
 export const updateProfile = (profile) => async (dispatch, getState, { getAccessToken, idpBaseUrl, loginUrl }) => {
-    const accessToken = await getAccessToken().catch(_ => history.replace(loginUrl));
+    const accessToken = await getAccessToken().catch(() => {
+        dispatch(stopLoading());
+        console.log('REJECTING PROMISE AFTER STOP LOADING')
+        return Promise.reject();
+    });
 
-    if (!accessToken) return;
+    if (!accessToken) return Promise.reject();
 
     dispatch(startLoading());
 

package/src/templates/content-page/shortcodes.js

@@ -11,7 +11,7 @@ const shortcodes = {
   // Example:
   // Grid,
   // SpeakerCard,
-  img: ResponsiveImage
+  ResponsiveImage
 };
 
 export default shortcodes;

package/src/templates/marketing-page-template/styles.module.scss

@@ -14,7 +14,7 @@
     display: inline-block;
     width: 100%;
     font-size: 0;
-    transform: scale(1.002);
+    transform: scale(1.004);
     .masonryImage {
       width: 100%;
       object-fit: cover;

package/src/utils/loginUtils.js

@@ -1,9 +1,20 @@
-import { initLogOut, getAccessToken } from 'openstack-uicore-foundation/lib/security/methods'
+import { getAccessToken } from 'openstack-uicore-foundation/lib/security/methods'
 import * as Sentry from '@sentry/react'
 import {
   getEnvVariable,
   AUTHORIZED_DEFAULT_PATH
 } from "./envVariables";
+import { navigate } from "gatsby";
+import { triggerLogoutEvent } from "@utils/eventTriggers";
+
+export const onLogOut = (backUrl = null) => {
+  triggerLogoutEvent();
+  navigate("/auth/logout", {
+    state: {
+      backUrl: backUrl || window.location.pathname
+    }
+  });
+}
 
 export const getDefaultLocation = (
   eventRedirect,
@@ -50,7 +61,7 @@ export const validateIdentityProviderButtons = (
     .filter(button =>
       // default identity provider has no providerParam set
       !button[buttonPropertyMapping.providerParam] ||
-      availableSocialProviders.includes(button[buttonPropertyMapping.providerParam]) 
+      availableSocialProviders.includes(button[buttonPropertyMapping.providerParam])
     );
 
   return filteredButtons;
@@ -60,9 +71,9 @@ export const getAccessTokenSafely = async () => {
   try {
     return await getAccessToken();
   } catch (e) {
-    console.log("getAccessToken error: ", e);
+    console.log("loginUtils::getAccessToken error: ", e);
     Sentry.captureException(e)
-    initLogOut();
+    onLogOut();
     return Promise.reject();
   }
 };