@intuitionrobotics/permissions 0.45.0 → 0.45.1

package/app-backend/api/v1/test/test-permissions.js

@@ -1,4 +1,21 @@
 "use strict";
+/*
+ * ts-common is the basic building blocks of our typescript projects
+ *
+ * Copyright (C) 2020 Intuition Robotics
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -9,17 +26,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const server_api_1 = require("@intuitionrobotics/thunderstorm/app-backend/modules/server/server-api");
-const types_1 = require("@intuitionrobotics/thunderstorm/shared/types");
-const permission_user_assert_benchmark_1 = require("../../../benchmark/permission-user-assert-benchmark");
-class ServerApi_TestPermissions extends server_api_1.ServerApi {
+const backend_1 = require("@intuitionrobotics/thunderstorm/backend");
+const thunderstorm_1 = require("@intuitionrobotics/thunderstorm");
+const _imports_1 = require("./_imports");
+class ServerApi_TestPermissions extends backend_1.ServerApi {
     constructor() {
-        super(types_1.HttpMethod.GET, "test-permissions");
+        super(thunderstorm_1.HttpMethod.GET, "test-permissions");
     }
     process(request, response, queryParams, body) {
         return __awaiter(this, void 0, void 0, function* () {
             console.log('Starting test permissions assert');
-            yield permission_user_assert_benchmark_1.testUserPermissionsTime();
+            yield _imports_1.testUserPermissionsTime();
             console.log('---Finish test permissions assert---');
         });
     }

package/app-backend/api/v1/test/test-permissions.js.map

@@ -1 +1 @@
-{"version":3,"file":"test-permissions.js","sourceRoot":"","sources":["../../../../../src/main/app-backend/api/v1/test/test-permissions.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,sGAA6G;AAE7G,wEAAwE;AAExE,0GAA4F;AAE5F,MAAM,yBACF,SAAQ,sBAAyC;IAEjD;QACI,KAAK,CAAC,kBAAU,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAC;IAC9C,CAAC;IAEe,OAAO,CAAC,OAAuB,EAAE,QAAqB,EAAE,WAAe,EAAE,IAAU;;YAC/F,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;YAChD,MAAM,0DAAuB,EAAE,CAAC;YAChC,OAAO,CAAC,GAAG,CAAC,sCAAsC,CAAC,CAAC;QACxD,CAAC;KAAA;CACJ;AAED,MAAM,CAAC,OAAO,GAAG,IAAI,yBAAyB,EAAE,CAAC"}
+{"version":3,"file":"test-permissions.js","sourceRoot":"","sources":["../../../../../src/main/app-backend/api/v1/test/test-permissions.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;;;;;;;;;AAEH,qEAGiD;AAGjD,kEAA2D;AAG3D,yCAAmD;AAGnD,MAAM,yBACL,SAAQ,mBAAyC;IAEjD;QACC,KAAK,CAAC,yBAAU,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAC;IAC3C,CAAC;IAEe,OAAO,CAAC,OAAuB,EAAE,QAAqB,EAAE,WAAe,EAAE,IAAU;;YAClG,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;YAChD,MAAM,kCAAuB,EAAE,CAAC;YAChC,OAAO,CAAC,GAAG,CAAC,sCAAsC,CAAC,CAAC;QACrD,CAAC;KAAA;CACD;AAED,MAAM,CAAC,OAAO,GAAG,IAAI,yBAAyB,EAAE,CAAC"}

package/app-backend/api/v1/user-custom-fields/_user-custom-fields.js

@@ -1,5 +1,22 @@
 "use strict";
+/*
+ * ts-common is the basic building blocks of our typescript projects
+ *
+ * Copyright (C) 2020 Intuition Robotics
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
-const HttpServer_1 = require("@intuitionrobotics/thunderstorm/app-backend/modules/server/HttpServer");
-module.exports = new HttpServer_1.RouteResolver(require, __dirname);
+const backend_1 = require("@intuitionrobotics/thunderstorm/backend");
+module.exports = new backend_1.RouteResolver(require, __dirname);
 //# sourceMappingURL=_user-custom-fields.js.map

package/app-backend/api/v1/user-custom-fields/_user-custom-fields.js.map

@@ -1 +1 @@
-{"version":3,"file":"_user-custom-fields.js","sourceRoot":"","sources":["../../../../../src/main/app-backend/api/v1/user-custom-fields/_user-custom-fields.ts"],"names":[],"mappings":";;AAAA,sGAAoG;AAEpG,MAAM,CAAC,OAAO,GAAG,IAAI,0BAAa,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC"}
+{"version":3,"file":"_user-custom-fields.js","sourceRoot":"","sources":["../../../../../src/main/app-backend/api/v1/user-custom-fields/_user-custom-fields.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;AAEH,qEAAsE;AAEtE,MAAM,CAAC,OAAO,GAAG,IAAI,uBAAa,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC"}

package/app-backend/api/v1/user-custom-fields/user-cf-by-share-groups.d.ts

@@ -1 +1,6 @@
-export {};
+import { ApiResponse, ExpressRequest, ServerApi } from "@intuitionrobotics/thunderstorm/backend";
+import { PermissionsApi_UserCFsByShareGroups, Request_UserCFsByShareGroups } from "../permissions/_imports";
+export declare class ServerApi_UserCFsByShareGroups extends ServerApi<PermissionsApi_UserCFsByShareGroups> {
+    constructor();
+    protected process(request: ExpressRequest, response: ApiResponse, queryParams: {}, body: Request_UserCFsByShareGroups): Promise<import("@intuitionrobotics/ts-common").StringMap[]>;
+}

package/app-backend/api/v1/user-custom-fields/user-cf-by-share-groups.js

@@ -1,4 +1,22 @@
 "use strict";
+/*
+ * Permissions management system, define access level for each of
+ * your server apis, and restrict users by giving them access levels
+ *
+ * Copyright (C) 2020 Intuition Robotics
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -9,21 +27,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const server_api_1 = require("@intuitionrobotics/thunderstorm/app-backend/modules/server/server-api");
-const types_1 = require("@intuitionrobotics/thunderstorm/shared/types");
-const AccountModule_1 = require("@intuitionrobotics/user-account/app-backend/modules/AccountModule");
+exports.ServerApi_UserCFsByShareGroups = void 0;
+const backend_1 = require("@intuitionrobotics/thunderstorm/backend");
+const thunderstorm_1 = require("@intuitionrobotics/thunderstorm");
+const backend_2 = require("@intuitionrobotics/user-account/backend");
 const PermissionsModule_1 = require("../../../modules/PermissionsModule");
-class ServerApi_UserCFsByShareGroups extends server_api_1.ServerApi {
+class ServerApi_UserCFsByShareGroups extends backend_1.ServerApi {
     constructor() {
-        super(types_1.HttpMethod.POST, "user-cf-by-share-groups");
+        super(thunderstorm_1.HttpMethod.POST, "user-cf-by-share-groups");
         this.dontPrintResponse();
     }
     process(request, response, queryParams, body) {
         return __awaiter(this, void 0, void 0, function* () {
-            const account = yield AccountModule_1.AccountModule.validateSession(request, response);
+            const account = yield backend_2.AccountModule.validateSession(request, this.getScopes(), response);
             return PermissionsModule_1.PermissionsModule.getUserCFsByShareGroups(account._id, body.groupsIds);
         });
     }
 }
+exports.ServerApi_UserCFsByShareGroups = ServerApi_UserCFsByShareGroups;
 module.exports = new ServerApi_UserCFsByShareGroups();
 //# sourceMappingURL=user-cf-by-share-groups.js.map

package/app-backend/api/v1/user-custom-fields/user-cf-by-share-groups.js.map

@@ -1 +1 @@
-{"version":3,"file":"user-cf-by-share-groups.js","sourceRoot":"","sources":["../../../../../src/main/app-backend/api/v1/user-custom-fields/user-cf-by-share-groups.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,sGAA6G;AAE7G,wEAAwE;AACxE,qGAAgG;AAEhG,0EAAqE;AAErE,MAAM,8BACF,SAAQ,sBAA8C;IAEtD;QACI,KAAK,CAAC,kBAAU,CAAC,IAAI,EAAE,yBAAyB,CAAC,CAAC;QAClD,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC7B,CAAC;IAEe,OAAO,CAAC,OAAuB,EAAE,QAAqB,EAAE,WAAe,EAAE,IAAkC;;YACvH,MAAM,OAAO,GAAG,MAAM,6BAAa,CAAC,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YACvE,OAAO,qCAAiB,CAAC,uBAAuB,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAClF,CAAC;KAAA;CACJ;AAED,MAAM,CAAC,OAAO,GAAG,IAAI,8BAA8B,EAAE,CAAC"}
+{"version":3,"file":"user-cf-by-share-groups.js","sourceRoot":"","sources":["../../../../../src/main/app-backend/api/v1/user-custom-fields/user-cf-by-share-groups.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;;;;;;;;;;AAEH,qEAIiD;AAKjD,kEAA2D;AAC3D,qEAAsE;AACtE,0EAAqE;AAErE,MAAa,8BACZ,SAAQ,mBAA8C;IAEtD;QACC,KAAK,CAAC,yBAAU,CAAC,IAAI,EAAE,yBAAyB,CAAC,CAAC;QAClD,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC1B,CAAC;IAEe,OAAO,CAAC,OAAuB,EAAE,QAAqB,EAAE,WAAe,EAAE,IAAkC;;YAC1H,MAAM,OAAO,GAAG,MAAM,uBAAa,CAAC,eAAe,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,EAAE,EAAE,QAAQ,CAAC,CAAC;YACzF,OAAO,qCAAiB,CAAC,uBAAuB,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAC/E,CAAC;KAAA;CACD;AAZD,wEAYC;AAED,MAAM,CAAC,OAAO,GAAG,IAAI,8BAA8B,EAAE,CAAC"}

package/app-backend/api/v1/user-custom-fields/users-cf-by-share-groups.d.ts

@@ -1 +1,6 @@
-export {};
+import { ApiResponse, ExpressRequest, ServerApi } from "@intuitionrobotics/thunderstorm/backend";
+import { PermissionsApi_UsersCFsByShareGroups, Request_UsersCFsByShareGroups } from "../permissions/_imports";
+export declare class ServerApi_UsersCFsByShareGroups extends ServerApi<PermissionsApi_UsersCFsByShareGroups> {
+    constructor();
+    protected process(request: ExpressRequest, response: ApiResponse, queryParams: {}, body: Request_UsersCFsByShareGroups): Promise<import("../permissions/_imports").Response_UsersCFsByShareGroups>;
+}

package/app-backend/api/v1/user-custom-fields/users-cf-by-share-groups.js

@@ -1,4 +1,22 @@
 "use strict";
+/*
+ * Permissions management system, define access level for each of
+ * your server apis, and restrict users by giving them access levels
+ *
+ * Copyright (C) 2020 Intuition Robotics
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -9,21 +27,22 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const server_api_1 = require("@intuitionrobotics/thunderstorm/app-backend/modules/server/server-api");
-const types_1 = require("@intuitionrobotics/thunderstorm/shared/types");
-const AccountModule_1 = require("@intuitionrobotics/user-account/app-backend/modules/AccountModule");
-const PermissionsModule_1 = require("../../../modules/PermissionsModule");
-class ServerApi_UsersCFsByShareGroups extends server_api_1.ServerApi {
+exports.ServerApi_UsersCFsByShareGroups = void 0;
+const backend_1 = require("@intuitionrobotics/thunderstorm/backend");
+const _imports_1 = require("../permissions/_imports");
+const thunderstorm_1 = require("@intuitionrobotics/thunderstorm");
+class ServerApi_UsersCFsByShareGroups extends backend_1.ServerApi {
     constructor() {
-        super(types_1.HttpMethod.POST, "users-cf-by-share-groups");
+        super(thunderstorm_1.HttpMethod.POST, "users-cf-by-share-groups");
         this.dontPrintResponse();
+        this.setMiddlewares(backend_1.RemoteProxy.Middleware);
     }
     process(request, response, queryParams, body) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield AccountModule_1.AccountModule.validateSession(request, response);
-            return PermissionsModule_1.PermissionsModule.getUsersCFsByShareGroups(body.usersEmails, body.groupsIds);
+            return _imports_1.PermissionsModule.getUsersCFsByShareGroups(body.usersEmails, body.groupsIds);
         });
     }
 }
+exports.ServerApi_UsersCFsByShareGroups = ServerApi_UsersCFsByShareGroups;
 module.exports = new ServerApi_UsersCFsByShareGroups();
 //# sourceMappingURL=users-cf-by-share-groups.js.map

package/app-backend/api/v1/user-custom-fields/users-cf-by-share-groups.js.map

@@ -1 +1 @@
-{"version":3,"file":"users-cf-by-share-groups.js","sourceRoot":"","sources":["../../../../../src/main/app-backend/api/v1/user-custom-fields/users-cf-by-share-groups.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,sGAA6G;AAE7G,wEAAwE;AACxE,qGAAgG;AAEhG,0EAAqE;AAErE,MAAM,+BACF,SAAQ,sBAA+C;IAEvD;QACI,KAAK,CAAC,kBAAU,CAAC,IAAI,EAAE,0BAA0B,CAAC,CAAC;QACnD,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC7B,CAAC;IAEe,OAAO,CAAC,OAAuB,EAAE,QAAqB,EAAE,WAAe,EAAE,IAAmC;;YACxH,MAAM,6BAAa,CAAC,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YACvD,OAAO,qCAAiB,CAAC,wBAAwB,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACxF,CAAC;KAAA;CACJ;AAED,MAAM,CAAC,OAAO,GAAG,IAAI,+BAA+B,EAAE,CAAC"}
+{"version":3,"file":"users-cf-by-share-groups.js","sourceRoot":"","sources":["../../../../../src/main/app-backend/api/v1/user-custom-fields/users-cf-by-share-groups.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;;;;;;;;;;AAEH,qEAKiD;AACjD,sDAIiC;AACjC,kEAA2D;AAE3D,MAAa,+BACZ,SAAQ,mBAA+C;IAEvD;QACC,KAAK,CAAC,yBAAU,CAAC,IAAI,EAAE,0BAA0B,CAAC,CAAC;QACnD,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzB,IAAI,CAAC,cAAc,CAAC,qBAAW,CAAC,UAAU,CAAC,CAAC;IAC7C,CAAC;IAEe,OAAO,CAAC,OAAuB,EAAE,QAAqB,EAAE,WAAe,EAAE,IAAmC;;YAC3H,OAAO,4BAAiB,CAAC,wBAAwB,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACrF,CAAC;KAAA;CACD;AAZD,0EAYC;AAED,MAAM,CAAC,OAAO,GAAG,IAAI,+BAA+B,EAAE,CAAC"}

package/app-backend/benchmark/permission-user-assert-benchmark.js

@@ -1,4 +1,21 @@
 "use strict";
+/*
+ * ts-common is the basic building blocks of our typescript projects
+ *
+ * Copyright (C) 2020 Intuition Robotics
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -10,8 +27,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.testUserPermissionsTime = void 0;
-const random_tools_1 = require("@intuitionrobotics/ts-common/utils/random-tools");
-const date_time_tools_1 = require("@intuitionrobotics/ts-common/utils/date-time-tools");
+const ts_common_1 = require("@intuitionrobotics/ts-common");
 const managment_1 = require("../modules/db-types/managment");
 const assign_1 = require("../modules/db-types/assign");
 const permissions_assert_1 = require("../modules/permissions-assert");
@@ -28,27 +44,22 @@ function testUserPermissionsTime() {
     return __awaiter(this, void 0, void 0, function* () {
         console.log("---￿Inside of permissions test---");
         const projectId = 'project-test-ten';
-        const apiId = random_tools_1.generateHex(32);
-        const userId = random_tools_1.generateHex(32);
+        const apiId = ts_common_1.generateHex(32);
+        const userId = ts_common_1.generateHex(32);
         const apiPath = '/v1/test/test-it10';
         const userUuid = 'test10@intuitionrobotics.com';
-        const permissionId = random_tools_1.generateHex(32);
-        const domainId = random_tools_1.generateHex(32);
+        const permissionId = ts_common_1.generateHex(32);
+        const domainId = ts_common_1.generateHex(32);
         const permissionValue = 50;
         const customField = { UnitId: 'eq1' };
         yield managment_1.ProjectPermissionsDB.upsert({ _id: projectId, name: 'project test' });
         yield managment_1.DomainPermissionsDB.upsert({ _id: domainId, projectId: projectId, namespace: 'domain-test' });
-        const accessLevel = yield managment_1.AccessLevelPermissionsDB.upsert({
-            _id: permissionId,
-            name: 'test-permission',
-            domainId,
-            value: permissionValue
-        });
+        const accessLevel = yield managment_1.AccessLevelPermissionsDB.upsert({ _id: permissionId, name: 'test-permission', domainId, value: permissionValue });
         yield managment_1.ApiPermissionsDB.upsert({ projectId: projectId, _id: apiId, path: apiPath, accessLevelIds: [permissionId] });
         const groupIdArray = [];
         const dbInstances = [];
         for (let counter = 0; counter < 100; counter++) {
-            const groupId = random_tools_1.generateHex(32);
+            const groupId = ts_common_1.generateHex(32);
             const baseAccessLevel = { domainId: accessLevel.domainId, value: accessLevel.value };
             dbInstances.push({
                 _id: groupId,
@@ -88,9 +99,9 @@ function testUserPermissionsTime() {
 exports.testUserPermissionsTime = testUserPermissionsTime;
 function runAssertion(projectId, apiPath, userUuid, customField) {
     return __awaiter(this, void 0, void 0, function* () {
-        const start = date_time_tools_1.currentTimeMillies();
+        const start = ts_common_1.currentTimeMillies();
         yield permissions_assert_1.PermissionsAssert.assertUserPermissions(projectId, apiPath, userUuid, customField);
-        const runTime = date_time_tools_1.currentTimeMillies() - start;
+        const runTime = ts_common_1.currentTimeMillies() - start;
         console.log(`Call to assertion took ${runTime}ms`);
         return runTime;
     });

package/app-backend/benchmark/permission-user-assert-benchmark.js.map

@@ -1 +1 @@
-{"version":3,"file":"permission-user-assert-benchmark.js","sourceRoot":"","sources":["../../../src/main/app-backend/benchmark/permission-user-assert-benchmark.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"permission-user-assert-benchmark.js","sourceRoot":"","sources":["../../../src/main/app-backend/benchmark/permission-user-assert-benchmark.ts"],"names":[],"mappings":"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"}

package/app-backend/core/module-pack.d.ts

@@ -1 +1,6 @@
-export declare const Backend_ModulePack_Permissions: (import("../modules/permissions-assert").PermissionsAssert_Class | import("../modules/db-types/assign").GroupsDB_Class | import("../modules/db-types/assign").UsersDB_Class | import("../modules/db-types/managment").LevelDB_Class | import("../modules/db-types/managment").ProjectDB_Class | import("../modules/db-types/managment").DomainDB_Class | import("../modules/db-types/managment").ApiDB_Class | import("../modules/PermissionsModule").PermissionsModule_Class | import("../modules/TagsModule").TagsDB_Class)[];
+export declare const Backend_ModulePack_Permissions: (import("../modules/PermissionsModule").PermissionsModule_Class | import("../modules/permissions-assert").PermissionsAssert_Class | import("../modules/db-types/managment").ApiDB_Class | import("../modules/db-types/assign").UsersDB_Class | import("../modules/db-types/managment").ProjectDB_Class | import("../modules/db-types/assign").GroupsDB_Class | import("../modules/db-types/managment").LevelDB_Class | import("../modules/db-types/managment").DomainDB_Class | import("../modules/TagsModule").TagsDB_Class)[];
+export * from "../modules/db-types/managment";
+export * from "../modules/db-types/assign";
+export * from "../modules/permissions-assert";
+export * from "../modules/PermissionsModule";
+export * from "../modules/TagsModule";

package/app-backend/core/module-pack.js

@@ -1,4 +1,31 @@
 "use strict";
+/*
+ * ts-common is the basic building blocks of our typescript projects
+ *
+ * Copyright (C) 2020 Intuition Robotics
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Backend_ModulePack_Permissions = void 0;
 const managment_1 = require("../modules/db-types/managment");
@@ -17,4 +44,9 @@ exports.Backend_ModulePack_Permissions = [
     PermissionsModule_1.PermissionsModule,
     TagsModule_1.TagsDB
 ];
+__exportStar(require("../modules/db-types/managment"), exports);
+__exportStar(require("../modules/db-types/assign"), exports);
+__exportStar(require("../modules/permissions-assert"), exports);
+__exportStar(require("../modules/PermissionsModule"), exports);
+__exportStar(require("../modules/TagsModule"), exports);
 //# sourceMappingURL=module-pack.js.map

package/app-backend/core/module-pack.js.map

@@ -1 +1 @@
-{"version":3,"file":"module-pack.js","sourceRoot":"","sources":["../../../src/main/app-backend/core/module-pack.ts"],"names":[],"mappings":";;;AAAA,6DAKuC;AACvC,uDAAiF;AACjF,sEAAgE;AAChE,oEAA+D;AAC/D,sDAA6C;AAEhC,QAAA,8BAA8B,GAAG;IAC1C,gCAAoB;IACpB,+BAAmB;IACnB,oCAAwB;IACxB,4BAAgB;IAChB,2BAAkB;IAClB,0BAAiB;IACjB,sCAAiB;IACjB,qCAAiB;IACjB,mBAAM;CACT,CAAC"}
+{"version":3,"file":"module-pack.js","sourceRoot":"","sources":["../../../src/main/app-backend/core/module-pack.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;;;;;;;;;;;AAEH,6DAKuC;AACvC,uDAGoC;AACpC,sEAAgE;AAChE,oEAA+D;AAC/D,sDAA6C;AAEhC,QAAA,8BAA8B,GAAG;IAC7C,gCAAoB;IACpB,+BAAmB;IACnB,oCAAwB;IACxB,4BAAgB;IAChB,2BAAkB;IAClB,0BAAiB;IACjB,sCAAiB;IACjB,qCAAiB;IACjB,mBAAM;CACN,CAAC;AAEF,gEAA6C;AAC7C,6DAA0C;AAC1C,gEAA6C;AAC7C,+DAA4C;AAC5C,wDAAqC"}

package/app-backend/modules/PermissionsModule.d.ts

@@ -1,8 +1,6 @@
-import { DB_PermissionProject } from "../../shared/manager-types";
-import { PredefinedGroup, PredefinedUser, Request_RegisterProject, Response_UsersCFsByShareGroups, UserUrlsPermissions } from "../../shared/apis";
-import { Module } from "@intuitionrobotics/ts-common/core/module";
-import { StringMap } from "@intuitionrobotics/ts-common/utils/types";
-import { HttpServer_Class } from "@intuitionrobotics/thunderstorm/app-backend/modules/server/HttpServer";
+import { Module, StringMap } from "@intuitionrobotics/ts-common";
+import { DB_PermissionProject, PredefinedGroup, PredefinedUser, Request_RegisterProject, Response_UsersCFsByShareGroups, UserUrlsPermissions } from "./_imports";
+import { HttpServer_Class } from "@intuitionrobotics/thunderstorm/backend";
 declare type Config = {
     project: DB_PermissionProject;
     predefinedGroups?: PredefinedGroup[];
@@ -15,6 +13,7 @@ export declare class PermissionsModule_Class extends Module<Config> {
     getUserUrlsPermissions(projectId: string, urlsMap: UserUrlsPermissions, userId: string, requestCustomField: StringMap): Promise<UserUrlsPermissions>;
     getUsersCFsByShareGroups(usersEmails: string[], groupsIds: string[]): Promise<Response_UsersCFsByShareGroups>;
     getUserCFsByShareGroups(userId: string, groupsIds: string[]): Promise<StringMap[]>;
+    private getCustomFields;
     registerProject(server: HttpServer_Class): Promise<void>;
     _registerProject(registerProject: Request_RegisterProject): Promise<void>;
 }

package/app-backend/modules/PermissionsModule.js

@@ -1,4 +1,21 @@
 "use strict";
+/*
+ * ts-common is the basic building blocks of our typescript projects
+ *
+ * Copyright (C) 2020 Intuition Robotics
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -10,20 +27,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PermissionsModule = exports.PermissionsModule_Class = void 0;
+const ts_common_1 = require("@intuitionrobotics/ts-common");
 const permissions_assert_1 = require("./permissions-assert");
 const managment_1 = require("./db-types/managment");
 const assign_1 = require("./db-types/assign");
-const module_1 = require("@intuitionrobotics/ts-common/core/module");
-const exceptions_1 = require("@intuitionrobotics/ts-common/core/exceptions");
-const AccountModule_1 = require("@intuitionrobotics/user-account/app-backend/modules/AccountModule");
-class PermissionsModule_Class extends module_1.Module {
+const backend_1 = require("@intuitionrobotics/user-account/backend");
+class PermissionsModule_Class extends ts_common_1.Module {
     constructor() {
         super("PermissionsModule");
         this.getProjectIdentity = () => this.config.project;
     }
     init() {
         if (!this.config)
-            throw new exceptions_1.ImplementationMissingException("MUST set config with project identity!!");
+            throw new ts_common_1.ImplementationMissingException("MUST set config with project identity!!");
     }
     getUserUrlsPermissions(projectId, urlsMap, userId, requestCustomField) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -51,32 +67,49 @@ class PermissionsModule_Class extends module_1.Module {
     }
     getUsersCFsByShareGroups(usersEmails, groupsIds) {
         return __awaiter(this, void 0, void 0, function* () {
-            const toRet = {};
-            yield Promise.all(usersEmails.map((email) => __awaiter(this, void 0, void 0, function* () {
-                const account = yield AccountModule_1.AccountModule.getUser(email);
+            const accounts = yield backend_1.AccountModule.getUsers(usersEmails);
+            const usersMap = ts_common_1.arrayToMap(accounts, u => u.email);
+            const permissionUsers = yield ts_common_1.batchActionParallel(accounts.map(u => u._id), 10, (batchedAccountIds) => __awaiter(this, void 0, void 0, function* () {
+                return assign_1.UserPermissionsDB.query({
+                    where: {
+                        accountId: {
+                            $in: batchedAccountIds
+                        }
+                    },
+                    select: ['_id', 'groups']
+                });
+            }));
+            const permissionUsersMap = ts_common_1.arrayToMap(permissionUsers, pu => pu._id);
+            return usersEmails.reduce((acc, e) => {
+                const account = usersMap[e.toLowerCase()];
                 if (!account)
-                    return;
-                toRet[email] = yield this.getUserCFsByShareGroups(account._id, groupsIds);
-            })));
-            return toRet;
+                    return acc;
+                const user = permissionUsersMap[account._id];
+                if (!user)
+                    return acc;
+                acc[e] = this.getCustomFields(user, groupsIds);
+                return acc;
+            }, {});
         });
     }
     getUserCFsByShareGroups(userId, groupsIds) {
         return __awaiter(this, void 0, void 0, function* () {
             const user = yield assign_1.UserPermissionsDB.queryUnique({ accountId: userId });
-            const userCFs = [];
-            if (!user.groups)
-                return userCFs;
-            user.groups.forEach(userGroup => {
-                if (!groupsIds.find(groupId => groupId === userGroup.groupId))
-                    return;
-                if (!userGroup.customField)
-                    return;
-                userCFs.push(userGroup.customField);
-            });
-            return userCFs;
+            return this.getCustomFields(user, groupsIds);
         });
     }
+    getCustomFields(user, groupsIds) {
+        if (!user.groups)
+            return [];
+        return user.groups.reduce((acc, userGroup) => {
+            if (!groupsIds.find(groupId => groupId === userGroup.groupId))
+                return acc;
+            if (!userGroup.customField)
+                return acc;
+            acc.push(userGroup.customField);
+            return acc;
+        }, []);
+    }
     registerProject(server) {
         return __awaiter(this, void 0, void 0, function* () {
             const routes = server.getRoutes().reduce((carry, httpRoute) => {

package/app-backend/modules/PermissionsModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"PermissionsModule.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/PermissionsModule.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PermissionsModule.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/PermissionsModule.ts"],"names":[],"mappings":"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"}

package/app-backend/modules/TagsModule.d.ts

@@ -1,9 +1,8 @@
-import { TypeValidator } from "@intuitionrobotics/ts-common/validator/validator";
-import { BaseDB_ApiGenerator } from "@intuitionrobotics/db-api-generator/app-backend/BaseDB_ApiGenerator";
-import { Clause_Where, FirestoreQuery } from "@intuitionrobotics/firebase/shared/types";
-import { ExpressRequest } from "@intuitionrobotics/thunderstorm/app-backend/utils/types";
-import { ServerApi } from "@intuitionrobotics/thunderstorm/app-backend/modules/server/server-api";
-import { DB_GroupTags } from "../../shared/assign-types";
+import { BaseDB_ApiGenerator } from "@intuitionrobotics/db-api-generator/backend";
+import { Clause_Where, FirestoreQuery } from "@intuitionrobotics/firebase";
+import { ExpressRequest, ServerApi } from "@intuitionrobotics/thunderstorm/backend";
+import { TypeValidator } from "@intuitionrobotics/ts-common";
+import { DB_GroupTags } from "../..";
 export declare const CollectionNameTags = "permissions--tags";
 export declare class TagsDB_Class extends BaseDB_ApiGenerator<DB_GroupTags> {
     static _validator: TypeValidator<DB_GroupTags>;

package/app-backend/modules/TagsModule.js

@@ -10,13 +10,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TagsDB = exports.TagsDB_Class = exports.CollectionNameTags = void 0;
-const validator_1 = require("@intuitionrobotics/ts-common/validator/validator");
-const BaseDB_ApiGenerator_1 = require("@intuitionrobotics/db-api-generator/app-backend/BaseDB_ApiGenerator");
-const apis_1 = require("@intuitionrobotics/db-api-generator/app-backend/apis");
+const backend_1 = require("@intuitionrobotics/db-api-generator/backend");
+const ts_common_1 = require("@intuitionrobotics/ts-common");
 const assign_1 = require("./db-types/assign");
-const validateGroupLabel = validator_1.validateRegexp(/^[A-Za-z-\._ ]+$/);
+const validateGroupLabel = ts_common_1.validateRegexp(/^[A-Za-z-\._ ]+$/);
 exports.CollectionNameTags = 'permissions--tags';
-class TagsDB_Class extends BaseDB_ApiGenerator_1.BaseDB_ApiGenerator {
+class TagsDB_Class extends backend_1.BaseDB_ApiGenerator {
     constructor() {
         super(exports.CollectionNameTags, TagsDB_Class._validator, "permissionsTags", "TagsDB");
     }
@@ -36,16 +35,16 @@ class TagsDB_Class extends BaseDB_ApiGenerator_1.BaseDB_ApiGenerator {
     }
     apis(pathPart) {
         return [
-            new apis_1.ServerApi_Delete(this, pathPart),
-            new apis_1.ServerApi_Query(this, pathPart),
-            new apis_1.ServerApi_Unique(this, pathPart),
-            new apis_1.ServerApi_Create(this, pathPart)
+            new backend_1.ServerApi_Delete(this, pathPart),
+            new backend_1.ServerApi_Query(this, pathPart),
+            new backend_1.ServerApi_Unique(this, pathPart),
+            new backend_1.ServerApi_Create(this, pathPart)
         ];
     }
 }
 exports.TagsDB_Class = TagsDB_Class;
 TagsDB_Class._validator = {
-    _id: BaseDB_ApiGenerator_1.validateStringAndNumbersWithDashes,
+    _id: backend_1.validateStringAndNumbersWithDashes,
     label: validateGroupLabel
 };
 exports.TagsDB = new TagsDB_Class();

package/app-backend/modules/TagsModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"TagsModule.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/TagsModule.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gFAA+F;AAC/F,6GAG6E;AAG7E,+EAK8D;AAG9D,8CAAqD;AAGrD,MAAM,kBAAkB,GAAG,0BAAc,CAAC,kBAAkB,CAAC,CAAC;AAEjD,QAAA,kBAAkB,GAAG,mBAAmB,CAAC;AAGtD,MAAa,YACT,SAAQ,yCAAiC;IAOzC;QACI,KAAK,CAAC,0BAAkB,EAAE,YAAY,CAAC,UAAU,EAAE,iBAAiB,EAAE,QAAQ,CAAC,CAAC;IACpF,CAAC;IAGS,cAAc,CAAC,IAAkB;QACvC,MAAM,EAAC,KAAK,EAAC,GAAG,IAAI,CAAC;QACrB,OAAO,CAAC,EAAC,KAAK,EAAC,CAAC,CAAC;IACrB,CAAC;IAEK,MAAM,CAAC,KAAmC,EAAE,OAAwB;;;;;;YACtE,OAAA,KAAK,CAAC,KAAK,0CAAE,GAAG,MAAI,MAAM,2BAAkB,CAAC,UAAU,OAAC,KAAK,CAAC,KAAK,0CAAE,GAAG,CAAC,QAAQ,GAAG,CAAA,CAAA;YACpF,OAAO,OAAM,MAAM,YAAC,KAAK,EAAE,OAAO,EAAC;;KACtC;IAED,IAAI,CAAC,QAAiB;QAClB,OAAO;YACH,IAAI,uBAAgB,CAAC,IAAI,EAAE,QAAQ,CAAC;YACpC,IAAI,sBAAe,CAAC,IAAI,EAAE,QAAQ,CAAC;YACnC,IAAI,uBAAgB,CAAC,IAAI,EAAE,QAAQ,CAAC;YACpC,IAAI,uBAAgB,CAAC,IAAI,EAAE,QAAQ,CAAC;SACvC,CAAC;IACN,CAAC;;AA9BL,oCA+BC;AA5BU,uBAAU,GAAgC;IAC7C,GAAG,EAAE,wDAAkC;IACvC,KAAK,EAAE,kBAAkB;CAC5B,CAAC;AA2BO,QAAA,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC"}
+{"version":3,"file":"TagsModule.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/TagsModule.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yEAOqD;AASrD,4DAGsC;AAEtC,8CAAqD;AAErD,MAAM,kBAAkB,GAAG,0BAAc,CAAC,kBAAkB,CAAC,CAAC;AAEjD,QAAA,kBAAkB,GAAG,mBAAmB,CAAC;AAGtD,MAAa,YACZ,SAAQ,6BAAiC;IAOzC;QACC,KAAK,CAAC,0BAAkB,EAAE,YAAY,CAAC,UAAU,EAAE,iBAAiB,EAAE,QAAQ,CAAC,CAAC;IACjF,CAAC;IAGS,cAAc,CAAC,IAAkB;QAC1C,MAAM,EAAC,KAAK,EAAC,GAAG,IAAI,CAAC;QACrB,OAAO,CAAC,EAAC,KAAK,EAAC,CAAC,CAAC;IAClB,CAAC;IAEK,MAAM,CAAC,KAAmC,EAAE,OAAwB;;;;;;YACzE,OAAA,KAAK,CAAC,KAAK,0CAAE,GAAG,MAAI,MAAM,2BAAkB,CAAC,UAAU,OAAC,KAAK,CAAC,KAAK,0CAAE,GAAG,CAAC,QAAQ,GAAG,CAAA,CAAA;YACpF,OAAO,OAAM,MAAM,YAAC,KAAK,EAAE,OAAO,EAAC;;KACnC;IAED,IAAI,CAAC,QAAiB;QACrB,OAAO;YACN,IAAI,0BAAgB,CAAC,IAAI,EAAE,QAAQ,CAAC;YACpC,IAAI,yBAAe,CAAC,IAAI,EAAE,QAAQ,CAAC;YACnC,IAAI,0BAAgB,CAAC,IAAI,EAAE,QAAQ,CAAC;YACpC,IAAI,0BAAgB,CAAC,IAAI,EAAE,QAAQ,CAAC;SACpC,CAAC;IACH,CAAC;;AA9BF,oCA+BC;AA5BO,uBAAU,GAAgC;IAChD,GAAG,EAAE,4CAAkC;IACvC,KAAK,EAAE,kBAAkB;CACzB,CAAC;AA2BU,QAAA,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC"}