@imposium-hub/components 2.5.18 → 2.6.0-1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/Util.js +1 -2
- package/dist/cjs/Util.js.map +1 -1
- package/dist/cjs/components/app-wrapper/AppWrapper.d.ts +32 -21
- package/dist/cjs/components/app-wrapper/AppWrapper.js +244 -208
- package/dist/cjs/components/app-wrapper/AppWrapper.js.map +1 -1
- package/dist/cjs/components/app-wrapper/AppWrapperV2.d.ts +3 -9
- package/dist/cjs/components/app-wrapper/AppWrapperV2.js +119 -45
- package/dist/cjs/components/app-wrapper/AppWrapperV2.js.map +1 -1
- package/dist/cjs/components/app-wrapper/AppWrapperV3.d.ts +1 -1
- package/dist/cjs/components/app-wrapper/AppWrapperV3.js +7 -44
- package/dist/cjs/components/app-wrapper/AppWrapperV3.js.map +1 -1
- package/dist/cjs/components/assets/StoryTableNameFilter.d.ts +9 -2
- package/dist/cjs/components/assets/StoryTableNameFilter.js +3 -13
- package/dist/cjs/components/assets/StoryTableNameFilter.js.map +1 -1
- package/dist/cjs/components/compositions/TextLayer.js +0 -1
- package/dist/cjs/components/compositions/TextLayer.js.map +1 -1
- package/dist/cjs/components/context-menu/AnimateComponent.d.ts +6 -6
- package/dist/cjs/components/context-menu/AnimateComponent.js.map +1 -1
- package/dist/cjs/components/context-menu/ContextMenu.d.ts +12 -27
- package/dist/cjs/components/context-menu/ContextMenu.js +2 -15
- package/dist/cjs/components/context-menu/ContextMenu.js.map +1 -1
- package/dist/cjs/components/context-menu/ContextMenuItem.d.ts +6 -18
- package/dist/cjs/components/context-menu/ContextMenuItem.js +2 -21
- package/dist/cjs/components/context-menu/ContextMenuItem.js.map +1 -1
- package/dist/cjs/components/context-menu/ContextMenuTrigger.d.ts +6 -16
- package/dist/cjs/components/context-menu/ContextMenuTrigger.js +2 -20
- package/dist/cjs/components/context-menu/ContextMenuTrigger.js.map +1 -1
- package/dist/cjs/components/context-menu/SubMenu.d.ts +4 -12
- package/dist/cjs/components/context-menu/SubMenu.js +2 -17
- package/dist/cjs/components/context-menu/SubMenu.js.map +1 -1
- package/dist/cjs/components/data-table/Paginator.d.ts +16 -1
- package/dist/cjs/components/data-table/Paginator.js +1 -1
- package/dist/cjs/components/data-table/Paginator.js.map +1 -1
- package/dist/cjs/components/font-picker/font-manager/constants.d.ts +4 -0
- package/dist/cjs/components/font-picker/font-manager/constants.js +5 -1
- package/dist/cjs/components/font-picker/font-manager/constants.js.map +1 -1
- package/dist/cjs/components/header/Header.d.ts +8 -9
- package/dist/cjs/components/header/Header.js +95 -160
- package/dist/cjs/components/header/Header.js.map +1 -1
- package/dist/cjs/components/header/ProjectDropdown.d.ts +13 -0
- package/dist/cjs/components/header/ProjectDropdown.js +128 -0
- package/dist/cjs/components/header/ProjectDropdown.js.map +1 -0
- package/dist/cjs/components/header/StoryDropdown.d.ts +6 -0
- package/dist/cjs/components/header/StoryDropdown.js +111 -0
- package/dist/cjs/components/header/StoryDropdown.js.map +1 -0
- package/dist/cjs/components/modal/Modal.d.ts +1 -1
- package/dist/cjs/components/modal/Modal.js +2 -3
- package/dist/cjs/components/modal/Modal.js.map +1 -1
- package/dist/cjs/components/portal/Portal.d.ts +0 -2
- package/dist/cjs/components/portal/Portal.js.map +1 -1
- package/dist/cjs/components/publish-wizard/PublishWizard.d.ts +1 -3
- package/dist/cjs/components/publish-wizard/PublishWizard.js.map +1 -1
- package/dist/cjs/components/publish-wizard/publish/EmailWorkflow.js.map +1 -1
- package/dist/cjs/constants/copy.d.ts +3 -0
- package/dist/cjs/constants/copy.js +3 -0
- package/dist/cjs/constants/copy.js.map +1 -1
- package/dist/cjs/index.d.ts +4 -7
- package/dist/cjs/index.js +11 -17
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/redux/actions/asset-uploads.js +0 -1
- package/dist/cjs/redux/actions/asset-uploads.js.map +1 -1
- package/dist/cjs/services/API.d.ts +10 -3
- package/dist/cjs/services/API.js +230 -84
- package/dist/cjs/services/API.js.map +1 -1
- package/dist/cjs/services/Session.d.ts +0 -11
- package/dist/cjs/services/Session.js +3 -126
- package/dist/cjs/services/Session.js.map +1 -1
- package/dist/cjs/utils/modal.d.ts +2 -0
- package/dist/cjs/utils/modal.js +11 -0
- package/dist/cjs/utils/modal.js.map +1 -0
- package/dist/cjs/utils/pendo.d.ts +24 -0
- package/dist/cjs/utils/pendo.js +62 -0
- package/dist/cjs/utils/pendo.js.map +1 -0
- package/dist/cjs/utils/routing.d.ts +2 -0
- package/dist/cjs/utils/routing.js +10 -1
- package/dist/cjs/utils/routing.js.map +1 -1
- package/dist/esm/Util.js +1 -2
- package/dist/esm/Util.js.map +1 -1
- package/dist/esm/components/app-wrapper/AppWrapper.d.ts +32 -21
- package/dist/esm/components/app-wrapper/AppWrapper.js +143 -172
- package/dist/esm/components/app-wrapper/AppWrapper.js.map +1 -1
- package/dist/esm/components/app-wrapper/AppWrapperV2.d.ts +3 -9
- package/dist/esm/components/app-wrapper/AppWrapperV2.js +30 -33
- package/dist/esm/components/app-wrapper/AppWrapperV2.js.map +1 -1
- package/dist/esm/components/app-wrapper/AppWrapperV3.d.ts +1 -1
- package/dist/esm/components/app-wrapper/AppWrapperV3.js +5 -42
- package/dist/esm/components/app-wrapper/AppWrapperV3.js.map +1 -1
- package/dist/esm/components/assets/StoryTableNameFilter.d.ts +9 -2
- package/dist/esm/components/assets/StoryTableNameFilter.js +3 -13
- package/dist/esm/components/assets/StoryTableNameFilter.js.map +1 -1
- package/dist/esm/components/compositions/TextLayer.js +0 -1
- package/dist/esm/components/compositions/TextLayer.js.map +1 -1
- package/dist/esm/components/context-menu/AnimateComponent.d.ts +6 -6
- package/dist/esm/components/context-menu/AnimateComponent.js.map +1 -1
- package/dist/esm/components/context-menu/ContextMenu.d.ts +12 -27
- package/dist/esm/components/context-menu/ContextMenu.js +2 -4
- package/dist/esm/components/context-menu/ContextMenu.js.map +1 -1
- package/dist/esm/components/context-menu/ContextMenuItem.d.ts +6 -18
- package/dist/esm/components/context-menu/ContextMenuItem.js +2 -10
- package/dist/esm/components/context-menu/ContextMenuItem.js.map +1 -1
- package/dist/esm/components/context-menu/ContextMenuTrigger.d.ts +6 -16
- package/dist/esm/components/context-menu/ContextMenuTrigger.js +2 -9
- package/dist/esm/components/context-menu/ContextMenuTrigger.js.map +1 -1
- package/dist/esm/components/context-menu/SubMenu.d.ts +4 -12
- package/dist/esm/components/context-menu/SubMenu.js +2 -6
- package/dist/esm/components/context-menu/SubMenu.js.map +1 -1
- package/dist/esm/components/data-table/Paginator.d.ts +16 -1
- package/dist/esm/components/data-table/Paginator.js +1 -1
- package/dist/esm/components/data-table/Paginator.js.map +1 -1
- package/dist/esm/components/font-picker/font-manager/constants.d.ts +4 -0
- package/dist/esm/components/font-picker/font-manager/constants.js +4 -0
- package/dist/esm/components/font-picker/font-manager/constants.js.map +1 -1
- package/dist/esm/components/header/Header.d.ts +8 -9
- package/dist/esm/components/header/Header.js +93 -147
- package/dist/esm/components/header/Header.js.map +1 -1
- package/dist/esm/components/header/ProjectDropdown.d.ts +13 -0
- package/dist/esm/components/header/ProjectDropdown.js +101 -0
- package/dist/esm/components/header/ProjectDropdown.js.map +1 -0
- package/dist/esm/components/header/StoryDropdown.d.ts +6 -0
- package/dist/esm/components/header/StoryDropdown.js +82 -0
- package/dist/esm/components/header/StoryDropdown.js.map +1 -0
- package/dist/esm/components/modal/Modal.d.ts +1 -1
- package/dist/esm/components/modal/Modal.js +2 -3
- package/dist/esm/components/modal/Modal.js.map +1 -1
- package/dist/esm/components/portal/Portal.d.ts +0 -2
- package/dist/esm/components/portal/Portal.js.map +1 -1
- package/dist/esm/components/publish-wizard/PublishWizard.d.ts +1 -3
- package/dist/esm/components/publish-wizard/PublishWizard.js.map +1 -1
- package/dist/esm/components/publish-wizard/publish/EmailWorkflow.js.map +1 -1
- package/dist/esm/constants/copy.d.ts +3 -0
- package/dist/esm/constants/copy.js +3 -0
- package/dist/esm/constants/copy.js.map +1 -1
- package/dist/esm/index.d.ts +4 -7
- package/dist/esm/index.js +4 -7
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/redux/actions/asset-uploads.js +0 -1
- package/dist/esm/redux/actions/asset-uploads.js.map +1 -1
- package/dist/esm/services/API.d.ts +10 -3
- package/dist/esm/services/API.js +74 -27
- package/dist/esm/services/API.js.map +1 -1
- package/dist/esm/services/Session.d.ts +0 -11
- package/dist/esm/services/Session.js +3 -84
- package/dist/esm/services/Session.js.map +1 -1
- package/dist/esm/utils/modal.d.ts +2 -0
- package/dist/esm/utils/modal.js +7 -0
- package/dist/esm/utils/modal.js.map +1 -0
- package/dist/esm/utils/pendo.d.ts +24 -0
- package/dist/esm/utils/pendo.js +52 -0
- package/dist/esm/utils/pendo.js.map +1 -0
- package/dist/esm/utils/routing.d.ts +2 -0
- package/dist/esm/utils/routing.js +7 -0
- package/dist/esm/utils/routing.js.map +1 -1
- package/dist/styles.css +0 -5
- package/dist/styles.less +0 -1
- package/less/components/button.less +0 -1
- package/package.json +5 -2
- package/src/Util.ts +1 -2
- package/src/components/app-wrapper/AppWrapper.tsx +245 -257
- package/src/components/assets/StoryTableNameFilter.tsx +6 -22
- package/src/components/compositions/TextLayer.tsx +0 -1
- package/src/components/context-menu/AnimateComponent.tsx +12 -1
- package/src/components/context-menu/ContextMenu.tsx +16 -8
- package/src/components/context-menu/ContextMenuItem.tsx +12 -11
- package/src/components/context-menu/ContextMenuTrigger.tsx +12 -10
- package/src/components/context-menu/SubMenu.tsx +6 -8
- package/src/components/data-table/Paginator.tsx +19 -6
- package/src/components/font-picker/font-manager/constants.ts +5 -0
- package/src/components/header/Header.tsx +130 -242
- package/src/components/header/ProjectDropdown.tsx +174 -0
- package/src/components/modal/Modal.tsx +7 -10
- package/src/components/portal/Portal.tsx +1 -2
- package/src/components/publish-wizard/PublishWizard.tsx +1 -1
- package/src/components/publish-wizard/publish/EmailWorkflow.tsx +7 -1
- package/src/constants/copy.ts +3 -0
- package/src/index.ts +6 -14
- package/src/redux/actions/asset-uploads.ts +0 -1
- package/src/services/API.ts +92 -30
- package/src/utils/modal.ts +9 -0
- package/src/utils/pendo.ts +61 -0
- package/src/utils/routing.ts +10 -0
- package/src/components/auth-gate/AuthGate.tsx +0 -84
- package/src/redux/actions/auth.ts +0 -30
- package/src/redux/reducers/auth.ts +0 -33
- package/src/services/Auth0.ts +0 -82
- package/src/services/Session.ts +0 -153
|
@@ -1,208 +1,179 @@
|
|
|
1
1
|
import * as React from 'react';
|
|
2
|
-
import NoAccess from '../no-access/NoAccess';
|
|
3
2
|
import Header from '../header/Header';
|
|
4
|
-
import SessionService from '../../services/Session';
|
|
5
|
-
import AuthService from '../../services/Auth0';
|
|
6
|
-
import { connect } from 'react-redux';
|
|
7
|
-
import { bindActionCreators } from 'redux';
|
|
8
|
-
import { login, clearCachedAuth } from '../../redux/actions/auth';
|
|
9
3
|
import { validateAccessLevel } from '../../Util';
|
|
10
|
-
import { setAccessData } from '../../redux/actions/access';
|
|
11
4
|
import { ConfirmModal } from '../confirm-modal/ConfirmModal';
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
5
|
+
import { useAuth0 } from '@auth0/auth0-react';
|
|
6
|
+
import { replaceRoute } from '../../utils/routing';
|
|
7
|
+
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
|
|
8
|
+
import { faExclamationTriangle } from '@fortawesome/pro-light-svg-icons';
|
|
9
|
+
export const APP_WRAPPER_ERROR_STATES = {
|
|
10
|
+
UNAUTHORIZED_ORG: 'UNAUTHORIZED_ORG',
|
|
11
|
+
NO_ORGS_FOUND: 'NO_ORGS_FOUND',
|
|
12
|
+
NO_STORIES: 'NO_STORIES',
|
|
13
|
+
UNAUTHORIZED_APP: 'UNAUTHORIZED_APP',
|
|
14
|
+
STORY_NOT_FOUND: 'STORY_NOT_FOUND'
|
|
15
|
+
};
|
|
16
|
+
export const AppWrapper = (props) => {
|
|
17
|
+
const [blockRender, setBlockRender] = React.useState(true);
|
|
18
|
+
const { children, organizationId, storyId, hideStoryPicker, hideDocs, hideOrgPicker, CrMLink, baseUrl, api, serviceId, unsavedChanges, saveStory, allowNoStories } = props;
|
|
19
|
+
const { isAuthenticated, isLoading, getAccessTokenSilently, loginWithRedirect, logout, user } = useAuth0();
|
|
20
|
+
const [errorState, setErrorState] = React.useState(null);
|
|
21
|
+
React.useEffect(() => {
|
|
22
|
+
void doCheckSession(true);
|
|
23
|
+
}, [isAuthenticated, isLoading]);
|
|
24
|
+
React.useEffect(() => {
|
|
25
|
+
void doCheckSession(false);
|
|
26
|
+
}, [organizationId, storyId]);
|
|
27
|
+
const getCachedStoryAndOrgForService = (freshAccess, sId) => {
|
|
28
|
+
const service = freshAccess.services.find((s) => s.id === sId);
|
|
29
|
+
if (service) {
|
|
30
|
+
return {
|
|
31
|
+
story_id: service.story_id,
|
|
32
|
+
organization_id: service.organization_id
|
|
33
|
+
};
|
|
31
34
|
}
|
|
32
|
-
// Always check the session
|
|
33
|
-
this.doCheckSession(true);
|
|
34
35
|
};
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
const { auth } = this.props;
|
|
40
|
-
let validAccessLevel;
|
|
41
|
-
if (auth) {
|
|
42
|
-
const { idTokenPayload: { exp } } = auth;
|
|
43
|
-
const validSession = AuthService.checkExpiry(exp);
|
|
44
|
-
if (!validSession) {
|
|
45
|
-
this.props.clearCachedAuth();
|
|
46
|
-
this.doCheckSession();
|
|
47
|
-
}
|
|
36
|
+
const validateStoryExists = (freshAccess, oId, sId) => {
|
|
37
|
+
const org = freshAccess.organizations.find((o) => o.id === oId);
|
|
38
|
+
if (!org) {
|
|
39
|
+
return false;
|
|
48
40
|
}
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
if (!this.state.restrictAccess && !validAccessLevel) {
|
|
53
|
-
this.setState({ restrictAccess: true });
|
|
54
|
-
}
|
|
55
|
-
if (this.state.restrictAccess && validAccessLevel) {
|
|
56
|
-
this.setState({ restrictAccess: false });
|
|
57
|
-
}
|
|
41
|
+
const story = org.stories.find((s) => s.id === sId);
|
|
42
|
+
if (!story) {
|
|
43
|
+
return false;
|
|
58
44
|
}
|
|
45
|
+
return true;
|
|
59
46
|
};
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
if (org) {
|
|
73
|
-
const story = org.stories.find((s) => s.id === session.story_id);
|
|
74
|
-
if (story) {
|
|
75
|
-
return { orgId: org.id, storyId: story.id };
|
|
76
|
-
}
|
|
47
|
+
const propagateCreds = (freshAccess) => {
|
|
48
|
+
const { storyId: initialStoryId, organizationId: initialOrganizationId, onAuthenticated } = props;
|
|
49
|
+
// 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
|
|
50
|
+
if (initialOrganizationId && initialStoryId) {
|
|
51
|
+
// Validate the user has access to the orgId and storyID passed in, if not, show the "Unauthorized" interface
|
|
52
|
+
const validAccessLevel = validateAccessLevel(initialOrganizationId, serviceId, freshAccess);
|
|
53
|
+
if (validAccessLevel) {
|
|
54
|
+
// Check to see if the story exists, if not, show the error state
|
|
55
|
+
const storyExists = validateStoryExists(freshAccess, initialOrganizationId, initialStoryId);
|
|
56
|
+
if (!storyExists) {
|
|
57
|
+
setErrorState(APP_WRAPPER_ERROR_STATES.STORY_NOT_FOUND);
|
|
58
|
+
return;
|
|
77
59
|
}
|
|
60
|
+
api.init(baseUrl, getAccessTokenSilently, initialOrganizationId);
|
|
61
|
+
onAuthenticated(initialOrganizationId, initialStoryId);
|
|
62
|
+
setBlockRender(false);
|
|
63
|
+
setErrorState(null);
|
|
78
64
|
}
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
if (!initialOrganizationId && initialStoryId) {
|
|
83
|
-
const org = freshAccess.organizations.find((o) => o.stories.find((s) => s.id === initialStoryId));
|
|
84
|
-
if (org) {
|
|
85
|
-
initialOrganizationId = org.id;
|
|
86
|
-
}
|
|
87
|
-
else if (firstOrg) {
|
|
88
|
-
initialOrganizationId = firstOrg.id;
|
|
65
|
+
else {
|
|
66
|
+
setErrorState(APP_WRAPPER_ERROR_STATES.UNAUTHORIZED_APP);
|
|
67
|
+
return;
|
|
89
68
|
}
|
|
69
|
+
// If no orgID or storyID was passed in from the URL use the cached orgID and story ID on the service
|
|
90
70
|
}
|
|
91
|
-
if (!initialStoryId) {
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
if (
|
|
95
|
-
|
|
96
|
-
|
|
71
|
+
else if (!initialOrganizationId && !initialStoryId) {
|
|
72
|
+
const { story_id, organization_id } = getCachedStoryAndOrgForService(freshAccess, serviceId);
|
|
73
|
+
// No org was found to show the user
|
|
74
|
+
if (!organization_id) {
|
|
75
|
+
setErrorState(APP_WRAPPER_ERROR_STATES.NO_ORGS_FOUND);
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
const validAccessLevel = validateAccessLevel(organization_id, serviceId, freshAccess);
|
|
79
|
+
if (validAccessLevel) {
|
|
80
|
+
api.init(baseUrl, getAccessTokenSilently, organization_id);
|
|
81
|
+
onAuthenticated(organization_id, story_id);
|
|
82
|
+
replaceRoute(`/${organization_id}/${story_id}`);
|
|
83
|
+
setBlockRender(false);
|
|
84
|
+
setErrorState(null);
|
|
97
85
|
}
|
|
98
86
|
else {
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
87
|
+
setErrorState(APP_WRAPPER_ERROR_STATES.UNAUTHORIZED_APP);
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
else if (initialOrganizationId) {
|
|
91
|
+
if (allowNoStories) {
|
|
92
|
+
const validAccessLevel = validateAccessLevel(initialOrganizationId, serviceId, freshAccess);
|
|
93
|
+
if (validAccessLevel) {
|
|
94
|
+
api.init(baseUrl, getAccessTokenSilently, initialOrganizationId);
|
|
95
|
+
onAuthenticated(initialOrganizationId, null);
|
|
96
|
+
setBlockRender(false);
|
|
97
|
+
setErrorState(null);
|
|
109
98
|
}
|
|
110
99
|
else {
|
|
111
|
-
|
|
112
|
-
initialStoryId = null;
|
|
100
|
+
setErrorState(APP_WRAPPER_ERROR_STATES.UNAUTHORIZED_APP);
|
|
113
101
|
}
|
|
114
102
|
}
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
if (initialOrganizationId) {
|
|
118
|
-
SessionService.buildFreshSession(freshIdentity, initialOrganizationId, initialStoryId);
|
|
119
|
-
onAuthenticated(initialOrganizationId, initialStoryId);
|
|
120
|
-
if (this.state.blockRender) {
|
|
121
|
-
this.setState({ blockRender: false });
|
|
103
|
+
else {
|
|
104
|
+
setErrorState(APP_WRAPPER_ERROR_STATES.NO_STORIES);
|
|
122
105
|
}
|
|
123
|
-
// If not, show the no-orgs interface
|
|
124
|
-
}
|
|
125
|
-
else {
|
|
126
|
-
this.setState({ restrictAccess: true, blockRender: false });
|
|
127
106
|
}
|
|
128
107
|
};
|
|
129
|
-
/*
|
|
130
|
-
Bust cached creds if exist, invoke auth failure handler
|
|
131
|
-
*/
|
|
132
|
-
handleCheckSessionFailure = (e) => {
|
|
133
|
-
if (this.props.storyId) {
|
|
134
|
-
SessionService.cacheStoryId(this.props.storyId);
|
|
135
|
-
}
|
|
136
|
-
else {
|
|
137
|
-
SessionService.clearCachedStoryId();
|
|
138
|
-
}
|
|
139
|
-
if (this.props.organizationId) {
|
|
140
|
-
SessionService.cacheOrgId(this.props.organizationId);
|
|
141
|
-
}
|
|
142
|
-
else {
|
|
143
|
-
SessionService.clearCachedOrgId();
|
|
144
|
-
}
|
|
145
|
-
this.props.clearCachedAuth();
|
|
146
|
-
this.props.onAuthenticationFailure(e);
|
|
147
|
-
};
|
|
148
108
|
/*
|
|
149
109
|
Check auth0 session, pull Imposium access creds on success and initialize app-wrapper
|
|
150
110
|
*/
|
|
151
|
-
doCheckSession = (
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
this.setState({ blockRender: true });
|
|
111
|
+
const doCheckSession = async (doBlockRender = false) => {
|
|
112
|
+
if (doBlockRender) {
|
|
113
|
+
setBlockRender(true);
|
|
155
114
|
}
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
115
|
+
// If we're authenticated, get the access token, pull the access data, and propagate back to the parent component
|
|
116
|
+
if (isAuthenticated) {
|
|
117
|
+
try {
|
|
118
|
+
await getAccessTokenSilently();
|
|
119
|
+
}
|
|
120
|
+
catch (e) {
|
|
121
|
+
// Trigger a logout if we can't get the access token
|
|
122
|
+
onLogout();
|
|
123
|
+
}
|
|
124
|
+
const orgId = organizationId ? organizationId : null;
|
|
125
|
+
api.init(baseUrl, getAccessTokenSilently, orgId);
|
|
126
|
+
api.getAccessData(false)
|
|
162
127
|
.then((freshAccess) => {
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
this.propagateCreds(freshAccess, freshIdentity);
|
|
128
|
+
props.setAccessData(freshAccess);
|
|
129
|
+
propagateCreds(freshAccess);
|
|
166
130
|
})
|
|
167
131
|
.catch((e) => {
|
|
168
|
-
|
|
132
|
+
setErrorState(APP_WRAPPER_ERROR_STATES.UNAUTHORIZED_ORG);
|
|
169
133
|
});
|
|
170
|
-
|
|
171
|
-
.catch((e) => {
|
|
172
|
-
this.handleCheckSessionFailure(e);
|
|
173
|
-
});
|
|
174
|
-
};
|
|
175
|
-
render = () => {
|
|
176
|
-
const { blockRender, restrictAccess } = this.state;
|
|
177
|
-
const { children, showRequestAccess, allowUnauthenticatedRender } = this.props;
|
|
178
|
-
let innerContent;
|
|
179
|
-
if (!blockRender && restrictAccess) {
|
|
180
|
-
const showNoOrgs = this.props.access &&
|
|
181
|
-
this.props.access.organizations &&
|
|
182
|
-
this.props.access.organizations.length === 0;
|
|
183
|
-
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);
|
|
184
|
-
innerContent = [
|
|
185
|
-
typeof children[0] === 'object' && children[0].type === Header && children[0],
|
|
186
|
-
errorIndicator
|
|
187
|
-
];
|
|
134
|
+
// If we're not loading, and we're not authenticated, call login, and cache story + org ID from URL if it's there
|
|
188
135
|
}
|
|
189
|
-
if (
|
|
190
|
-
|
|
136
|
+
else if (!isLoading && !isAuthenticated) {
|
|
137
|
+
void loginWithRedirect({
|
|
138
|
+
appState: { returnTo: window.location.href }
|
|
139
|
+
});
|
|
191
140
|
}
|
|
192
|
-
return (React.createElement("div", { id: 'app', className: 'app' },
|
|
193
|
-
innerContent,
|
|
194
|
-
React.createElement(ConfirmModal, null)));
|
|
195
141
|
};
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
142
|
+
const onLogout = () => {
|
|
143
|
+
setBlockRender(true);
|
|
144
|
+
void logout({ logoutParams: { returnTo: window.location.origin } });
|
|
145
|
+
};
|
|
146
|
+
let innerContent;
|
|
147
|
+
if (errorState) {
|
|
148
|
+
innerContent = (React.createElement(AppWrapperErrors, { error: errorState, email: user.userEmail }));
|
|
149
|
+
}
|
|
150
|
+
else if (!blockRender) {
|
|
151
|
+
innerContent = children;
|
|
152
|
+
}
|
|
153
|
+
return (React.createElement("div", { id: 'app', className: 'app' },
|
|
154
|
+
React.createElement(Header, { errorState: errorState, saveStory: saveStory, onLogout: onLogout, activeServiceId: serviceId, baseUrl: baseUrl, api: api, unsavedChanges: unsavedChanges, activeOrganization: organizationId, activeStory: storyId, hideStoryPicker: hideStoryPicker, hideDocs: hideDocs, showFTLogo: false, hideOrgPicker: hideOrgPicker, CrMLink: CrMLink }),
|
|
155
|
+
innerContent,
|
|
156
|
+
React.createElement(ConfirmModal, null)));
|
|
157
|
+
};
|
|
158
|
+
export const ERROR_HEADINGS = {
|
|
159
|
+
[APP_WRAPPER_ERROR_STATES.UNAUTHORIZED_ORG]: 'Organization Not Found',
|
|
160
|
+
[APP_WRAPPER_ERROR_STATES.NO_ORGS_FOUND]: 'No Organizations Found',
|
|
161
|
+
[APP_WRAPPER_ERROR_STATES.UNAUTHORIZED_APP]: 'Service Not Found',
|
|
162
|
+
[APP_WRAPPER_ERROR_STATES.NO_STORIES]: 'No Projects Found',
|
|
163
|
+
[APP_WRAPPER_ERROR_STATES.STORY_NOT_FOUND]: 'Project Not Found'
|
|
164
|
+
};
|
|
165
|
+
export const ERROR_DESCRIPTIONS = {
|
|
166
|
+
[APP_WRAPPER_ERROR_STATES.UNAUTHORIZED_ORG]: 'Your user "[email]" does not have access to this organization. Please request access from an admin already on the organization.',
|
|
167
|
+
[APP_WRAPPER_ERROR_STATES.NO_ORGS_FOUND]: 'Your user "[email]" has not been added to any organizations. Please request access from an admin.',
|
|
168
|
+
[APP_WRAPPER_ERROR_STATES.UNAUTHORIZED_APP]: 'Your user "[email]" does not have access to this serivce. Please request access from an admin.',
|
|
169
|
+
[APP_WRAPPER_ERROR_STATES.NO_STORIES]: 'There are no projects on this organization.',
|
|
170
|
+
[APP_WRAPPER_ERROR_STATES.STORY_NOT_FOUND]: 'The Project cound not be found. Please check the URL and try again.'
|
|
203
171
|
};
|
|
204
|
-
const
|
|
205
|
-
return
|
|
172
|
+
export const AppWrapperErrors = ({ error, email, onCreateStory }) => {
|
|
173
|
+
return (React.createElement("div", { className: 'no-access' },
|
|
174
|
+
React.createElement(FontAwesomeIcon, { icon: faExclamationTriangle, size: '6x' }),
|
|
175
|
+
React.createElement("div", { className: 'no-access-copy' },
|
|
176
|
+
React.createElement("h1", { className: 'no-access-heading' }, ERROR_HEADINGS[error]),
|
|
177
|
+
React.createElement("p", null, ERROR_DESCRIPTIONS[error].replace('[email]', email)))));
|
|
206
178
|
};
|
|
207
|
-
export default connect(mapStateToProps, mapDispatchToProps)(AppWrapper);
|
|
208
179
|
//# sourceMappingURL=AppWrapper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppWrapper.js","sourceRoot":"","sources":["../../../../src/components/app-wrapper/AppWrapper.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,
|
|
1
|
+
{"version":3,"file":"AppWrapper.js","sourceRoot":"","sources":["../../../../src/components/app-wrapper/AppWrapper.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,24 +1,18 @@
|
|
|
1
1
|
import * as React from 'react';
|
|
2
|
-
import { IIdentity } from '../../services/Auth0';
|
|
3
2
|
import { IImposiumAPI } from '../../services/API';
|
|
4
3
|
export interface IAppWrapperProps {
|
|
4
|
+
auth0: any;
|
|
5
|
+
auth0Code: string;
|
|
5
6
|
baseUrl: string;
|
|
6
7
|
api: IImposiumAPI;
|
|
7
8
|
children: React.ReactChildren;
|
|
8
|
-
auth0Domain: string;
|
|
9
|
-
auth0ClientId: string;
|
|
10
9
|
organizationId: string;
|
|
11
10
|
serviceId: number;
|
|
12
11
|
access: any;
|
|
13
|
-
auth: any;
|
|
14
12
|
setAccessData(accessData: any): any;
|
|
15
13
|
onAuthenticated: (activeOrgId: string, activeStoryId: string) => any;
|
|
16
14
|
onStoryChange(storyId: string): any;
|
|
17
15
|
onOrganizationChange(orgId: string, storyId: string): any;
|
|
18
|
-
onAuthenticationFailure: (e: Error) => any;
|
|
19
|
-
login: (id: IIdentity) => any;
|
|
20
|
-
logout: (doFederatedLogout: boolean) => any;
|
|
21
|
-
clearCachedAuth: () => any;
|
|
22
16
|
storyId?: string;
|
|
23
17
|
CrMLink?: string;
|
|
24
18
|
hideStoryPicker?: boolean;
|
|
@@ -28,5 +22,5 @@ export interface IAppWrapperProps {
|
|
|
28
22
|
export interface IAppWrapperState {
|
|
29
23
|
blockRender: boolean;
|
|
30
24
|
}
|
|
31
|
-
declare const _default:
|
|
25
|
+
declare const _default: React.ComponentType<Omit<import("@auth0/auth0-react").WithAuth0Props, "auth0">>;
|
|
32
26
|
export default _default;
|
|
@@ -1,14 +1,13 @@
|
|
|
1
1
|
import * as React from 'react';
|
|
2
2
|
import Header from '../header/Header';
|
|
3
|
-
import AuthService from '../../services/Auth0';
|
|
4
3
|
import { connect } from 'react-redux';
|
|
5
4
|
import { bindActionCreators } from 'redux';
|
|
6
|
-
import { login, clearCachedAuth } from '../../redux/actions/auth';
|
|
7
5
|
import { validateAccessLevel } from '../../Util';
|
|
8
6
|
import { setAccessData } from '../../redux/actions/access';
|
|
9
7
|
import { ConfirmModal } from '../confirm-modal/ConfirmModal';
|
|
10
8
|
import API from '../../services/API';
|
|
11
9
|
import SessionService from '../../services/Session';
|
|
10
|
+
import { withAuth0, withAuthenticationRequired } from '@auth0/auth0-react';
|
|
12
11
|
class AppWrapper extends React.Component {
|
|
13
12
|
constructor(p) {
|
|
14
13
|
super(p);
|
|
@@ -17,25 +16,24 @@ class AppWrapper extends React.Component {
|
|
|
17
16
|
};
|
|
18
17
|
}
|
|
19
18
|
componentDidMount = () => {
|
|
20
|
-
|
|
21
|
-
AuthService.bindToClient(auth0ClientId, auth0Domain);
|
|
22
|
-
// Always check the session
|
|
23
|
-
this.doCheckSession(true);
|
|
19
|
+
void this.doCheckSession(true);
|
|
24
20
|
};
|
|
25
21
|
/*
|
|
26
22
|
Check the auth0 session expiry
|
|
27
23
|
*/
|
|
28
24
|
componentDidUpdate = (prevProps) => {
|
|
29
|
-
const { auth } = this.props;
|
|
25
|
+
// const { auth } = this.props;
|
|
30
26
|
// let validAccessLevel: boolean;
|
|
31
|
-
if (auth) {
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
27
|
+
// if (auth) {
|
|
28
|
+
// const {
|
|
29
|
+
// idTokenPayload: { exp }
|
|
30
|
+
// } = auth;
|
|
31
|
+
// const validSession: boolean = AuthService.checkExpiry(exp);
|
|
32
|
+
// if (!validSession) {
|
|
33
|
+
// // this.props.clearCachedAuth();
|
|
34
|
+
// this.doCheckSession();
|
|
35
|
+
// }
|
|
36
|
+
// }
|
|
39
37
|
};
|
|
40
38
|
/*
|
|
41
39
|
Emit creds to React parent
|
|
@@ -49,7 +47,7 @@ class AppWrapper extends React.Component {
|
|
|
49
47
|
};
|
|
50
48
|
}
|
|
51
49
|
}
|
|
52
|
-
propagateCreds = (freshAccess
|
|
50
|
+
propagateCreds = (freshAccess) => {
|
|
53
51
|
const { storyId: initialStoryId, organizationId: initialOrganizationId, onAuthenticated } = this.props;
|
|
54
52
|
// 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
|
|
55
53
|
if (initialOrganizationId && initialStoryId) {
|
|
@@ -87,36 +85,35 @@ class AppWrapper extends React.Component {
|
|
|
87
85
|
SessionService.clearCachedOrgId();
|
|
88
86
|
}
|
|
89
87
|
// this.props.clearCachedAuth();
|
|
90
|
-
this.props.onAuthenticationFailure(e);
|
|
88
|
+
// this.props.onAuthenticationFailure(e);
|
|
91
89
|
};
|
|
92
90
|
/*
|
|
93
91
|
Check auth0 session, pull Imposium access creds on success and initialize app-wrapper
|
|
94
92
|
*/
|
|
95
|
-
doCheckSession = (blockRender = false) => {
|
|
96
|
-
const { baseUrl } = this.props;
|
|
93
|
+
doCheckSession = async (blockRender = false) => {
|
|
94
|
+
const { auth0, baseUrl } = this.props;
|
|
97
95
|
if (blockRender) {
|
|
98
96
|
this.setState({ blockRender: true });
|
|
99
97
|
}
|
|
100
|
-
|
|
101
|
-
.
|
|
98
|
+
if (auth0.isAuthenticated) {
|
|
99
|
+
const token = await auth0.getAccessTokenSilently();
|
|
102
100
|
const orgId = this.props.organizationId
|
|
103
101
|
? this.props.organizationId
|
|
104
102
|
: null;
|
|
105
|
-
const api = new API(baseUrl,
|
|
103
|
+
const api = new API(baseUrl, token, orgId);
|
|
106
104
|
api.getAccessData(false)
|
|
107
105
|
.then((freshAccess) => {
|
|
108
106
|
this.props.setAccessData(freshAccess);
|
|
109
|
-
this.
|
|
110
|
-
this.propagateCreds(freshAccess, freshIdentity);
|
|
107
|
+
this.propagateCreds(freshAccess);
|
|
111
108
|
})
|
|
112
109
|
.catch((e) => {
|
|
113
110
|
// this.setState({ restrictAccess: true, blockRender: false });
|
|
114
111
|
// TODO: push to a different route here?
|
|
115
112
|
});
|
|
116
|
-
}
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
}
|
|
113
|
+
}
|
|
114
|
+
else {
|
|
115
|
+
auth0.loginWithRedirect();
|
|
116
|
+
}
|
|
120
117
|
};
|
|
121
118
|
render = () => {
|
|
122
119
|
const { blockRender } = this.state;
|
|
@@ -126,20 +123,20 @@ class AppWrapper extends React.Component {
|
|
|
126
123
|
innerContent = children;
|
|
127
124
|
}
|
|
128
125
|
return (React.createElement("div", { id: 'app', className: 'app' },
|
|
129
|
-
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
|
|
126
|
+
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 }),
|
|
130
127
|
innerContent,
|
|
131
128
|
React.createElement(ConfirmModal, null)));
|
|
132
129
|
};
|
|
133
130
|
}
|
|
134
131
|
const mapDispatchToProps = (dispatch) => {
|
|
135
132
|
return bindActionCreators({
|
|
136
|
-
login,
|
|
133
|
+
// login,
|
|
137
134
|
setAccessData,
|
|
138
|
-
clearCachedAuth
|
|
135
|
+
// clearCachedAuth
|
|
139
136
|
}, dispatch);
|
|
140
137
|
};
|
|
141
138
|
const mapStateToProps = (state) => {
|
|
142
|
-
return {
|
|
139
|
+
return { access: state.access };
|
|
143
140
|
};
|
|
144
|
-
export default connect(mapStateToProps, mapDispatchToProps)(AppWrapper);
|
|
141
|
+
export default withAuth0(withAuthenticationRequired(connect(mapStateToProps, mapDispatchToProps)(AppWrapper)));
|
|
145
142
|
//# sourceMappingURL=AppWrapperV2.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppWrapperV2.js","sourceRoot":"","sources":["../../../../src/components/app-wrapper/AppWrapperV2.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,MAAM,MAAM,kBAAkB,CAAC;AACtC,OAAO,
|
|
1
|
+
{"version":3,"file":"AppWrapperV2.js","sourceRoot":"","sources":["../../../../src/components/app-wrapper/AppWrapperV2.tsx"],"names":[],"mappings":"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"}
|