@imposium-hub/components 2.5.2 → 2.5.3
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 +3 -8
- package/dist/cjs/components/app-wrapper/AppWrapper.js.map +1 -1
- package/dist/cjs/components/no-access/NoAccess.d.ts +1 -0
- package/dist/cjs/components/no-access/NoAccess.js +2 -2
- package/dist/cjs/components/no-access/NoAccess.js.map +1 -1
- package/dist/esm/components/app-wrapper/AppWrapper.js +3 -8
- package/dist/esm/components/app-wrapper/AppWrapper.js.map +1 -1
- package/dist/esm/components/no-access/NoAccess.d.ts +1 -0
- package/dist/esm/components/no-access/NoAccess.js +2 -2
- package/dist/esm/components/no-access/NoAccess.js.map +1 -1
- package/package.json +1 -1
- package/src/components/app-wrapper/AppWrapper.tsx +13 -14
- package/src/components/no-access/NoAccess.tsx +3 -2
|
@@ -204,8 +204,7 @@ var AppWrapper = /** @class */ (function (_super) {
|
|
|
204
204
|
_this.propagateCreds(freshAccess, freshIdentity);
|
|
205
205
|
})
|
|
206
206
|
.catch(function (e) {
|
|
207
|
-
|
|
208
|
-
_this.handleCheckSessionFailure(e);
|
|
207
|
+
_this.setState({ restrictAccess: true, blockRender: false });
|
|
209
208
|
});
|
|
210
209
|
})
|
|
211
210
|
.catch(function (e) {
|
|
@@ -216,15 +215,12 @@ var AppWrapper = /** @class */ (function (_super) {
|
|
|
216
215
|
var _a = _this.state, blockRender = _a.blockRender, restrictAccess = _a.restrictAccess;
|
|
217
216
|
var _b = _this.props, children = _b.children, showRequestAccess = _b.showRequestAccess, allowUnauthenticatedRender = _b.allowUnauthenticatedRender;
|
|
218
217
|
var innerContent;
|
|
218
|
+
console.log(_this.props.auth);
|
|
219
219
|
if (!blockRender && restrictAccess) {
|
|
220
220
|
var showNoOrgs = _this.props.access &&
|
|
221
221
|
_this.props.access.organizations &&
|
|
222
222
|
_this.props.access.organizations.length === 0;
|
|
223
|
-
var errorIndicator = showNoOrgs
|
|
224
|
-
? AppWrapper.NO_ORGS
|
|
225
|
-
: showRequestAccess
|
|
226
|
-
? AppWrapper.RESTRICTED_REQUEST
|
|
227
|
-
: AppWrapper.RESTRICTED_BLOCK;
|
|
223
|
+
var errorIndicator = showNoOrgs ? (React.createElement(NoAccess_1.default, { email: _this.props.auth.idTokenPayload.userEmail, key: 'restriction-msg', type: 'no-orgs' })) : showRequestAccess ? (AppWrapper.RESTRICTED_REQUEST) : (AppWrapper.RESTRICTED_BLOCK);
|
|
228
224
|
innerContent = [
|
|
229
225
|
typeof children[0] === 'object' && children[0].type === Header_1.default && children[0],
|
|
230
226
|
errorIndicator
|
|
@@ -243,7 +239,6 @@ var AppWrapper = /** @class */ (function (_super) {
|
|
|
243
239
|
}
|
|
244
240
|
AppWrapper.RESTRICTED_REQUEST = (React.createElement(NoAccess_1.default, { key: 'restriction-msg', type: 'request' }));
|
|
245
241
|
AppWrapper.RESTRICTED_BLOCK = (React.createElement(NoAccess_1.default, { key: 'restriction-msg', type: 'restrict' }));
|
|
246
|
-
AppWrapper.NO_ORGS = (React.createElement(NoAccess_1.default, { key: 'restriction-msg', type: 'no-orgs' }));
|
|
247
242
|
return AppWrapper;
|
|
248
243
|
}(React.Component));
|
|
249
244
|
var mapDispatchToProps = function (dispatch) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppWrapper.js","sourceRoot":"","sources":["../../../../src/components/app-wrapper/AppWrapper.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA+B;AAC/B,mEAA6C;AAC7C,4DAAsC;AACtC,mEAAoD;AACpD,+DAA8D;AAC9D,2CAAsC;AACtC,+BAA2C;AAC3C,iDAAkE;AAClE,mCAAiD;AACjD,qDAA2D;AA2B3D;IAAyB,8BAAmD;
|
|
1
|
+
{"version":3,"file":"AppWrapper.js","sourceRoot":"","sources":["../../../../src/components/app-wrapper/AppWrapper.tsx"],"names":[],"mappings":"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"}
|
|
@@ -31,7 +31,7 @@ var MAIL_TO = 'mailto:info@imposium.com?subject=My access to Imposium is restric
|
|
|
31
31
|
var REQUEST_ACCESS_TITLE = "You don't have access to Imposium yet";
|
|
32
32
|
var REQUEST_HREF_COPY = 'Request Access';
|
|
33
33
|
var RESTRICTED_ACCESS_TITLE = 'Service not found';
|
|
34
|
-
var NO_ORGS_TITLE = '
|
|
34
|
+
var NO_ORGS_TITLE = 'Organization Not Found';
|
|
35
35
|
var NoAccess = function (p) {
|
|
36
36
|
if (!p.type) {
|
|
37
37
|
throw new Error('NoAccess requires a type of either: request or restrict or no-orgs');
|
|
@@ -47,7 +47,7 @@ var NoAccess = function (p) {
|
|
|
47
47
|
? NO_ORGS_TITLE
|
|
48
48
|
: RESTRICTED_ACCESS_TITLE),
|
|
49
49
|
React.createElement("p", null, isNoOrgs
|
|
50
|
-
?
|
|
50
|
+
? "Your email \"".concat(p.email, "\" does not have access to this organization. Please request access from an admin already on the organization.")
|
|
51
51
|
: null),
|
|
52
52
|
isRequest && React.createElement("a", { href: MAIL_TO }, REQUEST_HREF_COPY))));
|
|
53
53
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NoAccess.js","sourceRoot":"","sources":["../../../../src/components/no-access/NoAccess.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA+B;AAC/B,oEAAiE;AACjE,2EAA0E;AAC1E,iGAAgG;
|
|
1
|
+
{"version":3,"file":"NoAccess.js","sourceRoot":"","sources":["../../../../src/components/no-access/NoAccess.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA+B;AAC/B,oEAAiE;AACjE,2EAA0E;AAC1E,iGAAgG;AAOhG,IAAM,OAAO,GAAW,sEAAsE,CAAC;AAC/F,IAAM,oBAAoB,GAAW,uCAAuC,CAAC;AAC7E,IAAM,iBAAiB,GAAW,gBAAgB,CAAC;AACnD,IAAM,uBAAuB,GAAW,mBAAmB,CAAC;AAC5D,IAAM,aAAa,GAAG,wBAAwB,CAAC;AAE/C,IAAM,QAAQ,GAA6B,UAAC,CAAiB;IACzD,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,oEAAoE,CAAC,CAAC;IAC1F,CAAC;IAED,IAAM,SAAS,GAAY,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC;IAChD,IAAM,QAAQ,GAAY,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC;IAE/C,OAAO,CACH,6BAAK,SAAS,EAAC,WAAW;QACrB,SAAS,CAAC,CAAC,CAAC,CACT,oBAAC,mCAAe,IACZ,IAAI,EAAE,uBAAU,EAChB,IAAI,EAAC,IAAI,GACX,CACL,CAAC,CAAC,CAAC,CACA,oBAAC,mCAAe,IACZ,IAAI,EAAE,6CAAqB,EAC3B,IAAI,EAAC,IAAI,GACX,CACL;QAED,6BAAK,SAAS,EAAC,gBAAgB;YAC3B,4BAAI,SAAS,EAAC,mBAAmB,IAC5B,SAAS;gBACN,CAAC,CAAC,oBAAoB;gBACtB,CAAC,CAAC,QAAQ;oBACV,CAAC,CAAC,aAAa;oBACf,CAAC,CAAC,uBAAuB,CAC5B;YACL,+BACK,QAAQ;gBACL,CAAC,CAAC,uBAAe,CAAC,CAAC,KAAK,mHAA+G;gBACvI,CAAC,CAAC,IAAI,CACV;YACH,SAAS,IAAI,2BAAG,IAAI,EAAE,OAAO,IAAG,iBAAiB,CAAK,CACrD,CACJ,CACT,CAAC;AACN,CAAC,CAAC;AAEF,kBAAe,QAAQ,CAAC"}
|
|
@@ -11,7 +11,6 @@ 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' }));
|
|
14
|
-
static NO_ORGS = (React.createElement(NoAccess, { key: 'restriction-msg', type: 'no-orgs' }));
|
|
15
14
|
constructor(p) {
|
|
16
15
|
super(p);
|
|
17
16
|
this.state = {
|
|
@@ -165,8 +164,7 @@ class AppWrapper extends React.Component {
|
|
|
165
164
|
this.propagateCreds(freshAccess, freshIdentity);
|
|
166
165
|
})
|
|
167
166
|
.catch((e) => {
|
|
168
|
-
|
|
169
|
-
this.handleCheckSessionFailure(e);
|
|
167
|
+
this.setState({ restrictAccess: true, blockRender: false });
|
|
170
168
|
});
|
|
171
169
|
})
|
|
172
170
|
.catch((e) => {
|
|
@@ -177,15 +175,12 @@ class AppWrapper extends React.Component {
|
|
|
177
175
|
const { blockRender, restrictAccess } = this.state;
|
|
178
176
|
const { children, showRequestAccess, allowUnauthenticatedRender } = this.props;
|
|
179
177
|
let innerContent;
|
|
178
|
+
console.log(this.props.auth);
|
|
180
179
|
if (!blockRender && restrictAccess) {
|
|
181
180
|
const showNoOrgs = this.props.access &&
|
|
182
181
|
this.props.access.organizations &&
|
|
183
182
|
this.props.access.organizations.length === 0;
|
|
184
|
-
const errorIndicator = showNoOrgs
|
|
185
|
-
? AppWrapper.NO_ORGS
|
|
186
|
-
: showRequestAccess
|
|
187
|
-
? AppWrapper.RESTRICTED_REQUEST
|
|
188
|
-
: AppWrapper.RESTRICTED_BLOCK;
|
|
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);
|
|
189
184
|
innerContent = [
|
|
190
185
|
typeof children[0] === 'object' && children[0].type === Header && children[0],
|
|
191
186
|
errorIndicator
|
|
@@ -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,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;
|
|
1
|
+
{"version":3,"file":"AppWrapper.js","sourceRoot":"","sources":["../../../../src/components/app-wrapper/AppWrapper.tsx"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ const MAIL_TO = 'mailto:info@imposium.com?subject=My access to Imposium is restr
|
|
|
6
6
|
const REQUEST_ACCESS_TITLE = "You don't have access to Imposium yet";
|
|
7
7
|
const REQUEST_HREF_COPY = 'Request Access';
|
|
8
8
|
const RESTRICTED_ACCESS_TITLE = 'Service not found';
|
|
9
|
-
const NO_ORGS_TITLE = '
|
|
9
|
+
const NO_ORGS_TITLE = 'Organization Not Found';
|
|
10
10
|
const NoAccess = (p) => {
|
|
11
11
|
if (!p.type) {
|
|
12
12
|
throw new Error('NoAccess requires a type of either: request or restrict or no-orgs');
|
|
@@ -22,7 +22,7 @@ const NoAccess = (p) => {
|
|
|
22
22
|
? NO_ORGS_TITLE
|
|
23
23
|
: RESTRICTED_ACCESS_TITLE),
|
|
24
24
|
React.createElement("p", null, isNoOrgs
|
|
25
|
-
?
|
|
25
|
+
? `Your email "${p.email}" does not have access to this organization. Please request access from an admin already on the organization.`
|
|
26
26
|
: null),
|
|
27
27
|
isRequest && React.createElement("a", { href: MAIL_TO }, REQUEST_HREF_COPY))));
|
|
28
28
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NoAccess.js","sourceRoot":"","sources":["../../../../src/components/no-access/NoAccess.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,8CAA8C,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,yDAAyD,CAAC;
|
|
1
|
+
{"version":3,"file":"NoAccess.js","sourceRoot":"","sources":["../../../../src/components/no-access/NoAccess.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,8CAA8C,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,yDAAyD,CAAC;AAOhG,MAAM,OAAO,GAAW,sEAAsE,CAAC;AAC/F,MAAM,oBAAoB,GAAW,uCAAuC,CAAC;AAC7E,MAAM,iBAAiB,GAAW,gBAAgB,CAAC;AACnD,MAAM,uBAAuB,GAAW,mBAAmB,CAAC;AAC5D,MAAM,aAAa,GAAG,wBAAwB,CAAC;AAE/C,MAAM,QAAQ,GAA6B,CAAC,CAAiB,EAAE,EAAE;IAC7D,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,oEAAoE,CAAC,CAAC;IAC1F,CAAC;IAED,MAAM,SAAS,GAAY,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC;IAChD,MAAM,QAAQ,GAAY,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC;IAE/C,OAAO,CACH,6BAAK,SAAS,EAAC,WAAW;QACrB,SAAS,CAAC,CAAC,CAAC,CACT,oBAAC,eAAe,IACZ,IAAI,EAAE,UAAU,EAChB,IAAI,EAAC,IAAI,GACX,CACL,CAAC,CAAC,CAAC,CACA,oBAAC,eAAe,IACZ,IAAI,EAAE,qBAAqB,EAC3B,IAAI,EAAC,IAAI,GACX,CACL;QAED,6BAAK,SAAS,EAAC,gBAAgB;YAC3B,4BAAI,SAAS,EAAC,mBAAmB,IAC5B,SAAS;gBACN,CAAC,CAAC,oBAAoB;gBACtB,CAAC,CAAC,QAAQ;oBACV,CAAC,CAAC,aAAa;oBACf,CAAC,CAAC,uBAAuB,CAC5B;YACL,+BACK,QAAQ;gBACL,CAAC,CAAC,eAAe,CAAC,CAAC,KAAK,+GAA+G;gBACvI,CAAC,CAAC,IAAI,CACV;YACH,SAAS,IAAI,2BAAG,IAAI,EAAE,OAAO,IAAG,iBAAiB,CAAK,CACrD,CACJ,CACT,CAAC;AACN,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
|
package/package.json
CHANGED
|
@@ -49,13 +49,6 @@ class AppWrapper extends React.Component<IAppWrapperProps, IAppWrapperState> {
|
|
|
49
49
|
/>
|
|
50
50
|
);
|
|
51
51
|
|
|
52
|
-
private static readonly NO_ORGS: JSX.Element = (
|
|
53
|
-
<NoAccess
|
|
54
|
-
key='restriction-msg'
|
|
55
|
-
type='no-orgs'
|
|
56
|
-
/>
|
|
57
|
-
);
|
|
58
|
-
|
|
59
52
|
constructor(p: IAppWrapperProps) {
|
|
60
53
|
super(p);
|
|
61
54
|
|
|
@@ -248,8 +241,7 @@ class AppWrapper extends React.Component<IAppWrapperProps, IAppWrapperState> {
|
|
|
248
241
|
this.propagateCreds(freshAccess, freshIdentity);
|
|
249
242
|
})
|
|
250
243
|
.catch((e: Error) => {
|
|
251
|
-
|
|
252
|
-
this.handleCheckSessionFailure(e);
|
|
244
|
+
this.setState({ restrictAccess: true, blockRender: false });
|
|
253
245
|
});
|
|
254
246
|
})
|
|
255
247
|
.catch((e: Error) => {
|
|
@@ -263,16 +255,23 @@ class AppWrapper extends React.Component<IAppWrapperProps, IAppWrapperState> {
|
|
|
263
255
|
|
|
264
256
|
let innerContent: any;
|
|
265
257
|
|
|
258
|
+
console.log(this.props.auth);
|
|
266
259
|
if (!blockRender && restrictAccess) {
|
|
267
260
|
const showNoOrgs =
|
|
268
261
|
this.props.access &&
|
|
269
262
|
this.props.access.organizations &&
|
|
270
263
|
this.props.access.organizations.length === 0;
|
|
271
|
-
const errorIndicator = showNoOrgs
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
264
|
+
const errorIndicator = showNoOrgs ? (
|
|
265
|
+
<NoAccess
|
|
266
|
+
email={this.props.auth.idTokenPayload.userEmail}
|
|
267
|
+
key='restriction-msg'
|
|
268
|
+
type='no-orgs'
|
|
269
|
+
/>
|
|
270
|
+
) : showRequestAccess ? (
|
|
271
|
+
AppWrapper.RESTRICTED_REQUEST
|
|
272
|
+
) : (
|
|
273
|
+
AppWrapper.RESTRICTED_BLOCK
|
|
274
|
+
);
|
|
276
275
|
innerContent = [
|
|
277
276
|
typeof children[0] === 'object' && children[0].type === Header && children[0],
|
|
278
277
|
errorIndicator
|
|
@@ -5,13 +5,14 @@ import { faExclamationTriangle } from '@fortawesome/free-solid-svg-icons/faExcla
|
|
|
5
5
|
|
|
6
6
|
interface INoAccessProps {
|
|
7
7
|
type: 'request' | 'restrict' | 'no-orgs';
|
|
8
|
+
email?: string;
|
|
8
9
|
}
|
|
9
10
|
|
|
10
11
|
const MAIL_TO: string = 'mailto:info@imposium.com?subject=My access to Imposium is restricted';
|
|
11
12
|
const REQUEST_ACCESS_TITLE: string = "You don't have access to Imposium yet";
|
|
12
13
|
const REQUEST_HREF_COPY: string = 'Request Access';
|
|
13
14
|
const RESTRICTED_ACCESS_TITLE: string = 'Service not found';
|
|
14
|
-
const NO_ORGS_TITLE = '
|
|
15
|
+
const NO_ORGS_TITLE = 'Organization Not Found';
|
|
15
16
|
|
|
16
17
|
const NoAccess: React.FC<INoAccessProps> = (p: INoAccessProps) => {
|
|
17
18
|
if (!p.type) {
|
|
@@ -45,7 +46,7 @@ const NoAccess: React.FC<INoAccessProps> = (p: INoAccessProps) => {
|
|
|
45
46
|
</h1>
|
|
46
47
|
<p>
|
|
47
48
|
{isNoOrgs
|
|
48
|
-
?
|
|
49
|
+
? `Your email "${p.email}" does not have access to this organization. Please request access from an admin already on the organization.`
|
|
49
50
|
: null}
|
|
50
51
|
</p>
|
|
51
52
|
{isRequest && <a href={MAIL_TO}>{REQUEST_HREF_COPY}</a>}
|