@formio/appserver 2.11.1 → 2.12.0-rc.1

package/lib/actions/role/RoleAction.js

@@ -107,7 +107,7 @@ exports.RoleAction = {
     executor(form, action, handler, method) {
         return __awaiter(this, void 0, void 0, function* () {
             return (req, res, next) => __awaiter(this, void 0, void 0, function* () {
-                var _a, _b;
+                var _a, _b, _c;
                 debug('Role Action');
                 // Check the submission for the submissionId.
                 if (action.settings.association !== 'existing' && action.settings.association !== 'new') {
@@ -134,7 +134,7 @@ exports.RoleAction = {
                     return res.status(400).send('Missing submission for RoleAction association of "existing:. Form must have a resource field named "submission".');
                 }
                 // Determine the resources based on the current request.
-                let resource = res.resource ? (res.resource.item || req.body) : req.body;
+                let resource = ((_c = res.resource) === null || _c === void 0 ? void 0 : _c.item) || req.submission || req.body;
                 let role = form.project.roleId(action.settings.role);
                 if (!resource.roles) {
                     resource.roles = [];

package/lib/actions/save/SaveAction.js

@@ -215,7 +215,7 @@ exports.SaveAction = {
         let childSub = { data: {} };
         if (action.settings.mapping) {
             try {
-                childSub = appserver_core_1.Utils.evaluate(action.settings.mapping, appserver_core_1.Utils.evalContext(form, req.body, req.auth, req.headers, req.findQuery), 'body');
+                childSub = appserver_core_1.Utils.evaluate(action.settings.mapping, appserver_core_1.Utils.evalContext(form, submission, req.auth, req.headers, req.findQuery), 'body');
             }
             catch (err) {
                 console.log(`Error in mapping transform: ${err.message}`);
@@ -234,7 +234,7 @@ exports.SaveAction = {
         childSub.metadata = submission.metadata;
         if (action.settings.transform) {
             try {
-                childSub.data = appserver_core_1.Utils.evaluate(action.settings.transform, appserver_core_1.Utils.evalContext(form, req.body, req.auth, req.headers, req.findQuery), 'data');
+                childSub.data = appserver_core_1.Utils.evaluate(action.settings.transform, appserver_core_1.Utils.evalContext(form, req.submission || req.body, req.auth, req.headers, req.findQuery), 'data');
             }
             catch (err) {
                 console.log(`Error in submission transform: ${err.message}`);
@@ -246,15 +246,16 @@ exports.SaveAction = {
     childResponse(action, req, res, form, submission) {
         var _a, _b;
         if ((_a = res.resource) === null || _a === void 0 ? void 0 : _a.item) {
+            const submission = req.submission || req.body;
             // Set the action in the property.
             if ((_b = action.settings) === null || _b === void 0 ? void 0 : _b.property) {
-                (0, set_1.default)(req.body.data, action.settings.property, res.resource.item);
+                (0, set_1.default)(submission.data, action.settings.property, res.resource.item);
             }
             // Save the reference in the external ids.
             if (req.method === 'POST' && res.resource.item._id) {
                 // Save the external resource in the external ids.
-                req.body.externalIds = req.body.externalIds || [];
-                req.body.externalIds.push({
+                submission.externalIds = submission.externalIds || [];
+                submission.externalIds.push({
                     type: 'resource',
                     resource: action.settings.resource,
                     id: res.resource.item._id.toString()
@@ -263,7 +264,7 @@ exports.SaveAction = {
             // Allow for a response mapping.
             if (action.settings.response) {
                 try {
-                    res.resource.item = appserver_core_1.Utils.evaluate(action.settings.response, Object.assign(Object.assign({}, appserver_core_1.Utils.evalContext(form, req.body, req.auth, req.headers, req.findQuery)), { response: res.resource.item }), 'response');
+                    res.resource.item = appserver_core_1.Utils.evaluate(action.settings.response, Object.assign(Object.assign({}, appserver_core_1.Utils.evalContext(form, submission, req.auth, req.headers, req.findQuery)), { response: res.resource.item }), 'response');
                 }
                 catch (err) {
                     console.log(`Error in mapping transform: ${err.message}`);
@@ -276,7 +277,7 @@ exports.SaveAction = {
             return (req, res, next) => __awaiter(this, void 0, void 0, function* () {
                 var _a;
                 debug('Save Action');
-                if (req.skipSave || !req.body || (req.method !== 'POST' && req.method !== 'PUT')) {
+                if (req.skipSave || !(req.submission || req.body) || (req.method !== 'POST' && req.method !== 'PUT')) {
                     debug('Skipping save action');
                     return next();
                 }

package/lib/modules/mongodb/db.d.ts

@@ -1,6 +1,6 @@
 import { Collection, Document, Db, MongoClient, FindOneOptions } from 'mongodb';
 import { Component, Submission } from '@formio/core';
-import { ServerDB, DBConfig, AppServerForm, DatabaseIndexResponse } from '@formio/appserver-core';
+import { ServerDB, DBConfig, AppServerForm, DatabaseIndexResponse, IndexQuery } from '@formio/appserver-core';
 export declare class Database implements ServerDB {
     config: DBConfig;
     db: Db | null;
@@ -9,7 +9,6 @@ export declare class Database implements ServerDB {
     currentCollection: Collection<Document> | null;
     defaultCollection: Collection<Document> | null;
     prefix: string;
-    authQuery: any;
     constructor(config: DBConfig);
     ObjectId(id: any): any;
     collectionName(name: string): string;
@@ -23,7 +22,6 @@ export declare class Database implements ServerDB {
     save(collectionName: string, item: any): Promise<any | null>;
     saveOne(collectionName: string, item: any): Promise<any>;
     load(collectionName: string, dbQuery?: {}): Promise<any | null>;
-    indexAuth(query: any): void;
     getQueryValue(name: string, value: string, selector: string): string | boolean | Date | null;
     /**
      * Converts the url query to query parameters.
@@ -61,12 +59,18 @@ export declare class Database implements ServerDB {
      * @returns
      */
     removeIndexes(form: AppServerForm, indexes: string[]): Promise<void>;
+    /**
+     * Get the index query from the url query.
+     * @param urlQuery
+     * @returns
+     */
+    indexQuery(urlQuery: any): IndexQuery;
     /**
      * Fetch a list of submissions from a table/collection.
      * @param {*} table
      * @param {*} query
      */
-    index(form: AppServerForm, urlQuery?: any, collection?: Collection<Document> | null): Promise<DatabaseIndexResponse<Submission>>;
+    index(form: AppServerForm, query: IndexQuery, collection?: Collection<Document> | null): Promise<DatabaseIndexResponse<Submission>>;
     /**
      * Perform a count of the amount of documents within a collection.
      * @param form

package/lib/modules/mongodb/db.js

@@ -30,7 +30,6 @@ class Database {
     constructor(config) {
         this.config = config;
         this.prefix = '';
-        this.authQuery = null;
         this.db = null;
         this.client = null; // Add this line
         this.currentCollectionName = 'submissions';
@@ -165,10 +164,6 @@ class Database {
             return item;
         });
     }
-    // Provides a suplemental query for authentication purposes.
-    indexAuth(query) {
-        this.authQuery = query || null;
-    }
     getQueryValue(name, value, selector) {
         if (name === 'created' || name === 'modified') {
             return new Date(value);
@@ -267,10 +262,6 @@ class Database {
                 return;
             }
         });
-        // If an authQuery is provided, merge it in.
-        if (this.authQuery && (0, lodash_1.isPlainObject)(this.authQuery)) {
-            return (0, lodash_1.merge)(dbQuery, this.authQuery);
-        }
         // Return the dbQuery.
         return dbQuery;
     }
@@ -427,40 +418,55 @@ class Database {
             }
         });
     }
+    /**
+     * Get the index query from the url query.
+     * @param urlQuery
+     * @returns
+     */
+    indexQuery(urlQuery) {
+        let skip = 0, limit = 10;
+        limit = parseInt(urlQuery.limit) || 10;
+        skip = parseInt(urlQuery.skip) || 0;
+        const sort = urlQuery.sort || { created: -1 };
+        const includeDeleted = urlQuery.includeDeleted || false;
+        let project = {};
+        if (urlQuery.select) {
+            if (typeof urlQuery.select === 'string') {
+                const fields = urlQuery.select.split(',');
+                fields.forEach((field) => {
+                    project[field] = true;
+                });
+            }
+            else {
+                Object.keys(urlQuery.select).forEach((field) => {
+                    project[field] = true;
+                });
+            }
+        }
+        delete urlQuery.limit;
+        delete urlQuery.skip;
+        delete urlQuery.sort;
+        delete urlQuery.select;
+        delete urlQuery.includeDeleted;
+        return {
+            limit,
+            skip,
+            sort,
+            includeDeleted,
+            project,
+            dbQuery: this.dbQuery(urlQuery)
+        };
+    }
     /**
      * Fetch a list of submissions from a table/collection.
      * @param {*} table
      * @param {*} query
      */
-    index(form_1) {
-        return __awaiter(this, arguments, void 0, function* (form, urlQuery = {}, collection = null) {
-            let items = [], skip = 0, limit = 10, count = 0;
+    index(form_1, query_1) {
+        return __awaiter(this, arguments, void 0, function* (form, query, collection = null) {
+            let items = [], count = 0;
+            const { limit, skip, sort, includeDeleted, project, dbQuery } = query;
             try {
-                limit = urlQuery.limit || 10;
-                skip = urlQuery.skip || 0;
-                const sort = urlQuery.sort || { created: -1 };
-                const includeDeleted = urlQuery.includeDeleted || false;
-                let project = {};
-                if (urlQuery.select) {
-                    if (typeof urlQuery.select === 'string') {
-                        const fields = urlQuery.select.split(',');
-                        fields.forEach((field) => {
-                            project[field] = true;
-                        });
-                    }
-                    else {
-                        Object.keys(urlQuery.select).forEach((field) => {
-                            project[field] = true;
-                        });
-                    }
-                }
-                delete urlQuery.limit;
-                delete urlQuery.skip;
-                delete urlQuery.sort;
-                delete urlQuery.select;
-                delete urlQuery.includeDeleted;
-                debug('db.index()', urlQuery);
-                const dbQuery = this.dbQuery(urlQuery);
                 items = (yield this.find(form, dbQuery, limit, skip, sort, project, collection, includeDeleted)) || [];
                 count = yield this.count(form, dbQuery, collection, includeDeleted);
             }
@@ -580,7 +586,12 @@ class Database {
                 if (!collection) {
                     return [];
                 }
-                return yield collection.find(this.query(form, dbQuery, includeDeleted)).limit(limit).skip(skip).sort(sort).project(select).toArray();
+                return yield collection.find(this.query(form, dbQuery, includeDeleted))
+                    .limit(parseInt(limit.toString()))
+                    .skip(parseInt(skip.toString()))
+                    .sort(sort)
+                    .project(select)
+                    .toArray();
             }
             catch (err) {
                 error(err.message);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/appserver",
-  "version": "2.11.1",
+  "version": "2.12.0-rc.1",
   "description": "A highly performant and extensible Application Server for Form.io Multi-Tenant Deployments.",
   "main": "lib/server.js",
   "types": "lib/server.d.ts",
@@ -10,7 +10,9 @@
   "scripts": {
     "clean": "rm -rf lib",
     "build": "npm run clean && tsc",
+    "build:lib": "npm run clean && tsc; true",
     "test": "mocha",
+    "dev": "tsc --watch --preserveWatchOutput",
     "prepack": "npm run build"
   },
   "repository": {
@@ -31,16 +33,16 @@
   ],
   "homepage": "https://github.com/formio/appserver#readme",
   "dependencies": {
-    "@formio/appserver-core": "^2.11.1",
+    "@formio/appserver-core": "^2.12.0-rc.1",
     "@formio/core": "2.5.1-dev.291.6557e4e",
     "async": "^3.2.6",
     "bcryptjs": "^3.0.3",
     "debug": "^4.4.3",
-    "dotenv": "^17.2.3",
+    "dotenv": "^17.2.4",
     "express": "^5.2.1",
     "jsonwebtoken": "^9.0.3",
     "lodash": "^4.17.23",
-    "mongodb": "^7.0.0"
+    "mongodb": "^7.1.0"
   },
   "devDependencies": {
     "@types/async": "^3.2.25",
@@ -50,7 +52,7 @@
     "@types/jsonwebtoken": "^9.0.10",
     "@types/lodash": "^4.17.23",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^25.1.0",
+    "@types/node": "^25.2.3",
     "chai": "^6.2.2",
     "cross-env": "^10.1.0",
     "mocha": "^11.7.5",