@hestia-earth/api 0.25.54 → 0.25.56

package/dist/nodes/model/model.d.ts

@@ -1,4 +1,5 @@
 import { SchemaType, NodeType } from '@hestia-earth/schema';
+import { User } from '../../users/model/model';
 export declare const blankNodeTypes: SchemaType[];
 export declare enum DataState {
     original = "original",
@@ -20,3 +21,7 @@ export declare const formatForUpload: (nodes: any[], typeToId?: {
     [type: string]: string[];
 }) => any;
 export declare const setPrivate: ({ source, defaultSource, ...node }: any) => any;
+export declare const dataVersionRestrictedDays = 90;
+export declare const isDataVersionRestricted: (dataVersion: string) => boolean;
+export declare const isDataVersionAuthorised: (user: User, dataVersion?: string) => boolean;
+export declare const isNodeAuthorised: (user: User, node: any, dataVersion?: string) => boolean;

package/dist/nodes/model/model.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setPrivate = exports.formatForUpload = exports.parseLogMissingLookups = exports.paramToNodeType = exports.nodeTypeToParam = exports.pathWithState = exports.allowedDataStates = exports.dataStatesTypeMapping = exports.DataState = exports.blankNodeTypes = void 0;
+exports.isNodeAuthorised = exports.isDataVersionAuthorised = exports.isDataVersionRestricted = exports.dataVersionRestrictedDays = exports.setPrivate = exports.formatForUpload = exports.parseLogMissingLookups = exports.paramToNodeType = exports.nodeTypeToParam = exports.pathWithState = exports.allowedDataStates = exports.dataStatesTypeMapping = exports.DataState = exports.blankNodeTypes = void 0;
 const schema_1 = require("@hestia-earth/schema");
 const utils_1 = require("@hestia-earth/utils");
 const model_1 = require("../../files/model/model");
+const model_2 = require("../../users/model/model");
 exports.blankNodeTypes = Object.values(schema_1.SchemaType).filter(t => !(0, schema_1.isTypeNode)(t));
 var DataState;
 (function (DataState) {
@@ -86,3 +87,20 @@ const setPrivate = ({ source, defaultSource, ...node }) => ({
     dataPrivate: true
 });
 exports.setPrivate = setPrivate;
+exports.dataVersionRestrictedDays = 90;
+const isDataVersionRestricted = (dataVersion) => (new Date().getTime() - new Date(dataVersion).getTime()) / utils_1.dayMs < exports.dataVersionRestrictedDays;
+exports.isDataVersionRestricted = isDataVersionRestricted;
+const isDataVersionAuthorised = (user, dataVersion) => dataVersion
+    ? (0, exports.isDataVersionRestricted)(dataVersion)
+        ?
+            (0, model_2.hasPermission)(model_2.UserPermission.aggregationsLatest, user)
+        : true
+    :
+        (0, model_2.hasPermission)(model_2.UserPermission.aggregationsPreview, user);
+exports.isDataVersionAuthorised = isDataVersionAuthorised;
+const isNodeAuthorised = (user, node, dataVersion) => !node.aggregated ||
+    [
+        (0, model_2.hasPermission)(model_2.UserPermission.aggregationsRead, user),
+        node.aggregatedDataValidated && (0, exports.isDataVersionAuthorised)(user, dataVersion)
+    ].some(Boolean);
+exports.isNodeAuthorised = isNodeAuthorised;

package/dist/users/model/model.d.ts

@@ -17,11 +17,26 @@ export declare enum UserPermission {
     aggregationsPreview = "aggregations-preview",
     aggregationsDelete = "aggregations-delete",
     aggregationsVerify = "aggregations-verify",
+    aggregationsLatest = "aggregations-latest",
     reconciliationsCreate = "reconciliations-create",
     reconciliationsRead = "reconciliations-view",
     reconciliationsUpdate = "reconciliations-update",
     reconciliationsDelete = "reconciliations-delete"
 }
+export declare enum UserPermissionRequestStatus {
+    Approved = "approved",
+    Rejected = "rejected",
+    Pending = "pending"
+}
+export interface UserPermissionRequest {
+    permission: UserPermission;
+    status: UserPermissionRequestStatus;
+    createdAt: Date;
+    updatedAt?: Date;
+    expiryDate?: Date;
+    rejectedReason?: string;
+    slackThreadTs?: string;
+}
 export declare class User extends BaseModel {
     email: string;
     firstName: string;
@@ -36,6 +51,7 @@ export declare class User extends BaseModel {
     validFilesCount: number;
     canCommitHestiaData: boolean;
     permissions: UserPermission[];
+    permissionsRequests: UserPermissionRequest[];
     emailNotificationsSuccess: boolean;
     emailNotificationsFailure: boolean;
     emailNotificationsFeedback: boolean;

package/dist/users/model/model.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.userToActor = exports.actorId = exports.contains = exports.hasPermission = exports.isDeveloper = exports.isReviewer = exports.isAdmin = exports.name = exports.User = exports.UserPermission = exports.UserRole = exports.MaxUploads = exports.defaultMaxApiCalls = void 0;
+exports.userToActor = exports.actorId = exports.contains = exports.hasPermission = exports.isDeveloper = exports.isReviewer = exports.isAdmin = exports.name = exports.User = exports.UserPermissionRequestStatus = exports.UserPermission = exports.UserRole = exports.MaxUploads = exports.defaultMaxApiCalls = void 0;
 const schema_1 = require("@hestia-earth/schema");
 const model_base_1 = require("../../db/model.base");
 exports.defaultMaxApiCalls = 100;
@@ -23,11 +23,18 @@ var UserPermission;
     UserPermission["aggregationsPreview"] = "aggregations-preview";
     UserPermission["aggregationsDelete"] = "aggregations-delete";
     UserPermission["aggregationsVerify"] = "aggregations-verify";
+    UserPermission["aggregationsLatest"] = "aggregations-latest";
     UserPermission["reconciliationsCreate"] = "reconciliations-create";
     UserPermission["reconciliationsRead"] = "reconciliations-view";
     UserPermission["reconciliationsUpdate"] = "reconciliations-update";
     UserPermission["reconciliationsDelete"] = "reconciliations-delete";
 })(UserPermission || (exports.UserPermission = UserPermission = {}));
+var UserPermissionRequestStatus;
+(function (UserPermissionRequestStatus) {
+    UserPermissionRequestStatus["Approved"] = "approved";
+    UserPermissionRequestStatus["Rejected"] = "rejected";
+    UserPermissionRequestStatus["Pending"] = "pending";
+})(UserPermissionRequestStatus || (exports.UserPermissionRequestStatus = UserPermissionRequestStatus = {}));
 class User extends model_base_1.BaseModel {
     email;
     firstName;
@@ -42,6 +49,7 @@ class User extends model_base_1.BaseModel {
     validFilesCount = 0;
     canCommitHestiaData = false;
     permissions = [];
+    permissionsRequests = [];
     emailNotificationsSuccess = false;
     emailNotificationsFailure = false;
     emailNotificationsFeedback = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hestia-earth/api",
-  "version": "0.25.54",
+  "version": "0.25.56",
   "description": "Hestia API definitions",
   "main": "dist/models.js",
   "typings": "dist/models.d.ts",