@imposium-hub/components 2.2.44-8 → 2.2.45-0

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.
Files changed (266) hide show
  1. package/dist/cjs/Util.d.ts +0 -1
  2. package/dist/cjs/Util.js +1 -8
  3. package/dist/cjs/Util.js.map +1 -1
  4. package/dist/cjs/components/Tooltip.d.ts +2 -2
  5. package/dist/cjs/components/Tooltip.js +7 -4
  6. package/dist/cjs/components/Tooltip.js.map +1 -1
  7. package/dist/cjs/components/advanced-number-field/AdvancedNumberField.d.ts +1 -1
  8. package/dist/cjs/components/anchor-field/AnchorField.d.ts +1 -1
  9. package/dist/cjs/components/app-wrapper/AppWrapper.d.ts +1 -2
  10. package/dist/cjs/components/app-wrapper/AppWrapper.js +71 -79
  11. package/dist/cjs/components/app-wrapper/AppWrapper.js.map +1 -1
  12. package/dist/cjs/components/app-wrapper/AppWrapper_BACKUP_73190.d.ts +27 -0
  13. package/dist/cjs/components/app-wrapper/AppWrapper_BACKUP_73190.js +243 -0
  14. package/dist/cjs/components/app-wrapper/AppWrapper_BACKUP_73190.js.map +1 -0
  15. package/dist/cjs/components/app-wrapper/AppWrapper_BASE_73190.d.ts +28 -0
  16. package/dist/cjs/components/app-wrapper/AppWrapper_BASE_73190.js +255 -0
  17. package/dist/cjs/components/app-wrapper/AppWrapper_BASE_73190.js.map +1 -0
  18. package/dist/cjs/components/app-wrapper/AppWrapper_LOCAL_73190.d.ts +27 -0
  19. package/dist/cjs/components/app-wrapper/AppWrapper_LOCAL_73190.js +243 -0
  20. package/dist/cjs/components/app-wrapper/AppWrapper_LOCAL_73190.js.map +1 -0
  21. package/dist/cjs/components/app-wrapper/AppWrapper_REMOTE_73190.d.ts +28 -0
  22. package/dist/cjs/components/app-wrapper/AppWrapper_REMOTE_73190.js +251 -0
  23. package/dist/cjs/components/app-wrapper/AppWrapper_REMOTE_73190.js.map +1 -0
  24. package/dist/cjs/components/assets/AssetField.js +2 -2
  25. package/dist/cjs/components/assets/AssetField.js.map +1 -1
  26. package/dist/cjs/components/assets/AssetsTableDurationCell.js +4 -1
  27. package/dist/cjs/components/assets/AssetsTableDurationCell.js.map +1 -1
  28. package/dist/cjs/components/assets/AssetsTableGlobalCell.js +1 -1
  29. package/dist/cjs/components/assets/AssetsTableGlobalCell.js.map +1 -1
  30. package/dist/cjs/components/assets/AssetsTableNameCell.js +3 -4
  31. package/dist/cjs/components/assets/AssetsTableNameCell.js.map +1 -1
  32. package/dist/cjs/components/assets/AssetsTableRateCell.js +3 -9
  33. package/dist/cjs/components/assets/AssetsTableRateCell.js.map +1 -1
  34. package/dist/cjs/components/assets/AssetsTableTypeFilter.js +2 -2
  35. package/dist/cjs/components/assets/AssetsTableTypeFilter.js.map +1 -1
  36. package/dist/cjs/components/assets/AssetsUploadMenu.js +34 -161
  37. package/dist/cjs/components/assets/AssetsUploadMenu.js.map +1 -1
  38. package/dist/cjs/components/auth-gate/AuthGate.js +8 -5
  39. package/dist/cjs/components/auth-gate/AuthGate.js.map +1 -1
  40. package/dist/cjs/components/button-group-field/ButtonGroupField.d.ts +1 -1
  41. package/dist/cjs/components/checkbox-field/CheckboxField.d.ts +1 -1
  42. package/dist/cjs/components/color-field/ColorField.d.ts +1 -1
  43. package/dist/cjs/components/color-field/ColorField.js +2 -2
  44. package/dist/cjs/components/color-field/ColorField.js.map +1 -1
  45. package/dist/cjs/components/context-menu/ContextMenu.js +4 -8
  46. package/dist/cjs/components/context-menu/ContextMenu.js.map +1 -1
  47. package/dist/cjs/components/data-table/DataTable.js +2 -2
  48. package/dist/cjs/components/data-table/DataTable.js.map +1 -1
  49. package/dist/cjs/components/dropdown/{Dropdown.stories.js → dropdown.stories.js} +1 -1
  50. package/dist/cjs/components/dropdown/{Dropdown.stories.js.map → dropdown.stories.js.map} +1 -1
  51. package/dist/cjs/components/error-message-preview/ErrorMessagePreview.d.ts +15 -0
  52. package/dist/cjs/components/error-message-preview/ErrorMessagePreview.js +91 -0
  53. package/dist/cjs/components/error-message-preview/ErrorMessagePreview.js.map +1 -0
  54. package/dist/cjs/components/header/Header.d.ts +4 -0
  55. package/dist/cjs/components/header/Header.js +27 -19
  56. package/dist/cjs/components/header/Header.js.map +1 -1
  57. package/dist/cjs/components/header/Header_BACKUP_73021.d.ts +33 -0
  58. package/dist/cjs/components/header/Header_BACKUP_73021.js +393 -0
  59. package/dist/cjs/components/header/Header_BACKUP_73021.js.map +1 -0
  60. package/dist/cjs/components/header/Header_BASE_73021.d.ts +29 -0
  61. package/dist/cjs/components/header/Header_BASE_73021.js +376 -0
  62. package/dist/cjs/components/header/Header_BASE_73021.js.map +1 -0
  63. package/dist/cjs/components/header/Header_LOCAL_73021.d.ts +33 -0
  64. package/dist/cjs/components/header/Header_LOCAL_73021.js +382 -0
  65. package/dist/cjs/components/header/Header_LOCAL_73021.js.map +1 -0
  66. package/dist/cjs/components/header/Header_REMOTE_73021.d.ts +30 -0
  67. package/dist/cjs/components/header/Header_REMOTE_73021.js +386 -0
  68. package/dist/cjs/components/header/Header_REMOTE_73021.js.map +1 -0
  69. package/dist/cjs/components/list-field/ListField.d.ts +1 -1
  70. package/dist/cjs/components/number-field/NumberField.d.ts +1 -1
  71. package/dist/cjs/components/publish-wizard/PublishWizard.js +119 -63
  72. package/dist/cjs/components/publish-wizard/PublishWizard.js.map +1 -1
  73. package/dist/cjs/components/publish-wizard/publish/EmailWorkflow.js +5 -28
  74. package/dist/cjs/components/publish-wizard/publish/EmailWorkflow.js.map +1 -1
  75. package/dist/cjs/components/select-field/SelectField.d.ts +1 -1
  76. package/dist/cjs/components/select-field/SelectField.js +0 -4
  77. package/dist/cjs/components/select-field/SelectField.js.map +1 -1
  78. package/dist/cjs/components/slider-field/SliderField.d.ts +1 -1
  79. package/dist/cjs/components/smpte-field/SMPTEField.d.ts +1 -1
  80. package/dist/cjs/components/text-area-field/TextAreaField.d.ts +1 -1
  81. package/dist/cjs/components/text-field/TextField.d.ts +1 -1
  82. package/dist/cjs/constants/copy.d.ts +5 -2
  83. package/dist/cjs/constants/copy.js +8 -5
  84. package/dist/cjs/constants/copy.js.map +1 -1
  85. package/dist/cjs/constants/icons.d.ts +1 -0
  86. package/dist/cjs/constants/icons.js +3 -1
  87. package/dist/cjs/constants/icons.js.map +1 -1
  88. package/dist/cjs/index.d.ts +3 -5
  89. package/dist/cjs/index.js +3 -8
  90. package/dist/cjs/index.js.map +1 -1
  91. package/dist/cjs/redux/actions/access.d.ts +1 -3
  92. package/dist/cjs/redux/actions/access.js +10 -43
  93. package/dist/cjs/redux/actions/access.js.map +1 -1
  94. package/dist/cjs/redux/actions/asset-uploads.d.ts +10 -5
  95. package/dist/cjs/redux/actions/asset-uploads.js +182 -262
  96. package/dist/cjs/redux/actions/asset-uploads.js.map +1 -1
  97. package/dist/cjs/redux/actions/publish.js +4 -3
  98. package/dist/cjs/redux/actions/publish.js.map +1 -1
  99. package/dist/cjs/redux/reducers/access.js +7 -30
  100. package/dist/cjs/redux/reducers/access.js.map +1 -1
  101. package/dist/cjs/redux/reducers/asset-uploads.js +24 -10
  102. package/dist/cjs/redux/reducers/asset-uploads.js.map +1 -1
  103. package/dist/cjs/services/Session.d.ts +9 -8
  104. package/dist/cjs/services/Session.js +31 -127
  105. package/dist/cjs/services/Session.js.map +1 -1
  106. package/dist/esm/Util.d.ts +0 -1
  107. package/dist/esm/Util.js +0 -6
  108. package/dist/esm/Util.js.map +1 -1
  109. package/dist/esm/components/Tooltip.d.ts +2 -2
  110. package/dist/esm/components/Tooltip.js +4 -4
  111. package/dist/esm/components/Tooltip.js.map +1 -1
  112. package/dist/esm/components/advanced-number-field/AdvancedNumberField.d.ts +1 -1
  113. package/dist/esm/components/anchor-field/AnchorField.d.ts +1 -1
  114. package/dist/esm/components/app-wrapper/AppWrapper.d.ts +1 -2
  115. package/dist/esm/components/app-wrapper/AppWrapper.js +69 -79
  116. package/dist/esm/components/app-wrapper/AppWrapper.js.map +1 -1
  117. package/dist/esm/components/app-wrapper/AppWrapper_BACKUP_73190.d.ts +27 -0
  118. package/dist/esm/components/app-wrapper/AppWrapper_BACKUP_73190.js +194 -0
  119. package/dist/esm/components/app-wrapper/AppWrapper_BACKUP_73190.js.map +1 -0
  120. package/dist/esm/components/app-wrapper/AppWrapper_BASE_73190.d.ts +28 -0
  121. package/dist/esm/components/app-wrapper/AppWrapper_BASE_73190.js +208 -0
  122. package/dist/esm/components/app-wrapper/AppWrapper_BASE_73190.js.map +1 -0
  123. package/dist/esm/components/app-wrapper/AppWrapper_LOCAL_73190.d.ts +27 -0
  124. package/dist/esm/components/app-wrapper/AppWrapper_LOCAL_73190.js +194 -0
  125. package/dist/esm/components/app-wrapper/AppWrapper_LOCAL_73190.js.map +1 -0
  126. package/dist/esm/components/app-wrapper/AppWrapper_REMOTE_73190.d.ts +28 -0
  127. package/dist/esm/components/app-wrapper/AppWrapper_REMOTE_73190.js +204 -0
  128. package/dist/esm/components/app-wrapper/AppWrapper_REMOTE_73190.js.map +1 -0
  129. package/dist/esm/components/assets/AssetField.js +2 -2
  130. package/dist/esm/components/assets/AssetField.js.map +1 -1
  131. package/dist/esm/components/assets/AssetsTableDurationCell.js +5 -2
  132. package/dist/esm/components/assets/AssetsTableDurationCell.js.map +1 -1
  133. package/dist/esm/components/assets/AssetsTableGlobalCell.js +1 -1
  134. package/dist/esm/components/assets/AssetsTableGlobalCell.js.map +1 -1
  135. package/dist/esm/components/assets/AssetsTableNameCell.js +3 -4
  136. package/dist/esm/components/assets/AssetsTableNameCell.js.map +1 -1
  137. package/dist/esm/components/assets/AssetsTableRateCell.js +3 -9
  138. package/dist/esm/components/assets/AssetsTableRateCell.js.map +1 -1
  139. package/dist/esm/components/assets/AssetsTableTypeFilter.js +2 -2
  140. package/dist/esm/components/assets/AssetsTableTypeFilter.js.map +1 -1
  141. package/dist/esm/components/assets/AssetsUploadMenu.js +34 -144
  142. package/dist/esm/components/assets/AssetsUploadMenu.js.map +1 -1
  143. package/dist/esm/components/auth-gate/AuthGate.js +9 -6
  144. package/dist/esm/components/auth-gate/AuthGate.js.map +1 -1
  145. package/dist/esm/components/button-group-field/ButtonGroupField.d.ts +1 -1
  146. package/dist/esm/components/checkbox-field/CheckboxField.d.ts +1 -1
  147. package/dist/esm/components/color-field/ColorField.d.ts +1 -1
  148. package/dist/esm/components/color-field/ColorField.js +2 -2
  149. package/dist/esm/components/color-field/ColorField.js.map +1 -1
  150. package/dist/esm/components/context-menu/ContextMenu.js +3 -7
  151. package/dist/esm/components/context-menu/ContextMenu.js.map +1 -1
  152. package/dist/esm/components/data-table/DataTable.js +2 -2
  153. package/dist/esm/components/data-table/DataTable.js.map +1 -1
  154. package/dist/esm/components/dropdown/{Dropdown.stories.js → dropdown.stories.js} +1 -1
  155. package/dist/esm/components/dropdown/{Dropdown.stories.js.map → dropdown.stories.js.map} +1 -1
  156. package/dist/esm/components/error-message-preview/ErrorMessagePreview.d.ts +15 -0
  157. package/dist/esm/components/error-message-preview/ErrorMessagePreview.js +35 -0
  158. package/dist/esm/components/error-message-preview/ErrorMessagePreview.js.map +1 -0
  159. package/dist/esm/components/header/Header.d.ts +4 -0
  160. package/dist/esm/components/header/Header.js +27 -19
  161. package/dist/esm/components/header/Header.js.map +1 -1
  162. package/dist/esm/components/header/Header_BACKUP_73021.d.ts +33 -0
  163. package/dist/esm/components/header/Header_BACKUP_73021.js +336 -0
  164. package/dist/esm/components/header/Header_BACKUP_73021.js.map +1 -0
  165. package/dist/esm/components/header/Header_BASE_73021.d.ts +29 -0
  166. package/dist/esm/components/header/Header_BASE_73021.js +322 -0
  167. package/dist/esm/components/header/Header_BASE_73021.js.map +1 -0
  168. package/dist/esm/components/header/Header_LOCAL_73021.d.ts +33 -0
  169. package/dist/esm/components/header/Header_LOCAL_73021.js +328 -0
  170. package/dist/esm/components/header/Header_LOCAL_73021.js.map +1 -0
  171. package/dist/esm/components/header/Header_REMOTE_73021.d.ts +30 -0
  172. package/dist/esm/components/header/Header_REMOTE_73021.js +329 -0
  173. package/dist/esm/components/header/Header_REMOTE_73021.js.map +1 -0
  174. package/dist/esm/components/list-field/ListField.d.ts +1 -1
  175. package/dist/esm/components/number-field/NumberField.d.ts +1 -1
  176. package/dist/esm/components/publish-wizard/PublishWizard.js +119 -64
  177. package/dist/esm/components/publish-wizard/PublishWizard.js.map +1 -1
  178. package/dist/esm/components/publish-wizard/publish/EmailWorkflow.js +5 -28
  179. package/dist/esm/components/publish-wizard/publish/EmailWorkflow.js.map +1 -1
  180. package/dist/esm/components/select-field/SelectField.d.ts +1 -1
  181. package/dist/esm/components/select-field/SelectField.js +0 -3
  182. package/dist/esm/components/select-field/SelectField.js.map +1 -1
  183. package/dist/esm/components/slider-field/SliderField.d.ts +1 -1
  184. package/dist/esm/components/smpte-field/SMPTEField.d.ts +1 -1
  185. package/dist/esm/components/text-area-field/TextAreaField.d.ts +1 -1
  186. package/dist/esm/components/text-field/TextField.d.ts +1 -1
  187. package/dist/esm/constants/copy.d.ts +5 -2
  188. package/dist/esm/constants/copy.js +8 -5
  189. package/dist/esm/constants/copy.js.map +1 -1
  190. package/dist/esm/constants/icons.d.ts +1 -0
  191. package/dist/esm/constants/icons.js +2 -0
  192. package/dist/esm/constants/icons.js.map +1 -1
  193. package/dist/esm/index.d.ts +3 -5
  194. package/dist/esm/index.js +3 -5
  195. package/dist/esm/index.js.map +1 -1
  196. package/dist/esm/redux/actions/access.d.ts +1 -3
  197. package/dist/esm/redux/actions/access.js +8 -37
  198. package/dist/esm/redux/actions/access.js.map +1 -1
  199. package/dist/esm/redux/actions/asset-uploads.d.ts +10 -5
  200. package/dist/esm/redux/actions/asset-uploads.js +167 -224
  201. package/dist/esm/redux/actions/asset-uploads.js.map +1 -1
  202. package/dist/esm/redux/actions/publish.js +4 -3
  203. package/dist/esm/redux/actions/publish.js.map +1 -1
  204. package/dist/esm/redux/reducers/access.js +5 -8
  205. package/dist/esm/redux/reducers/access.js.map +1 -1
  206. package/dist/esm/redux/reducers/asset-uploads.js +47 -15
  207. package/dist/esm/redux/reducers/asset-uploads.js.map +1 -1
  208. package/dist/esm/services/Session.d.ts +9 -8
  209. package/dist/esm/services/Session.js +29 -102
  210. package/dist/esm/services/Session.js.map +1 -1
  211. package/dist/styles.css +25 -110
  212. package/dist/styles.less +100 -196
  213. package/less/components/assets.less +63 -153
  214. package/less/components/button.less +1 -7
  215. package/less/components/data-table.less +11 -17
  216. package/less/components/header.less +13 -0
  217. package/less/components/publish-wizard.less +13 -20
  218. package/less/components/story-previewer.less +0 -1
  219. package/package.json +6 -6
  220. package/src/Util.ts +0 -10
  221. package/src/components/Tooltip.tsx +9 -9
  222. package/src/components/advanced-number-field/AdvancedNumberField.tsx +1 -1
  223. package/src/components/anchor-field/AnchorField.tsx +1 -1
  224. package/src/components/app-wrapper/AppWrapper.tsx +79 -120
  225. package/src/components/assets/AssetField.tsx +8 -3
  226. package/src/components/assets/AssetsTableDurationCell.tsx +5 -2
  227. package/src/components/assets/AssetsTableNameCell.tsx +5 -3
  228. package/src/components/assets/AssetsTableRateCell.tsx +4 -11
  229. package/src/components/assets/AssetsTableTypeFilter.tsx +8 -7
  230. package/src/components/assets/AssetsUploadMenu.tsx +98 -275
  231. package/src/components/auth-gate/AuthGate.tsx +14 -8
  232. package/src/components/button-group-field/ButtonGroupField.tsx +1 -1
  233. package/src/components/checkbox-field/CheckboxField.tsx +1 -1
  234. package/src/components/color-field/ColorField.tsx +3 -3
  235. package/src/components/context-menu/ContextMenu.tsx +11 -16
  236. package/src/components/data-table/DataTable.tsx +2 -2
  237. package/src/components/header/Header.tsx +74 -39
  238. package/src/components/list-field/ListField.tsx +1 -1
  239. package/src/components/number-field/NumberField.tsx +1 -1
  240. package/src/components/publish-wizard/PublishWizard.tsx +180 -102
  241. package/src/components/publish-wizard/publish/EmailWorkflow.tsx +10 -42
  242. package/src/components/select-field/SelectField.tsx +1 -4
  243. package/src/components/slider-field/SliderField.tsx +1 -1
  244. package/src/components/smpte-field/SMPTEField.tsx +1 -1
  245. package/src/components/text-area-field/TextAreaField.tsx +1 -1
  246. package/src/components/text-field/TextField.tsx +1 -1
  247. package/src/constants/copy.ts +9 -5
  248. package/src/constants/icons.tsx +3 -0
  249. package/src/index.ts +9 -16
  250. package/src/redux/actions/access.ts +5 -67
  251. package/src/redux/actions/asset-uploads.ts +205 -305
  252. package/src/redux/actions/publish.ts +6 -3
  253. package/src/redux/reducers/access.ts +5 -8
  254. package/src/redux/reducers/asset-uploads.ts +47 -17
  255. package/src/services/Session.ts +34 -120
  256. package/dist/cjs/components/copy-prop-id-button/CopyPropIdButton.d.ts +0 -12
  257. package/dist/cjs/components/copy-prop-id-button/CopyPropIdButton.js +0 -75
  258. package/dist/cjs/components/copy-prop-id-button/CopyPropIdButton.js.map +0 -1
  259. package/dist/esm/components/copy-prop-id-button/CopyPropIdButton.d.ts +0 -12
  260. package/dist/esm/components/copy-prop-id-button/CopyPropIdButton.js +0 -24
  261. package/dist/esm/components/copy-prop-id-button/CopyPropIdButton.js.map +0 -1
  262. package/src/components/assets/AssetsTableGlobalCell.tsx +0 -15
  263. package/src/components/copy-prop-id-button/CopyPropIdButton.tsx +0 -44
  264. /package/dist/cjs/components/dropdown/{Dropdown.stories.d.ts → dropdown.stories.d.ts} +0 -0
  265. /package/dist/esm/components/dropdown/{Dropdown.stories.d.ts → dropdown.stories.d.ts} +0 -0
  266. /package/src/components/dropdown/{Dropdown.stories.tsx → dropdown.stories.tsx} +0 -0
@@ -6,8 +6,8 @@ import AuthService from '../../services/Auth0';
6
6
  import { connect } from 'react-redux';
7
7
  import { bindActionCreators } from 'redux';
8
8
  import { login, clearCachedAuth } from '../../redux/actions/auth';
9
- import { cacheAccessData, clearCachedAccessList } from '../../redux/actions/access';
10
9
  import { validateAccessLevel } from '../../Util';
10
+ import { setAccessData } from '../../redux/actions/access';
11
11
  class AppWrapper extends React.Component {
12
12
  static RESTRICTED_REQUEST = (React.createElement(NoAccess, { key: 'restriction-msg', type: 'request' }));
13
13
  static RESTRICTED_BLOCK = (React.createElement(NoAccess, { key: 'restriction-msg', type: 'restrict' }));
@@ -20,8 +20,7 @@ class AppWrapper extends React.Component {
20
20
  };
21
21
  }
22
22
  componentDidMount = () => {
23
- const { auth, access, auth0ClientId, auth0Domain, isFreshUser } = this.props;
24
- const session = SessionService.getSession();
23
+ const { auth0ClientId, auth0Domain } = this.props;
25
24
  AuthService.bindToClient(auth0ClientId, auth0Domain);
26
25
  const validAccessLevel = validateAccessLevel(this.props.organizationId, this.props.serviceId, this.props.access);
27
26
  if (!this.state.restrictAccess && !validAccessLevel) {
@@ -30,21 +29,8 @@ class AppWrapper extends React.Component {
30
29
  if (this.state.restrictAccess && validAccessLevel) {
31
30
  this.setState({ restrictAccess: false });
32
31
  }
33
- // If cookie, auth or access data is missing / mismatched,
34
- // silently check auth0 session and refresh flow on success
35
- if (!isFreshUser &&
36
- auth !== null &&
37
- access !== null &&
38
- typeof session === 'object' &&
39
- typeof session.sub === 'string' &&
40
- session.sub === auth.idTokenPayload.sub &&
41
- session.stories_hash === SessionService.generateStoriesHash(access) &&
42
- session.orgs_hash === SessionService.generateOrgsHash(access)) {
43
- this.propagateCreds();
44
- }
45
- else {
46
- this.doCheckSession(true);
47
- }
32
+ // Always check the session
33
+ this.doCheckSession(true);
48
34
  };
49
35
  /*
50
36
  Check the auth0 session expiry
@@ -57,11 +43,11 @@ class AppWrapper extends React.Component {
57
43
  const validSession = AuthService.checkExpiry(exp);
58
44
  if (!validSession) {
59
45
  this.props.clearCachedAuth();
60
- this.props.clearCachedAccessList();
61
46
  this.doCheckSession();
62
47
  }
63
48
  }
64
- if (this.props.organizationId !== prevProps.organizationId) {
49
+ if (this.props.organizationId !== prevProps.organizationId ||
50
+ this.props.access !== prevProps.access) {
65
51
  validAccessLevel = validateAccessLevel(this.props.organizationId, this.props.serviceId, this.props.access);
66
52
  if (!this.state.restrictAccess && !validAccessLevel) {
67
53
  this.setState({ restrictAccess: true });
@@ -74,14 +60,50 @@ class AppWrapper extends React.Component {
74
60
  /*
75
61
  Emit creds to React parent
76
62
  */
77
- propagateCreds = () => {
78
- const { auth, access, storyId, onAuthenticated } = this.props;
79
- const activeOrgId = this.determineActiveOrganization(auth, access);
80
- let activeStoryId = SessionService.getSession().story_id;
81
- if (storyId) {
82
- activeStoryId = storyId;
63
+ propagateCreds = (freshAccess, freshIdentity) => {
64
+ const { storyId, organizationId, onAuthenticated } = this.props;
65
+ let initialStoryId = storyId;
66
+ let initialOrganizationId = organizationId;
67
+ const firstOrg = freshAccess.organizations[0];
68
+ const getIDsFromSession = () => {
69
+ const session = SessionService.getSession();
70
+ if (session && session.story_id && session.organization_id) {
71
+ const org = freshAccess.organizations.find((o) => o.id === session.organization_id);
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
+ }
77
+ }
78
+ }
79
+ return null;
80
+ };
81
+ // 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
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 {
88
+ initialOrganizationId = firstOrg.id;
89
+ }
83
90
  }
84
- onAuthenticated(activeOrgId, activeStoryId);
91
+ if (!initialStoryId) {
92
+ // If storyID is not provided, try to use the one from the previous session
93
+ const sessionIds = getIDsFromSession();
94
+ if (sessionIds) {
95
+ initialOrganizationId = sessionIds.orgId;
96
+ initialStoryId = sessionIds.storyId;
97
+ }
98
+ else {
99
+ // If that doesn't work - default to the first org & story
100
+ const story = firstOrg.stories[0];
101
+ initialOrganizationId = firstOrg.id;
102
+ initialStoryId = story.id;
103
+ }
104
+ }
105
+ SessionService.buildFreshSession(freshIdentity, initialOrganizationId, initialStoryId);
106
+ onAuthenticated(initialOrganizationId, initialStoryId);
85
107
  if (this.state.blockRender) {
86
108
  this.setState({ blockRender: false });
87
109
  }
@@ -90,8 +112,19 @@ class AppWrapper extends React.Component {
90
112
  Bust cached creds if exist, invoke auth failure handler
91
113
  */
92
114
  handleCheckSessionFailure = (e) => {
115
+ if (this.props.storyId) {
116
+ SessionService.cacheStoryId(this.props.storyId);
117
+ }
118
+ else {
119
+ SessionService.clearCachedStoryId();
120
+ }
121
+ if (this.props.organizationId) {
122
+ SessionService.cacheOrgId(this.props.organizationId);
123
+ }
124
+ else {
125
+ SessionService.clearCachedOrgId();
126
+ }
93
127
  this.props.clearCachedAuth();
94
- this.props.clearCachedAccessList();
95
128
  this.props.onAuthenticationFailure(e);
96
129
  };
97
130
  /*
@@ -104,12 +137,14 @@ class AppWrapper extends React.Component {
104
137
  }
105
138
  AuthService.checkSession()
106
139
  .then((freshIdentity) => {
107
- SessionService.getAccessData(freshIdentity.idToken, baseUrl)
140
+ const orgId = this.props.organizationId
141
+ ? this.props.organizationId
142
+ : SessionService.getCachedOrgId();
143
+ SessionService.getAccessData(freshIdentity.idToken, baseUrl, false, orgId)
108
144
  .then((freshAccess) => {
145
+ this.props.setAccessData(freshAccess);
109
146
  this.props.login(freshIdentity);
110
- this.props.cacheAccessData(freshAccess);
111
- SessionService.buildFreshSession(freshIdentity, freshAccess);
112
- this.propagateCreds();
147
+ this.propagateCreds(freshAccess, freshIdentity);
113
148
  })
114
149
  .catch((e) => {
115
150
  console.error(e);
@@ -121,50 +156,6 @@ class AppWrapper extends React.Component {
121
156
  this.handleCheckSessionFailure(e);
122
157
  });
123
158
  };
124
- determineActiveOrganizationIn(auth, session, organizationIds) {
125
- const { organizationId } = this.props;
126
- const { idTokenPayload: { exp } } = auth;
127
- if (organizationIds.length > 0) {
128
- if (organizationId && organizationIds.indexOf(organizationId) > -1) {
129
- return this.setActiveOrganization(organizationId, exp, session);
130
- }
131
- if (session &&
132
- session.organization_id &&
133
- organizationIds.indexOf(session.organization_id) > -1) {
134
- return session.organization_id;
135
- }
136
- return this.setActiveOrganization(organizationIds[0], exp, session);
137
- }
138
- return '';
139
- }
140
- /*
141
- Figure out what the active org should be based on app-wrapper configuration
142
- */
143
- determineActiveOrganization = (auth, access) => {
144
- const { serviceId } = this.props;
145
- const { organizations } = access;
146
- const session = SessionService.getSession();
147
- const allOrgIdsFlattened = organizations.map((o) => o.id);
148
- const activeOrgId = this.determineActiveOrganizationIn(auth, session, allOrgIdsFlattened);
149
- const activeOrg = organizations.find((o) => o.id === activeOrgId);
150
- if (activeOrg && !activeOrg.services.includes(serviceId)) {
151
- this.setState({ restrictAccess: true });
152
- }
153
- return activeOrgId;
154
- };
155
- /*
156
- Update session if no session exists or diff in org id
157
- */
158
- setActiveOrganization = (organizationId, exp, sharedSession) => {
159
- if (!sharedSession ||
160
- !sharedSession.organization_id ||
161
- sharedSession.organization_id !== organizationId) {
162
- const activeOrg = this.props.access.organizations.find((o) => o.id === organizationId);
163
- const firstStoryId = typeof activeOrg.stories[0] === 'object' ? activeOrg.stories[0].id : '';
164
- SessionService.updateSession({ organization_id: organizationId, story_id: firstStoryId }, exp);
165
- }
166
- return organizationId;
167
- };
168
159
  render = () => {
169
160
  const { blockRender, restrictAccess } = this.state;
170
161
  const { children, showRequestAccess, allowUnauthenticatedRender } = this.props;
@@ -192,9 +183,8 @@ class AppWrapper extends React.Component {
192
183
  const mapDispatchToProps = (dispatch) => {
193
184
  return bindActionCreators({
194
185
  login,
195
- clearCachedAuth,
196
- cacheAccessData,
197
- clearCachedAccessList
186
+ setAccessData,
187
+ clearCachedAuth
198
188
  }, dispatch);
199
189
  };
200
190
  const mapStateToProps = (state) => {
@@ -1 +1 @@
1
- {"version":3,"file":"AppWrapper.js","sourceRoot":"","sources":["../../../../src/components/app-wrapper/AppWrapper.tsx"],"names":[],"mappings":"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"}
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,QAAQ,MAAM,uBAAuB,CAAC;AAC7C,OAAO,MAAM,MAAM,kBAAkB,CAAC;AACtC,OAAO,cAAc,MAAM,wBAAwB,CAAC;AACpD,OAAO,WAA0B,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AA2B3D,MAAM,UAAW,SAAQ,KAAK,CAAC,SAA6C;IAChE,MAAM,CAAU,kBAAkB,GAAgB,CACtD,oBAAC,QAAQ,IACL,GAAG,EAAC,iBAAiB,EACrB,IAAI,EAAC,SAAS,GAChB,CACL,CAAC;IAEM,MAAM,CAAU,gBAAgB,GAAgB,CACpD,oBAAC,QAAQ,IACL,GAAG,EAAC,iBAAiB,EACrB,IAAI,EAAC,UAAU,GACjB,CACL,CAAC;IAEM,MAAM,CAAU,OAAO,GAAgB,CAC3C,oBAAC,QAAQ,IACL,GAAG,EAAC,iBAAiB,EACrB,IAAI,EAAC,SAAS,GAChB,CACL,CAAC;IAEF,YAAY,CAAmB;QAC3B,KAAK,CAAC,CAAC,CAAC,CAAC;QAET,IAAI,CAAC,KAAK,GAAG;YACT,WAAW,EAAE,IAAI;YACjB,cAAc,EAAE,KAAK;SACxB,CAAC;IACN,CAAC;IAEM,iBAAiB,GAAG,GAAS,EAAE;QAClC,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAElD,WAAW,CAAC,YAAY,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;QAErD,MAAM,gBAAgB,GAAG,mBAAmB,CACxC,IAAI,CAAC,KAAK,CAAC,cAAc,EACzB,IAAI,CAAC,KAAK,CAAC,SAAS,EACpB,IAAI,CAAC,KAAK,CAAC,MAAM,CACpB,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAClD,IAAI,CAAC,QAAQ,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC;QAC5C,CAAC;QAED,IAAI,IAAI,CAAC,KAAK,CAAC,cAAc,IAAI,gBAAgB,EAAE,CAAC;YAChD,IAAI,CAAC,QAAQ,CAAC,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,CAAC;QAC7C,CAAC;QAED,2BAA2B;QAC3B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC,CAAC;IAEF;;OAEG;IACI,kBAAkB,GAAG,CACxB,SAAqC,EACrC,SAAqC,EACjC,EAAE;QACN,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAC5B,IAAI,gBAAyB,CAAC;QAE9B,IAAI,IAAI,EAAE,CAAC;YACP,MAAM,EACF,cAAc,EAAE,EAAE,GAAG,EAAE,EAC1B,GAAG,IAAI,CAAC;YACT,MAAM,YAAY,GAAY,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;YAE3D,IAAI,CAAC,YAAY,EAAE,CAAC;gBAChB,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC;gBAC7B,IAAI,CAAC,cAAc,EAAE,CAAC;YAC1B,CAAC;QACL,CAAC;QAED,IACI,IAAI,CAAC,KAAK,CAAC,cAAc,KAAK,SAAS,CAAC,cAAc;YACtD,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC,MAAM,EACxC,CAAC;YACC,gBAAgB,GAAG,mBAAmB,CAClC,IAAI,CAAC,KAAK,CAAC,cAAc,EACzB,IAAI,CAAC,KAAK,CAAC,SAAS,EACpB,IAAI,CAAC,KAAK,CAAC,MAAM,CACpB,CAAC;YAEF,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBAClD,IAAI,CAAC,QAAQ,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC;YAC5C,CAAC;YAED,IAAI,IAAI,CAAC,KAAK,CAAC,cAAc,IAAI,gBAAgB,EAAE,CAAC;gBAChD,IAAI,CAAC,QAAQ,CAAC,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,CAAC;YAC7C,CAAC;QACL,CAAC;IACL,CAAC,CAAC;IAEF;;OAEG;IACK,cAAc,GAAG,CAAC,WAAW,EAAE,aAAa,EAAQ,EAAE;QAC1D,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAEhE,IAAI,cAAc,GAAG,OAAO,CAAC;QAC7B,IAAI,qBAAqB,GAAG,cAAc,CAAC;QAE3C,MAAM,QAAQ,GAAG,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QAE9C,MAAM,iBAAiB,GAAG,GAAG,EAAE;YAC3B,MAAM,OAAO,GAAG,cAAc,CAAC,UAAU,EAAE,CAAC;YAC5C,IAAI,OAAO,IAAI,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;gBACzD,MAAM,GAAG,GAAG,WAAW,CAAC,aAAa,CAAC,IAAI,CACtC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,OAAO,CAAC,eAAe,CAC/C,CAAC;gBACF,IAAI,GAAG,EAAE,CAAC;oBACN,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;oBACtE,IAAI,KAAK,EAAE,CAAC;wBACR,OAAO,EAAE,KAAK,EAAE,GAAG,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;oBAChD,CAAC;gBACL,CAAC;YACL,CAAC;YACD,OAAO,IAAI,CAAC;QAChB,CAAC,CAAC;QAEF,yKAAyK;QACzK,IAAI,CAAC,qBAAqB,IAAI,cAAc,EAAE,CAAC;YAC3C,MAAM,GAAG,GAAG,WAAW,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAClD,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,cAAc,CAAC,CACtD,CAAC;YACF,IAAI,GAAG,EAAE,CAAC;gBACN,qBAAqB,GAAG,GAAG,CAAC,EAAE,CAAC;YACnC,CAAC;iBAAM,CAAC;gBACJ,qBAAqB,GAAG,QAAQ,CAAC,EAAE,CAAC;YACxC,CAAC;QACL,CAAC;QAED,IAAI,CAAC,cAAc,EAAE,CAAC;YAClB,2EAA2E;YAC3E,MAAM,UAAU,GAAG,iBAAiB,EAAE,CAAC;YACvC,IAAI,UAAU,EAAE,CAAC;gBACb,qBAAqB,GAAG,UAAU,CAAC,KAAK,CAAC;gBACzC,cAAc,GAAG,UAAU,CAAC,OAAO,CAAC;YACxC,CAAC;iBAAM,CAAC;gBACJ,0DAA0D;gBAC1D,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;gBAClC,qBAAqB,GAAG,QAAQ,CAAC,EAAE,CAAC;gBACpC,cAAc,GAAG,KAAK,CAAC,EAAE,CAAC;YAC9B,CAAC;QACL,CAAC;QAED,cAAc,CAAC,iBAAiB,CAAC,aAAa,EAAE,qBAAqB,EAAE,cAAc,CAAC,CAAC;QACvF,eAAe,CAAC,qBAAqB,EAAE,cAAc,CAAC,CAAC;QAEvD,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;YACzB,IAAI,CAAC,QAAQ,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;QAC1C,CAAC;IACL,CAAC,CAAC;IAEF;;OAEG;IACK,yBAAyB,GAAG,CAAC,CAAQ,EAAQ,EAAE;QACnD,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YACrB,cAAc,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACpD,CAAC;aAAM,CAAC;YACJ,cAAc,CAAC,kBAAkB,EAAE,CAAC;QACxC,CAAC;QAED,IAAI,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC;YAC5B,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QACzD,CAAC;aAAM,CAAC;YACJ,cAAc,CAAC,gBAAgB,EAAE,CAAC;QACtC,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC;QAC7B,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC;IAC1C,CAAC,CAAC;IAEF;;MAEE;IACM,cAAc,GAAG,CAAC,cAAuB,KAAK,EAAQ,EAAE;QAC5D,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAE/B,IAAI,WAAW,EAAE,CAAC;YACd,IAAI,CAAC,QAAQ,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;QACzC,CAAC;QACD,WAAW,CAAC,YAAY,EAAE;aACrB,IAAI,CAAC,CAAC,aAAwB,EAAE,EAAE;YAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc;gBACnC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc;gBAC3B,CAAC,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC;YACtC,cAAc,CAAC,aAAa,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC;iBACrE,IAAI,CAAC,CAAC,WAAgB,EAAE,EAAE;gBACvB,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;gBACtC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;gBAChC,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;YACpD,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,CAAQ,EAAE,EAAE;gBAChB,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACjB,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC;YACtC,CAAC,CAAC,CAAC;QACX,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,CAAQ,EAAE,EAAE;YAChB,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACjB,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;IACX,CAAC,CAAC;IAEK,MAAM,GAAG,GAAgB,EAAE;QAC9B,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACnD,MAAM,EAAE,QAAQ,EAAE,iBAAiB,EAAE,0BAA0B,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAE/E,IAAI,YAAiB,CAAC;QAEtB,IAAI,CAAC,WAAW,IAAI,cAAc,EAAE,CAAC;YACjC,MAAM,UAAU,GACZ,IAAI,CAAC,KAAK,CAAC,MAAM;gBACjB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,aAAa;gBAC/B,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,KAAK,CAAC,CAAC;YACjD,MAAM,cAAc,GAAG,UAAU;gBAC7B,CAAC,CAAC,UAAU,CAAC,OAAO;gBACpB,CAAC,CAAC,iBAAiB;oBACnB,CAAC,CAAC,UAAU,CAAC,kBAAkB;oBAC/B,CAAC,CAAC,UAAU,CAAC,gBAAgB,CAAC;YAClC,YAAY,GAAG;gBACX,OAAO,QAAQ,CAAC,CAAC,CAAC,KAAK,QAAQ,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,IAAI,QAAQ,CAAC,CAAC,CAAC;gBAC7E,cAAc;aACjB,CAAC;QACN,CAAC;QAED,IAAI,CAAC,CAAC,WAAW,IAAI,CAAC,cAAc,CAAC,IAAI,0BAA0B,EAAE,CAAC;YAClE,YAAY,GAAG,QAAQ,CAAC;QAC5B,CAAC;QAED,OAAO,CACH,6BACI,EAAE,EAAC,KAAK,EACR,SAAS,EAAC,KAAK,IACd,YAAY,CACX,CACT,CAAC;IACN,CAAC,CAAC;;AAGN,MAAM,kBAAkB,GAAG,CAAC,QAAQ,EAAE,EAAE;IACpC,OAAO,kBAAkB,CACrB;QACI,KAAK;QACL,aAAa;QACb,eAAe;KAClB,EACD,QAAQ,CACX,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,KAAK,EAAO,EAAE;IACnC,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC;AACtD,CAAC,CAAC;AAEF,eAAe,OAAO,CAAC,eAAe,EAAE,kBAAkB,CAAC,CAAC,UAAU,CAAC,CAAC"}
@@ -0,0 +1,27 @@
1
+ import * as React from 'react';
2
+ import { IIdentity } from '../../services/Auth0';
3
+ export interface IAppWrapperProps {
4
+ children: React.ReactChildren;
5
+ auth0Domain: string;
6
+ auth0ClientId: string;
7
+ organizationId: string;
8
+ baseUrl: string;
9
+ storyId?: string;
10
+ serviceId: number;
11
+ access: any;
12
+ auth: any;
13
+ isFreshUser: boolean;
14
+ setAccessData(accessData: any): any;
15
+ allowUnauthenticatedRender: boolean;
16
+ onAuthenticated: (activeOrgId: string, activeStoryId: string) => any;
17
+ onAuthenticationFailure: (e: Error) => any;
18
+ showRequestAccess?: boolean;
19
+ login: (id: IIdentity) => any;
20
+ clearCachedAuth: () => any;
21
+ }
22
+ export interface IAppWrapperState {
23
+ blockRender: boolean;
24
+ restrictAccess: boolean;
25
+ }
26
+ declare const _default: any;
27
+ export default _default;
@@ -0,0 +1,194 @@
1
+ import * as React from 'react';
2
+ import NoAccess from '../no-access/NoAccess';
3
+ 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
+ import { validateAccessLevel } from '../../Util';
10
+ import { setAccessData } from '../../redux/actions/access';
11
+ class AppWrapper extends React.Component {
12
+ static RESTRICTED_REQUEST = (React.createElement(NoAccess, { key: 'restriction-msg', type: 'request' }));
13
+ static RESTRICTED_BLOCK = (React.createElement(NoAccess, { key: 'restriction-msg', type: 'restrict' }));
14
+ static NO_ORGS = (React.createElement(NoAccess, { key: 'restriction-msg', type: 'no-orgs' }));
15
+ constructor(p) {
16
+ super(p);
17
+ this.state = {
18
+ blockRender: true,
19
+ restrictAccess: false
20
+ };
21
+ }
22
+ componentDidMount = () => {
23
+ const { auth0ClientId, auth0Domain } = this.props;
24
+ AuthService.bindToClient(auth0ClientId, auth0Domain);
25
+ const validAccessLevel = validateAccessLevel(this.props.organizationId, this.props.serviceId, this.props.access);
26
+ if (!this.state.restrictAccess && !validAccessLevel) {
27
+ this.setState({ restrictAccess: true });
28
+ }
29
+ if (this.state.restrictAccess && validAccessLevel) {
30
+ this.setState({ restrictAccess: false });
31
+ }
32
+ // Always check the session
33
+ this.doCheckSession(true);
34
+ };
35
+ /*
36
+ Check the auth0 session expiry
37
+ */
38
+ componentDidUpdate = (prevProps, prevState) => {
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
+ }
48
+ }
49
+ if (this.props.organizationId !== prevProps.organizationId ||
50
+ this.props.access !== prevProps.access) {
51
+ validAccessLevel = validateAccessLevel(this.props.organizationId, this.props.serviceId, this.props.access);
52
+ if (!this.state.restrictAccess && !validAccessLevel) {
53
+ this.setState({ restrictAccess: true });
54
+ }
55
+ if (this.state.restrictAccess && validAccessLevel) {
56
+ this.setState({ restrictAccess: false });
57
+ }
58
+ }
59
+ };
60
+ /*
61
+ Emit creds to React parent
62
+ */
63
+ propagateCreds = (freshAccess, freshIdentity) => {
64
+ const { storyId, organizationId, onAuthenticated } = this.props;
65
+ let initialStoryId = storyId;
66
+ let initialOrganizationId = organizationId;
67
+ const firstOrg = freshAccess.organizations[0];
68
+ const getIDsFromSession = () => {
69
+ const session = SessionService.getSession();
70
+ if (session && session.story_id && session.organization_id) {
71
+ const org = freshAccess.organizations.find((o) => o.id === session.organization_id);
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
+ }
77
+ }
78
+ }
79
+ return null;
80
+ };
81
+ // 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
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 {
88
+ initialOrganizationId = firstOrg.id;
89
+ }
90
+ }
91
+ if (!initialStoryId) {
92
+ // If storyID is not provided, try to use the one from the previous session
93
+ const sessionIds = getIDsFromSession();
94
+ if (sessionIds) {
95
+ initialOrganizationId = sessionIds.orgId;
96
+ initialStoryId = sessionIds.storyId;
97
+ }
98
+ else {
99
+ // If that doesn't work - default to the first org & story
100
+ const story = firstOrg.stories[0];
101
+ initialOrganizationId = firstOrg.id;
102
+ initialStoryId = story.id;
103
+ }
104
+ }
105
+ SessionService.buildFreshSession(freshIdentity, initialOrganizationId, initialStoryId);
106
+ onAuthenticated(initialOrganizationId, initialStoryId);
107
+ if (this.state.blockRender) {
108
+ this.setState({ blockRender: false });
109
+ }
110
+ };
111
+ /*
112
+ Bust cached creds if exist, invoke auth failure handler
113
+ */
114
+ handleCheckSessionFailure = (e) => {
115
+ if (this.props.storyId) {
116
+ SessionService.cacheStoryId(this.props.storyId);
117
+ }
118
+ else {
119
+ SessionService.clearCachedStoryId();
120
+ }
121
+ if (this.props.organizationId) {
122
+ SessionService.cacheOrgId(this.props.organizationId);
123
+ }
124
+ else {
125
+ SessionService.clearCachedOrgId();
126
+ }
127
+ this.props.clearCachedAuth();
128
+ this.props.onAuthenticationFailure(e);
129
+ };
130
+ /*
131
+ Check auth0 session, pull Imposium access creds on success and initialize app-wrapper
132
+ */
133
+ doCheckSession = (blockRender = false) => {
134
+ const { baseUrl } = this.props;
135
+ if (blockRender) {
136
+ this.setState({ blockRender: true });
137
+ }
138
+ AuthService.checkSession()
139
+ .then((freshIdentity) => {
140
+ const orgId = this.props.organizationId
141
+ ? this.props.organizationId
142
+ : SessionService.getCachedOrgId();
143
+ SessionService.getAccessData(freshIdentity.idToken, baseUrl, false, orgId)
144
+ .then((freshAccess) => {
145
+ this.props.setAccessData(freshAccess);
146
+ this.props.login(freshIdentity);
147
+ this.propagateCreds(freshAccess, freshIdentity);
148
+ })
149
+ .catch((e) => {
150
+ console.error(e);
151
+ this.handleCheckSessionFailure(e);
152
+ });
153
+ })
154
+ .catch((e) => {
155
+ console.error(e);
156
+ this.handleCheckSessionFailure(e);
157
+ });
158
+ };
159
+ render = () => {
160
+ const { blockRender, restrictAccess } = this.state;
161
+ const { children, showRequestAccess, allowUnauthenticatedRender } = this.props;
162
+ let innerContent;
163
+ if (!blockRender && restrictAccess) {
164
+ const showNoOrgs = this.props.access &&
165
+ this.props.access.organizations &&
166
+ this.props.access.organizations.length === 0;
167
+ const errorIndicator = showNoOrgs
168
+ ? AppWrapper.NO_ORGS
169
+ : showRequestAccess
170
+ ? AppWrapper.RESTRICTED_REQUEST
171
+ : AppWrapper.RESTRICTED_BLOCK;
172
+ innerContent = [
173
+ typeof children[0] === 'object' && children[0].type === Header && children[0],
174
+ errorIndicator
175
+ ];
176
+ }
177
+ if ((!blockRender && !restrictAccess) || allowUnauthenticatedRender) {
178
+ innerContent = children;
179
+ }
180
+ return (React.createElement("div", { id: 'app', className: 'app' }, innerContent));
181
+ };
182
+ }
183
+ const mapDispatchToProps = (dispatch) => {
184
+ return bindActionCreators({
185
+ login,
186
+ setAccessData,
187
+ clearCachedAuth
188
+ }, dispatch);
189
+ };
190
+ const mapStateToProps = (state) => {
191
+ return { auth: state.auth, access: state.access };
192
+ };
193
+ export default connect(mapStateToProps, mapDispatchToProps)(AppWrapper);
194
+ //# sourceMappingURL=AppWrapper_BACKUP_73190.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"AppWrapper_BACKUP_73190.js","sourceRoot":"","sources":["../../../../src/components/app-wrapper/AppWrapper_BACKUP_73190.tsx"],"names":[],"mappings":"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"}
@@ -0,0 +1,28 @@
1
+ import * as React from 'react';
2
+ import { IIdentity } from '../../services/Auth0';
3
+ export interface IAppWrapperProps {
4
+ children: React.ReactChildren;
5
+ auth0Domain: string;
6
+ auth0ClientId: string;
7
+ organizationId: string;
8
+ baseUrl: string;
9
+ storyId?: string;
10
+ serviceId: number;
11
+ access: any;
12
+ auth: any;
13
+ isFreshUser: boolean;
14
+ allowUnauthenticatedRender: boolean;
15
+ onAuthenticated: (activeOrgId: string, activeStoryId: string) => any;
16
+ onAuthenticationFailure: (e: Error) => any;
17
+ showRequestAccess?: boolean;
18
+ login: (id: IIdentity) => any;
19
+ clearCachedAuth: () => any;
20
+ cacheAccessData: (accessData: any) => any;
21
+ clearCachedAccessList: () => any;
22
+ }
23
+ export interface IAppWrapperState {
24
+ blockRender: boolean;
25
+ restrictAccess: boolean;
26
+ }
27
+ declare const _default: any;
28
+ export default _default;