@imposium-hub/components 2.6.1 → 2.6.2
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/components/app-wrapper/AppWrapper.js +17 -8
- package/dist/cjs/components/app-wrapper/AppWrapper.js.map +1 -1
- package/dist/esm/components/app-wrapper/AppWrapper.js +18 -9
- package/dist/esm/components/app-wrapper/AppWrapper.js.map +1 -1
- package/package.json +1 -1
- package/src/components/app-wrapper/AppWrapper.tsx +23 -13
|
@@ -190,20 +190,29 @@ var AppWrapper = function (props) {
|
|
|
190
190
|
}
|
|
191
191
|
}
|
|
192
192
|
else if (initialOrganizationId) {
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
193
|
+
var validAccessLevel = (0, Util_1.validateAccessLevel)(initialOrganizationId, serviceId, freshAccess);
|
|
194
|
+
if (validAccessLevel) {
|
|
195
|
+
var lastModified = (0, Util_1.getLastModifiedStoryInOrg)(initialOrganizationId, freshAccess);
|
|
196
|
+
api.init(baseUrl, getAccessTokenSilently, initialOrganizationId);
|
|
197
|
+
if (lastModified) {
|
|
198
|
+
(0, routing_1.replaceRoute)("/".concat(initialOrganizationId, "/").concat(lastModified));
|
|
199
|
+
onAuthenticated(initialOrganizationId, lastModified);
|
|
199
200
|
setErrorState(null);
|
|
201
|
+
setBlockRender(false);
|
|
200
202
|
}
|
|
201
203
|
else {
|
|
202
|
-
|
|
204
|
+
if (allowNoStories) {
|
|
205
|
+
onAuthenticated(initialOrganizationId, null);
|
|
206
|
+
setErrorState(null);
|
|
207
|
+
setBlockRender(false);
|
|
208
|
+
}
|
|
209
|
+
else {
|
|
210
|
+
setErrorState(exports.APP_WRAPPER_ERROR_STATES.NO_STORIES);
|
|
211
|
+
}
|
|
203
212
|
}
|
|
204
213
|
}
|
|
205
214
|
else {
|
|
206
|
-
setErrorState(exports.APP_WRAPPER_ERROR_STATES.
|
|
215
|
+
setErrorState(exports.APP_WRAPPER_ERROR_STATES.UNAUTHORIZED_APP);
|
|
207
216
|
}
|
|
208
217
|
}
|
|
209
218
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppWrapper.js","sourceRoot":"","sources":["../../../../src/components/app-wrapper/AppWrapper.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA+B;AAC/B,4DAAsC;AACtC,
|
|
1
|
+
{"version":3,"file":"AppWrapper.js","sourceRoot":"","sources":["../../../../src/components/app-wrapper/AppWrapper.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as React from 'react';
|
|
2
2
|
import Header from '../header/Header';
|
|
3
|
-
import { validateAccessLevel } from '../../Util';
|
|
3
|
+
import { getLastModifiedStoryInOrg, validateAccessLevel } from '../../Util';
|
|
4
4
|
import { ConfirmModal } from '../confirm-modal/ConfirmModal';
|
|
5
5
|
import { useAuth0 } from '@auth0/auth0-react';
|
|
6
6
|
import { replaceRoute } from '../../utils/routing';
|
|
@@ -99,20 +99,29 @@ export const AppWrapper = (props) => {
|
|
|
99
99
|
}
|
|
100
100
|
}
|
|
101
101
|
else if (initialOrganizationId) {
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
102
|
+
const validAccessLevel = validateAccessLevel(initialOrganizationId, serviceId, freshAccess);
|
|
103
|
+
if (validAccessLevel) {
|
|
104
|
+
const lastModified = getLastModifiedStoryInOrg(initialOrganizationId, freshAccess);
|
|
105
|
+
api.init(baseUrl, getAccessTokenSilently, initialOrganizationId);
|
|
106
|
+
if (lastModified) {
|
|
107
|
+
replaceRoute(`/${initialOrganizationId}/${lastModified}`);
|
|
108
|
+
onAuthenticated(initialOrganizationId, lastModified);
|
|
108
109
|
setErrorState(null);
|
|
110
|
+
setBlockRender(false);
|
|
109
111
|
}
|
|
110
112
|
else {
|
|
111
|
-
|
|
113
|
+
if (allowNoStories) {
|
|
114
|
+
onAuthenticated(initialOrganizationId, null);
|
|
115
|
+
setErrorState(null);
|
|
116
|
+
setBlockRender(false);
|
|
117
|
+
}
|
|
118
|
+
else {
|
|
119
|
+
setErrorState(APP_WRAPPER_ERROR_STATES.NO_STORIES);
|
|
120
|
+
}
|
|
112
121
|
}
|
|
113
122
|
}
|
|
114
123
|
else {
|
|
115
|
-
setErrorState(APP_WRAPPER_ERROR_STATES.
|
|
124
|
+
setErrorState(APP_WRAPPER_ERROR_STATES.UNAUTHORIZED_APP);
|
|
116
125
|
}
|
|
117
126
|
}
|
|
118
127
|
};
|
|
@@ -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,MAAM,MAAM,kBAAkB,CAAC;AACtC,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"AppWrapper.js","sourceRoot":"","sources":["../../../../src/components/app-wrapper/AppWrapper.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as React from 'react';
|
|
2
2
|
import Header from '../header/Header';
|
|
3
|
-
import { validateAccessLevel } from '../../Util';
|
|
3
|
+
import { getLastModifiedStoryInOrg, validateAccessLevel } from '../../Util';
|
|
4
4
|
import { ConfirmModal } from '../confirm-modal/ConfirmModal';
|
|
5
5
|
import { IImposiumAPI } from '../../services/API';
|
|
6
6
|
import { useAuth0 } from '@auth0/auth0-react';
|
|
@@ -165,22 +165,32 @@ export const AppWrapper: React.FC<IAppWrapperProps> = (props) => {
|
|
|
165
165
|
setErrorState(APP_WRAPPER_ERROR_STATES.UNAUTHORIZED_APP);
|
|
166
166
|
}
|
|
167
167
|
} else if (initialOrganizationId) {
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
168
|
+
const validAccessLevel = validateAccessLevel(
|
|
169
|
+
initialOrganizationId,
|
|
170
|
+
serviceId,
|
|
171
|
+
freshAccess
|
|
172
|
+
);
|
|
173
|
+
|
|
174
|
+
if (validAccessLevel) {
|
|
175
|
+
const lastModified = getLastModifiedStoryInOrg(initialOrganizationId, freshAccess);
|
|
176
|
+
api.init(baseUrl, getAccessTokenSilently, initialOrganizationId);
|
|
177
|
+
|
|
178
|
+
if (lastModified) {
|
|
179
|
+
replaceRoute(`/${initialOrganizationId}/${lastModified}`);
|
|
180
|
+
onAuthenticated(initialOrganizationId, lastModified);
|
|
178
181
|
setErrorState(null);
|
|
182
|
+
setBlockRender(false);
|
|
179
183
|
} else {
|
|
180
|
-
|
|
184
|
+
if (allowNoStories) {
|
|
185
|
+
onAuthenticated(initialOrganizationId, null);
|
|
186
|
+
setErrorState(null);
|
|
187
|
+
setBlockRender(false);
|
|
188
|
+
} else {
|
|
189
|
+
setErrorState(APP_WRAPPER_ERROR_STATES.NO_STORIES);
|
|
190
|
+
}
|
|
181
191
|
}
|
|
182
192
|
} else {
|
|
183
|
-
setErrorState(APP_WRAPPER_ERROR_STATES.
|
|
193
|
+
setErrorState(APP_WRAPPER_ERROR_STATES.UNAUTHORIZED_APP);
|
|
184
194
|
}
|
|
185
195
|
}
|
|
186
196
|
};
|