@openforis/arena-server 2.7.1 → 2.8.0

package/dist/api/userGroup/common.d.ts

@@ -1,4 +1,4 @@
-import { UserGroup } from '@openforis/arena-core';
+import { UserGroup, UserGroupProps } from '@openforis/arena-core';
 import { UserGroupService } from '../../service';
 export declare const getUserGroupService: () => UserGroupService;
 export declare const getSurveyUuid: (surveyId: number) => Promise<string>;
@@ -9,3 +9,8 @@ export declare const getUserGroupBelongingToSurvey: (params: {
     surveyUuid: string;
     userGroup: UserGroup;
 }>;
+export declare const sanitizeReadableGroupUuids: (params: {
+    surveyUuid: string;
+    groupUuid?: string;
+    props?: UserGroupProps;
+}) => Promise<UserGroupProps | undefined>;

package/dist/api/userGroup/common.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserGroupBelongingToSurvey = exports.getSurveyUuid = exports.getUserGroupService = void 0;
+exports.sanitizeReadableGroupUuids = exports.getUserGroupBelongingToSurvey = exports.getSurveyUuid = exports.getUserGroupService = void 0;
 const arena_core_1 = require("@openforis/arena-core");
 const server_1 = require("../../server");
 const serverServiceType_1 = require("../../server/arenaServer/serverServiceType");
@@ -23,4 +23,17 @@ const getUserGroupBelongingToSurvey = async (params) => {
     return { surveyUuid, userGroup };
 };
 exports.getUserGroupBelongingToSurvey = getUserGroupBelongingToSurvey;
+const sanitizeReadableGroupUuids = async (params) => {
+    const { surveyUuid, groupUuid, props } = params;
+    if (props?.readableGroupUuids === undefined)
+        return props;
+    const readableGroupUuids = Array.isArray(props.readableGroupUuids) ? props.readableGroupUuids : [];
+    const surveyGroups = await (0, exports.getUserGroupService)().getAll({ surveyUuid });
+    const surveyGroupUuids = new Set(surveyGroups.map((group) => group.uuid));
+    return {
+        ...props,
+        readableGroupUuids: [...new Set(readableGroupUuids)].filter((uuid) => uuid !== groupUuid && surveyGroupUuids.has(uuid)),
+    };
+};
+exports.sanitizeReadableGroupUuids = sanitizeReadableGroupUuids;
 //# sourceMappingURL=common.js.map

package/dist/api/userGroup/common.js.map

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/api/userGroup/common.ts"],"names":[],"mappings":";;;AAAA,sDAA8F;AAE9F,yCAA2D;AAC3D,kFAA8E;AAGvE,MAAM,mBAAmB,GAAG,GAAqB,EAAE,CACxD,4BAAe,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,qCAAiB,CAAC,SAAS,CAAqB,CAAA;AAD9E,QAAA,mBAAmB,GAAnB,mBAAmB,CAC2D;AAEpF,MAAM,aAAa,GAAG,KAAK,EAAE,QAAgB,EAAmB,EAAE;IACvE,MAAM,aAAa,GAAG,4BAAe,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,wBAAW,CAAC,MAAM,CAAkB,CAAA;IACnG,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAA;IACpD,OAAO,MAAM,CAAC,IAAI,CAAA;AACpB,CAAC,CAAA;AAJY,QAAA,aAAa,GAAb,aAAa,CAIzB;AAOM,MAAM,6BAA6B,GAAG,KAAK,EAAE,MAGnD,EAAyD,EAAE;IAC1D,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,MAAM,CAAA;IAEtC,MAAM,UAAU,GAAG,MAAM,IAAA,QAAA,aAAa,EAAC,QAAQ,CAAC,CAAA;IAEhD,MAAM,OAAO,GAAG,IAAA,QAAA,mBAAmB,GAAE,CAAA;IACrC,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAA;IAE9D,IAAI,SAAS,EAAE,UAAU,KAAK,UAAU,EAAE,CAAC;QACzC,MAAM,IAAI,oBAAW,CAAC,8BAA8B,EAAE,EAAE,SAAS,EAAE,EAAE,wBAAe,CAAC,SAAS,CAAC,CAAA;IACjG,CAAC;IACD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,CAAA;AAClC,CAAC,CAAA;AAfY,QAAA,6BAA6B,GAA7B,6BAA6B,CAezC"}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/api/userGroup/common.ts"],"names":[],"mappings":";;;AAAA,sDAA8G;AAE9G,yCAA2D;AAC3D,kFAA8E;AAGvE,MAAM,mBAAmB,GAAG,GAAqB,EAAE,CACxD,4BAAe,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,qCAAiB,CAAC,SAAS,CAAqB,CAAA;AAD9E,QAAA,mBAAmB,GAAnB,mBAAmB,CAC2D;AAEpF,MAAM,aAAa,GAAG,KAAK,EAAE,QAAgB,EAAmB,EAAE;IACvE,MAAM,aAAa,GAAG,4BAAe,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,wBAAW,CAAC,MAAM,CAAkB,CAAA;IACnG,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAA;IACpD,OAAO,MAAM,CAAC,IAAI,CAAA;AACpB,CAAC,CAAA;AAJY,QAAA,aAAa,GAAb,aAAa,CAIzB;AAOM,MAAM,6BAA6B,GAAG,KAAK,EAAE,MAGnD,EAAyD,EAAE;IAC1D,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,MAAM,CAAA;IAEtC,MAAM,UAAU,GAAG,MAAM,IAAA,QAAA,aAAa,EAAC,QAAQ,CAAC,CAAA;IAEhD,MAAM,OAAO,GAAG,IAAA,QAAA,mBAAmB,GAAE,CAAA;IACrC,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAA;IAE9D,IAAI,SAAS,EAAE,UAAU,KAAK,UAAU,EAAE,CAAC;QACzC,MAAM,IAAI,oBAAW,CAAC,8BAA8B,EAAE,EAAE,SAAS,EAAE,EAAE,wBAAe,CAAC,SAAS,CAAC,CAAA;IACjG,CAAC;IACD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,CAAA;AAClC,CAAC,CAAA;AAfY,QAAA,6BAA6B,GAA7B,6BAA6B,CAezC;AAKM,MAAM,0BAA0B,GAAG,KAAK,EAAE,MAIhD,EAAuC,EAAE;IACxC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,MAAM,CAAA;IAC/C,IAAI,KAAK,EAAE,kBAAkB,KAAK,SAAS;QAAE,OAAO,KAAK,CAAA;IAEzD,MAAM,kBAAkB,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,CAAA;IAClG,MAAM,YAAY,GAAG,MAAM,IAAA,QAAA,mBAAmB,GAAE,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,CAAC,CAAA;IACvE,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;IACzE,OAAO;QACL,GAAG,KAAK;QACR,kBAAkB,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAC,MAAM,CACzD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,SAAS,IAAI,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,CAC3D;KACF,CAAA;AACH,CAAC,CAAA;AAjBY,QAAA,0BAA0B,GAA1B,0BAA0B,CAiBtC"}

package/dist/api/userGroup/create.js

@@ -13,8 +13,9 @@ exports.UserGroupCreate = {
                 const { surveyId } = utils_1.Requests.getParams(req);
                 const item = req.body;
                 const surveyUuid = await (0, common_1.getSurveyUuid)(surveyId);
+                const props = await (0, common_1.sanitizeReadableGroupUuids)({ surveyUuid, props: item?.props });
                 const service = (0, common_1.getUserGroupService)();
-                const userGroupInserted = await service.insert({ surveyUuid, item });
+                const userGroupInserted = await service.insert({ surveyUuid, item: { ...item, props } });
                 res.json(userGroupInserted);
             }
             catch (error) {

package/dist/api/userGroup/create.js.map

@@ -1 +1 @@
-{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/api/userGroup/create.ts"],"names":[],"mappings":";;;AAGA,uCAAsC;AAEtC,0CAAyC;AACzC,8CAAiD;AACjD,qCAA4F;AAE5F,MAAM,EAAE,gCAAgC,EAAE,GAAG,8BAAiB,CAAA;AAEjD,QAAA,eAAe,GAAuB;IACjD,IAAI,EAAE,CAAC,OAAgB,EAAQ,EAAE;QAC/B,OAAO,CAAC,IAAI,CACV,sBAAW,CAAC,SAAS,CAAC,UAAU,CAAC,WAAW,CAAC,EAC7C,gCAAgC,EAChC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACvB,IAAI,CAAC;gBACH,MAAM,EAAE,QAAQ,EAAE,GAAG,gBAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;gBAC5C,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;gBAErB,MAAM,UAAU,GAAG,MAAM,IAAA,sBAAa,EAAC,QAAQ,CAAC,CAAA;gBAEhD,MAAM,OAAO,GAAG,IAAA,4BAAmB,GAAE,CAAA;gBACrC,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAA;gBAEpE,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;YAC7B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,KAAK,CAAC,CAAA;YACb,CAAC;QACH,CAAC,CACF,CAAA;QAED,OAAO,CAAC,IAAI,CACV,sBAAW,CAAC,SAAS,CAAC,gBAAgB,CAAC,WAAW,EAAE,YAAY,CAAC,EACjE,gCAAgC,EAChC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACvB,IAAI,CAAC;gBACH,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,gBAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;gBACvD,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC,IAAI,CAAA;gBAE7B,MAAM,IAAA,sCAA6B,EAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAA;gBAE5D,MAAM,OAAO,GAAG,IAAA,4BAAmB,GAAE,CAAA;gBACrC,MAAM,OAAO,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAA;gBAEhD,GAAG,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAA;YACnC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,KAAK,CAAC,CAAA;YACb,CAAC;QACH,CAAC,CACF,CAAA;IACH,CAAC;CACF,CAAA"}
+{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/api/userGroup/create.ts"],"names":[],"mappings":";;;AAGA,uCAAsC;AAEtC,0CAAyC;AACzC,8CAAiD;AACjD,qCAAwH;AAExH,MAAM,EAAE,gCAAgC,EAAE,GAAG,8BAAiB,CAAA;AAEjD,QAAA,eAAe,GAAuB;IACjD,IAAI,EAAE,CAAC,OAAgB,EAAQ,EAAE;QAC/B,OAAO,CAAC,IAAI,CACV,sBAAW,CAAC,SAAS,CAAC,UAAU,CAAC,WAAW,CAAC,EAC7C,gCAAgC,EAChC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACvB,IAAI,CAAC;gBACH,MAAM,EAAE,QAAQ,EAAE,GAAG,gBAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;gBAC5C,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;gBAErB,MAAM,UAAU,GAAG,MAAM,IAAA,sBAAa,EAAC,QAAQ,CAAC,CAAA;gBAChD,MAAM,KAAK,GAAG,MAAM,IAAA,mCAA0B,EAAC,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;gBAElF,MAAM,OAAO,GAAG,IAAA,4BAAmB,GAAE,CAAA;gBACrC,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CAAA;gBAExF,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;YAC7B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,KAAK,CAAC,CAAA;YACb,CAAC;QACH,CAAC,CACF,CAAA;QAED,OAAO,CAAC,IAAI,CACV,sBAAW,CAAC,SAAS,CAAC,gBAAgB,CAAC,WAAW,EAAE,YAAY,CAAC,EACjE,gCAAgC,EAChC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACvB,IAAI,CAAC;gBACH,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,gBAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;gBACvD,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC,IAAI,CAAA;gBAE7B,MAAM,IAAA,sCAA6B,EAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAA;gBAE5D,MAAM,OAAO,GAAG,IAAA,4BAAmB,GAAE,CAAA;gBACrC,MAAM,OAAO,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAA;gBAEhD,GAAG,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAA;YACnC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,KAAK,CAAC,CAAA;YACb,CAAC;QACH,CAAC,CACF,CAAA;IACH,CAAC;CACF,CAAA"}

package/dist/api/userGroup/update.js

@@ -12,9 +12,10 @@ exports.UserGroupUpdate = {
             try {
                 const { surveyId, groupUuid } = utils_1.Requests.getParams(req);
                 const { props } = req.body;
-                await (0, common_1.getUserGroupBelongingToSurvey)({ surveyId, groupUuid });
+                const { surveyUuid } = await (0, common_1.getUserGroupBelongingToSurvey)({ surveyId, groupUuid });
+                const propsSanitized = await (0, common_1.sanitizeReadableGroupUuids)({ surveyUuid, groupUuid, props });
                 const service = (0, common_1.getUserGroupService)();
-                const userGroupUpdated = await service.update({ uuid: groupUuid, props });
+                const userGroupUpdated = await service.update({ uuid: groupUuid, props: propsSanitized ?? props });
                 res.json(userGroupUpdated);
             }
             catch (error) {

package/dist/api/userGroup/update.js.map

@@ -1 +1 @@
-{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/api/userGroup/update.ts"],"names":[],"mappings":";;;AAGA,uCAAsC;AAEtC,0CAAyC;AACzC,8CAAiD;AACjD,qCAA6E;AAE7E,MAAM,EAAE,gCAAgC,EAAE,GAAG,8BAAiB,CAAA;AAEjD,QAAA,eAAe,GAAuB;IACjD,IAAI,EAAE,CAAC,OAAgB,EAAQ,EAAE;QAC/B,OAAO,CAAC,GAAG,CACT,sBAAW,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,EAAE,YAAY,CAAC,EAC1D,gCAAgC,EAChC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACvB,IAAI,CAAC;gBACH,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,gBAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;gBACvD,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,IAAI,CAAA;gBAE1B,MAAM,IAAA,sCAA6B,EAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAA;gBAE5D,MAAM,OAAO,GAAG,IAAA,4BAAmB,GAAE,CAAA;gBACrC,MAAM,gBAAgB,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAA;gBAEzE,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;YAC5B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,KAAK,CAAC,CAAA;YACb,CAAC;QACH,CAAC,CACF,CAAA;IACH,CAAC;CACF,CAAA"}
+{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/api/userGroup/update.ts"],"names":[],"mappings":";;;AAGA,uCAAsC;AAEtC,0CAAyC;AACzC,8CAAiD;AACjD,qCAAyG;AAEzG,MAAM,EAAE,gCAAgC,EAAE,GAAG,8BAAiB,CAAA;AAEjD,QAAA,eAAe,GAAuB;IACjD,IAAI,EAAE,CAAC,OAAgB,EAAQ,EAAE;QAC/B,OAAO,CAAC,GAAG,CACT,sBAAW,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,EAAE,YAAY,CAAC,EAC1D,gCAAgC,EAChC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACvB,IAAI,CAAC;gBACH,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,gBAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;gBACvD,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,IAAI,CAAA;gBAE1B,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAA,sCAA6B,EAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAA;gBACnF,MAAM,cAAc,GAAG,MAAM,IAAA,mCAA0B,EAAC,EAAE,UAAU,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAA;gBAEzF,MAAM,OAAO,GAAG,IAAA,4BAAmB,GAAE,CAAA;gBACrC,MAAM,gBAAgB,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,cAAc,IAAI,KAAK,EAAE,CAAC,CAAA;gBAElG,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;YAC5B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,KAAK,CAAC,CAAA;YACb,CAAC;QACH,CAAC,CACF,CAAA;IACH,CAAC;CACF,CAAA"}

package/dist/repository/userGroup/index.d.ts

@@ -1,6 +1,6 @@
 import { insert } from './insert';
 import { count, getAll, getByUuid } from './read';
-import { update, updateProps } from './update';
+import { removeReadableGroupUuid, update, updateProps } from './update';
 import { deleteItem } from './delete';
 import { getManyByUser } from './getUserGroupsByUser';
 import { addMember, removeMember, getMembers } from './members';
@@ -12,6 +12,7 @@ export declare const UserGroupRepository: {
     insert: typeof insert;
     update: typeof update;
     updateProps: typeof updateProps;
+    removeReadableGroupUuid: typeof removeReadableGroupUuid;
     deleteItem: typeof deleteItem;
     addMember: typeof addMember;
     removeMember: typeof removeMember;

package/dist/repository/userGroup/index.js

@@ -15,6 +15,7 @@ exports.UserGroupRepository = {
     insert: insert_1.insert,
     update: update_1.update,
     updateProps: update_1.updateProps,
+    removeReadableGroupUuid: update_1.removeReadableGroupUuid,
     deleteItem: delete_1.deleteItem,
     addMember: members_1.addMember,
     removeMember: members_1.removeMember,

package/dist/repository/userGroup/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/repository/userGroup/index.ts"],"names":[],"mappings":";;;AAAA,qCAAiC;AACjC,iCAAiD;AACjD,qCAA8C;AAC9C,qCAAqC;AACrC,+DAAqD;AACrD,uCAA+D;AAElD,QAAA,mBAAmB,GAAG;IACjC,KAAK,EAAL,YAAK;IACL,MAAM,EAAN,aAAM;IACN,SAAS,EAAT,gBAAS;IACT,aAAa,EAAb,mCAAa;IACb,MAAM,EAAN,eAAM;IACN,MAAM,EAAN,eAAM;IACN,WAAW,EAAX,oBAAW;IACX,UAAU,EAAV,mBAAU;IACV,SAAS,EAAT,mBAAS;IACT,YAAY,EAAZ,sBAAY;IACZ,UAAU,EAAV,oBAAU;CACX,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/repository/userGroup/index.ts"],"names":[],"mappings":";;;AAAA,qCAAiC;AACjC,iCAAiD;AACjD,qCAAuE;AACvE,qCAAqC;AACrC,+DAAqD;AACrD,uCAA+D;AAElD,QAAA,mBAAmB,GAAG;IACjC,KAAK,EAAL,YAAK;IACL,MAAM,EAAN,aAAM;IACN,SAAS,EAAT,gBAAS;IACT,aAAa,EAAb,mCAAa;IACb,MAAM,EAAN,eAAM;IACN,MAAM,EAAN,eAAM;IACN,WAAW,EAAX,oBAAW;IACX,uBAAuB,EAAvB,gCAAuB;IACvB,UAAU,EAAV,mBAAU;IACV,SAAS,EAAT,mBAAS;IACT,YAAY,EAAZ,sBAAY;IACZ,UAAU,EAAV,oBAAU;CACX,CAAA"}

package/dist/repository/userGroup/update.d.ts

@@ -8,3 +8,7 @@ export declare const updateProps: (params: {
     uuid: string;
     props: Partial<UserGroup['props']>;
 }, client?: BaseProtocol) => Promise<UserGroup>;
+export declare const removeReadableGroupUuid: (params: {
+    surveyUuid: string;
+    groupUuid: string;
+}, client?: BaseProtocol) => Promise<null>;

package/dist/repository/userGroup/update.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateProps = exports.update = void 0;
+exports.removeReadableGroupUuid = exports.updateProps = exports.update = void 0;
 const db_1 = require("../../db");
 const sql_1 = require("../../db/sql");
 const dateModifiedNow = "(now() AT TIME ZONE 'UTC')";
@@ -30,4 +30,20 @@ const updateProps = (params, client = db_1.DB) => {
     return client.one(sql, [props, uuid], (row) => db_1.DBs.transformCallback({ row }));
 };
 exports.updateProps = updateProps;
+const removeReadableGroupUuid = (params, client = db_1.DB) => {
+    const { surveyUuid, groupUuid } = params;
+    const table = new db_1.TableUserGroup();
+    const readableGroupUuidsPath = `${table.props} -> 'readableGroupUuids'`;
+    const sql = new sql_1.SqlUpdateBuilder()
+        .update(table)
+        .set(table.props, `jsonb_set(${table.props}, '{readableGroupUuids}', COALESCE(
+        (SELECT jsonb_agg(item) FROM jsonb_array_elements(${readableGroupUuidsPath}) AS item WHERE item <> to_jsonb($1::text)),
+        '[]'::jsonb
+      ))`)
+        .set(table.dateModified, dateModifiedNow)
+        .where(`${table.surveyUuid} = $2 AND jsonb_typeof(${readableGroupUuidsPath}) = 'array' AND ${readableGroupUuidsPath} ? $1`)
+        .build();
+    return client.none(sql, [groupUuid, surveyUuid]);
+};
+exports.removeReadableGroupUuid = removeReadableGroupUuid;
 //# sourceMappingURL=update.js.map

package/dist/repository/userGroup/update.js.map

@@ -1 +1 @@
-{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/repository/userGroup/update.ts"],"names":[],"mappings":";;;AACA,iCAAgE;AAChE,sCAA+C;AAE/C,MAAM,eAAe,GAAG,4BAA4B,CAAA;AAG7C,MAAM,MAAM,GAAG,CACpB,MAAmD,EACnD,MAAM,GAAiB,OAAE,EACL,EAAE;IACtB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,CAAA;IAC9B,MAAM,KAAK,GAAG,IAAI,mBAAc,EAAE,CAAA;IAElC,MAAM,GAAG,GAAG,IAAI,sBAAgB,EAAE;SAC/B,MAAM,CAAC,KAAK,CAAC;SACb,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,WAAW,CAAC;SAC7B,GAAG,CAAC,KAAK,CAAC,YAAY,EAAE,eAAe,CAAC;SACxC,KAAK,CAAC,GAAG,KAAK,CAAC,IAAI,OAAO,CAAC;SAC3B,SAAS,CAAC,GAAG,KAAK,CAAC,cAAc,CAAC;SAClC,KAAK,EAAE,CAAA;IAEV,OAAO,MAAM,CAAC,GAAG,CAAY,GAAG,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,QAAG,CAAC,iBAAiB,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAA;AAC3F,CAAC,CAAA;AAhBY,QAAA,MAAM,GAAN,MAAM,CAgBlB;AAGM,MAAM,WAAW,GAAG,CACzB,MAA4D,EAC5D,MAAM,GAAiB,OAAE,EACL,EAAE;IACtB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,CAAA;IAC9B,MAAM,KAAK,GAAG,IAAI,mBAAc,EAAE,CAAA;IAElC,MAAM,GAAG,GAAG,IAAI,sBAAgB,EAAE;SAC/B,MAAM,CAAC,KAAK,CAAC;SACb,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,KAAK,CAAC,KAAK,eAAe,CAAC;SAC/C,GAAG,CAAC,KAAK,CAAC,YAAY,EAAE,eAAe,CAAC;SACxC,KAAK,CAAC,GAAG,KAAK,CAAC,IAAI,OAAO,CAAC;SAC3B,SAAS,CAAC,GAAG,KAAK,CAAC,cAAc,CAAC;SAClC,KAAK,EAAE,CAAA;IAEV,OAAO,MAAM,CAAC,GAAG,CAAY,GAAG,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,QAAG,CAAC,iBAAiB,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAA;AAC3F,CAAC,CAAA;AAhBY,QAAA,WAAW,GAAX,WAAW,CAgBvB"}
+{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/repository/userGroup/update.ts"],"names":[],"mappings":";;;AACA,iCAAgE;AAChE,sCAA+C;AAE/C,MAAM,eAAe,GAAG,4BAA4B,CAAA;AAG7C,MAAM,MAAM,GAAG,CACpB,MAAmD,EACnD,MAAM,GAAiB,OAAE,EACL,EAAE;IACtB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,CAAA;IAC9B,MAAM,KAAK,GAAG,IAAI,mBAAc,EAAE,CAAA;IAElC,MAAM,GAAG,GAAG,IAAI,sBAAgB,EAAE;SAC/B,MAAM,CAAC,KAAK,CAAC;SACb,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,WAAW,CAAC;SAC7B,GAAG,CAAC,KAAK,CAAC,YAAY,EAAE,eAAe,CAAC;SACxC,KAAK,CAAC,GAAG,KAAK,CAAC,IAAI,OAAO,CAAC;SAC3B,SAAS,CAAC,GAAG,KAAK,CAAC,cAAc,CAAC;SAClC,KAAK,EAAE,CAAA;IAEV,OAAO,MAAM,CAAC,GAAG,CAAY,GAAG,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,QAAG,CAAC,iBAAiB,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAA;AAC3F,CAAC,CAAA;AAhBY,QAAA,MAAM,GAAN,MAAM,CAgBlB;AAGM,MAAM,WAAW,GAAG,CACzB,MAA4D,EAC5D,MAAM,GAAiB,OAAE,EACL,EAAE;IACtB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,CAAA;IAC9B,MAAM,KAAK,GAAG,IAAI,mBAAc,EAAE,CAAA;IAElC,MAAM,GAAG,GAAG,IAAI,sBAAgB,EAAE;SAC/B,MAAM,CAAC,KAAK,CAAC;SACb,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,KAAK,CAAC,KAAK,eAAe,CAAC;SAC/C,GAAG,CAAC,KAAK,CAAC,YAAY,EAAE,eAAe,CAAC;SACxC,KAAK,CAAC,GAAG,KAAK,CAAC,IAAI,OAAO,CAAC;SAC3B,SAAS,CAAC,GAAG,KAAK,CAAC,cAAc,CAAC;SAClC,KAAK,EAAE,CAAA;IAEV,OAAO,MAAM,CAAC,GAAG,CAAY,GAAG,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,QAAG,CAAC,iBAAiB,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAA;AAC3F,CAAC,CAAA;AAhBY,QAAA,WAAW,GAAX,WAAW,CAgBvB;AAGM,MAAM,uBAAuB,GAAG,CACrC,MAAiD,EACjD,MAAM,GAAiB,OAAE,EACV,EAAE;IACjB,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,MAAM,CAAA;IACxC,MAAM,KAAK,GAAG,IAAI,mBAAc,EAAE,CAAA;IAClC,MAAM,sBAAsB,GAAG,GAAG,KAAK,CAAC,KAAK,0BAA0B,CAAA;IAEvE,MAAM,GAAG,GAAG,IAAI,sBAAgB,EAAE;SAC/B,MAAM,CAAC,KAAK,CAAC;SACb,GAAG,CACF,KAAK,CAAC,KAAK,EACX,aAAa,KAAK,CAAC,KAAK;4DAC8B,sBAAsB;;SAEzE,CACJ;SACA,GAAG,CAAC,KAAK,CAAC,YAAY,EAAE,eAAe,CAAC;SACxC,KAAK,CACJ,GAAG,KAAK,CAAC,UAAU,0BAA0B,sBAAsB,mBAAmB,sBAAsB,OAAO,CACpH;SACA,KAAK,EAAE,CAAA;IAEV,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAA;AAClD,CAAC,CAAA;AAxBY,QAAA,uBAAuB,GAAvB,uBAAuB,CAwBnC"}

package/dist/service/userAuthToken/index.d.ts

@@ -1,3 +1,3 @@
 import { UserAuthTokenService } from '@openforis/arena-core';
 export declare const UserAuthTokenServiceServer: UserAuthTokenService;
-export { jwtExpiresMs, jwtRefreshTokenExpireMs } from './userAuthTokenServiceConstants';
+export { jwtExpiresMs, jwtRefreshTokenExpireMs, jwtRefreshTokenMobileExpireMs } from './userAuthTokenServiceConstants';

package/dist/service/userAuthToken/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.jwtRefreshTokenExpireMs = exports.jwtExpiresMs = exports.UserAuthTokenServiceServer = void 0;
+exports.jwtRefreshTokenMobileExpireMs = exports.jwtRefreshTokenExpireMs = exports.jwtExpiresMs = exports.UserAuthTokenServiceServer = void 0;
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 const arena_core_1 = require("@openforis/arena-core");
 const db_1 = require("../../db");
@@ -28,12 +28,14 @@ const createUserAuthToken = ({ userUuid, }) => {
     const payload = createUserAuthTokenPayload({ userUuid });
     return createAuthTokenFromPayload(payload, userAuthTokenServiceConstants_1.jwtExpiresMs);
 };
+const getRefreshTokenExpireMs = (props) => props?.appInfo?.appId === userAuthTokenServiceConstants_1.arenaMobileAppId ? userAuthTokenServiceConstants_1.jwtRefreshTokenMobileExpireMs : userAuthTokenServiceConstants_1.jwtRefreshTokenExpireMs;
 const createAndStoreRefreshToken = ({ userUuid, props }, client = db_1.DB) => {
     const uuid = arena_core_1.UUIDs.v4();
     const now = new Date();
-    const expiresAt = new Date(now.getTime() + userAuthTokenServiceConstants_1.jwtRefreshTokenExpireMs);
+    const expireMs = getRefreshTokenExpireMs(props);
+    const expiresAt = new Date(now.getTime() + expireMs);
     const payload = { ...createUserAuthTokenPayload({ userUuid }), uuid };
-    const token = signToken(payload, userAuthTokenServiceConstants_1.jwtRefreshTokenExpireMs / 1000);
+    const token = signToken(payload, expireMs / 1000);
     const refreshToken = { uuid, userUuid, token, dateCreated: now, expiresAt, props };
     return repository_1.UserRefreshTokenRepository.insert(refreshToken, client);
 };
@@ -101,4 +103,5 @@ exports.UserAuthTokenServiceServer = {
 var userAuthTokenServiceConstants_2 = require("./userAuthTokenServiceConstants");
 Object.defineProperty(exports, "jwtExpiresMs", { enumerable: true, get: function () { return userAuthTokenServiceConstants_2.jwtExpiresMs; } });
 Object.defineProperty(exports, "jwtRefreshTokenExpireMs", { enumerable: true, get: function () { return userAuthTokenServiceConstants_2.jwtRefreshTokenExpireMs; } });
+Object.defineProperty(exports, "jwtRefreshTokenMobileExpireMs", { enumerable: true, get: function () { return userAuthTokenServiceConstants_2.jwtRefreshTokenMobileExpireMs; } });
 //# sourceMappingURL=index.js.map

package/dist/service/userAuthToken/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/service/userAuthToken/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/service/userAuthToken/index.ts"],"names":[],"mappings":"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"}

package/dist/service/userAuthToken/userAuthTokenServiceConstants.d.ts

@@ -1,6 +1,8 @@
 import { Algorithm } from 'jsonwebtoken';
 export declare const jwtExpiresMs: number;
 export declare const jwtRefreshTokenExpireMs: number;
+export declare const jwtRefreshTokenMobileExpireMs: number;
+export declare const arenaMobileAppId = "am";
 export declare const jwtDownloadTokenExpireMs: number;
 export declare const jwtAlgorithm: Algorithm;
 export declare const jwtAlgorithms: Algorithm[];

package/dist/service/userAuthToken/userAuthTokenServiceConstants.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.jwtAlgorithms = exports.jwtAlgorithm = exports.jwtDownloadTokenExpireMs = exports.jwtRefreshTokenExpireMs = exports.jwtExpiresMs = void 0;
+exports.jwtAlgorithms = exports.jwtAlgorithm = exports.jwtDownloadTokenExpireMs = exports.arenaMobileAppId = exports.jwtRefreshTokenMobileExpireMs = exports.jwtRefreshTokenExpireMs = exports.jwtExpiresMs = void 0;
 exports.jwtExpiresMs = 60 * 60 * 1000;
 exports.jwtRefreshTokenExpireMs = 7 * 24 * 60 * 60 * 1000;
+exports.jwtRefreshTokenMobileExpireMs = 30 * 24 * 60 * 60 * 1000;
+exports.arenaMobileAppId = 'am';
 exports.jwtDownloadTokenExpireMs = 30 * 60 * 1000;
 exports.jwtAlgorithm = 'HS256';
 exports.jwtAlgorithms = [exports.jwtAlgorithm];

package/dist/service/userAuthToken/userAuthTokenServiceConstants.js.map

@@ -1 +1 @@
-{"version":3,"file":"userAuthTokenServiceConstants.js","sourceRoot":"","sources":["../../../src/service/userAuthToken/userAuthTokenServiceConstants.ts"],"names":[],"mappings":";;;AAEa,QAAA,YAAY,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;AAC7B,QAAA,uBAAuB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;AACjD,QAAA,wBAAwB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;AAEzC,QAAA,YAAY,GAAc,OAAO,CAAA;AACjC,QAAA,aAAa,GAAgB,CAAC,QAAA,YAAY,CAAC,CAAA"}
+{"version":3,"file":"userAuthTokenServiceConstants.js","sourceRoot":"","sources":["../../../src/service/userAuthToken/userAuthTokenServiceConstants.ts"],"names":[],"mappings":";;;AAEa,QAAA,YAAY,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;AAC7B,QAAA,uBAAuB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;AAEjD,QAAA,6BAA6B,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;AACxD,QAAA,gBAAgB,GAAG,IAAI,CAAA;AACvB,QAAA,wBAAwB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;AAEzC,QAAA,YAAY,GAAc,OAAO,CAAA;AACjC,QAAA,aAAa,GAAgB,CAAC,QAAA,YAAY,CAAC,CAAA"}

package/dist/service/userGroup/index.js

@@ -1,8 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserGroupServiceServer = void 0;
+const db_1 = require("../../db");
 const userGroup_1 = require("../../repository/userGroup");
-const { count, getAll, getByUuid, getManyByUser, insert, update, updateProps, deleteItem, addMember, removeMember, getMembers, } = userGroup_1.UserGroupRepository;
+const { count, getAll, getByUuid, getManyByUser, insert, update, updateProps, removeReadableGroupUuid, deleteItem: deleteItemRepository, addMember, removeMember, getMembers, } = userGroup_1.UserGroupRepository;
+const deleteItem = (params, client = db_1.DB) => client.tx(async (t) => {
+    const deleted = await deleteItemRepository(params, t);
+    if (deleted?.surveyUuid) {
+        await removeReadableGroupUuid({ surveyUuid: deleted.surveyUuid, groupUuid: params.uuid }, t);
+    }
+    return deleted;
+});
 exports.UserGroupServiceServer = {
     count,
     getAll,

package/dist/service/userGroup/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/service/userGroup/index.ts"],"names":[],"mappings":";;;AAEA,0DAAiF;AAEjF,MAAM,EACJ,KAAK,EACL,MAAM,EACN,SAAS,EACT,aAAa,EACb,MAAM,EACN,MAAM,EACN,WAAW,EACX,UAAU,EACV,SAAS,EACT,YAAY,EACZ,UAAU,GACX,GAAG,+BAAmB,CAAA;AAgBV,QAAA,sBAAsB,GAAqB;IACtD,KAAK;IACL,MAAM;IACN,SAAS;IACT,aAAa;IACb,MAAM;IACN,MAAM;IACN,WAAW;IACX,UAAU;IACV,SAAS;IACT,YAAY;IACZ,UAAU;CACX,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/service/userGroup/index.ts"],"names":[],"mappings":";;;AACA,iCAA2C;AAC3C,0DAAiF;AAEjF,MAAM,EACJ,KAAK,EACL,MAAM,EACN,SAAS,EACT,aAAa,EACb,MAAM,EACN,MAAM,EACN,WAAW,EACX,uBAAuB,EACvB,UAAU,EAAE,oBAAoB,EAChC,SAAS,EACT,YAAY,EACZ,UAAU,GACX,GAAG,+BAAmB,CAAA;AAGvB,MAAM,UAAU,GAAG,CAAC,MAAwB,EAAE,MAAM,GAAiB,OAAE,EAA6B,EAAE,CACpG,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;IACpB,MAAM,OAAO,GAAG,MAAM,oBAAoB,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;IACrD,IAAI,OAAO,EAAE,UAAU,EAAE,CAAC;QACxB,MAAM,uBAAuB,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,SAAS,EAAE,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAA;IAC9F,CAAC;IACD,OAAO,OAAO,CAAA;AAChB,CAAC,CAAC,CAAA;AAgBS,QAAA,sBAAsB,GAAqB;IACtD,KAAK;IACL,MAAM;IACN,SAAS;IACT,aAAa;IACb,MAAM;IACN,MAAM;IACN,WAAW;IACX,UAAU;IACV,SAAS;IACT,YAAY;IACZ,UAAU;CACX,CAAA"}

package/package.json

@@ -4,7 +4,7 @@
     "name": "OpenForis",
     "email": "openforis.arena@gmail.com"
   },
-  "version": "2.7.1",
+  "version": "2.8.0",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -47,7 +47,7 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.1156.0",
     "@godaddy/terminus": "^4.12.1",
-    "@openforis/arena-core": "^2.11.1",
+    "@openforis/arena-core": "^2.12.0",
     "bcryptjs": "^3.0.3",
     "compression": "^1.8.2",
     "cookie-parser": "^1.4.7",