@intuitionrobotics/permissions 0.43.21 → 0.43.23

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.
@@ -13,6 +13,7 @@ export declare class PermissionsModule_Class extends Module<Config> {
13
13
  getUserUrlsPermissions(projectId: string, urlsMap: UserUrlsPermissions, userId: string, requestCustomField: StringMap): Promise<UserUrlsPermissions>;
14
14
  getUsersCFsByShareGroups(usersEmails: string[], groupsIds: string[]): Promise<Response_UsersCFsByShareGroups>;
15
15
  getUserCFsByShareGroups(userId: string, groupsIds: string[]): Promise<StringMap[]>;
16
+ private getCustomFields;
16
17
  registerProject(server: HttpServer_Class): Promise<void>;
17
18
  _registerProject(registerProject: Request_RegisterProject): Promise<void>;
18
19
  }
@@ -67,32 +67,49 @@ class PermissionsModule_Class extends ts_common_1.Module {
67
67
  }
68
68
  getUsersCFsByShareGroups(usersEmails, groupsIds) {
69
69
  return __awaiter(this, void 0, void 0, function* () {
70
- const toRet = {};
71
- yield Promise.all(usersEmails.map((email) => __awaiter(this, void 0, void 0, function* () {
72
- const account = yield backend_1.AccountModule.getUser(email);
70
+ const accounts = yield backend_1.AccountModule.getUsers(usersEmails);
71
+ const usersMap = ts_common_1.arrayToMap(accounts, u => u.email);
72
+ const permissionUsers = yield ts_common_1.batchActionParallel(accounts.map(u => u._id), 10, (batchedAccountIds) => __awaiter(this, void 0, void 0, function* () {
73
+ return assign_1.UserPermissionsDB.query({
74
+ where: {
75
+ accountId: {
76
+ $in: batchedAccountIds
77
+ }
78
+ },
79
+ select: ['_id', 'groups']
80
+ });
81
+ }));
82
+ const permissionUsersMap = ts_common_1.arrayToMap(permissionUsers, pu => pu._id);
83
+ return usersEmails.reduce((acc, e) => {
84
+ const account = usersMap[e.toLowerCase()];
73
85
  if (!account)
74
- return;
75
- toRet[email] = yield this.getUserCFsByShareGroups(account._id, groupsIds);
76
- })));
77
- return toRet;
86
+ return acc;
87
+ const user = permissionUsersMap[account._id];
88
+ if (!user)
89
+ return acc;
90
+ acc[e] = this.getCustomFields(user, groupsIds);
91
+ return acc;
92
+ }, {});
78
93
  });
79
94
  }
80
95
  getUserCFsByShareGroups(userId, groupsIds) {
81
96
  return __awaiter(this, void 0, void 0, function* () {
82
97
  const user = yield assign_1.UserPermissionsDB.queryUnique({ accountId: userId });
83
- const userCFs = [];
84
- if (!user.groups)
85
- return userCFs;
86
- user.groups.forEach(userGroup => {
87
- if (!groupsIds.find(groupId => groupId === userGroup.groupId))
88
- return;
89
- if (!userGroup.customField)
90
- return;
91
- userCFs.push(userGroup.customField);
92
- });
93
- return userCFs;
98
+ return this.getCustomFields(user, groupsIds);
94
99
  });
95
100
  }
101
+ getCustomFields(user, groupsIds) {
102
+ if (!user.groups)
103
+ return [];
104
+ return user.groups.reduce((acc, userGroup) => {
105
+ if (!groupsIds.find(groupId => groupId === userGroup.groupId))
106
+ return acc;
107
+ if (!userGroup.customField)
108
+ return acc;
109
+ acc.push(userGroup.customField);
110
+ return acc;
111
+ }, []);
112
+ }
96
113
  registerProject(server) {
97
114
  return __awaiter(this, void 0, void 0, function* () {
98
115
  const routes = server.getRoutes().reduce((carry, httpRoute) => {
@@ -1 +1 @@
1
- {"version":3,"file":"PermissionsModule.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/PermissionsModule.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"PermissionsModule.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/PermissionsModule.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@intuitionrobotics/permissions",
3
- "version": "0.43.21",
3
+ "version": "0.43.23",
4
4
  "description": "Permissions",
5
5
  "keywords": [
6
6
  "IR",