@imposium-hub/components 2.5.18 → 2.6.0-0

package/dist/esm/components/app-wrapper/AppWrapper.js

@@ -1,208 +1,101 @@
 import * as React from 'react';
-import NoAccess from '../no-access/NoAccess';
 import Header from '../header/Header';
-import SessionService from '../../services/Session';
-import AuthService from '../../services/Auth0';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-import { login, clearCachedAuth } from '../../redux/actions/auth';
 import { validateAccessLevel } from '../../Util';
-import { setAccessData } from '../../redux/actions/access';
 import { ConfirmModal } from '../confirm-modal/ConfirmModal';
-class AppWrapper extends React.Component {
-    static RESTRICTED_REQUEST = (React.createElement(NoAccess, { key: 'restriction-msg', type: 'request' }));
-    static RESTRICTED_BLOCK = (React.createElement(NoAccess, { key: 'restriction-msg', type: 'restrict' }));
-    constructor(p) {
-        super(p);
-        this.state = {
-            blockRender: true,
-            restrictAccess: false
-        };
-    }
-    componentDidMount = () => {
-        const { auth0ClientId, auth0Domain } = this.props;
-        AuthService.bindToClient(auth0ClientId, auth0Domain);
-        const validAccessLevel = validateAccessLevel(this.props.organizationId, this.props.serviceId, this.props.access);
-        if (!this.state.restrictAccess && !validAccessLevel) {
-            this.setState({ restrictAccess: true });
-        }
-        if (this.state.restrictAccess && validAccessLevel) {
-            this.setState({ restrictAccess: false });
-        }
-        // Always check the session
-        this.doCheckSession(true);
-    };
-    /*
-        Check the auth0 session expiry
-     */
-    componentDidUpdate = (prevProps) => {
-        const { auth } = this.props;
-        let validAccessLevel;
-        if (auth) {
-            const { idTokenPayload: { exp } } = auth;
-            const validSession = AuthService.checkExpiry(exp);
-            if (!validSession) {
-                this.props.clearCachedAuth();
-                this.doCheckSession();
-            }
-        }
-        if (this.props.organizationId !== prevProps.organizationId ||
-            this.props.access !== prevProps.access) {
-            validAccessLevel = validateAccessLevel(this.props.organizationId, this.props.serviceId, this.props.access);
-            if (!this.state.restrictAccess && !validAccessLevel) {
-                this.setState({ restrictAccess: true });
-            }
-            if (this.state.restrictAccess && validAccessLevel) {
-                this.setState({ restrictAccess: false });
-            }
+import API from '../../services/API';
+import { useAuth0 } from '@auth0/auth0-react';
+const APP_WRAPPER_ERROR_STATES = {
+    UNAUTHORIZED_ORG: 'UNAUTHORIZED_ORG',
+    UNAUTHORIZED_APP: 'UNAUTHORIZED_APP'
+};
+export const AppWrapper = (props) => {
+    const [blockRender, setBlockRender] = React.useState(true);
+    const { children, organizationId, storyId, hideStoryPicker, hideDocs, hideOrgPicker, CrMLink, baseUrl, api, serviceId } = props;
+    const { isAuthenticated, isLoading, getAccessTokenSilently, loginWithRedirect, logout } = useAuth0();
+    const [errorState, setErrorState] = React.useState(null);
+    React.useEffect(() => {
+        void doCheckSession(true);
+    }, [isAuthenticated, isLoading]);
+    const getCachedStoryAndOrgForService = (freshAccess, sId) => {
+        const service = freshAccess.services.find((s) => s.id === sId);
+        if (service) {
+            return {
+                story_id: service.story_id,
+                organization_id: service.organization_id
+            };
         }
     };
-    /*
-        Emit creds to React parent
-     */
-    propagateCreds = (freshAccess, freshIdentity) => {
-        const { storyId, organizationId, onAuthenticated } = this.props;
-        let initialStoryId = storyId;
-        let initialOrganizationId = organizationId;
-        const firstOrg = freshAccess.organizations[0];
-        const getIDsFromSession = () => {
-            const session = SessionService.getSession();
-            if (session && session.story_id && session.organization_id) {
-                const org = freshAccess.organizations.find((o) => o.id === session.organization_id);
-                if (org) {
-                    const story = org.stories.find((s) => s.id === session.story_id);
-                    if (story) {
-                        return { orgId: org.id, storyId: story.id };
-                    }
-                }
-            }
-            return null;
-        };
-        // If the org ID is not provided, but the storyID is provided, find the org ID if we can, if not, use the first org ID found and we'll show the story not found interface
-        if (!initialOrganizationId && initialStoryId) {
-            const org = freshAccess.organizations.find((o) => o.stories.find((s) => s.id === initialStoryId));
-            if (org) {
-                initialOrganizationId = org.id;
-            }
-            else if (firstOrg) {
-                initialOrganizationId = firstOrg.id;
-            }
-        }
-        if (!initialStoryId) {
-            // If storyID is not provided, try to use the one from the previous session
-            const sessionIds = getIDsFromSession();
-            if (sessionIds) {
-                initialOrganizationId = sessionIds.orgId;
-                initialStoryId = sessionIds.storyId;
+    const propagateCreds = (freshAccess, token) => {
+        const { storyId: initialStoryId, organizationId: initialOrganizationId } = props;
+        // If an org and story ID was passed in, we're following a deeplink. Verify we have access to it, and if so, propagate those IDs and set them on the service
+        if (initialOrganizationId && initialStoryId) {
+            // Validate the user has access to the orgId and storyID passed in, if not, show the "Unauthorized" interface
+            const validAccessLevel = validateAccessLevel(initialOrganizationId, serviceId, freshAccess);
+            if (validAccessLevel) {
+                props.onAuthenticated(token, initialOrganizationId, initialStoryId);
+                setBlockRender(false);
             }
             else {
-                // If that doesn't work - default to the first org & story
-                if (firstOrg) {
-                    initialOrganizationId = firstOrg.id;
-                    const story = firstOrg.stories[0];
-                    if (story) {
-                        initialStoryId = story.id;
-                    }
-                    else {
-                        initialStoryId = null;
-                    }
-                }
-                else {
-                    initialOrganizationId = null;
-                    initialStoryId = null;
-                }
-            }
-        }
-        // If at least one org was found, propagate that
-        if (initialOrganizationId) {
-            SessionService.buildFreshSession(freshIdentity, initialOrganizationId, initialStoryId);
-            onAuthenticated(initialOrganizationId, initialStoryId);
-            if (this.state.blockRender) {
-                this.setState({ blockRender: false });
+                setErrorState(APP_WRAPPER_ERROR_STATES.UNAUTHORIZED_APP);
             }
-            // If not, show the no-orgs interface
+            // If no orgID or storyID was passed in from the URL use the cached orgID and story ID on the service
         }
         else {
-            this.setState({ restrictAccess: true, blockRender: false });
+            const { story_id, organization_id } = getCachedStoryAndOrgForService(freshAccess, serviceId);
+            props.onAuthenticated(token, organization_id, story_id);
+            setBlockRender(false);
         }
     };
-    /*
-        Bust cached creds if exist, invoke auth failure handler
-     */
-    handleCheckSessionFailure = (e) => {
-        if (this.props.storyId) {
-            SessionService.cacheStoryId(this.props.storyId);
-        }
-        else {
-            SessionService.clearCachedStoryId();
-        }
-        if (this.props.organizationId) {
-            SessionService.cacheOrgId(this.props.organizationId);
-        }
-        else {
-            SessionService.clearCachedOrgId();
-        }
-        this.props.clearCachedAuth();
-        this.props.onAuthenticationFailure(e);
-    };
     /*
         Check auth0 session, pull Imposium access creds on success and initialize app-wrapper
     */
-    doCheckSession = (blockRender = false) => {
-        const { baseUrl } = this.props;
-        if (blockRender) {
-            this.setState({ blockRender: true });
+    const doCheckSession = async (doBlockRender = false) => {
+        if (doBlockRender) {
+            setBlockRender(true);
         }
-        AuthService.checkSession()
-            .then((freshIdentity) => {
-            const orgId = this.props.organizationId
-                ? this.props.organizationId
-                : SessionService.getCachedOrgId();
-            SessionService.getAccessData(freshIdentity.accessToken, baseUrl, false, orgId)
+        // If we're authenticated, get the access token, pull the access data, and propagate back to the parent component
+        if (isAuthenticated) {
+            let token;
+            try {
+                token = await getAccessTokenSilently();
+            }
+            catch (e) {
+                // Trigger a logout if we can't get the access token
+                onLogout();
+            }
+            const orgId = organizationId ? organizationId : null;
+            const tempAPI = new API(baseUrl, token, orgId);
+            tempAPI
+                .getAccessData(false)
                 .then((freshAccess) => {
-                this.props.setAccessData(freshAccess);
-                this.props.login(freshIdentity);
-                this.propagateCreds(freshAccess, freshIdentity);
+                props.setAccessData(freshAccess);
+                propagateCreds(freshAccess, token);
             })
                 .catch((e) => {
-                this.setState({ restrictAccess: true, blockRender: false });
+                setErrorState(APP_WRAPPER_ERROR_STATES.UNAUTHORIZED_ORG);
             });
-        })
-            .catch((e) => {
-            this.handleCheckSessionFailure(e);
-        });
-    };
-    render = () => {
-        const { blockRender, restrictAccess } = this.state;
-        const { children, showRequestAccess, allowUnauthenticatedRender } = this.props;
-        let innerContent;
-        if (!blockRender && restrictAccess) {
-            const showNoOrgs = this.props.access &&
-                this.props.access.organizations &&
-                this.props.access.organizations.length === 0;
-            const errorIndicator = showNoOrgs ? (React.createElement(NoAccess, { email: this.props.auth.idTokenPayload.userEmail, key: 'restriction-msg', type: 'no-orgs' })) : showRequestAccess ? (AppWrapper.RESTRICTED_REQUEST) : (AppWrapper.RESTRICTED_BLOCK);
-            innerContent = [
-                typeof children[0] === 'object' && children[0].type === Header && children[0],
-                errorIndicator
-            ];
+            // If we're not loading, and we're not authenticated, call login, and cache story + org ID from URL if it's there
         }
-        if ((!blockRender && !restrictAccess) || allowUnauthenticatedRender) {
-            innerContent = children;
+        else if (!isLoading && !isAuthenticated) {
+            void loginWithRedirect({
+                appState: { returnTo: window.location.href }
+            });
         }
-        return (React.createElement("div", { id: 'app', className: 'app' },
-            innerContent,
-            React.createElement(ConfirmModal, null)));
     };
-}
-const mapDispatchToProps = (dispatch) => {
-    return bindActionCreators({
-        login,
-        setAccessData,
-        clearCachedAuth
-    }, dispatch);
-};
-const mapStateToProps = (state) => {
-    return { auth: state.auth, access: state.access };
+    const onLogout = () => {
+        setBlockRender(true);
+        void logout({ logoutParams: { returnTo: window.location.origin } });
+    };
+    let innerContent;
+    if (errorState) {
+        innerContent = errorState;
+    }
+    else if (!blockRender) {
+        innerContent = children;
+    }
+    return (React.createElement("div", { id: 'app', className: 'app' },
+        React.createElement(Header, { onLogout: onLogout, activeServiceId: serviceId, baseUrl: baseUrl, api: api, activeOrganization: organizationId, activeStory: storyId, hideStoryPicker: hideStoryPicker, hideDocs: hideDocs, showFTLogo: false, hideOrgPicker: hideOrgPicker, CrMLink: CrMLink, onStoryChange: props.onStoryChange, onOrganizationChange: props.onOrganizationChange }),
+        innerContent,
+        React.createElement(ConfirmModal, null)));
 };
-export default connect(mapStateToProps, mapDispatchToProps)(AppWrapper);
 //# sourceMappingURL=AppWrapper.js.map

package/dist/esm/components/app-wrapper/AppWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"AppWrapper.js","sourceRoot":"","sources":["../../../../src/components/app-wrapper/AppWrapper.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"AppWrapper.js","sourceRoot":"","sources":["../../../../src/components/app-wrapper/AppWrapper.tsx"],"names":[],"mappings":"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"}

package/dist/esm/components/app-wrapper/AppWrapperV2.d.ts

@@ -1,24 +1,18 @@
 import * as React from 'react';
-import { IIdentity } from '../../services/Auth0';
 import { IImposiumAPI } from '../../services/API';
 export interface IAppWrapperProps {
+    auth0: any;
+    auth0Code: string;
     baseUrl: string;
     api: IImposiumAPI;
     children: React.ReactChildren;
-    auth0Domain: string;
-    auth0ClientId: string;
     organizationId: string;
     serviceId: number;
     access: any;
-    auth: any;
     setAccessData(accessData: any): any;
     onAuthenticated: (activeOrgId: string, activeStoryId: string) => any;
     onStoryChange(storyId: string): any;
     onOrganizationChange(orgId: string, storyId: string): any;
-    onAuthenticationFailure: (e: Error) => any;
-    login: (id: IIdentity) => any;
-    logout: (doFederatedLogout: boolean) => any;
-    clearCachedAuth: () => any;
     storyId?: string;
     CrMLink?: string;
     hideStoryPicker?: boolean;
@@ -28,5 +22,5 @@ export interface IAppWrapperProps {
 export interface IAppWrapperState {
     blockRender: boolean;
 }
-declare const _default: any;
+declare const _default: React.ComponentType<Omit<import("@auth0/auth0-react").WithAuth0Props, "auth0">>;
 export default _default;

package/dist/esm/components/app-wrapper/AppWrapperV2.js

@@ -1,14 +1,13 @@
 import * as React from 'react';
 import Header from '../header/Header';
-import AuthService from '../../services/Auth0';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
-import { login, clearCachedAuth } from '../../redux/actions/auth';
 import { validateAccessLevel } from '../../Util';
 import { setAccessData } from '../../redux/actions/access';
 import { ConfirmModal } from '../confirm-modal/ConfirmModal';
 import API from '../../services/API';
 import SessionService from '../../services/Session';
+import { withAuth0, withAuthenticationRequired } from '@auth0/auth0-react';
 class AppWrapper extends React.Component {
     constructor(p) {
         super(p);
@@ -17,25 +16,24 @@ class AppWrapper extends React.Component {
         };
     }
     componentDidMount = () => {
-        const { auth0ClientId, auth0Domain } = this.props;
-        AuthService.bindToClient(auth0ClientId, auth0Domain);
-        // Always check the session
-        this.doCheckSession(true);
+        void this.doCheckSession(true);
     };
     /*
         Check the auth0 session expiry
      */
     componentDidUpdate = (prevProps) => {
-        const { auth } = this.props;
+        // const { auth } = this.props;
         // let validAccessLevel: boolean;
-        if (auth) {
-            const { idTokenPayload: { exp } } = auth;
-            const validSession = AuthService.checkExpiry(exp);
-            if (!validSession) {
-                this.props.clearCachedAuth();
-                this.doCheckSession();
-            }
-        }
+        // if (auth) {
+        //     const {
+        //         idTokenPayload: { exp }
+        //     } = auth;
+        // const validSession: boolean = AuthService.checkExpiry(exp);
+        // if (!validSession) {
+        //     // this.props.clearCachedAuth();
+        //     this.doCheckSession();
+        // }
+        // }
     };
     /*
         Emit creds to React parent
@@ -49,7 +47,7 @@ class AppWrapper extends React.Component {
             };
         }
     }
-    propagateCreds = (freshAccess, freshIdentity) => {
+    propagateCreds = (freshAccess) => {
         const { storyId: initialStoryId, organizationId: initialOrganizationId, onAuthenticated } = this.props;
         // If an org and story ID was passed in, we're following a deeplink. Verify we have access to it, and if so, propagate those IDs and set them on the service
         if (initialOrganizationId && initialStoryId) {
@@ -87,36 +85,35 @@ class AppWrapper extends React.Component {
             SessionService.clearCachedOrgId();
         }
         // this.props.clearCachedAuth();
-        this.props.onAuthenticationFailure(e);
+        // this.props.onAuthenticationFailure(e);
     };
     /*
         Check auth0 session, pull Imposium access creds on success and initialize app-wrapper
     */
-    doCheckSession = (blockRender = false) => {
-        const { baseUrl } = this.props;
+    doCheckSession = async (blockRender = false) => {
+        const { auth0, baseUrl } = this.props;
         if (blockRender) {
             this.setState({ blockRender: true });
         }
-        AuthService.checkSession()
-            .then((freshIdentity) => {
+        if (auth0.isAuthenticated) {
+            const token = await auth0.getAccessTokenSilently();
             const orgId = this.props.organizationId
                 ? this.props.organizationId
                 : null;
-            const api = new API(baseUrl, freshIdentity.accessToken, orgId);
+            const api = new API(baseUrl, token, orgId);
             api.getAccessData(false)
                 .then((freshAccess) => {
                 this.props.setAccessData(freshAccess);
-                this.props.login(freshIdentity);
-                this.propagateCreds(freshAccess, freshIdentity);
+                this.propagateCreds(freshAccess);
             })
                 .catch((e) => {
                 // this.setState({ restrictAccess: true, blockRender: false });
                 // TODO: push to a different route here?
             });
-        })
-            .catch((e) => {
-            this.handleCheckSessionFailure(e);
-        });
+        }
+        else {
+            auth0.loginWithRedirect();
+        }
     };
     render = () => {
         const { blockRender } = this.state;
@@ -126,20 +123,20 @@ class AppWrapper extends React.Component {
             innerContent = children;
         }
         return (React.createElement("div", { id: 'app', className: 'app' },
-            React.createElement(Header, { activeServiceId: this.props.serviceId, baseUrl: baseUrl, api: api, activeOrganization: organizationId, activeStory: storyId, hideStoryPicker: hideStoryPicker, hideDocs: hideDocs, showFTLogo: false, hideOrgPicker: hideOrgPicker, CrMLink: CrMLink, onStoryChange: this.props.onStoryChange, onOrganizationChange: this.props.onOrganizationChange, logout: this.props.logout }),
+            React.createElement(Header, { activeServiceId: this.props.serviceId, baseUrl: baseUrl, api: api, activeOrganization: organizationId, activeStory: storyId, hideStoryPicker: hideStoryPicker, hideDocs: hideDocs, showFTLogo: false, hideOrgPicker: hideOrgPicker, CrMLink: CrMLink, onStoryChange: this.props.onStoryChange, onOrganizationChange: this.props.onOrganizationChange }),
             innerContent,
             React.createElement(ConfirmModal, null)));
     };
 }
 const mapDispatchToProps = (dispatch) => {
     return bindActionCreators({
-        login,
+        // login,
         setAccessData,
-        clearCachedAuth
+        // clearCachedAuth
     }, dispatch);
 };
 const mapStateToProps = (state) => {
-    return { auth: state.auth, access: state.access };
+    return { access: state.access };
 };
-export default connect(mapStateToProps, mapDispatchToProps)(AppWrapper);
+export default withAuth0(withAuthenticationRequired(connect(mapStateToProps, mapDispatchToProps)(AppWrapper)));
 //# sourceMappingURL=AppWrapperV2.js.map

package/dist/esm/components/app-wrapper/AppWrapperV2.js.map

@@ -1 +1 @@
-{"version":3,"file":"AppWrapperV2.js","sourceRoot":"","sources":["../../../../src/components/app-wrapper/AppWrapperV2.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"AppWrapperV2.js","sourceRoot":"","sources":["../../../../src/components/app-wrapper/AppWrapperV2.tsx"],"names":[],"mappings":"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"}

package/dist/esm/components/app-wrapper/AppWrapperV3.d.ts

@@ -16,4 +16,4 @@ export interface IAppWrapperProps {
     hideDocs?: boolean;
     hideOrgPicker?: boolean;
 }
-export declare const AppWrapperV3: (props: IAppWrapperProps) => React.JSX.Element;
+export declare const AppWrapper: (props: IAppWrapperProps) => React.JSX.Element;

package/dist/esm/components/app-wrapper/AppWrapperV3.js

@@ -3,38 +3,14 @@ import Header from '../header/Header';
 import { validateAccessLevel } from '../../Util';
 import { ConfirmModal } from '../confirm-modal/ConfirmModal';
 import API from '../../services/API';
-import SessionService from '../../services/Session';
 import { useAuth0 } from '@auth0/auth0-react';
-export const AppWrapperV3 = (props) => {
+export const AppWrapper = (props) => {
     const [blockRender, setBlockRender] = React.useState(true);
     const { children, organizationId, storyId, hideStoryPicker, hideDocs, hideOrgPicker, CrMLink, baseUrl, api, serviceId } = props;
     const { isAuthenticated, isLoading, getAccessTokenSilently, loginWithRedirect, logout } = useAuth0();
     React.useEffect(() => {
         void doCheckSession(true);
     }, [isAuthenticated, isLoading]);
-    // public componentDidMount = (): void => {
-    //     void this.doCheckSession(true);
-    // };
-    /*
-        Check the auth0 session expiry
-     */
-    // public componentDidUpdate = (prevProps): void => {
-    // const { auth } = this.props;
-    // let validAccessLevel: boolean;
-    // if (auth) {
-    //     const {
-    //         idTokenPayload: { exp }
-    //     } = auth;
-    // const validSession: boolean = AuthService.checkExpiry(exp);
-    // if (!validSession) {
-    //     // this.props.clearCachedAuth();
-    //     this.doCheckSession();
-    // }
-    // }
-    // };
-    /*
-        Emit creds to React parent
-     */
     const getCachedStoryAndOrgForService = (freshAccess, sId) => {
         const service = freshAccess.services.find((s) => s.id === sId);
         if (service) {
@@ -46,10 +22,6 @@ export const AppWrapperV3 = (props) => {
     };
     const propagateCreds = (freshAccess, token) => {
         const { storyId: initialStoryId, organizationId: initialOrganizationId } = props;
-        const cachedOrgId = SessionService.getCachedOrgId() || null;
-        const cachedStoryId = SessionService.getCachedStoryId() || null;
-        console.log('cached ids');
-        console.log(cachedOrgId, cachedStoryId);
         // If an org and story ID was passed in, we're following a deeplink. Verify we have access to it, and if so, propagate those IDs and set them on the service
         if (initialOrganizationId && initialStoryId) {
             // Validate the user has access to the orgId and storyID passed in, if not, show the "Unauthorized" interface
@@ -95,22 +67,13 @@ export const AppWrapperV3 = (props) => {
             // If we're not loading, and we're not authenticated, call login, and cache story + org ID from URL if it's there
         }
         else if (!isLoading && !isAuthenticated) {
-            if (storyId) {
-                SessionService.cacheStoryId(storyId);
-            }
-            else {
-                SessionService.clearCachedStoryId();
-            }
-            if (organizationId) {
-                SessionService.cacheOrgId(organizationId);
-            }
-            else {
-                SessionService.clearCachedOrgId();
-            }
-            void loginWithRedirect();
+            void loginWithRedirect({
+                appState: { returnTo: window.location.href }
+            });
         }
     };
     const onLogout = () => {
+        setBlockRender(true);
         void logout({ logoutParams: { returnTo: window.location.origin } });
     };
     let innerContent;

package/dist/esm/components/app-wrapper/AppWrapperV3.js.map

@@ -1 +1 @@
-{"version":3,"file":"AppWrapperV3.js","sourceRoot":"","sources":["../../../../src/components/app-wrapper/AppWrapperV3.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"AppWrapperV3.js","sourceRoot":"","sources":["../../../../src/components/app-wrapper/AppWrapperV3.tsx"],"names":[],"mappings":"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"}

package/dist/esm/components/compositions/TextLayer.js

@@ -87,7 +87,6 @@ export default class TextLayer extends React.PureComponent {
             }
         }
         else if (font_type === FONT_TYPES.STANDARD) {
-            // TODO: check this?
             this.fontReady();
         }
     }