@frontegg/js 6.197.0 → 6.198.0-alpha.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.
- package/FronteggApp/FronteggApp.d.ts +5 -3
- package/FronteggApp/FronteggApp.js +30 -31
- package/FronteggApp/utils.d.ts +3 -1
- package/FronteggApp/utils.js +16 -18
- package/HostedLogin/index.js +5 -4
- package/index.js +1 -1
- package/node/FronteggApp/FronteggApp.js +27 -27
- package/node/FronteggApp/utils.js +16 -18
- package/node/HostedLogin/index.js +5 -4
- package/node/index.js +1 -1
- package/node/version.js +1 -1
- package/package.json +2 -2
- package/umd/frontegg.development.js +3437 -2715
- package/umd/frontegg.production.min.js +1 -1
- package/umd/frontegg.production.min.js.LICENSE.txt +1 -1
- package/version.js +1 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { EnhancedStore, EntitledToOptions, Entitlement,
|
|
2
|
-
import { FronteggAppOptions, FronteggCheckoutDialogOptions,
|
|
3
|
-
import { IFeatureFlagsAttributes } from '@frontegg/rest-api';
|
|
1
|
+
import { EnhancedStore, EntitledToOptions, Entitlement, IsSteppedUpOptions, StepUpOptions } from '@frontegg/redux-store';
|
|
2
|
+
import { FronteggAppOptions, FronteggCheckoutDialogOptions, LoadEntitlementsCallback, LocalizationsOverrides, ShowAdminPortalOptions, SwitchTenantOptions } from '@frontegg/types';
|
|
3
|
+
import { FetchClient, FronteggApiClient, IFeatureFlagsAttributes } from '@frontegg/rest-api';
|
|
4
4
|
import { CustomAttributes } from '@frontegg/entitlements-javascript-commons';
|
|
5
5
|
declare type FronteggAppContainers = {
|
|
6
6
|
adminPortalEl: HTMLElement;
|
|
@@ -28,6 +28,8 @@ export declare class FronteggApp {
|
|
|
28
28
|
loginBoxRenderer?: any;
|
|
29
29
|
store: EnhancedStore;
|
|
30
30
|
loadingListeners: (() => void)[];
|
|
31
|
+
fetchClient: FetchClient;
|
|
32
|
+
apiClient: FronteggApiClient;
|
|
31
33
|
updateLocalizations?: (localizations: LocalizationsOverrides) => void;
|
|
32
34
|
constructor(_options: FronteggAppOptions, name: string, iframeRendering?: boolean, allowMultipleRenderers?: boolean);
|
|
33
35
|
/**
|
|
@@ -3,14 +3,13 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
|
|
3
3
|
import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
|
|
4
4
|
import _createClass from "@babel/runtime/helpers/esm/createClass";
|
|
5
5
|
import _regeneratorRuntime from "@babel/runtime/regenerator";
|
|
6
|
-
import { createFronteggStore,
|
|
6
|
+
import { createFronteggStore, getFeatureEntitlements as _getFeatureEntitlements, getPermissionEntitlements as _getPermissionEntitlements, isSteppedUp as _isSteppedUp, redirectByStepUpUrl } from '@frontegg/redux-store';
|
|
7
|
+
import * as FronteggTypes from '@frontegg/types';
|
|
7
8
|
import { Metadata } from '@frontegg/types';
|
|
8
9
|
import { formatName, restoreSearchParams } from '../utils';
|
|
9
10
|
import { AppHolder } from '../AppHolder';
|
|
10
|
-
import { fetch as FronteggFetch, ContextHolder } from '@frontegg/rest-api';
|
|
11
|
-
import { RequestSource } from '@frontegg/rest-api';
|
|
12
11
|
import * as FronteggRestApi from '@frontegg/rest-api';
|
|
13
|
-
import
|
|
12
|
+
import { ContextHolder, createApiClient, FetchClient, RequestSource } from '@frontegg/rest-api';
|
|
14
13
|
import versions from '../version';
|
|
15
14
|
import { mockFlagsList } from '../utils/mockFlagsList';
|
|
16
15
|
import { getOverriddenMetadata, loadGTM } from './utils';
|
|
@@ -39,43 +38,43 @@ export var FronteggApp = /*#__PURE__*/function () {
|
|
|
39
38
|
this.loginBoxRenderer = void 0;
|
|
40
39
|
this.store = void 0;
|
|
41
40
|
this.loadingListeners = [];
|
|
41
|
+
this.fetchClient = void 0;
|
|
42
|
+
this.apiClient = void 0;
|
|
42
43
|
this.updateLocalizations = void 0;
|
|
43
44
|
this.loadAdminBoxMetadata = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
|
|
44
|
-
var
|
|
45
|
+
var _data$rows$0$configur, _data$rows, _data$rows$, data, metadata;
|
|
45
46
|
return _regeneratorRuntime.wrap(function _callee$(_context) {
|
|
46
47
|
while (1) switch (_context.prev = _context.next) {
|
|
47
48
|
case 0:
|
|
48
|
-
Get = FronteggFetch.Get;
|
|
49
49
|
if (_this.options.metadata) {
|
|
50
|
-
_context.next =
|
|
50
|
+
_context.next = 14;
|
|
51
51
|
break;
|
|
52
52
|
}
|
|
53
|
-
_context.prev =
|
|
54
|
-
_context.next =
|
|
55
|
-
return
|
|
53
|
+
_context.prev = 1;
|
|
54
|
+
_context.next = 4;
|
|
55
|
+
return _this.fetchClient.get('/metadata', {
|
|
56
56
|
entityName: 'adminBox'
|
|
57
57
|
});
|
|
58
|
-
case
|
|
58
|
+
case 4:
|
|
59
59
|
data = _context.sent;
|
|
60
60
|
metadata = (_data$rows$0$configur = data == null ? void 0 : (_data$rows = data.rows) == null ? void 0 : (_data$rows$ = _data$rows[0]) == null ? void 0 : _data$rows$.configuration) != null ? _data$rows$0$configur : {};
|
|
61
|
-
_context.next =
|
|
62
|
-
return getOverriddenMetadata(metadata);
|
|
63
|
-
case
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
_context.next = 16;
|
|
61
|
+
_context.next = 8;
|
|
62
|
+
return getOverriddenMetadata(metadata, _this.fetchClient);
|
|
63
|
+
case 8:
|
|
64
|
+
_this.options.metadata = _context.sent;
|
|
65
|
+
_context.next = 14;
|
|
67
66
|
break;
|
|
68
|
-
case
|
|
69
|
-
_context.prev =
|
|
70
|
-
_context.t0 = _context["catch"](
|
|
67
|
+
case 11:
|
|
68
|
+
_context.prev = 11;
|
|
69
|
+
_context.t0 = _context["catch"](1);
|
|
71
70
|
console.error('failed to get admin portal metadata', _context.t0);
|
|
72
|
-
case
|
|
71
|
+
case 14:
|
|
73
72
|
Metadata.set(_this.options.metadata, _this.name);
|
|
74
|
-
case
|
|
73
|
+
case 15:
|
|
75
74
|
case "end":
|
|
76
75
|
return _context.stop();
|
|
77
76
|
}
|
|
78
|
-
}, _callee, null, [[
|
|
77
|
+
}, _callee, null, [[1, 11]]);
|
|
79
78
|
}));
|
|
80
79
|
this.requestAuthorize = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
|
|
81
80
|
var _this$options$authOpt, _this$options$authOpt2;
|
|
@@ -123,7 +122,7 @@ export var FronteggApp = /*#__PURE__*/function () {
|
|
|
123
122
|
case 4:
|
|
124
123
|
_context3.prev = 4;
|
|
125
124
|
_context3.next = 7;
|
|
126
|
-
return
|
|
125
|
+
return _this.apiClient.featureFlags.loadFeatureFlags();
|
|
127
126
|
case 7:
|
|
128
127
|
flags = _context3.sent;
|
|
129
128
|
if (_this.options.overrideFeatureFlags) {
|
|
@@ -179,6 +178,8 @@ export var FronteggApp = /*#__PURE__*/function () {
|
|
|
179
178
|
requestCredentials: 'include'
|
|
180
179
|
}, _options.contextOptions)
|
|
181
180
|
});
|
|
181
|
+
this.fetchClient = new FetchClient(this.name);
|
|
182
|
+
this.apiClient = createApiClient(this.name);
|
|
182
183
|
if (this.options.cdnUrl) {
|
|
183
184
|
this.cdnUrl = this.options.cdnUrl;
|
|
184
185
|
}
|
|
@@ -209,9 +210,7 @@ export var FronteggApp = /*#__PURE__*/function () {
|
|
|
209
210
|
this.setSessionContext({
|
|
210
211
|
enableSessionPerTenant: (_options$authOptions = _options.authOptions) == null ? void 0 : _options$authOptions.enableSessionPerTenant
|
|
211
212
|
});
|
|
212
|
-
|
|
213
|
-
// for feature flags (for entitlements)
|
|
214
|
-
ContextHolder.setAppName(appName);
|
|
213
|
+
ContextHolder.createInstance(appName);
|
|
215
214
|
}
|
|
216
215
|
|
|
217
216
|
/**
|
|
@@ -221,12 +220,12 @@ export var FronteggApp = /*#__PURE__*/function () {
|
|
|
221
220
|
_createClass(FronteggApp, [{
|
|
222
221
|
key: "setEntitlementsOptions",
|
|
223
222
|
value: function setEntitlementsOptions(entitlementsOptions) {
|
|
224
|
-
ContextHolder.setEntitlementsOptions(Object.assign({}, entitlementsOptions));
|
|
223
|
+
ContextHolder["for"](this.name).setEntitlementsOptions(Object.assign({}, entitlementsOptions));
|
|
225
224
|
}
|
|
226
225
|
}, {
|
|
227
226
|
key: "setSessionContext",
|
|
228
227
|
value: function setSessionContext(sessionContext) {
|
|
229
|
-
ContextHolder.setSessionContext(Object.assign({}, sessionContext));
|
|
228
|
+
ContextHolder["for"](this.name).setSessionContext(Object.assign({}, sessionContext));
|
|
230
229
|
}
|
|
231
230
|
}, {
|
|
232
231
|
key: "initContainers",
|
|
@@ -414,7 +413,7 @@ export var FronteggApp = /*#__PURE__*/function () {
|
|
|
414
413
|
isMultiApp: false
|
|
415
414
|
}, isMultiApp = _ref4.isMultiApp;
|
|
416
415
|
_this$queryFeatureFla = this.queryFeatureFlags(['multi-apps-admin-portal']), _this$queryFeatureFla2 = _slicedToArray(_this$queryFeatureFla, 1), multiAppsFlag = _this$queryFeatureFla2[0];
|
|
417
|
-
|
|
416
|
+
ContextHolder["for"](this.name).setRequestSource(RequestSource.AdminPortal);
|
|
418
417
|
_context6.next = 5;
|
|
419
418
|
return this.loadScript('FronteggAdminPortal');
|
|
420
419
|
case 5:
|
|
@@ -462,7 +461,7 @@ export var FronteggApp = /*#__PURE__*/function () {
|
|
|
462
461
|
(_this$adminPortalRend = this.adminPortalRenderer) == null ? void 0 : _this$adminPortalRend.unmount();
|
|
463
462
|
// unmount is removing url search params, therefore we need to restore them after unmount
|
|
464
463
|
restoreSearchParams(searchParams);
|
|
465
|
-
|
|
464
|
+
ContextHolder["for"](this.name).setRequestSource(null);
|
|
466
465
|
} catch (e) {
|
|
467
466
|
console.error('Failed to unmount admin portal', e);
|
|
468
467
|
}
|
package/FronteggApp/utils.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { FronteggMetadata } from '@frontegg/types';
|
|
2
|
+
import { FetchClient } from '@frontegg/rest-api';
|
|
2
3
|
/**
|
|
3
4
|
* load gtm scripts by using metadata gtm keys
|
|
4
5
|
* @param fronteggAppName
|
|
@@ -6,6 +7,7 @@ import { FronteggMetadata } from '@frontegg/types';
|
|
|
6
7
|
export declare const loadGTM: (fronteggAppName: string) => void;
|
|
7
8
|
/**
|
|
8
9
|
* @param metadata {FronteggMetadata}
|
|
10
|
+
* @param fetchClient - fetch client to get metadata overrides per app
|
|
9
11
|
* this function will get metadata overrides from the metadataOverrides.url and will return a new object with override of old metadata
|
|
10
12
|
*/
|
|
11
|
-
export declare const getOverriddenMetadata: (metadata: FronteggMetadata) => Promise<FronteggMetadata>;
|
|
13
|
+
export declare const getOverriddenMetadata: (metadata: FronteggMetadata, fetchClient: FetchClient) => Promise<FronteggMetadata>;
|
package/FronteggApp/utils.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
|
2
2
|
import _regeneratorRuntime from "@babel/runtime/regenerator";
|
|
3
3
|
import { Metadata } from '@frontegg/types';
|
|
4
|
-
import { fetch as FronteggFetch } from '@frontegg/rest-api';
|
|
5
4
|
import deepMerge from 'deepmerge';
|
|
6
5
|
|
|
7
6
|
/**
|
|
@@ -38,12 +37,13 @@ export var loadGTM = function loadGTM(fronteggAppName) {
|
|
|
38
37
|
|
|
39
38
|
/**
|
|
40
39
|
* @param metadata {FronteggMetadata}
|
|
40
|
+
* @param fetchClient - fetch client to get metadata overrides per app
|
|
41
41
|
* this function will get metadata overrides from the metadataOverrides.url and will return a new object with override of old metadata
|
|
42
42
|
*/
|
|
43
43
|
export var getOverriddenMetadata = /*#__PURE__*/function () {
|
|
44
|
-
var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(metadata) {
|
|
44
|
+
var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(metadata, fetchClient) {
|
|
45
45
|
var _metadata$metadataOve;
|
|
46
|
-
var overrideUrl,
|
|
46
|
+
var overrideUrl, overrideData;
|
|
47
47
|
return _regeneratorRuntime.wrap(function _callee$(_context) {
|
|
48
48
|
while (1) switch (_context.prev = _context.next) {
|
|
49
49
|
case 0:
|
|
@@ -55,35 +55,33 @@ export var getOverriddenMetadata = /*#__PURE__*/function () {
|
|
|
55
55
|
return _context.abrupt("return", metadata);
|
|
56
56
|
case 3:
|
|
57
57
|
_context.prev = 3;
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
return Get(overrideUrl, {}, {
|
|
58
|
+
_context.next = 6;
|
|
59
|
+
return fetchClient.get(overrideUrl, {}, {
|
|
61
60
|
credentials: 'same-origin'
|
|
62
61
|
});
|
|
63
|
-
case
|
|
62
|
+
case 6:
|
|
64
63
|
overrideData = _context.sent;
|
|
65
64
|
if (!overrideData) {
|
|
66
|
-
_context.next =
|
|
65
|
+
_context.next = 9;
|
|
67
66
|
break;
|
|
68
67
|
}
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
_context.next = 16;
|
|
68
|
+
return _context.abrupt("return", deepMerge(metadata, overrideData));
|
|
69
|
+
case 9:
|
|
70
|
+
_context.next = 14;
|
|
73
71
|
break;
|
|
74
|
-
case
|
|
75
|
-
_context.prev =
|
|
72
|
+
case 11:
|
|
73
|
+
_context.prev = 11;
|
|
76
74
|
_context.t0 = _context["catch"](3);
|
|
77
75
|
console.error('Failed to get metadata overrides', _context.t0);
|
|
78
|
-
case
|
|
76
|
+
case 14:
|
|
79
77
|
return _context.abrupt("return", metadata);
|
|
80
|
-
case
|
|
78
|
+
case 15:
|
|
81
79
|
case "end":
|
|
82
80
|
return _context.stop();
|
|
83
81
|
}
|
|
84
|
-
}, _callee, null, [[3,
|
|
82
|
+
}, _callee, null, [[3, 11]]);
|
|
85
83
|
}));
|
|
86
|
-
return function getOverriddenMetadata(_x) {
|
|
84
|
+
return function getOverriddenMetadata(_x, _x2) {
|
|
87
85
|
return _ref3.apply(this, arguments);
|
|
88
86
|
};
|
|
89
87
|
}();
|
package/HostedLogin/index.js
CHANGED
|
@@ -12,9 +12,10 @@ export var HostedLogin = /*#__PURE__*/function () {
|
|
|
12
12
|
value: function setAuthentication(isAuthenticated, accessToken, user) {
|
|
13
13
|
var appName = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'default';
|
|
14
14
|
var app = AppHolder.getInstance(appName);
|
|
15
|
+
var contextHolder = ContextHolder["for"](appName);
|
|
15
16
|
if (isAuthenticated && accessToken) {
|
|
16
|
-
|
|
17
|
-
|
|
17
|
+
contextHolder.setAccessToken(accessToken);
|
|
18
|
+
contextHolder.setUser(Object.assign({}, user, {
|
|
18
19
|
accessToken: accessToken
|
|
19
20
|
}));
|
|
20
21
|
app.store.dispatch(authActions.setState({
|
|
@@ -24,8 +25,8 @@ export var HostedLogin = /*#__PURE__*/function () {
|
|
|
24
25
|
}));
|
|
25
26
|
app.store.dispatch(authActions.loadTenants());
|
|
26
27
|
} else {
|
|
27
|
-
|
|
28
|
-
|
|
28
|
+
contextHolder.setAccessToken(null);
|
|
29
|
+
contextHolder.setUser(null);
|
|
29
30
|
app.store.dispatch(authActions.setState({
|
|
30
31
|
isLoading: false,
|
|
31
32
|
isAuthenticated: false,
|
package/index.js
CHANGED
|
@@ -46,43 +46,43 @@ var FronteggApp = /*#__PURE__*/function () {
|
|
|
46
46
|
this.loginBoxRenderer = void 0;
|
|
47
47
|
this.store = void 0;
|
|
48
48
|
this.loadingListeners = [];
|
|
49
|
+
this.fetchClient = void 0;
|
|
50
|
+
this.apiClient = void 0;
|
|
49
51
|
this.updateLocalizations = void 0;
|
|
50
52
|
this.loadAdminBoxMetadata = /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
|
|
51
|
-
var
|
|
53
|
+
var _data$rows$0$configur, _data$rows, _data$rows$, data, metadata;
|
|
52
54
|
return _regenerator["default"].wrap(function _callee$(_context) {
|
|
53
55
|
while (1) switch (_context.prev = _context.next) {
|
|
54
56
|
case 0:
|
|
55
|
-
Get = FronteggRestApi.fetch.Get;
|
|
56
57
|
if (_this.options.metadata) {
|
|
57
|
-
_context.next =
|
|
58
|
+
_context.next = 14;
|
|
58
59
|
break;
|
|
59
60
|
}
|
|
60
|
-
_context.prev =
|
|
61
|
-
_context.next =
|
|
62
|
-
return
|
|
61
|
+
_context.prev = 1;
|
|
62
|
+
_context.next = 4;
|
|
63
|
+
return _this.fetchClient.get('/metadata', {
|
|
63
64
|
entityName: 'adminBox'
|
|
64
65
|
});
|
|
65
|
-
case
|
|
66
|
+
case 4:
|
|
66
67
|
data = _context.sent;
|
|
67
68
|
metadata = (_data$rows$0$configur = data == null ? void 0 : (_data$rows = data.rows) == null ? void 0 : (_data$rows$ = _data$rows[0]) == null ? void 0 : _data$rows$.configuration) != null ? _data$rows$0$configur : {};
|
|
68
|
-
_context.next =
|
|
69
|
-
return (0, _utils2.getOverriddenMetadata)(metadata);
|
|
70
|
-
case
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
_context.next = 16;
|
|
69
|
+
_context.next = 8;
|
|
70
|
+
return (0, _utils2.getOverriddenMetadata)(metadata, _this.fetchClient);
|
|
71
|
+
case 8:
|
|
72
|
+
_this.options.metadata = _context.sent;
|
|
73
|
+
_context.next = 14;
|
|
74
74
|
break;
|
|
75
|
-
case
|
|
76
|
-
_context.prev =
|
|
77
|
-
_context.t0 = _context["catch"](
|
|
75
|
+
case 11:
|
|
76
|
+
_context.prev = 11;
|
|
77
|
+
_context.t0 = _context["catch"](1);
|
|
78
78
|
console.error('failed to get admin portal metadata', _context.t0);
|
|
79
|
-
case
|
|
79
|
+
case 14:
|
|
80
80
|
FronteggTypes.Metadata.set(_this.options.metadata, _this.name);
|
|
81
|
-
case
|
|
81
|
+
case 15:
|
|
82
82
|
case "end":
|
|
83
83
|
return _context.stop();
|
|
84
84
|
}
|
|
85
|
-
}, _callee, null, [[
|
|
85
|
+
}, _callee, null, [[1, 11]]);
|
|
86
86
|
}));
|
|
87
87
|
this.requestAuthorize = /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
|
|
88
88
|
var _this$options$authOpt, _this$options$authOpt2;
|
|
@@ -130,7 +130,7 @@ var FronteggApp = /*#__PURE__*/function () {
|
|
|
130
130
|
case 4:
|
|
131
131
|
_context3.prev = 4;
|
|
132
132
|
_context3.next = 7;
|
|
133
|
-
return
|
|
133
|
+
return _this.apiClient.featureFlags.loadFeatureFlags();
|
|
134
134
|
case 7:
|
|
135
135
|
flags = _context3.sent;
|
|
136
136
|
if (_this.options.overrideFeatureFlags) {
|
|
@@ -186,6 +186,8 @@ var FronteggApp = /*#__PURE__*/function () {
|
|
|
186
186
|
requestCredentials: 'include'
|
|
187
187
|
}, _options.contextOptions)
|
|
188
188
|
});
|
|
189
|
+
this.fetchClient = new FronteggRestApi.FetchClient(this.name);
|
|
190
|
+
this.apiClient = (0, FronteggRestApi.createApiClient)(this.name);
|
|
189
191
|
if (this.options.cdnUrl) {
|
|
190
192
|
this.cdnUrl = this.options.cdnUrl;
|
|
191
193
|
}
|
|
@@ -216,9 +218,7 @@ var FronteggApp = /*#__PURE__*/function () {
|
|
|
216
218
|
this.setSessionContext({
|
|
217
219
|
enableSessionPerTenant: (_options$authOptions = _options.authOptions) == null ? void 0 : _options$authOptions.enableSessionPerTenant
|
|
218
220
|
});
|
|
219
|
-
|
|
220
|
-
// for feature flags (for entitlements)
|
|
221
|
-
FronteggRestApi.ContextHolder.setAppName(appName);
|
|
221
|
+
FronteggRestApi.ContextHolder.createInstance(appName);
|
|
222
222
|
}
|
|
223
223
|
|
|
224
224
|
/**
|
|
@@ -228,12 +228,12 @@ var FronteggApp = /*#__PURE__*/function () {
|
|
|
228
228
|
(0, _createClass2["default"])(FronteggApp, [{
|
|
229
229
|
key: "setEntitlementsOptions",
|
|
230
230
|
value: function setEntitlementsOptions(entitlementsOptions) {
|
|
231
|
-
FronteggRestApi.ContextHolder.setEntitlementsOptions(Object.assign({}, entitlementsOptions));
|
|
231
|
+
FronteggRestApi.ContextHolder["for"](this.name).setEntitlementsOptions(Object.assign({}, entitlementsOptions));
|
|
232
232
|
}
|
|
233
233
|
}, {
|
|
234
234
|
key: "setSessionContext",
|
|
235
235
|
value: function setSessionContext(sessionContext) {
|
|
236
|
-
FronteggRestApi.ContextHolder.setSessionContext(Object.assign({}, sessionContext));
|
|
236
|
+
FronteggRestApi.ContextHolder["for"](this.name).setSessionContext(Object.assign({}, sessionContext));
|
|
237
237
|
}
|
|
238
238
|
}, {
|
|
239
239
|
key: "initContainers",
|
|
@@ -421,7 +421,7 @@ var FronteggApp = /*#__PURE__*/function () {
|
|
|
421
421
|
isMultiApp: false
|
|
422
422
|
}, isMultiApp = _ref4.isMultiApp;
|
|
423
423
|
_this$queryFeatureFla = this.queryFeatureFlags(['multi-apps-admin-portal']), _this$queryFeatureFla2 = (0, _slicedToArray2["default"])(_this$queryFeatureFla, 1), multiAppsFlag = _this$queryFeatureFla2[0];
|
|
424
|
-
FronteggRestApi.ContextHolder.setRequestSource(FronteggRestApi.RequestSource.AdminPortal);
|
|
424
|
+
FronteggRestApi.ContextHolder["for"](this.name).setRequestSource(FronteggRestApi.RequestSource.AdminPortal);
|
|
425
425
|
_context6.next = 5;
|
|
426
426
|
return this.loadScript('FronteggAdminPortal');
|
|
427
427
|
case 5:
|
|
@@ -469,7 +469,7 @@ var FronteggApp = /*#__PURE__*/function () {
|
|
|
469
469
|
(_this$adminPortalRend = this.adminPortalRenderer) == null ? void 0 : _this$adminPortalRend.unmount();
|
|
470
470
|
// unmount is removing url search params, therefore we need to restore them after unmount
|
|
471
471
|
(0, _utils.restoreSearchParams)(searchParams);
|
|
472
|
-
FronteggRestApi.ContextHolder.setRequestSource(null);
|
|
472
|
+
FronteggRestApi.ContextHolder["for"](this.name).setRequestSource(null);
|
|
473
473
|
} catch (e) {
|
|
474
474
|
console.error('Failed to unmount admin portal', e);
|
|
475
475
|
}
|
|
@@ -8,7 +8,6 @@ exports.loadGTM = exports.getOverriddenMetadata = void 0;
|
|
|
8
8
|
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
9
9
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
10
10
|
var _types = require("@frontegg/types");
|
|
11
|
-
var _restApi = require("@frontegg/rest-api");
|
|
12
11
|
var _deepmerge = _interopRequireDefault(require("deepmerge"));
|
|
13
12
|
/**
|
|
14
13
|
* To prevent XSS attack, this function check for gtm key validity
|
|
@@ -44,13 +43,14 @@ var loadGTM = function loadGTM(fronteggAppName) {
|
|
|
44
43
|
|
|
45
44
|
/**
|
|
46
45
|
* @param metadata {FronteggMetadata}
|
|
46
|
+
* @param fetchClient - fetch client to get metadata overrides per app
|
|
47
47
|
* this function will get metadata overrides from the metadataOverrides.url and will return a new object with override of old metadata
|
|
48
48
|
*/
|
|
49
49
|
exports.loadGTM = loadGTM;
|
|
50
50
|
var getOverriddenMetadata = /*#__PURE__*/function () {
|
|
51
|
-
var _ref3 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(metadata) {
|
|
51
|
+
var _ref3 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(metadata, fetchClient) {
|
|
52
52
|
var _metadata$metadataOve;
|
|
53
|
-
var overrideUrl,
|
|
53
|
+
var overrideUrl, overrideData;
|
|
54
54
|
return _regenerator["default"].wrap(function _callee$(_context) {
|
|
55
55
|
while (1) switch (_context.prev = _context.next) {
|
|
56
56
|
case 0:
|
|
@@ -62,35 +62,33 @@ var getOverriddenMetadata = /*#__PURE__*/function () {
|
|
|
62
62
|
return _context.abrupt("return", metadata);
|
|
63
63
|
case 3:
|
|
64
64
|
_context.prev = 3;
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
return Get(overrideUrl, {}, {
|
|
65
|
+
_context.next = 6;
|
|
66
|
+
return fetchClient.get(overrideUrl, {}, {
|
|
68
67
|
credentials: 'same-origin'
|
|
69
68
|
});
|
|
70
|
-
case
|
|
69
|
+
case 6:
|
|
71
70
|
overrideData = _context.sent;
|
|
72
71
|
if (!overrideData) {
|
|
73
|
-
_context.next =
|
|
72
|
+
_context.next = 9;
|
|
74
73
|
break;
|
|
75
74
|
}
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
_context.next = 16;
|
|
75
|
+
return _context.abrupt("return", (0, _deepmerge["default"])(metadata, overrideData));
|
|
76
|
+
case 9:
|
|
77
|
+
_context.next = 14;
|
|
80
78
|
break;
|
|
81
|
-
case
|
|
82
|
-
_context.prev =
|
|
79
|
+
case 11:
|
|
80
|
+
_context.prev = 11;
|
|
83
81
|
_context.t0 = _context["catch"](3);
|
|
84
82
|
console.error('Failed to get metadata overrides', _context.t0);
|
|
85
|
-
case
|
|
83
|
+
case 14:
|
|
86
84
|
return _context.abrupt("return", metadata);
|
|
87
|
-
case
|
|
85
|
+
case 15:
|
|
88
86
|
case "end":
|
|
89
87
|
return _context.stop();
|
|
90
88
|
}
|
|
91
|
-
}, _callee, null, [[3,
|
|
89
|
+
}, _callee, null, [[3, 11]]);
|
|
92
90
|
}));
|
|
93
|
-
return function getOverriddenMetadata(_x) {
|
|
91
|
+
return function getOverriddenMetadata(_x, _x2) {
|
|
94
92
|
return _ref3.apply(this, arguments);
|
|
95
93
|
};
|
|
96
94
|
}();
|
|
@@ -19,9 +19,10 @@ var HostedLogin = /*#__PURE__*/function () {
|
|
|
19
19
|
value: function setAuthentication(isAuthenticated, accessToken, user) {
|
|
20
20
|
var appName = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'default';
|
|
21
21
|
var app = _AppHolder.AppHolder.getInstance(appName);
|
|
22
|
+
var contextHolder = _restApi.ContextHolder["for"](appName);
|
|
22
23
|
if (isAuthenticated && accessToken) {
|
|
23
|
-
|
|
24
|
-
|
|
24
|
+
contextHolder.setAccessToken(accessToken);
|
|
25
|
+
contextHolder.setUser(Object.assign({}, user, {
|
|
25
26
|
accessToken: accessToken
|
|
26
27
|
}));
|
|
27
28
|
app.store.dispatch(_reduxStore.authActions.setState({
|
|
@@ -31,8 +32,8 @@ var HostedLogin = /*#__PURE__*/function () {
|
|
|
31
32
|
}));
|
|
32
33
|
app.store.dispatch(_reduxStore.authActions.loadTenants());
|
|
33
34
|
} else {
|
|
34
|
-
|
|
35
|
-
|
|
35
|
+
contextHolder.setAccessToken(null);
|
|
36
|
+
contextHolder.setUser(null);
|
|
36
37
|
app.store.dispatch(_reduxStore.authActions.setState({
|
|
37
38
|
isLoading: false,
|
|
38
39
|
isAuthenticated: false,
|
package/node/index.js
CHANGED
package/node/version.js
CHANGED
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@frontegg/js",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.198.0-alpha.0",
|
|
4
4
|
"main": "./node/index.js",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"author": "Frontegg LTD",
|
|
7
7
|
"dependencies": {
|
|
8
8
|
"@babel/runtime": "^7.18.6",
|
|
9
|
-
"@frontegg/types": "6.
|
|
9
|
+
"@frontegg/types": "6.198.0-alpha.0"
|
|
10
10
|
},
|
|
11
11
|
"browserslist": {
|
|
12
12
|
"production": [
|