@formio/appserver 2.0.0-dev.2 → 2.0.0-dev.4

package/lib/actions/save/SaveAction.js

@@ -88,13 +88,13 @@ exports.SaveAction = {
                     components: []
                 };
                 const toFields = [];
-                yield scope.utils.eachComponent(form.components, (component) => {
+                yield scope.utils.eachComponentAsync(form.components, (component) => {
                     if (['button'].indexOf(component.type) !== -1) {
                         return;
                     }
                     toFields.push({ label: component.label || component.key, value: component.key });
                 });
-                yield scope.utils.eachComponent(scope.form.components, (component) => {
+                yield scope.utils.eachComponentAsync(scope.form.components, (component) => {
                     if (['button'].indexOf(component.type) !== -1) {
                         return;
                     }

package/lib/prepare/index.d.ts

@@ -5,5 +5,7 @@ export declare const Preppers: {
     persist: (scope: PrepScope) => Promise<void>;
     protect: (scope: PrepScope) => Promise<void>;
     password: (scope: PrepScope) => Promise<void>;
+    referenceLoad: (scope: PrepScope) => Promise<void>;
+    referenceSave: (scope: PrepScope) => Promise<void>;
 };
 export declare const Prepper: PrepperType;

package/lib/prepare/index.js

@@ -19,19 +19,23 @@ const access_1 = __importDefault(require("./access"));
 const persist_1 = __importDefault(require("./persist"));
 const protect_1 = __importDefault(require("./protect"));
 const password_1 = __importDefault(require("./password"));
+const reference_1 = require("./reference");
+const core_1 = require("@formio/core");
 exports.Preppers = {
     bcrypt: bcrypt_1.default,
     access: access_1.default,
     persist: persist_1.default,
     protect: protect_1.default,
-    password: password_1.default
+    password: password_1.default,
+    referenceLoad: reference_1.referenceLoad,
+    referenceSave: reference_1.referenceSave
 };
 const debug = require('debug')('formio:prepare');
 const error = require('debug')('formio:error');
 exports.Prepper = {
     preppers: {
-        save: [exports.Preppers.persist, exports.Preppers.access, exports.Preppers.password, exports.Preppers.bcrypt],
-        read: [exports.Preppers.protect]
+        save: [exports.Preppers.persist, exports.Preppers.access, exports.Preppers.password, exports.Preppers.bcrypt, exports.Preppers.referenceSave],
+        read: [exports.Preppers.protect, exports.Preppers.referenceLoad]
     },
     prepare(scope) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -39,12 +43,10 @@ exports.Prepper = {
             const { type, form, submission } = scope;
             try {
                 debug(`Preparing data for ${form.name}...`);
-                yield scope.utils.eachComponentData(form.components, submission.data, (component, row, path) => __awaiter(this, void 0, void 0, function* () {
+                yield scope.utils.eachComponentData(form.components, submission.data, (component, compData, compRow, compPath) => __awaiter(this, void 0, void 0, function* () {
                     if (exports.Prepper.preppers.hasOwnProperty(type)) {
                         for (let i = 0; i < exports.Prepper.preppers[type].length; i++) {
-                            yield exports.Prepper.preppers[type][i](Object.assign(Object.assign({}, scope), { component,
-                                row,
-                                data, value: (0, get_1.default)(row, component.key), path }));
+                            yield exports.Prepper.preppers[type][i](Object.assign(Object.assign({}, scope), { component, row: compRow, data, value: (0, get_1.default)(compData, compPath), path: core_1.Utils.getComponentAbsolutePath(component) }));
                         }
                     }
                 }));

package/lib/prepare/password.js

@@ -14,15 +14,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const get_1 = __importDefault(require("lodash/get"));
 const set_1 = __importDefault(require("lodash/set"));
-const has_1 = __importDefault(require("lodash/has"));
 exports.default = (scope) => __awaiter(void 0, void 0, void 0, function* () {
     // Check if they do not provide a password in the save, but one exists in the current record.
     // Do not allow them to wipe out their password by saving data that does not include one.
     const { type, component, row, current, path, data } = scope;
-    if (component.type === 'password' &&
-        type === 'save' &&
-        !(0, has_1.default)(row, component.key) &&
-        (0, has_1.default)(current, `data.${path}`)) {
-        (0, set_1.default)(data, path, (0, get_1.default)(current.data, path));
+    if (component.type === 'password' && type === 'save') {
+        const currentPass = (0, get_1.default)(current, `data.${path}`);
+        if (!(0, get_1.default)(row, component.key) && currentPass) {
+            (0, set_1.default)(data, path, currentPass);
+        }
     }
 });

package/lib/prepare/reference.d.ts

@@ -0,0 +1,3 @@
+import { PrepScope } from '@formio/appserver-types';
+export declare const referenceLoad: (scope: PrepScope) => Promise<void>;
+export declare const referenceSave: (scope: PrepScope) => Promise<void>;

package/lib/prepare/reference.js

@@ -0,0 +1,71 @@
+"use strict";
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.referenceSave = exports.referenceLoad = void 0;
+const lodash_1 = require("lodash");
+const protect_1 = __importDefault(require("./protect"));
+const getResource = (scope) => {
+    var _a, _b, _c, _d, _e;
+    const { component } = scope;
+    const resourceId = (_a = component.data) === null || _a === void 0 ? void 0 : _a.resource;
+    let resource = (_b = scope.server) === null || _b === void 0 ? void 0 : _b.project.forms[resourceId];
+    if (!resource) {
+        for (let name in (_c = scope.server) === null || _c === void 0 ? void 0 : _c.project.forms) {
+            const form = (_d = scope.server) === null || _d === void 0 ? void 0 : _d.project.forms[name].clientForm;
+            if (form._id.toString() === resourceId) {
+                resource = (_e = scope.server) === null || _e === void 0 ? void 0 : _e.project.forms[name];
+                break;
+            }
+        }
+    }
+    return resource;
+};
+const referenceLoad = (scope) => __awaiter(void 0, void 0, void 0, function* () {
+    const { component, data, value, path } = scope;
+    if (!value) {
+        return;
+    }
+    if (component.reference) {
+        const resource = getResource(scope);
+        if (resource) {
+            const submission = yield resource.loadSubmission(value._id);
+            if (submission) {
+                // Make sure to protect this submission like any other submission output.
+                const context = Object.assign(Object.assign({}, scope), { data: {} });
+                yield scope.utils.eachComponentDataAsync(resource.clientForm.components, submission.data, (comp, compData, compRow, compPath) => __awaiter(void 0, void 0, void 0, function* () {
+                    yield (0, protect_1.default)(Object.assign(Object.assign({}, context), { component: comp, row: compRow, data: compData, value: (0, lodash_1.get)(compRow, comp.key), path: compPath }));
+                }));
+                submission.data = context.data;
+                (0, lodash_1.set)(data, path, submission);
+            }
+        }
+    }
+});
+exports.referenceLoad = referenceLoad;
+const referenceSave = (scope) => __awaiter(void 0, void 0, void 0, function* () {
+    const { component, data, value, path } = scope;
+    if (!value || !value._id) {
+        return;
+    }
+    if (component.reference && value._id) {
+        const resource = getResource(scope);
+        if (resource) {
+            (0, lodash_1.set)(data, path, {
+                _id: value._id,
+                form: resource.clientForm._id
+            });
+        }
+    }
+});
+exports.referenceSave = referenceSave;

package/lib/types/server.d.ts

@@ -85,6 +85,7 @@ export interface ServerScope {
     template?: any;
     utils?: any;
     util?: any;
+    server?: any;
     hook?: (name: string, ...args: any[]) => void;
     licenseKey?: OfflineLicenseStruct;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/appserver",
-  "version": "2.0.0-dev.2",
+  "version": "2.0.0-dev.4",
   "description": "A highly performant and extensible Application Server for Form.io Multi-Tenant Deployments.",
   "main": "server.js",
   "scripts": {
@@ -30,10 +30,11 @@
   "homepage": "https://github.com/formio/appserver#readme",
   "dependencies": {
     "@formio/appserver-auth-jwt": "^2.0.0-dev.1",
-    "@formio/appserver-core": "^2.0.0-dev.3",
+    "@formio/appserver-core": "^2.0.0-dev.4",
     "@formio/appserver-db-mongodb": "^2.0.0-dev.1",
     "@formio/appserver-types": "^2.0.0-dev.1",
-    "@formio/core": "^2.0.0-dev.3",
+    "@formio/core": "^2.0.0-rc.16",
+    "@formio/vm": "^0.0.7-rc.7",
     "async": "^3.2.4",
     "bcryptjs": "^2.4.3",
     "debug": "^4.3.4",

package/lib/auth.d.ts

@@ -1,5 +0,0 @@
-import { AuthModule, AuthToken } from '@formio/appserver-types';
-export declare class Auth implements AuthModule {
-    token(user: AuthToken, secret: string, expire?: number): Promise<string>;
-    user(token: string, secret: string): Promise<AuthToken | null>;
-}

package/lib/auth.js

@@ -1,70 +0,0 @@
-"use strict";
-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) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Auth = void 0;
-const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
-const debug = require('debug')('formio:auth');
-const error = require('debug')('formio:error');
-class Auth {
-    token(user, secret, expire = 240) {
-        return __awaiter(this, void 0, void 0, function* () {
-            user = Object.assign({}, user);
-            delete user.iat;
-            delete user.exp;
-            return new Promise((resolve, reject) => {
-                if (!secret) {
-                    return reject(new Error('You cannot generate a token without a secret!'));
-                }
-                debug('auth.token()', user);
-                jsonwebtoken_1.default.sign(user, secret, {
-                    expiresIn: expire * 60,
-                }, (err, signed) => {
-                    if (err) {
-                        error(err);
-                        return reject(err);
-                    }
-                    resolve(signed || '');
-                });
-            });
-        });
-    }
-    user(token, secret) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!token) {
-                return Promise.resolve(null);
-            }
-            return new Promise((resolve, reject) => {
-                if (!secret) {
-                    return reject('You cannot authenticate without a JWT Secret!');
-                }
-                debug('auth.verify()', token);
-                jsonwebtoken_1.default.verify(token, secret, (err, payload) => {
-                    if (err) {
-                        error(err);
-                        if (err.name === 'JsonWebTokenError') {
-                            return reject({ message: 'Bad Token' });
-                        }
-                        if (err.name === 'TokenExpiredError') {
-                            return reject({ message: 'Token Expired' });
-                        }
-                        return reject(err);
-                    }
-                    debug('auth.user()', payload);
-                    resolve(payload);
-                });
-            });
-        });
-    }
-}
-exports.Auth = Auth;

package/lib/db.d.ts

@@ -1,97 +0,0 @@
-import { Collection, Db } from 'mongodb';
-import { DBConfig, ServerDB, FormScope } from '@formio/appserver-types';
-export declare class Database implements ServerDB {
-    config: DBConfig;
-    db: Db | null;
-    currentCollectionName: string;
-    currentCollection: Collection<Document> | null;
-    defaultCollection: Collection<Document> | null;
-    prefix: string;
-    constructor(config: DBConfig);
-    ObjectId(id: any): any;
-    collectionName(name: string): string;
-    /**
-     * Connect to the database.
-     * @param {*} scope
-     * @returns
-     */
-    connect(prefix?: string): Promise<void>;
-    save(collectionName: string, item: any): Promise<import("mongodb").WithId<import("bson").Document> | null>;
-    load(collectionName: string): Promise<import("mongodb").WithId<import("bson").Document> | null | undefined>;
-    remove(collectionName: string): Promise<number | null>;
-    /**
-     * Ensures the form collection is created an returns it.
-     * @param scope
-     * @returns
-     */
-    formCollection(scope: FormScope): Promise<Collection<Document> | null>;
-    /**
-     * Setup indexes.
-     */
-    setupIndexes(collection: Collection<Document> | null, scope?: FormScope): Promise<void>;
-    /**
-     * Add a field index
-     */
-    addIndex(collection: Collection<Document>, path: string): Promise<void>;
-    /**
-     * Adds new indexes to the forms submission collection.
-     * @param scope
-     * @param indexes
-     * @returns
-     */
-    addIndexes(scope: FormScope, indexes: string[]): Promise<void>;
-    /**
-     * Remove a field index.
-     */
-    removeIndex(collection: Collection<Document>, path: string): Promise<void>;
-    /**
-     * Removes indexes to the forms submission collection.
-     * @param scope
-     * @param indexes
-     * @returns
-     */
-    removeIndexes(scope: FormScope, indexes: string[]): Promise<void>;
-    /**
-     * Fetch a list of submissions from a table/collection.
-     * @param {*} table
-     * @param {*} query
-     */
-    index(scope: FormScope, query?: {}): Promise<import("mongodb").WithId<Document>[] | undefined>;
-    /**
-     * Create a new record.
-     */
-    create(scope: FormScope, record: any, allowFields?: string[]): Promise<import("mongodb").WithId<Document> | null | undefined>;
-    /**
-     * Return a query for a single mongo record.
-     * @param {*} form
-     * @param {*} id
-     * @returns
-     */
-    query(scope: FormScope, query?: any): any;
-    /**
-     * Find many records that match a query.
-     */
-    find(scope: FormScope, query?: any): Promise<import("mongodb").WithId<Document>[]>;
-    /**
-     * Find a record for a provided query.
-     */
-    findOne(scope: FormScope, query?: any): Promise<import("mongodb").WithId<Document> | null>;
-    /**
-     * Read a single submission from a form
-     *
-     * @param {*} table
-     * @param {*} query
-     */
-    read(scope: FormScope, id: string): Promise<import("mongodb").WithId<Document> | null>;
-    /**
-     * Update a single submission of a form.
-     *
-     * @param {*} table
-     * @param {*} query
-     */
-    update(scope: FormScope, id: string, update: any, allowFields?: string[]): Promise<import("mongodb").WithId<Document> | null>;
-    /**
-     * Delete a record from the database.
-     */
-    delete(scope: FormScope, id: string): Promise<boolean>;
-}