@frontegg/redux-store 7.83.0 → 7.84.0-alpha.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/auth/TeamState/actions/invitation-link.actions.js +6 -6
- package/auth/TeamState/actions/users.actions.js +12 -1
- package/auth/TeamState/interfaces.d.ts +1 -0
- package/index.js +1 -1
- package/node/auth/TeamState/actions/invitation-link.actions.js +6 -6
- package/node/auth/TeamState/actions/users.actions.js +12 -1
- package/node/index.js +1 -1
- package/node/toolkit/index.js +7 -0
- package/package.json +2 -2
- package/toolkit/index.d.ts +1 -1
- package/toolkit/index.js +1 -1
|
@@ -48,7 +48,8 @@ export default ((store, api, sharedActions) => {
|
|
|
48
48
|
const {
|
|
49
49
|
callback,
|
|
50
50
|
expiresInMinutes,
|
|
51
|
-
shouldSendEmail
|
|
51
|
+
shouldSendEmail,
|
|
52
|
+
roleIds
|
|
52
53
|
} = payload;
|
|
53
54
|
actions.setTeamError({
|
|
54
55
|
key: TeamStateKeys.CREATE_TOKEN_LINK,
|
|
@@ -61,9 +62,10 @@ export default ((store, api, sharedActions) => {
|
|
|
61
62
|
const [enhancedInviteUserModalFlag] = await actions.getFeatureFlags(['invite_user_modal_enhancements_frontend']);
|
|
62
63
|
let data;
|
|
63
64
|
if (enhancedInviteUserModalFlag) {
|
|
64
|
-
data = await api.teams.
|
|
65
|
+
data = await api.teams.createInviteUserLinkV2({
|
|
65
66
|
expiresInMinutes: expiresInMinutes != null ? expiresInMinutes : 43200,
|
|
66
|
-
shouldSendEmail: shouldSendEmail != null ? shouldSendEmail : true
|
|
67
|
+
shouldSendEmail: shouldSendEmail != null ? shouldSendEmail : true,
|
|
68
|
+
roleIds: roleIds != null ? roleIds : []
|
|
67
69
|
});
|
|
68
70
|
} else {
|
|
69
71
|
data = await api.teams.createInviteUserLink({
|
|
@@ -122,9 +124,7 @@ export default ((store, api, sharedActions) => {
|
|
|
122
124
|
});
|
|
123
125
|
try {
|
|
124
126
|
await api.teams.deleteInviteUserLink();
|
|
125
|
-
|
|
126
|
-
inviteTokenState: undefined
|
|
127
|
-
});
|
|
127
|
+
await __getInvitationLinkConfig();
|
|
128
128
|
callback == null ? void 0 : callback(true);
|
|
129
129
|
} catch (e) {
|
|
130
130
|
actions.setTeamError({
|
|
@@ -258,8 +258,12 @@ export default ((store, api, sharedActions) => {
|
|
|
258
258
|
|
|
259
259
|
// Fetch roles, permissions, user roles, user groups, and all groups in parallel
|
|
260
260
|
const [{
|
|
261
|
+
items: userUsernames
|
|
262
|
+
}, {
|
|
261
263
|
items: roles
|
|
262
|
-
}, permissions, userRoles, userGroups, groups] = await Promise.all([
|
|
264
|
+
}, permissions, userRoles, userGroups, groups] = await Promise.all([userIds.length > 0 ? api.users.getUsersUsernames({
|
|
265
|
+
userIds
|
|
266
|
+
}) : [], api.teams.loadAvailableRoles(), api.teams.loadAvailablePermissions(), userIds.length > 0 ? api.users.getUsersRoles({
|
|
263
267
|
ids: userIds
|
|
264
268
|
}) : [], userIds.length > 0 ? api.users.getUsersGroups({
|
|
265
269
|
ids: userIds
|
|
@@ -269,6 +273,7 @@ export default ((store, api, sharedActions) => {
|
|
|
269
273
|
|
|
270
274
|
// Map user roles and groups to users
|
|
271
275
|
const usersWithRolesAndGroups = users.map(user => {
|
|
276
|
+
var _userUsernames$find;
|
|
272
277
|
// Find user's role IDs
|
|
273
278
|
const userRoleData = userRoles.find(ur => ur.userId === user.id);
|
|
274
279
|
const userRoleIds = (userRoleData == null ? void 0 : userRoleData.roleIds) || [];
|
|
@@ -279,6 +284,12 @@ export default ((store, api, sharedActions) => {
|
|
|
279
284
|
const userGroupIds = (userGroupData == null ? void 0 : userGroupData.groupIds) || [];
|
|
280
285
|
const userGroupsFull = groups.filter(g => userGroupIds.includes(g.id));
|
|
281
286
|
|
|
287
|
+
// Find user's username
|
|
288
|
+
const userUsername = userUsernames == null ? void 0 : (_userUsernames$find = userUsernames.find(username => username.userId === user.id)) == null ? void 0 : _userUsernames$find.username;
|
|
289
|
+
if (!user.name) {
|
|
290
|
+
user.name = userUsername;
|
|
291
|
+
}
|
|
292
|
+
|
|
282
293
|
//@ts-ignore
|
|
283
294
|
return _extends({}, user, {
|
|
284
295
|
roles: userRolesFull,
|
package/index.js
CHANGED
|
@@ -55,7 +55,8 @@ var _default = (store, api, sharedActions) => {
|
|
|
55
55
|
const {
|
|
56
56
|
callback,
|
|
57
57
|
expiresInMinutes,
|
|
58
|
-
shouldSendEmail
|
|
58
|
+
shouldSendEmail,
|
|
59
|
+
roleIds
|
|
59
60
|
} = payload;
|
|
60
61
|
actions.setTeamError({
|
|
61
62
|
key: _interfaces.TeamStateKeys.CREATE_TOKEN_LINK,
|
|
@@ -68,9 +69,10 @@ var _default = (store, api, sharedActions) => {
|
|
|
68
69
|
const [enhancedInviteUserModalFlag] = await actions.getFeatureFlags(['invite_user_modal_enhancements_frontend']);
|
|
69
70
|
let data;
|
|
70
71
|
if (enhancedInviteUserModalFlag) {
|
|
71
|
-
data = await api.teams.
|
|
72
|
+
data = await api.teams.createInviteUserLinkV2({
|
|
72
73
|
expiresInMinutes: expiresInMinutes != null ? expiresInMinutes : 43200,
|
|
73
|
-
shouldSendEmail: shouldSendEmail != null ? shouldSendEmail : true
|
|
74
|
+
shouldSendEmail: shouldSendEmail != null ? shouldSendEmail : true,
|
|
75
|
+
roleIds: roleIds != null ? roleIds : []
|
|
74
76
|
});
|
|
75
77
|
} else {
|
|
76
78
|
data = await api.teams.createInviteUserLink({
|
|
@@ -129,9 +131,7 @@ var _default = (store, api, sharedActions) => {
|
|
|
129
131
|
});
|
|
130
132
|
try {
|
|
131
133
|
await api.teams.deleteInviteUserLink();
|
|
132
|
-
|
|
133
|
-
inviteTokenState: undefined
|
|
134
|
-
});
|
|
134
|
+
await __getInvitationLinkConfig();
|
|
135
135
|
callback == null ? void 0 : callback(true);
|
|
136
136
|
} catch (e) {
|
|
137
137
|
actions.setTeamError({
|
|
@@ -265,8 +265,12 @@ var _default = (store, api, sharedActions) => {
|
|
|
265
265
|
|
|
266
266
|
// Fetch roles, permissions, user roles, user groups, and all groups in parallel
|
|
267
267
|
const [{
|
|
268
|
+
items: userUsernames
|
|
269
|
+
}, {
|
|
268
270
|
items: roles
|
|
269
|
-
}, permissions, userRoles, userGroups, groups] = await Promise.all([
|
|
271
|
+
}, permissions, userRoles, userGroups, groups] = await Promise.all([userIds.length > 0 ? api.users.getUsersUsernames({
|
|
272
|
+
userIds
|
|
273
|
+
}) : [], api.teams.loadAvailableRoles(), api.teams.loadAvailablePermissions(), userIds.length > 0 ? api.users.getUsersRoles({
|
|
270
274
|
ids: userIds
|
|
271
275
|
}) : [], userIds.length > 0 ? api.users.getUsersGroups({
|
|
272
276
|
ids: userIds
|
|
@@ -276,6 +280,7 @@ var _default = (store, api, sharedActions) => {
|
|
|
276
280
|
|
|
277
281
|
// Map user roles and groups to users
|
|
278
282
|
const usersWithRolesAndGroups = users.map(user => {
|
|
283
|
+
var _userUsernames$find;
|
|
279
284
|
// Find user's role IDs
|
|
280
285
|
const userRoleData = userRoles.find(ur => ur.userId === user.id);
|
|
281
286
|
const userRoleIds = (userRoleData == null ? void 0 : userRoleData.roleIds) || [];
|
|
@@ -286,6 +291,12 @@ var _default = (store, api, sharedActions) => {
|
|
|
286
291
|
const userGroupIds = (userGroupData == null ? void 0 : userGroupData.groupIds) || [];
|
|
287
292
|
const userGroupsFull = groups.filter(g => userGroupIds.includes(g.id));
|
|
288
293
|
|
|
294
|
+
// Find user's username
|
|
295
|
+
const userUsername = userUsernames == null ? void 0 : (_userUsernames$find = userUsernames.find(username => username.userId === user.id)) == null ? void 0 : _userUsernames$find.username;
|
|
296
|
+
if (!user.name) {
|
|
297
|
+
user.name = userUsername;
|
|
298
|
+
}
|
|
299
|
+
|
|
289
300
|
//@ts-ignore
|
|
290
301
|
return (0, _extends2.default)({}, user, {
|
|
291
302
|
roles: userRolesFull,
|
package/node/index.js
CHANGED
package/node/toolkit/index.js
CHANGED
|
@@ -8,6 +8,7 @@ var _exportNames = {
|
|
|
8
8
|
FronteggNativeModule: true,
|
|
9
9
|
snapshot: true,
|
|
10
10
|
subscribe: true,
|
|
11
|
+
ref: true,
|
|
11
12
|
createProxy: true
|
|
12
13
|
};
|
|
13
14
|
Object.defineProperty(exports, "FronteggNativeModule", {
|
|
@@ -22,6 +23,12 @@ Object.defineProperty(exports, "createProxy", {
|
|
|
22
23
|
return _proxy.createProxy;
|
|
23
24
|
}
|
|
24
25
|
});
|
|
26
|
+
Object.defineProperty(exports, "ref", {
|
|
27
|
+
enumerable: true,
|
|
28
|
+
get: function () {
|
|
29
|
+
return _valtio.ref;
|
|
30
|
+
}
|
|
31
|
+
});
|
|
25
32
|
Object.defineProperty(exports, "snapshot", {
|
|
26
33
|
enumerable: true,
|
|
27
34
|
get: function () {
|
package/package.json
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@frontegg/redux-store",
|
|
3
|
-
"version": "7.
|
|
3
|
+
"version": "7.84.0-alpha.1",
|
|
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
9
|
"@frontegg/entitlements-javascript-commons": "1.1.2",
|
|
10
|
-
"@frontegg/rest-api": "7.
|
|
10
|
+
"@frontegg/rest-api": "7.84.0-alpha.1",
|
|
11
11
|
"fast-deep-equal": "3.1.3",
|
|
12
12
|
"get-value": "^3.0.1",
|
|
13
13
|
"proxy-compare": "^3.0.0",
|
package/toolkit/index.d.ts
CHANGED
|
@@ -2,5 +2,5 @@ export { default as FronteggNativeModule } from './FronteggNativeModule';
|
|
|
2
2
|
export * from './store';
|
|
3
3
|
import { INTERNAL_Snapshot as Snapshot } from '../valtio';
|
|
4
4
|
export type { Snapshot };
|
|
5
|
-
export { snapshot, subscribe } from '../valtio';
|
|
5
|
+
export { snapshot, subscribe, ref } from '../valtio';
|
|
6
6
|
export { createProxy } from './proxy';
|
package/toolkit/index.js
CHANGED