@hestia-earth/api 0.9.27 → 0.9.28-2

package/dist/nodes/model/model.js

@@ -63,12 +63,19 @@ exports.pathWithState = function (type, id, dataState) {
 exports.nodeTypeToParam = function (type) { return (type || '').toLowerCase() + "s"; };
 exports.paramToNodeType = function (type) { return Object.values(schema_1.NodeType).find(function (v) { return exports.nodeTypeToParam(v) === type; }); };
 var csvValue = function (value) { return (value || '').replace('[', '').replace(']', ''); };
-var parseMessage = function (message) { return JSON.parse(message).message.split(',').reduce(function (prev, parts) {
-    var _a;
-    var _b = parts.split('='), key = _b[0], value = _b[1];
-    var val = csvValue(value);
-    return __assign(__assign({}, prev), (key && val ? (_a = {}, _a[key.trim()] = val, _a) : {}));
-}, {}); };
+var parseMessage = function (message) {
+    try {
+        return JSON.parse(message).message.split(',').reduce(function (prev, parts) {
+            var _a;
+            var _b = parts.split('='), key = _b[0], value = _b[1];
+            var val = csvValue(value);
+            return __assign(__assign({}, prev), (key && val ? (_a = {}, _a[key.trim()] = val, _a) : {}));
+        }, {});
+    }
+    catch (err) {
+        return {};
+    }
+};
 var termTypes = Object.values(schema_1.TermTermType);
 var parseFilename = function (filepath) {
     var filename = filepath.split('.')[0];

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

@@ -1,3 +1,4 @@
+import { IActorJSONLD } from '@hestia-earth/schema';
 import { BaseModel } from '../../db/model.base';
 export declare const defaultMaxApiCalls = 100;
 export declare enum MaxUploads {
@@ -23,6 +24,7 @@ export declare class User extends BaseModel {
     emailNotificationsSuccess: boolean;
     emailNotificationsFailure: boolean;
     emailNotificationsFeedback: boolean;
+    autoSubmitPrivateSubmissions: boolean;
     confirmToken?: string;
     confirmedAt?: Date;
     scopusID?: string;
@@ -41,4 +43,5 @@ export declare const name: ({ firstName, lastName }: Partial<User>) => string;
 export declare const isAdmin: ({ role }: Partial<User>) => boolean;
 export declare const isDeveloper: ({ role }: Partial<User>) => boolean;
 export declare const contains: (users: Partial<User>[], user: Partial<User>) => boolean;
-export declare const actorId: ({ id }: Partial<User>) => string;
+export declare const actorId: (user: Partial<User>) => string;
+export declare const userToActor: (user: Partial<User>, domain?: string) => Partial<IActorJSONLD>;

package/dist/users/model/model.js

@@ -12,8 +12,20 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.actorId = exports.contains = exports.isDeveloper = exports.isAdmin = exports.name = exports.User = exports.UserRole = exports.MaxUploads = exports.defaultMaxApiCalls = void 0;
+exports.userToActor = exports.actorId = exports.contains = exports.isDeveloper = exports.isAdmin = exports.name = exports.User = exports.UserRole = exports.MaxUploads = exports.defaultMaxApiCalls = void 0;
+var schema_1 = require("@hestia-earth/schema");
 var model_base_1 = require("../../db/model.base");
 exports.defaultMaxApiCalls = 100;
 var MaxUploads;
@@ -51,7 +63,14 @@ exports.isDeveloper = function (_a) {
     ].includes(role);
 };
 exports.contains = function (users, user) { return users.some(function (u) { return u.email === user.email; }); };
-exports.actorId = function (_a) {
-    var id = _a.id;
-    return "" + id.toString();
+exports.actorId = function (user) { return "" + (user._id || user.id).toString(); };
+var jsonLDContext = function (type, domain) { return domain + "/schema/" + type + ".jsonld"; };
+var addIfDefined = function (key, value) {
+    var _a;
+    return !!value ? (_a = {}, _a[key] = value, _a) : {};
+};
+var profileData = function (user) { return (user.dataPrivate ? {} : __assign(__assign(__assign(__assign(__assign(__assign({ email: user.email, firstName: user.firstName, lastName: user.lastName, name: user.displayName || exports.name(user) }, addIfDefined('scopusID', user.scopusID)), addIfDefined('orcid', user.orcid)), addIfDefined('primaryInstitution', user.primaryInstitution)), addIfDefined('city', user.city)), addIfDefined('country', user.country ? { type: schema_1.NodeType.Term, name: user.country } : undefined)), addIfDefined('website', user.website ? { '@id': user.website } : undefined))); };
+exports.userToActor = function (user, domain) {
+    if (domain === void 0) { domain = 'https://hestia.earth'; }
+    return (__assign({ '@context': jsonLDContext(schema_1.NodeType.Actor, domain), '@type': schema_1.NodeType.Actor, '@id': exports.actorId(user), dataPrivate: user.dataPrivate }, profileData(user)));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hestia-earth/api",
-  "version": "0.9.27",
+  "version": "0.9.28-2",
   "description": "Hestia API definitions",
   "main": "dist/models.js",
   "typings": "dist/models.d.ts",
@@ -74,6 +74,7 @@
     "eslint": "^7.32.0",
     "eslint-plugin-jsdoc": "^25.4.3",
     "express": "^4.17.2",
+    "express-async-errors": "^3.1.1",
     "express-recaptcha": "^5.0.2",
     "express-redis-cache": "^1.1.3",
     "express-session": "^1.17.2",