@tsed/formio 7.0.0-beta.9 → 7.0.0-rc.3

package/jest.config.js

@@ -0,0 +1,14 @@
+// For a detailed explanation regarding each configuration property, visit:
+// https://jestjs.io/docs/en/configuration.html
+
+module.exports = {
+  ...require("@tsed/jest-config")(__dirname, "formio"),
+  coverageThreshold: {
+    global: {
+      statements: 100,
+      branches: 90.74,
+      functions: 100,
+      lines: 100
+    }
+  }
+};

package/lib/cjs/FormioModule.js

@@ -17,6 +17,16 @@ const FormioHooksService_1 = require("./services/FormioHooksService");
 const FormioInstaller_1 = require("./services/FormioInstaller");
 const FormioService_1 = require("./services/FormioService");
 let FormioModule = class FormioModule {
+    formio;
+    hooks;
+    installer;
+    app;
+    injector;
+    settings;
+    baseUrl;
+    skipInstall;
+    template;
+    root;
     $onInit() {
         return this.init((0, core_1.deepClone)(this.settings));
     }
@@ -25,8 +35,7 @@ let FormioModule = class FormioModule {
     }
     async $onRoutesInit() {
         if (this.formio.isInit()) {
-            const router = this.app.getRouter();
-            router.use(this.baseUrl, this.formio.middleware.restrictRequestTypes, this.formio.router);
+            this.app.use(this.baseUrl, this.formio.middleware.restrictRequestTypes, this.formio.router);
             if (await this.shouldInstall()) {
                 await this.installer.install(this.template, this.root);
             }
@@ -46,17 +55,11 @@ let FormioModule = class FormioModule {
             Object.entries(spec.paths).forEach(([path, methods]) => {
                 Object.entries(methods).forEach(([method, operation]) => {
                     routes.push({
-                        toJSON() {
-                            return {
-                                method,
-                                name: operation.operationId,
-                                url: (0, common_1.normalizePath)(baseUrl, path.replace(/\/{(.*)}/gi, "/:$1")),
-                                className: "formio",
-                                methodClassName: operation.operationId,
-                                parameters: [],
-                                rawBody: false
-                            };
-                        }
+                        method,
+                        name: operation.operationId,
+                        url: (0, common_1.normalizePath)(baseUrl, path.replace(/\/{(.*)}/gi, "/:$1")),
+                        className: "formio",
+                        methodClassName: operation.operationId
                     });
                 });
             });
@@ -65,8 +68,9 @@ let FormioModule = class FormioModule {
     }
     // istanbul ignore next
     async $onReady() {
-        if (this.formio.isInit() && this.injector.settings.getBestHost) {
+        if (this.formio.isInit() && "getBestHost" in this.injector.settings) {
             const { injector } = this;
+            // @ts-ignore
             const host = injector.settings.getBestHost();
             const url = host.toString();
             injector.logger.info(`Form.io API is available on ${url}${this.baseUrl || "/"}`);

package/lib/cjs/FormioModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"FormioModule.js","sourceRoot":"","sources":["../../src/FormioModule.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Constant,\n  Inject,\n  InjectorService,\n  normalizePath,\n  OnReady,\n  OnRoutesInit,\n  PlatformApplication,\n  PlatformRouteDetails\n} from \"@tsed/common\";\nimport {deepClone} from \"@tsed/core\";\nimport {Module} from \"@tsed/di\";\nimport {AlterActions} from \"./components/AlterActions\";\nimport {AlterAudit} from \"./components/AlterAudit\";\nimport {AlterHost} from \"./components/AlterHost\";\nimport {AlterLog} from \"./components/AlterLog\";\nimport {AlterSkip} from \"./components/AlterSkip\";\nimport {AlterTemplateExportSteps} from \"./components/AlterTemplateExportSteps\";\nimport {AlterTemplateImportSteps} from \"./components/AlterTemplateImportSteps\";\nimport {FormioConfig} from \"./domain/FormioConfig\";\nimport {FormioTemplate} from \"./domain/FormioTemplate\";\nimport {FormioAuthService} from \"./services/FormioAuthService\";\nimport {FormioHooksService} from \"./services/FormioHooksService\";\nimport {FormioInstaller} from \"./services/FormioInstaller\";\nimport {FormioService} from \"./services/FormioService\";\n\n@Module({\n  imports: [\n    FormioService,\n    FormioHooksService,\n    FormioAuthService,\n    AlterActions,\n    AlterHost,\n    AlterAudit,\n    AlterLog,\n    AlterSkip,\n    AlterTemplateImportSteps,\n    AlterTemplateExportSteps\n  ]\n})\nexport class FormioModule implements OnRoutesInit, OnReady {\n  @Inject()\n  protected formio: FormioService;\n\n  @Inject()\n  protected hooks: FormioHooksService;\n\n  @Inject()\n  protected installer: FormioInstaller;\n\n  @Inject()\n  protected app: PlatformApplication;\n\n  @Inject()\n  protected injector: InjectorService;\n\n  @Constant(\"formio\", {})\n  protected settings: FormioConfig;\n\n  @Constant(\"formio.baseUrl\", \"/\")\n  protected baseUrl: string;\n\n  @Constant(\"formio.skipInstall\", false)\n  protected skipInstall: boolean;\n\n  @Constant(\"formio.template\")\n  protected template?: FormioTemplate;\n\n  @Constant(\"formio.root\")\n  protected root?: any;\n\n  $onInit() {\n    return this.init(deepClone(this.settings));\n  }\n\n  async init(options: FormioConfig) {\n    return this.formio.init(options, this.hooks.getHooks());\n  }\n\n  async $onRoutesInit() {\n    if (this.formio.isInit()) {\n      const router: any = this.app.getRouter();\n\n      router.use(this.baseUrl, this.formio.middleware.restrictRequestTypes, this.formio.router);\n\n      if (await this.shouldInstall()) {\n        await this.installer.install(this.template!, this.root);\n      }\n    }\n  }\n\n  async $logRoutes(routes: PlatformRouteDetails[]): Promise<PlatformRouteDetails[]> {\n    if (this.formio.isInit()) {\n      const spec = (await this.formio.swagger(\n        {\n          $ctx: {\n            request: {\n              protocol: \"http\",\n              host: \"localhost\"\n            }\n          }\n        },\n        this.formio.router\n      )) as any;\n      const {baseUrl} = this;\n\n      Object.entries(spec.paths).forEach(([path, methods]: [string, any]) => {\n        Object.entries(methods).forEach(([method, operation]: [string, any]) => {\n          routes.push({\n            toJSON() {\n              return {\n                method,\n                name: operation.operationId,\n                url: normalizePath(baseUrl, path.replace(/\\/{(.*)}/gi, \"/:$1\")),\n                className: \"formio\",\n                methodClassName: operation.operationId,\n                parameters: [],\n                rawBody: false\n              };\n            }\n          } as any);\n        });\n      });\n    }\n\n    return routes;\n  }\n\n  // istanbul ignore next\n  async $onReady(): Promise<void> {\n    if (this.formio.isInit() && this.injector.settings.getBestHost) {\n      const {injector} = this;\n      const host = injector.settings.getBestHost();\n      const url = host.toString();\n\n      injector.logger.info(`Form.io API is available on ${url}${this.baseUrl || \"/\"}`);\n    }\n  }\n\n  protected async shouldInstall() {\n    const hasForms = await this.installer.hasForms();\n\n    return this.template && !(hasForms || this.skipInstall);\n  }\n}\n"]}
+{"version":3,"file":"FormioModule.js","sourceRoot":"","sources":["../../src/FormioModule.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Constant,\n  Inject,\n  InjectorService,\n  normalizePath,\n  OnReady,\n  OnRoutesInit,\n  PlatformApplication,\n  PlatformRouteDetails\n} from \"@tsed/common\";\nimport {deepClone} from \"@tsed/core\";\nimport {Module} from \"@tsed/di\";\nimport {AlterActions} from \"./components/AlterActions\";\nimport {AlterAudit} from \"./components/AlterAudit\";\nimport {AlterHost} from \"./components/AlterHost\";\nimport {AlterLog} from \"./components/AlterLog\";\nimport {AlterSkip} from \"./components/AlterSkip\";\nimport {AlterTemplateExportSteps} from \"./components/AlterTemplateExportSteps\";\nimport {AlterTemplateImportSteps} from \"./components/AlterTemplateImportSteps\";\nimport {FormioConfig} from \"./domain/FormioConfig\";\nimport {FormioTemplate} from \"./domain/FormioTemplate\";\nimport {FormioAuthService} from \"./services/FormioAuthService\";\nimport {FormioHooksService} from \"./services/FormioHooksService\";\nimport {FormioInstaller} from \"./services/FormioInstaller\";\nimport {FormioService} from \"./services/FormioService\";\n\n@Module({\n  imports: [\n    FormioService,\n    FormioHooksService,\n    FormioAuthService,\n    AlterActions,\n    AlterHost,\n    AlterAudit,\n    AlterLog,\n    AlterSkip,\n    AlterTemplateImportSteps,\n    AlterTemplateExportSteps\n  ]\n})\nexport class FormioModule implements OnRoutesInit, OnReady {\n  @Inject()\n  protected formio: FormioService;\n\n  @Inject()\n  protected hooks: FormioHooksService;\n\n  @Inject()\n  protected installer: FormioInstaller;\n\n  @Inject()\n  protected app: PlatformApplication;\n\n  @Inject()\n  protected injector: InjectorService;\n\n  @Constant(\"formio\", {})\n  protected settings: FormioConfig;\n\n  @Constant(\"formio.baseUrl\", \"/\")\n  protected baseUrl: string;\n\n  @Constant(\"formio.skipInstall\", false)\n  protected skipInstall: boolean;\n\n  @Constant(\"formio.template\")\n  protected template?: FormioTemplate;\n\n  @Constant(\"formio.root\")\n  protected root?: any;\n\n  $onInit() {\n    return this.init(deepClone(this.settings));\n  }\n\n  async init(options: FormioConfig) {\n    return this.formio.init(options, this.hooks.getHooks());\n  }\n\n  async $onRoutesInit() {\n    if (this.formio.isInit()) {\n      this.app.use(this.baseUrl, this.formio.middleware.restrictRequestTypes, this.formio.router);\n\n      if (await this.shouldInstall()) {\n        await this.installer.install(this.template!, this.root);\n      }\n    }\n  }\n\n  async $logRoutes(routes: PlatformRouteDetails[]): Promise<PlatformRouteDetails[]> {\n    if (this.formio.isInit()) {\n      const spec = (await this.formio.swagger(\n        {\n          $ctx: {\n            request: {\n              protocol: \"http\",\n              host: \"localhost\"\n            }\n          }\n        },\n        this.formio.router\n      )) as any;\n      const {baseUrl} = this;\n\n      Object.entries(spec.paths).forEach(([path, methods]: [string, any]) => {\n        Object.entries(methods).forEach(([method, operation]: [string, any]) => {\n          routes.push({\n            method,\n            name: operation.operationId,\n            url: normalizePath(baseUrl, path.replace(/\\/{(.*)}/gi, \"/:$1\")),\n            className: \"formio\",\n            methodClassName: operation.operationId\n          });\n        });\n      });\n    }\n\n    return routes;\n  }\n\n  // istanbul ignore next\n  async $onReady(): Promise<void> {\n    if (this.formio.isInit() && \"getBestHost\" in this.injector.settings) {\n      const {injector} = this;\n      // @ts-ignore\n      const host = injector.settings.getBestHost();\n      const url = host.toString();\n\n      injector.logger.info(`Form.io API is available on ${url}${this.baseUrl || \"/\"}`);\n    }\n  }\n\n  protected async shouldInstall() {\n    const hasForms = await this.installer.hasForms();\n    return this.template && !(hasForms || this.skipInstall);\n  }\n}\n"]}

package/lib/cjs/builder/FormioMapper.js

@@ -2,12 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FormioMapper = void 0;
 class FormioMapper {
+    ctxData;
     constructor(ctxData) {
         this.ctxData = ctxData;
     }
     find(key) {
         const store = Object.values(this.ctxData).find((store) => store.get(key));
-        return store === null || store === void 0 ? void 0 : store.get(key);
+        return store?.get(key);
     }
     findId(data) {
         const key = String(data).startsWith("$machineName:") ? String(data) : `$machineName:${String(data)}`;

package/lib/cjs/builder/FormioMapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"FormioMapper.js","sourceRoot":"","sources":["../../../src/builder/FormioMapper.ts"],"names":[],"mappings":"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","sourcesContent":["import {FormioCtxMapper} from \"../domain/FormioCtxMapper\";\n\nexport class FormioMapper {\n  constructor(readonly ctxData: FormioCtxMapper) {}\n\n  find(key: string) {\n    const store = Object.values(this.ctxData).find((store) => store.get(key));\n\n    return store?.get(key);\n  }\n\n  findId(data: string) {\n    const key = String(data).startsWith(\"$machineName:\") ? String(data) : `$machineName:${String(data)}`;\n    const item = this.find(key);\n\n    return item ? item._id : undefined;\n  }\n\n  findMachineName(data: any) {\n    const key = String(data);\n    const item: any = this.find(key);\n\n    return item ? `$machineName:${item.name || item.machineName}` : undefined;\n  }\n\n  mapToExport(data: any) {\n    return this.mapData(data, this.findMachineName.bind(this));\n  }\n\n  mapToImport(data: any) {\n    return this.mapData(data, this.findId.bind(this));\n  }\n\n  mapData(data: any, resolver: any): any {\n    if (!data) {\n      return data;\n    }\n\n    if (Array.isArray(data)) {\n      return data.map((item) => {\n        return this.mapData(item, resolver);\n      });\n    }\n\n    const key = resolver(data, this.ctxData);\n\n    if (key) {\n      return key;\n    }\n\n    if (typeof data === \"object\" && !(\"_bsontype\" in data) && !(data instanceof Date)) {\n      const isForm = data.path && data.type;\n      const mapped = Object.entries(data).reduce((obj, [key, value]) => {\n        return {\n          ...obj,\n          [key]: this.mapData(value, resolver)\n        };\n      }, {});\n\n      return isForm\n        ? {\n            ...mapped,\n            name: data.name,\n            machineName: data.machineName || data.name\n          }\n        : mapped;\n    }\n\n    return data;\n  }\n}\n"]}
+{"version":3,"file":"FormioMapper.js","sourceRoot":"","sources":["../../../src/builder/FormioMapper.ts"],"names":[],"mappings":"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","sourcesContent":["import {FormioCtxMapper} from \"../domain/FormioCtxMapper\";\n\nexport class FormioMapper {\n  constructor(readonly ctxData: FormioCtxMapper) {}\n\n  find(key: string) {\n    const store = Object.values(this.ctxData).find((store) => store.get(key));\n\n    return store?.get(key);\n  }\n\n  findId(data: string) {\n    const key = String(data).startsWith(\"$machineName:\") ? String(data) : `$machineName:${String(data)}`;\n    const item = this.find(key);\n\n    return item ? item._id : undefined;\n  }\n\n  findMachineName(data: any) {\n    const key = String(data);\n    const item: any = this.find(key);\n\n    return item ? `$machineName:${item.name || item.machineName}` : undefined;\n  }\n\n  mapToExport(data: any) {\n    return this.mapData(data, this.findMachineName.bind(this));\n  }\n\n  mapToImport(data: any) {\n    return this.mapData(data, this.findId.bind(this));\n  }\n\n  mapData(data: any, resolver: any): any {\n    if (!data) {\n      return data;\n    }\n\n    if (Array.isArray(data)) {\n      return data.map((item) => {\n        return this.mapData(item, resolver);\n      });\n    }\n\n    const key = resolver(data, this.ctxData);\n\n    if (key) {\n      return key;\n    }\n\n    if (typeof data === \"object\" && !(\"_bsontype\" in data) && !(data instanceof Date)) {\n      const isForm = data.path && data.type;\n      const mapped = Object.entries(data).reduce((obj, [key, value]) => {\n        return {\n          ...obj,\n          [key]: this.mapData(value, resolver)\n        };\n      }, {});\n\n      return isForm\n        ? {\n            ...mapped,\n            name: data.name,\n            machineName: data.machineName || data.name\n          }\n        : mapped;\n    }\n\n    return data;\n  }\n}\n"]}

package/lib/cjs/components/AlterActions.js

@@ -2,41 +2,43 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AlterActions = void 0;
 const tslib_1 = require("tslib");
+const common_1 = require("@tsed/common");
+const core_1 = require("@tsed/core");
 const di_1 = require("@tsed/di");
-const schema_1 = require("@tsed/schema");
 const platform_params_1 = require("@tsed/platform-params");
 const platform_response_filter_1 = require("@tsed/platform-response-filter");
-const core_1 = require("@tsed/core");
-const common_1 = require("@tsed/common");
+const schema_1 = require("@tsed/schema");
 const alter_1 = require("../decorators/alter");
 const FormioService_1 = require("../services/FormioService");
 let AlterActions = class AlterActions {
+    injector;
+    formio;
+    params;
+    responseFilter;
     transform(actions) {
         const { Action } = this.formio;
         return this.getActions().reduce((actions, provider) => {
-            var _a;
             const instance = this.injector.invoke(provider.token);
             const options = provider.store.get("formio:action");
             const resolveHandler = this.createHandler(provider, "resolve");
             return {
                 ...actions,
-                [options.name]: (_a = class extends Action {
-                        static async info(req, res, next) {
-                            let opts = { ...options };
-                            if (instance.info) {
-                                opts = await instance.info(opts, req, res);
-                            }
-                            next(null, opts);
-                        }
-                        static async settingsForm(req, res, next) {
-                            next(null, await instance.settingsForm(req, res));
+                [options.name]: class extends Action {
+                    static access = options.access;
+                    static async info(req, res, next) {
+                        let opts = { ...options };
+                        if (instance.info) {
+                            opts = await instance.info(opts, req, res);
                         }
-                        resolve(handler, method, req, res, next, setActionItemMessage) {
-                            resolveHandler(this, handler, method, req, res, next, setActionItemMessage);
-                        }
-                    },
-                    _a.access = options.access,
-                    _a)
+                        next(null, opts);
+                    }
+                    static async settingsForm(req, res, next) {
+                        next(null, await instance.settingsForm(req, res));
+                    }
+                    resolve(handler, method, req, res, next, setActionItemMessage) {
+                        resolveHandler(this, handler, method, req, res, next, setActionItemMessage);
+                    }
+                }
             };
         }, actions);
     }
@@ -44,42 +46,46 @@ let AlterActions = class AlterActions {
         return this.injector.getProviders("formio:action");
     }
     createHandler(provider, propertyKey) {
-        const promisedHandler = this.params.compileHandler({
+        const compiledHandler = this.params.compileHandler({
             token: provider.token,
             propertyKey
         });
         return async (action, handler, method, req, res, next, setActionItemMessage) => {
-            const $ctx = req.$ctx;
-            $ctx.set("ACTION_CTX", { handler, method, setActionItemMessage, action });
-            $ctx.endpoint = schema_1.EndpointMetadata.get(provider.useClass, "resolve");
-            await this.injector.runInContext($ctx, async () => {
+            const { $ctx } = req;
+            if ($ctx) {
+                $ctx.set("ACTION_CTX", { handler, method, setActionItemMessage, action });
+                $ctx.endpoint = schema_1.EndpointMetadata.get(provider.useClass, "resolve");
                 try {
-                    const resolver = new core_1.AnyToPromise();
-                    const handler = await promisedHandler;
-                    const { state, data, status, headers } = await resolver.call(() => handler({ $ctx }));
-                    if (state === core_1.AnyToPromiseStatus.RESOLVED) {
-                        if (status) {
-                            $ctx.response.status(status);
-                        }
-                        if (headers) {
-                            $ctx.response.setHeaders(headers);
-                        }
-                        if (data !== undefined) {
-                            $ctx.data = data;
-                            return await this.flush($ctx.data, $ctx);
-                        }
+                    if (await this.onRequest(compiledHandler, $ctx)) {
                         next();
                     }
                 }
                 catch (er) {
                     next(er);
                 }
-            });
+            }
         };
     }
+    async onRequest(handler, $ctx) {
+        const resolver = new core_1.AnyToPromise();
+        const { state, data, status, headers } = await resolver.call(() => handler({ $ctx }));
+        if (state === core_1.AnyToPromiseStatus.RESOLVED) {
+            if (status) {
+                $ctx.response.status(status);
+            }
+            if (headers) {
+                $ctx.response.setHeaders(headers);
+            }
+            if (data !== undefined) {
+                $ctx.data = data;
+                return await this.flush($ctx.data, $ctx);
+            }
+            return true;
+        }
+    }
     async flush(data, $ctx) {
         const { response } = $ctx;
-        if (!response.isDone()) {
+        if (!$ctx.isDone()) {
             (0, common_1.setResponseHeaders)($ctx);
             data = await this.responseFilter.serialize(data, $ctx);
             data = await this.responseFilter.transform(data, $ctx);

package/lib/cjs/components/AlterActions.js.map

@@ -1 +1 @@
-{"version":3,"file":"AlterActions.js","sourceRoot":"","sources":["../../../src/components/AlterActions.ts"],"names":[],"mappings":"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","sourcesContent":["import {Inject, InjectorService, Provider} from \"@tsed/di\";\nimport {EndpointMetadata} from \"@tsed/schema\";\nimport {FormioActionInfo} from \"@tsed/formio-types\";\nimport {PlatformParams} from \"@tsed/platform-params\";\nimport {PlatformResponseFilter} from \"@tsed/platform-response-filter\";\nimport {AnyToPromise, AnyToPromiseStatus} from \"@tsed/core\";\nimport {PlatformContext, setResponseHeaders} from \"@tsed/common\";\nimport {Alter} from \"../decorators/alter\";\nimport {AlterHook} from \"../domain/AlterHook\";\nimport {SetActionItemMessage} from \"../domain/FormioAction\";\nimport {FormioActions} from \"../domain/FormioActionsIndex\";\nimport {FormioService} from \"../services/FormioService\";\n\n@Alter(\"actions\")\nexport class AlterActions implements AlterHook {\n  @Inject()\n  protected injector: InjectorService;\n\n  @Inject()\n  protected formio: FormioService;\n\n  @Inject()\n  protected params: PlatformParams;\n\n  @Inject()\n  protected responseFilter: PlatformResponseFilter;\n\n  transform(actions: FormioActions): FormioActions {\n    const {Action} = this.formio;\n\n    return this.getActions().reduce((actions, provider) => {\n      const instance = this.injector.invoke<any>(provider.token);\n      const options = provider.store.get<FormioActionInfo>(\"formio:action\");\n      const resolveHandler = this.createHandler(provider, \"resolve\");\n\n      return {\n        ...actions,\n        [options.name]: class extends Action {\n          static access = options.access;\n\n          static async info(req: any, res: any, next: Function) {\n            let opts = {...options};\n\n            if (instance.info) {\n              opts = await instance.info(opts, req, res);\n            }\n\n            next(null, opts);\n          }\n\n          static async settingsForm(req: any, res: any, next: Function) {\n            next(null, await instance.settingsForm(req, res));\n          }\n\n          resolve(handler: string, method: string, req: any, res: any, next: Function, setActionItemMessage: SetActionItemMessage): void {\n            resolveHandler(this, handler, method, req, res, next, setActionItemMessage);\n          }\n        }\n      };\n    }, actions);\n  }\n\n  protected getActions() {\n    return this.injector.getProviders(\"formio:action\");\n  }\n\n  protected createHandler(provider: Provider, propertyKey: string | symbol) {\n    const promisedHandler = this.params.compileHandler({\n      token: provider.token,\n      propertyKey\n    });\n\n    return async (\n      action: any,\n      handler: string,\n      method: string,\n      req: {$ctx: PlatformContext},\n      res: any,\n      next: any,\n      setActionItemMessage: SetActionItemMessage\n    ) => {\n      const $ctx = req.$ctx;\n      $ctx.set(\"ACTION_CTX\", {handler, method, setActionItemMessage, action});\n      $ctx.endpoint = EndpointMetadata.get(provider.useClass, \"resolve\");\n\n      await this.injector.runInContext($ctx, async () => {\n        try {\n          const resolver = new AnyToPromise();\n          const handler = await promisedHandler;\n          const {state, data, status, headers} = await resolver.call(() => handler({$ctx}));\n          if (state === AnyToPromiseStatus.RESOLVED) {\n            if (status) {\n              $ctx.response.status(status);\n            }\n\n            if (headers) {\n              $ctx.response.setHeaders(headers);\n            }\n\n            if (data !== undefined) {\n              $ctx.data = data;\n\n              return await this.flush($ctx.data, $ctx);\n            }\n\n            next();\n          }\n        } catch (er) {\n          next(er);\n        }\n      });\n    };\n  }\n\n  private async flush(data: any, $ctx: PlatformContext) {\n    const {response} = $ctx;\n\n    if (!response.isDone()) {\n      setResponseHeaders($ctx);\n\n      data = await this.responseFilter.serialize(data, $ctx);\n      data = await this.responseFilter.transform(data, $ctx);\n\n      response.body(data);\n    }\n\n    return response;\n  }\n}\n"]}
+{"version":3,"file":"AlterActions.js","sourceRoot":"","sources":["../../../src/components/AlterActions.ts"],"names":[],"mappings":"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","sourcesContent":["import {PlatformContext, setResponseHeaders} from \"@tsed/common\";\nimport {AnyToPromise, AnyToPromiseStatus} from \"@tsed/core\";\nimport {Inject, InjectorService, Provider} from \"@tsed/di\";\nimport {FormioActionInfo} from \"@tsed/formio-types\";\nimport {PlatformParams} from \"@tsed/platform-params\";\nimport {PlatformResponseFilter} from \"@tsed/platform-response-filter\";\nimport {EndpointMetadata} from \"@tsed/schema\";\nimport {Alter} from \"../decorators/alter\";\nimport {AlterHook} from \"../domain/AlterHook\";\nimport {SetActionItemMessage} from \"../domain/FormioAction\";\nimport {FormioActions} from \"../domain/FormioActionsIndex\";\nimport {FormioService} from \"../services/FormioService\";\n\n@Alter(\"actions\")\nexport class AlterActions implements AlterHook {\n  @Inject()\n  protected injector: InjectorService;\n\n  @Inject()\n  protected formio: FormioService;\n\n  @Inject()\n  protected params: PlatformParams;\n\n  @Inject()\n  protected responseFilter: PlatformResponseFilter;\n\n  transform(actions: FormioActions): FormioActions {\n    const {Action} = this.formio;\n\n    return this.getActions().reduce((actions, provider) => {\n      const instance = this.injector.invoke<any>(provider.token);\n      const options = provider.store.get<FormioActionInfo>(\"formio:action\");\n      const resolveHandler = this.createHandler(provider, \"resolve\");\n\n      return {\n        ...actions,\n        [options.name]: class extends Action {\n          static access = options.access;\n\n          static async info(req: any, res: any, next: Function) {\n            let opts = {...options};\n\n            if (instance.info) {\n              opts = await instance.info(opts, req, res);\n            }\n\n            next(null, opts);\n          }\n\n          static async settingsForm(req: any, res: any, next: Function) {\n            next(null, await instance.settingsForm(req, res));\n          }\n\n          resolve(handler: string, method: string, req: any, res: any, next: Function, setActionItemMessage: SetActionItemMessage): void {\n            resolveHandler(this, handler, method, req, res, next, setActionItemMessage);\n          }\n        }\n      };\n    }, actions);\n  }\n\n  protected getActions() {\n    return this.injector.getProviders(\"formio:action\");\n  }\n\n  protected createHandler(provider: Provider, propertyKey: string | symbol) {\n    const compiledHandler = this.params.compileHandler({\n      token: provider.token,\n      propertyKey\n    });\n\n    return async (\n      action: any,\n      handler: string,\n      method: string,\n      req: any,\n      res: any,\n      next: any,\n      setActionItemMessage: SetActionItemMessage\n    ) => {\n      const {$ctx} = req;\n\n      if ($ctx) {\n        $ctx.set(\"ACTION_CTX\", {handler, method, setActionItemMessage, action});\n        $ctx.endpoint = EndpointMetadata.get(provider.useClass, \"resolve\");\n\n        try {\n          if (await this.onRequest(compiledHandler, $ctx)) {\n            next();\n          }\n        } catch (er) {\n          next(er);\n        }\n      }\n    };\n  }\n\n  private async onRequest(handler: any, $ctx: PlatformContext) {\n    const resolver = new AnyToPromise();\n    const {state, data, status, headers} = await resolver.call(() => handler({$ctx}));\n\n    if (state === AnyToPromiseStatus.RESOLVED) {\n      if (status) {\n        $ctx.response.status(status);\n      }\n\n      if (headers) {\n        $ctx.response.setHeaders(headers);\n      }\n\n      if (data !== undefined) {\n        $ctx.data = data;\n\n        return await this.flush($ctx.data, $ctx);\n      }\n\n      return true;\n    }\n  }\n\n  private async flush(data: any, $ctx: PlatformContext) {\n    const {response} = $ctx;\n\n    if (!$ctx.isDone()) {\n      setResponseHeaders($ctx);\n\n      data = await this.responseFilter.serialize(data, $ctx as any);\n      data = await this.responseFilter.transform(data, $ctx as any);\n\n      response.body(data);\n    }\n\n    return response;\n  }\n}\n"]}

package/lib/cjs/components/AlterSkip.js

@@ -6,6 +6,8 @@ const common_1 = require("@tsed/common");
 const common_2 = require("@tsed/common");
 const alter_1 = require("../decorators/alter");
 let AlterSkip = class AlterSkip {
+    baseUrl;
+    whiteList;
     transform(value, ctx) {
         if (value) {
             return true;

package/lib/cjs/components/AlterSkip.js.map

@@ -1 +1 @@
-{"version":3,"file":"AlterSkip.js","sourceRoot":"","sources":["../../../src/components/AlterSkip.ts"],"names":[],"mappings":";;;;AAAA,yCAAuD;AACvD,yCAA2C;AAC3C,+CAA0C;AAI1C,IAAa,SAAS,GAAtB,MAAa,SAAS;IAOpB,SAAS,CAAC,KAAU,EAAE,GAAoB;QACxC,IAAI,KAAK,EAAE;YACT,OAAO,IAAI,CAAC;SACb;QAED,MAAM,EAAC,OAAO,EAAC,GAAG,GAAG,CAAC;QACtB,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAEtC,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;YACrC,OAAO,IAAA,sBAAa,EAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,KAAK,GAAG,CAAC;QACpD,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAjBC;IADC,IAAA,iBAAQ,EAAC,gBAAgB,EAAE,GAAG,CAAC;;0CAChB;AAGhB;IADC,IAAA,iBAAQ,EAAC,kBAAkB,EAAE,CAAC,YAAY,CAAC,CAAC;;4CACzB;AALT,SAAS;IADrB,IAAA,aAAK,EAAC,MAAM,CAAC;GACD,SAAS,CAmBrB;AAnBY,8BAAS","sourcesContent":["import {Constant, PlatformContext} from \"@tsed/common\";\nimport {normalizePath} from \"@tsed/common\";\nimport {Alter} from \"../decorators/alter\";\nimport {AlterHook} from \"../domain/AlterHook\";\n\n@Alter(\"skip\")\nexport class AlterSkip implements AlterHook {\n  @Constant(\"formio.baseUrl\", \"/\")\n  baseUrl: string;\n\n  @Constant(\"formio.whiteList\", [\"/spec.json\"])\n  whiteList: string[];\n\n  transform(value: any, ctx: PlatformContext): any {\n    if (value) {\n      return true;\n    }\n\n    const {request} = ctx;\n    const url = request.url.split(\"?\")[0];\n\n    return !!this.whiteList.find((entry) => {\n      return normalizePath(this.baseUrl, entry) === url;\n    });\n  }\n}\n"]}
+{"version":3,"file":"AlterSkip.js","sourceRoot":"","sources":["../../../src/components/AlterSkip.ts"],"names":[],"mappings":";;;;AAAA,yCAAuD;AACvD,yCAA2C;AAC3C,+CAA0C;AAI1C,IAAa,SAAS,GAAtB,MAAa,SAAS;IAEpB,OAAO,CAAS;IAGhB,SAAS,CAAW;IAEpB,SAAS,CAAC,KAAU,EAAE,GAAoB;QACxC,IAAI,KAAK,EAAE;YACT,OAAO,IAAI,CAAC;SACb;QAED,MAAM,EAAC,OAAO,EAAC,GAAG,GAAG,CAAC;QACtB,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAEtC,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;YACrC,OAAO,IAAA,sBAAa,EAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,KAAK,GAAG,CAAC;QACpD,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAjBC;IADC,IAAA,iBAAQ,EAAC,gBAAgB,EAAE,GAAG,CAAC;;0CAChB;AAGhB;IADC,IAAA,iBAAQ,EAAC,kBAAkB,EAAE,CAAC,YAAY,CAAC,CAAC;;4CACzB;AALT,SAAS;IADrB,IAAA,aAAK,EAAC,MAAM,CAAC;GACD,SAAS,CAmBrB;AAnBY,8BAAS","sourcesContent":["import {Constant, PlatformContext} from \"@tsed/common\";\nimport {normalizePath} from \"@tsed/common\";\nimport {Alter} from \"../decorators/alter\";\nimport {AlterHook} from \"../domain/AlterHook\";\n\n@Alter(\"skip\")\nexport class AlterSkip implements AlterHook {\n  @Constant(\"formio.baseUrl\", \"/\")\n  baseUrl: string;\n\n  @Constant(\"formio.whiteList\", [\"/spec.json\"])\n  whiteList: string[];\n\n  transform(value: any, ctx: PlatformContext): any {\n    if (value) {\n      return true;\n    }\n\n    const {request} = ctx;\n    const url = request.url.split(\"?\")[0];\n\n    return !!this.whiteList.find((entry) => {\n      return normalizePath(this.baseUrl, entry) === url;\n    });\n  }\n}\n"]}

package/lib/cjs/components/AlterTemplateExportSteps.js

@@ -8,6 +8,7 @@ const alter_1 = require("../decorators/alter");
 const FormioDatabase_1 = require("../services/FormioDatabase");
 const async_1 = tslib_1.__importDefault(require("async"));
 let AlterTemplateExportSteps = class AlterTemplateExportSteps {
+    database;
     transform(queue, template, map, options) {
         queue.push(async_1.default.apply(this.exportSubmissions.bind(this), template, map, options));
         return queue;

package/lib/cjs/components/AlterTemplateExportSteps.js.map

@@ -1 +1 @@
-{"version":3,"file":"AlterTemplateExportSteps.js","sourceRoot":"","sources":["../../../src/components/AlterTemplateExportSteps.ts"],"names":[],"mappings":";;;;AAAA,qCAAoC;AACpC,iCAAgC;AAGhC,+CAA0C;AAI1C,+DAA0D;AAC1D,0DAA0B;AAG1B,IAAa,wBAAwB,GAArC,MAAa,wBAAwB;IAInC,SAAS,CAAC,KAAY,EAAE,QAAwB,EAAE,GAAQ,EAAE,OAAY;QACtE,KAAK,CAAC,IAAI,CAAC,eAAK,CAAC,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;QAEnF,OAAO,KAAK,CAAC;IACf,CAAC;IAES,KAAK,CAAC,iBAAiB,CAAC,QAAwB,EAAE,GAAQ,EAAE,OAAY,EAAE,IAAS;QAC3F,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC9C,IAAI,CAAC,QAAQ,CAAC,eAAe,EAAE;YAC/B,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC;gBACjC,OAAO,EAAE,EAAC,GAAG,EAAE,IAAI,EAAC;aACrB,CAAC;SACH,CAAC,CAAC;QAEH,QAAQ,CAAC,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAEtE,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACvB,CAAC;IAES,cAAc,CAAC,WAAiD,EAAE,MAAoB;QAC9F,OAAO,WAAW;aACf,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;aAC1C,MAAM,CAAC,CAAC,GAAQ,EAAE,EAAC,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,UAAU,EAAC,EAAE,EAAE;YACxG,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YACxD,MAAM,GAAG,GAAG,WAAW,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;YAErD,GAAG,CAAC,GAAG,CAAC,GAAG,IAAA,eAAQ,EAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;YAElC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACZ,GAAG,UAAU;gBACb,OAAO,EAAE,OAAO,IAAI,OAAO,CAAC,QAAQ,EAAE;gBACtC,QAAQ,EAAE,QAAQ,IAAI,QAAQ,CAAC,QAAQ,EAAE;gBACzC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC;gBACzC,KAAK,EAAE,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC;gBAChD,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC;aAC/B,CAAC,CAAC;YAEH,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAE,CAAC,CAAC;IACX,CAAC;CACF,CAAA;AA1CC;IADC,IAAA,WAAM,GAAE;sCACW,+BAAc;0DAAC;AAFxB,wBAAwB;IADpC,IAAA,aAAK,EAAC,qBAAqB,CAAC;GAChB,wBAAwB,CA4CpC;AA5CY,4DAAwB","sourcesContent":["import {getValue} from \"@tsed/core\";\nimport {Inject} from \"@tsed/di\";\nimport {MongooseDocument} from \"@tsed/mongoose\";\nimport {FormioMapper} from \"../builder/FormioMapper\";\nimport {Alter} from \"../decorators/alter\";\nimport {AlterHook} from \"../domain/AlterHook\";\nimport {FormioSubmission} from \"../domain/FormioModels\";\nimport {FormioTemplate} from \"../domain/FormioTemplate\";\nimport {FormioDatabase} from \"../services/FormioDatabase\";\nimport async from \"async\";\n\n@Alter(\"templateExportSteps\")\nexport class AlterTemplateExportSteps implements AlterHook {\n  @Inject()\n  protected database: FormioDatabase;\n\n  transform(queue: any[], template: FormioTemplate, map: any, options: any): any {\n    queue.push(async.apply(this.exportSubmissions.bind(this), template, map, options));\n\n    return queue;\n  }\n\n  protected async exportSubmissions(template: FormioTemplate, map: any, options: any, next: any) {\n    const [mapper, submissions] = await Promise.all([\n      this.database.getFormioMapper(),\n      this.database.submissionModel.find({\n        deleted: {$eq: null}\n      })\n    ]);\n\n    template.submissions = await this.mapSubmissions(submissions, mapper);\n\n    next(null, template);\n  }\n\n  protected mapSubmissions(submissions: MongooseDocument<FormioSubmission>[], mapper: FormioMapper) {\n    return submissions\n      .map((submission) => submission.toObject())\n      .reduce((acc: any, {_id, created, updated, modified, __v, owner, roles, form, metadata, ...submission}) => {\n        const machineName = mapper.mapToExport(form.toString());\n        const key = machineName.replace(\"$machineName:\", \"\");\n\n        acc[key] = getValue(acc, key, []);\n\n        acc[key].push({\n          ...submission,\n          created: created && created.toString(),\n          modified: modified && modified.toString(),\n          data: mapper.mapToExport(submission.data),\n          roles: mapper.mapToExport(roles).filter(Boolean),\n          form: mapper.mapToExport(form)\n        });\n\n        return acc;\n      }, {});\n  }\n}\n"]}
+{"version":3,"file":"AlterTemplateExportSteps.js","sourceRoot":"","sources":["../../../src/components/AlterTemplateExportSteps.ts"],"names":[],"mappings":";;;;AAAA,qCAAoC;AACpC,iCAAgC;AAGhC,+CAA0C;AAI1C,+DAA0D;AAC1D,0DAA0B;AAG1B,IAAa,wBAAwB,GAArC,MAAa,wBAAwB;IAEzB,QAAQ,CAAiB;IAEnC,SAAS,CAAC,KAAY,EAAE,QAAwB,EAAE,GAAQ,EAAE,OAAY;QACtE,KAAK,CAAC,IAAI,CAAC,eAAK,CAAC,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;QAEnF,OAAO,KAAK,CAAC;IACf,CAAC;IAES,KAAK,CAAC,iBAAiB,CAAC,QAAwB,EAAE,GAAQ,EAAE,OAAY,EAAE,IAAS;QAC3F,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC9C,IAAI,CAAC,QAAQ,CAAC,eAAe,EAAE;YAC/B,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC;gBACjC,OAAO,EAAE,EAAC,GAAG,EAAE,IAAI,EAAC;aACrB,CAAC;SACH,CAAC,CAAC;QAEH,QAAQ,CAAC,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAEtE,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACvB,CAAC;IAES,cAAc,CAAC,WAAiD,EAAE,MAAoB;QAC9F,OAAO,WAAW;aACf,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;aAC1C,MAAM,CAAC,CAAC,GAAQ,EAAE,EAAC,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,UAAU,EAAC,EAAE,EAAE;YACxG,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YACxD,MAAM,GAAG,GAAG,WAAW,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;YAErD,GAAG,CAAC,GAAG,CAAC,GAAG,IAAA,eAAQ,EAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;YAElC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACZ,GAAG,UAAU;gBACb,OAAO,EAAE,OAAO,IAAI,OAAO,CAAC,QAAQ,EAAE;gBACtC,QAAQ,EAAE,QAAQ,IAAI,QAAQ,CAAC,QAAQ,EAAE;gBACzC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC;gBACzC,KAAK,EAAE,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC;gBAChD,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC;aAC/B,CAAC,CAAC;YAEH,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAE,CAAC,CAAC;IACX,CAAC;CACF,CAAA;AA1CC;IADC,IAAA,WAAM,GAAE;sCACW,+BAAc;0DAAC;AAFxB,wBAAwB;IADpC,IAAA,aAAK,EAAC,qBAAqB,CAAC;GAChB,wBAAwB,CA4CpC;AA5CY,4DAAwB","sourcesContent":["import {getValue} from \"@tsed/core\";\nimport {Inject} from \"@tsed/di\";\nimport {MongooseDocument} from \"@tsed/mongoose\";\nimport {FormioMapper} from \"../builder/FormioMapper\";\nimport {Alter} from \"../decorators/alter\";\nimport {AlterHook} from \"../domain/AlterHook\";\nimport {FormioSubmission} from \"../domain/FormioModels\";\nimport {FormioTemplate} from \"../domain/FormioTemplate\";\nimport {FormioDatabase} from \"../services/FormioDatabase\";\nimport async from \"async\";\n\n@Alter(\"templateExportSteps\")\nexport class AlterTemplateExportSteps implements AlterHook {\n  @Inject()\n  protected database: FormioDatabase;\n\n  transform(queue: any[], template: FormioTemplate, map: any, options: any): any {\n    queue.push(async.apply(this.exportSubmissions.bind(this), template, map, options));\n\n    return queue;\n  }\n\n  protected async exportSubmissions(template: FormioTemplate, map: any, options: any, next: any) {\n    const [mapper, submissions] = await Promise.all([\n      this.database.getFormioMapper(),\n      this.database.submissionModel.find({\n        deleted: {$eq: null}\n      })\n    ]);\n\n    template.submissions = await this.mapSubmissions(submissions, mapper);\n\n    next(null, template);\n  }\n\n  protected mapSubmissions(submissions: MongooseDocument<FormioSubmission>[], mapper: FormioMapper) {\n    return submissions\n      .map((submission) => submission.toObject())\n      .reduce((acc: any, {_id, created, updated, modified, __v, owner, roles, form, metadata, ...submission}) => {\n        const machineName = mapper.mapToExport(form.toString());\n        const key = machineName.replace(\"$machineName:\", \"\");\n\n        acc[key] = getValue(acc, key, []);\n\n        acc[key].push({\n          ...submission,\n          created: created && created.toString(),\n          modified: modified && modified.toString(),\n          data: mapper.mapToExport(submission.data),\n          roles: mapper.mapToExport(roles).filter(Boolean),\n          form: mapper.mapToExport(form)\n        });\n\n        return acc;\n      }, {});\n  }\n}\n"]}

package/lib/cjs/components/AlterTemplateImportSteps.js

@@ -7,6 +7,7 @@ const alter_1 = require("../decorators/alter");
 const FormioDatabase_1 = require("../services/FormioDatabase");
 const async_1 = tslib_1.__importDefault(require("async"));
 let AlterTemplateImportSteps = class AlterTemplateImportSteps {
+    database;
     transform(queue, install, template) {
         queue.push(async_1.default.apply(this.importSubmissions.bind(this), template));
         return queue;

package/lib/cjs/components/AlterTemplateImportSteps.js.map

@@ -1 +1 @@
-{"version":3,"file":"AlterTemplateImportSteps.js","sourceRoot":"","sources":["../../../src/components/AlterTemplateImportSteps.ts"],"names":[],"mappings":";;;;AAAA,iCAAgC;AAEhC,+CAA0C;AAI1C,+DAA0D;AAC1D,0DAA0B;AAG1B,IAAa,wBAAwB,GAArC,MAAa,wBAAwB;IAInC,SAAS,CAAC,KAAY,EAAE,OAAiB,EAAE,QAAiC;QAC1E,KAAK,CAAC,IAAI,CAAC,eAAK,CAAC,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;QAErE,OAAO,KAAK,CAAC;IACf,CAAC;IAES,KAAK,CAAC,iBAAiB,CAAC,QAAiC,EAAE,IAAS;QAC5E,IAAI,QAAQ,IAAI,QAAQ,CAAC,WAAW,EAAE;YACpC,wBAAwB;YACxB,MAAM,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YAEnD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC;YACtD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YAErD,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE;gBAC3B,KAAK,MAAM,UAAU,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE;oBACjC,MAAM,IAAI,CAAC,gBAAgB,CAAC,EAAC,GAAG,UAAU,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,IAAI,KAAK,CAAC,CAAC,CAAC,EAAC,EAAE,OAAO,CAAC,CAAC;iBAC1F;aACF;SACF;QAED,IAAI,EAAE,CAAC;IACT,CAAC;IAES,KAAK,CAAC,gBAAgB,CAAC,UAAqC,EAAE,MAAoB;QAC1F,MAAM,KAAK,GAAG;YACZ,GAAG,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC;YACjC,KAAK,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC;SAChF,CAAC;QAEF,MAAM,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAElD,OAAO,KAAK,CAAC;IACf,CAAC;CACF,CAAA;AApCC;IADC,IAAA,WAAM,GAAE;sCACW,+BAAc;0DAAC;AAFxB,wBAAwB;IADpC,IAAA,aAAK,EAAC,qBAAqB,CAAC;GAChB,wBAAwB,CAsCpC;AAtCY,4DAAwB","sourcesContent":["import {Inject} from \"@tsed/di\";\nimport {FormioMapper} from \"../builder/FormioMapper\";\nimport {Alter} from \"../decorators/alter\";\nimport {AlterHook} from \"../domain/AlterHook\";\nimport {FormioSubmission} from \"../domain/FormioModels\";\nimport {FormioTemplate} from \"../domain/FormioTemplate\";\nimport {FormioDatabase} from \"../services/FormioDatabase\";\nimport async from \"async\";\n\n@Alter(\"templateImportSteps\")\nexport class AlterTemplateImportSteps implements AlterHook {\n  @Inject()\n  protected database: FormioDatabase;\n\n  transform(queue: any[], install: Function, template: Partial<FormioTemplate>): any {\n    queue.push(async.apply(this.importSubmissions.bind(this), template));\n\n    return queue;\n  }\n\n  protected async importSubmissions(template: Partial<FormioTemplate>, done: any) {\n    if (template && template.submissions) {\n      // clean all submissions\n      await this.database.submissionModel.deleteMany({});\n\n      const ctxData = await this.database.getFormioMapper();\n      const entries = Object.entries(template.submissions);\n\n      for (const entry of entries) {\n        for (const submission of entry[1]) {\n          await this.importSubmission({...submission, form: submission.form || entry[0]}, ctxData);\n        }\n      }\n    }\n\n    done();\n  }\n\n  protected async importSubmission(submission: Partial<FormioSubmission>, mapper: FormioMapper) {\n    const value = {\n      ...mapper.mapToImport(submission),\n      roles: [...new Set(mapper.mapToImport(submission.roles || []))].filter(Boolean)\n    };\n\n    await this.database.submissionModel.create(value);\n\n    return value;\n  }\n}\n"]}
+{"version":3,"file":"AlterTemplateImportSteps.js","sourceRoot":"","sources":["../../../src/components/AlterTemplateImportSteps.ts"],"names":[],"mappings":";;;;AAAA,iCAAgC;AAEhC,+CAA0C;AAI1C,+DAA0D;AAC1D,0DAA0B;AAG1B,IAAa,wBAAwB,GAArC,MAAa,wBAAwB;IAEzB,QAAQ,CAAiB;IAEnC,SAAS,CAAC,KAAY,EAAE,OAAiB,EAAE,QAAiC;QAC1E,KAAK,CAAC,IAAI,CAAC,eAAK,CAAC,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;QAErE,OAAO,KAAK,CAAC;IACf,CAAC;IAES,KAAK,CAAC,iBAAiB,CAAC,QAAiC,EAAE,IAAS;QAC5E,IAAI,QAAQ,IAAI,QAAQ,CAAC,WAAW,EAAE;YACpC,wBAAwB;YACxB,MAAM,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YAEnD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC;YACtD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YAErD,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE;gBAC3B,KAAK,MAAM,UAAU,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE;oBACjC,MAAM,IAAI,CAAC,gBAAgB,CAAC,EAAC,GAAG,UAAU,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,IAAI,KAAK,CAAC,CAAC,CAAC,EAAC,EAAE,OAAO,CAAC,CAAC;iBAC1F;aACF;SACF;QAED,IAAI,EAAE,CAAC;IACT,CAAC;IAES,KAAK,CAAC,gBAAgB,CAAC,UAAqC,EAAE,MAAoB;QAC1F,MAAM,KAAK,GAAG;YACZ,GAAG,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC;YACjC,KAAK,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC;SAChF,CAAC;QAEF,MAAM,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAElD,OAAO,KAAK,CAAC;IACf,CAAC;CACF,CAAA;AApCC;IADC,IAAA,WAAM,GAAE;sCACW,+BAAc;0DAAC;AAFxB,wBAAwB;IADpC,IAAA,aAAK,EAAC,qBAAqB,CAAC;GAChB,wBAAwB,CAsCpC;AAtCY,4DAAwB","sourcesContent":["import {Inject} from \"@tsed/di\";\nimport {FormioMapper} from \"../builder/FormioMapper\";\nimport {Alter} from \"../decorators/alter\";\nimport {AlterHook} from \"../domain/AlterHook\";\nimport {FormioSubmission} from \"../domain/FormioModels\";\nimport {FormioTemplate} from \"../domain/FormioTemplate\";\nimport {FormioDatabase} from \"../services/FormioDatabase\";\nimport async from \"async\";\n\n@Alter(\"templateImportSteps\")\nexport class AlterTemplateImportSteps implements AlterHook {\n  @Inject()\n  protected database: FormioDatabase;\n\n  transform(queue: any[], install: Function, template: Partial<FormioTemplate>): any {\n    queue.push(async.apply(this.importSubmissions.bind(this), template));\n\n    return queue;\n  }\n\n  protected async importSubmissions(template: Partial<FormioTemplate>, done: any) {\n    if (template && template.submissions) {\n      // clean all submissions\n      await this.database.submissionModel.deleteMany({});\n\n      const ctxData = await this.database.getFormioMapper();\n      const entries = Object.entries(template.submissions);\n\n      for (const entry of entries) {\n        for (const submission of entry[1]) {\n          await this.importSubmission({...submission, form: submission.form || entry[0]}, ctxData);\n        }\n      }\n    }\n\n    done();\n  }\n\n  protected async importSubmission(submission: Partial<FormioSubmission>, mapper: FormioMapper) {\n    const value = {\n      ...mapper.mapToImport(submission),\n      roles: [...new Set(mapper.mapToImport(submission.roles || []))].filter(Boolean)\n    };\n\n    await this.database.submissionModel.create(value);\n\n    return value;\n  }\n}\n"]}

package/lib/cjs/middlewares/FormioAuthMiddleware.js

@@ -12,6 +12,7 @@ const FormioService_1 = require("../services/FormioService");
  * @formio
  */
 let FormioAuthMiddleware = class FormioAuthMiddleware {
+    formio;
     get tokenHandler() {
         return (0, util_1.promisify)(this.formio.middleware.tokenHandler);
     }

package/lib/cjs/middlewares/FormioAuthMiddleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"FormioAuthMiddleware.js","sourceRoot":"","sources":["../../../src/middlewares/FormioAuthMiddleware.ts"],"names":[],"mappings":";;;;AAAA,yCAAyD;AACzD,qCAAoC;AACpC,iDAA8C;AAC9C,+BAA+B;AAC/B,6DAAwD;AAExD;;;GAGG;AAEH,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAI/B,IAAI,YAAY;QACd,OAAO,IAAA,gBAAS,EAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,GAAG,CAAY,GAAY;QAC/B,MAAM,GAAG,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC;QAC7B,MAAM,GAAG,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;QAE9B,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAElC,IAAI,CAAC,IAAA,eAAQ,EAAC,GAAG,EAAE,gBAAgB,CAAC,EAAE;YACpC,MAAM,IAAI,yBAAY,CAAC,mBAAmB,CAAC,CAAC;SAC7C;IACH,CAAC;CACF,CAAA;AAhBC;IADC,IAAA,eAAM,GAAE;sCACS,6BAAa;oDAAC;AAMhC;IAAW,mBAAA,IAAA,gBAAO,GAAE,CAAA;;;;+CASnB;AAjBU,oBAAoB;IADhC,IAAA,mBAAU,GAAE;GACA,oBAAoB,CAkBhC;AAlBY,oDAAoB","sourcesContent":["import {Context, Inject, Middleware} from \"@tsed/common\";\nimport {getValue} from \"@tsed/core\";\nimport {Unauthorized} from \"@tsed/exceptions\";\nimport {promisify} from \"util\";\nimport {FormioService} from \"../services/FormioService\";\n\n/**\n * @middleware\n * @formio\n */\n@Middleware()\nexport class FormioAuthMiddleware {\n  @Inject()\n  protected formio: FormioService;\n\n  get tokenHandler(): any {\n    return promisify(this.formio.middleware.tokenHandler);\n  }\n\n  async use(@Context() ctx: Context) {\n    const req = ctx.getRequest();\n    const res = ctx.getResponse();\n\n    await this.tokenHandler(req, res);\n\n    if (!getValue(req, \"token.user._id\")) {\n      throw new Unauthorized(\"User unauthorized\");\n    }\n  }\n}\n"]}
+{"version":3,"file":"FormioAuthMiddleware.js","sourceRoot":"","sources":["../../../src/middlewares/FormioAuthMiddleware.ts"],"names":[],"mappings":";;;;AAAA,yCAAyD;AACzD,qCAAoC;AACpC,iDAA8C;AAC9C,+BAA+B;AAC/B,6DAAwD;AAExD;;;GAGG;AAEH,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAErB,MAAM,CAAgB;IAEhC,IAAI,YAAY;QACd,OAAO,IAAA,gBAAS,EAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,GAAG,CAAY,GAAY;QAC/B,MAAM,GAAG,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC;QAC7B,MAAM,GAAG,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;QAE9B,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAElC,IAAI,CAAC,IAAA,eAAQ,EAAC,GAAG,EAAE,gBAAgB,CAAC,EAAE;YACpC,MAAM,IAAI,yBAAY,CAAC,mBAAmB,CAAC,CAAC;SAC7C;IACH,CAAC;CACF,CAAA;AAhBC;IADC,IAAA,eAAM,GAAE;sCACS,6BAAa;oDAAC;AAMhC;IAAW,mBAAA,IAAA,gBAAO,GAAE,CAAA;;;;+CASnB;AAjBU,oBAAoB;IADhC,IAAA,mBAAU,GAAE;GACA,oBAAoB,CAkBhC;AAlBY,oDAAoB","sourcesContent":["import {Context, Inject, Middleware} from \"@tsed/common\";\nimport {getValue} from \"@tsed/core\";\nimport {Unauthorized} from \"@tsed/exceptions\";\nimport {promisify} from \"util\";\nimport {FormioService} from \"../services/FormioService\";\n\n/**\n * @middleware\n * @formio\n */\n@Middleware()\nexport class FormioAuthMiddleware {\n  @Inject()\n  protected formio: FormioService;\n\n  get tokenHandler(): any {\n    return promisify(this.formio.middleware.tokenHandler);\n  }\n\n  async use(@Context() ctx: Context) {\n    const req = ctx.getRequest();\n    const res = ctx.getResponse();\n\n    await this.tokenHandler(req, res);\n\n    if (!getValue(req, \"token.user._id\")) {\n      throw new Unauthorized(\"User unauthorized\");\n    }\n  }\n}\n"]}

package/lib/cjs/services/FormioAuthService.js

@@ -10,6 +10,9 @@ const FormioDatabase_1 = require("./FormioDatabase");
 const FormioHooksService_1 = require("./FormioHooksService");
 const FormioService_1 = require("./FormioService");
 let FormioAuthService = class FormioAuthService {
+    formio;
+    hooks;
+    db;
     get currentUser() {
         return (0, util_1.promisify)(this.formio.auth.currentUser);
     }
@@ -72,7 +75,7 @@ let FormioAuthService = class FormioAuthService {
                 _id: user._id
             },
             form: {
-                _id: form === null || form === void 0 ? void 0 : form._id
+                _id: form?._id
             }
         }, form, req);
         const decoded = this.hooks.alter("tokenDecode", token, req);

package/lib/cjs/services/FormioAuthService.js.map

@@ -1 +1 @@
-{"version":3,"file":"FormioAuthService.js","sourceRoot":"","sources":["../../../src/services/FormioAuthService.ts"],"names":[],"mappings":"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","sourcesContent":["import {PlatformContext, Req} from \"@tsed/common\";\nimport {isFunction} from \"@tsed/core\";\nimport {Inject, Injectable} from \"@tsed/di\";\nimport {BadRequest, NotFound, Unauthorized} from \"@tsed/exceptions\";\nimport {promisify} from \"util\";\nimport {FormioPayloadToken} from \"../domain/FormioDecodedToken\";\nimport {FormioForm, FormioSubmission, WithID} from \"../domain/FormioModels\";\nimport {FormioDatabase} from \"./FormioDatabase\";\nimport {FormioHooksService} from \"./FormioHooksService\";\nimport {FormioService} from \"./FormioService\";\n\n@Injectable()\nexport class FormioAuthService {\n  @Inject()\n  formio: FormioService;\n\n  @Inject()\n  hooks: FormioHooksService;\n\n  @Inject()\n  db: FormioDatabase;\n\n  get currentUser() {\n    return promisify(this.formio.auth.currentUser);\n  }\n\n  get getToken() {\n    return this.formio.auth.getToken;\n  }\n\n  get tempToken() {\n    return this.formio.auth.tempToken;\n  }\n\n  get logout() {\n    return this.formio.auth.logout;\n  }\n\n  setCurrentUser<User = any>(user: WithID<FormioSubmission<User>>, token: FormioPayloadToken, ctx: PlatformContext) {\n    const request = ctx.getRequest();\n    const response = ctx.getResponse();\n\n    request.submission.data = user.data;\n    request.user = user;\n    request.token = token.decoded;\n    response.token = token.token;\n    request[\"x-jwt-token\"] = token.token;\n\n    return this;\n  }\n\n  /**\n   * Generate the payload token for the session\n   * @param user\n   * @param ctx\n   */\n  async generatePayloadToken<User = any>(\n    user: WithID<FormioSubmission<User>>,\n    ctx: PlatformContext\n  ): Promise<{user: WithID<FormioSubmission<User>>; token: FormioPayloadToken}> {\n    const req = ctx.getRequest();\n    const audit = this.formio.audit;\n    let form: FormioForm | null;\n\n    try {\n      form = (await this.db.getForm(user.form)) as any;\n    } catch (err) {\n      audit(\n        \"EAUTH_USERFORM\",\n        {\n          ...req,\n          userId: user._id\n        },\n        user.form,\n        err\n      );\n      throw err;\n    }\n\n    if (!form) {\n      audit(\n        \"EAUTH_USERFORM\",\n        {\n          ...req,\n          userId: user._id\n        },\n        user.form,\n        {message: \"User form not found\"}\n      );\n\n      throw new NotFound(\"User form not found.\");\n    }\n\n    try {\n      user = await this.hooks.alterAsync(\"user\", user);\n    } catch (err) {\n      // istanbul ignore next\n      ctx.logger.debug(err);\n    }\n\n    await this.hooks.alterAsync(\"login\", user, req);\n\n    // Allow anyone to hook and modify the token.\n    const token = this.hooks.alter(\n      \"token\",\n      {\n        user: {\n          _id: user._id\n        },\n        form: {\n          _id: form?._id\n        }\n      },\n      form,\n      req\n    );\n\n    const decoded = this.hooks.alter(\"tokenDecode\", token, req);\n\n    return {\n      user,\n      token: {\n        token: this.getToken(token) as string,\n        decoded\n      }\n    };\n  }\n\n  /**\n   * Generate session from the given authenticated user.\n   * @param user\n   * @param ctx\n   */\n  async generateSession<User = any>(user: WithID<FormioSubmission<User>>, ctx: PlatformContext) {\n    try {\n      const {user: userSession, token} = await this.generatePayloadToken(user, ctx);\n      this.setCurrentUser(userSession, token, ctx);\n\n      await this.currentUser(ctx.getRequest(), ctx.getResponse());\n    } catch (err) {\n      ctx.logger.error({event: \"Error on OAuthActions\", error: err});\n      throw new Unauthorized(err.message);\n    }\n  }\n\n  /**\n   * Retrieve roles\n   * @param req\n   */\n  async getRoles(req?: Req) {\n    try {\n      const query = this.hooks.alter(\"roleQuery\", {deleted: {$eq: null}}, req);\n      return await this.db.roleModel.find(query).sort({title: 1}).lean().exec();\n    } catch (err) {\n      throw new BadRequest(this.formio.util.errorCodes.role.EROLESLOAD);\n    }\n  }\n\n  /**\n   * Update the role of the current user submission\n   * @param _id\n   * @param role\n   * @param req\n   */\n  async updateUserRole(_id: string | any, role: string, req?: Req) {\n    const query = this.hooks.alter(\n      \"submissionQuery\",\n      {\n        _id: this.formio.util.idToBson(_id),\n        deleted: {$eq: null}\n      },\n      req\n    );\n\n    const user = await this.db.submissionModel.findOne(query).exec();\n\n    if (!user) {\n      throw new BadRequest(\"No Submission was found with the given setting `submission`.\");\n    }\n\n    user.roles = [this.formio.util.idToBson(role)];\n\n    if (isFunction(user.save)) {\n      await user.save();\n    }\n\n    return user;\n  }\n\n  /**\n   * Create a user submission in formio\n   * @param user\n   */\n  async createUser<User = any>(user: Partial<FormioSubmission<User>>) {\n    const submission = new this.db.submissionModel({\n      owner: null,\n      deleted: null,\n      roles: [],\n      externalsIds: [],\n      ...user,\n      created: new Date().toISOString(),\n      modified: new Date().toISOString()\n    });\n\n    user.form && (submission.form = this.db.idToBson(user.form));\n\n    await submission.save();\n\n    return submission.toObject();\n  }\n\n  /**\n   * Update user submission in formio\n   * @param user\n   */\n  async updateUser<User = any>(user: WithID<FormioSubmission<User>>) {\n    await this.db.submissionModel.updateOne(\n      {\n        _id: user._id\n      },\n      {$set: user}\n    );\n\n    return user;\n  }\n}\n"]}
+{"version":3,"file":"FormioAuthService.js","sourceRoot":"","sources":["../../../src/services/FormioAuthService.ts"],"names":[],"mappings":"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","sourcesContent":["import {PlatformContext, Req} from \"@tsed/common\";\nimport {isFunction} from \"@tsed/core\";\nimport {Inject, Injectable} from \"@tsed/di\";\nimport {BadRequest, NotFound, Unauthorized} from \"@tsed/exceptions\";\nimport {promisify} from \"util\";\nimport {FormioPayloadToken} from \"../domain/FormioDecodedToken\";\nimport {FormioForm, FormioSubmission, WithID} from \"../domain/FormioModels\";\nimport {FormioDatabase} from \"./FormioDatabase\";\nimport {FormioHooksService} from \"./FormioHooksService\";\nimport {FormioService} from \"./FormioService\";\n\n@Injectable()\nexport class FormioAuthService {\n  @Inject()\n  formio: FormioService;\n\n  @Inject()\n  hooks: FormioHooksService;\n\n  @Inject()\n  db: FormioDatabase;\n\n  get currentUser() {\n    return promisify(this.formio.auth.currentUser);\n  }\n\n  get getToken() {\n    return this.formio.auth.getToken;\n  }\n\n  get tempToken() {\n    return this.formio.auth.tempToken;\n  }\n\n  get logout() {\n    return this.formio.auth.logout;\n  }\n\n  setCurrentUser<User = any>(user: WithID<FormioSubmission<User>>, token: FormioPayloadToken, ctx: PlatformContext) {\n    const request = ctx.getRequest();\n    const response = ctx.getResponse();\n\n    request.submission.data = user.data;\n    request.user = user;\n    request.token = token.decoded;\n    response.token = token.token;\n    request[\"x-jwt-token\"] = token.token;\n\n    return this;\n  }\n\n  /**\n   * Generate the payload token for the session\n   * @param user\n   * @param ctx\n   */\n  async generatePayloadToken<User = any>(\n    user: WithID<FormioSubmission<User>>,\n    ctx: PlatformContext\n  ): Promise<{user: WithID<FormioSubmission<User>>; token: FormioPayloadToken}> {\n    const req = ctx.getRequest();\n    const audit = this.formio.audit;\n    let form: FormioForm | null;\n\n    try {\n      form = (await this.db.getForm(user.form)) as any;\n    } catch (err) {\n      audit(\n        \"EAUTH_USERFORM\",\n        {\n          ...req,\n          userId: user._id\n        },\n        user.form,\n        err\n      );\n      throw err;\n    }\n\n    if (!form) {\n      audit(\n        \"EAUTH_USERFORM\",\n        {\n          ...req,\n          userId: user._id\n        },\n        user.form,\n        {message: \"User form not found\"}\n      );\n\n      throw new NotFound(\"User form not found.\");\n    }\n\n    try {\n      user = await this.hooks.alterAsync(\"user\", user);\n    } catch (err) {\n      // istanbul ignore next\n      ctx.logger.debug(err);\n    }\n\n    await this.hooks.alterAsync(\"login\", user, req);\n\n    // Allow anyone to hook and modify the token.\n    const token = this.hooks.alter(\n      \"token\",\n      {\n        user: {\n          _id: user._id\n        },\n        form: {\n          _id: form?._id\n        }\n      },\n      form,\n      req\n    );\n\n    const decoded = this.hooks.alter(\"tokenDecode\", token, req);\n\n    return {\n      user,\n      token: {\n        token: this.getToken(token) as string,\n        decoded\n      }\n    };\n  }\n\n  /**\n   * Generate session from the given authenticated user.\n   * @param user\n   * @param ctx\n   */\n  async generateSession<User = any>(user: WithID<FormioSubmission<User>>, ctx: PlatformContext) {\n    try {\n      const {user: userSession, token} = await this.generatePayloadToken(user, ctx);\n      this.setCurrentUser(userSession, token, ctx);\n\n      await this.currentUser(ctx.getRequest(), ctx.getResponse());\n    } catch (err) {\n      ctx.logger.error({event: \"Error on OAuthActions\", error: err});\n      throw new Unauthorized(err.message);\n    }\n  }\n\n  /**\n   * Retrieve roles\n   * @param req\n   */\n  async getRoles(req?: Req) {\n    try {\n      const query = this.hooks.alter(\"roleQuery\", {deleted: {$eq: null}}, req);\n      return await this.db.roleModel.find(query).sort({title: 1}).lean().exec();\n    } catch (err) {\n      throw new BadRequest(this.formio.util.errorCodes.role.EROLESLOAD);\n    }\n  }\n\n  /**\n   * Update the role of the current user submission\n   * @param _id\n   * @param role\n   * @param req\n   */\n  async updateUserRole(_id: string | any, role: string, req?: Req) {\n    const query = this.hooks.alter(\n      \"submissionQuery\",\n      {\n        _id: this.formio.util.idToBson(_id),\n        deleted: {$eq: null}\n      },\n      req\n    );\n\n    const user = await this.db.submissionModel.findOne(query).exec();\n\n    if (!user) {\n      throw new BadRequest(\"No Submission was found with the given setting `submission`.\");\n    }\n\n    user.roles = [this.formio.util.idToBson(role)];\n\n    if (isFunction(user.save)) {\n      await user.save();\n    }\n\n    return user;\n  }\n\n  /**\n   * Create a user submission in formio\n   * @param user\n   */\n  async createUser<User = any>(user: Partial<FormioSubmission<User>>) {\n    const submission = new this.db.submissionModel({\n      owner: null,\n      deleted: null,\n      roles: [],\n      externalsIds: [],\n      ...user,\n      created: new Date().toISOString(),\n      modified: new Date().toISOString()\n    });\n\n    user.form && (submission.form = this.db.idToBson(user.form));\n\n    await submission.save();\n\n    return submission.toObject();\n  }\n\n  /**\n   * Update user submission in formio\n   * @param user\n   */\n  async updateUser<User = any>(user: WithID<FormioSubmission<User>>) {\n    await this.db.submissionModel.updateOne(\n      {\n        _id: user._id\n      },\n      {$set: user}\n    );\n\n    return user;\n  }\n}\n"]}

package/lib/cjs/services/FormioDatabase.js

@@ -12,6 +12,7 @@ function toMap(list) {
     return (0, core_1.toMap)(list, (o) => [o._id.toString(), `$machineName:${o.name || o.machineName}`]);
 }
 let FormioDatabase = class FormioDatabase {
+    formio;
     get models() {
         return this.formio.mongoose.models;
     }
@@ -93,7 +94,7 @@ let FormioDatabase = class FormioDatabase {
         return this.saveForm(mapper.mapToImport(form));
     }
     async saveForm(form) {
-        form = (0, omit_1.default)(form, ["__v"]);
+        form = new this.formModel((0, omit_1.default)(form, ["__v"]));
         return this.formModel.findOneAndUpdate({ _id: form._id }, form, { upsert: true, new: true });
     }
     async getSubmissions(query = {}) {
@@ -112,7 +113,7 @@ let FormioDatabase = class FormioDatabase {
         return this.saveSubmission(mapper.mapToImport(submission));
     }
     async saveSubmission(submission) {
-        submission = (0, omit_1.default)(submission, ["__v"]);
+        submission = new this.submissionModel((0, omit_1.default)(submission, ["__v"]));
         return this.submissionModel.findOneAndUpdate({
             _id: submission._id
         }, submission, { new: true, upsert: true });

package/lib/cjs/services/FormioDatabase.js.map

@@ -1 +1 @@
-{"version":3,"file":"FormioDatabase.js","sourceRoot":"","sources":["../../../src/services/FormioDatabase.ts"],"names":[],"mappings":"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","sourcesContent":["import {isArray, isObject, isString, toMap as tMap} from \"@tsed/core\";\nimport {Inject, Injectable} from \"@tsed/di\";\nimport {MongooseDocument, MongooseModel} from \"@tsed/mongoose\";\nimport type {FilterQuery} from \"mongoose\";\nimport omit from \"lodash/omit\";\nimport {FormioAction, FormioActionItem, FormioForm, FormioRole, FormioSubmission, FormioToken} from \"@tsed/formio-types\";\nimport {FormioMapper} from \"../builder/FormioMapper\";\nimport {isMongoId} from \"../utils/isMongoId\";\nimport {FormioService} from \"./FormioService\";\n\nfunction toMap<T>(list: any[]) {\n  return tMap<string, MongooseDocument<T>>(list, (o: any) => [o._id.toString(), `$machineName:${o.name || o.machineName}`]);\n}\n\n@Injectable()\nexport class FormioDatabase {\n  @Inject()\n  protected formio: FormioService;\n\n  get models() {\n    return this.formio.mongoose.models;\n  }\n\n  get roleModel(): MongooseModel<FormioRole> {\n    return this.models.role;\n  }\n\n  get formModel(): MongooseModel<FormioForm> {\n    return this.models.form;\n  }\n\n  get actionModel(): MongooseModel<FormioAction> {\n    return this.models.action;\n  }\n\n  get submissionModel(): MongooseModel<FormioSubmission> {\n    return this.models.submission;\n  }\n\n  get tokenModel(): MongooseModel<FormioToken> {\n    return this.models.token;\n  }\n\n  get actionItemModel(): MongooseModel<FormioActionItem> {\n    return this.models.actionItem;\n  }\n\n  async getFormioMapper(): Promise<FormioMapper> {\n    const [roles, forms, actions] = await Promise.all([\n      this.roleModel.find({\n        deleted: {$eq: null}\n      }),\n      this.formModel.find({\n        deleted: {$eq: null}\n      }),\n      this.actionModel.find({\n        deleted: {$eq: null}\n      })\n    ]);\n\n    return new FormioMapper({\n      forms: toMap<FormioForm>(forms),\n      actions: toMap<FormioAction>(actions),\n      roles: toMap<FormioRole>(roles)\n    });\n  }\n\n  async hasForms(): Promise<boolean> {\n    return (await this.formModel.countDocuments()) > 0;\n  }\n\n  async hasForm(name: string): Promise<boolean> {\n    return !!(await this.formModel.countDocuments({name: {$eq: name}}));\n  }\n\n  async getForm(nameOrId: string) {\n    return this.formModel\n      .findOne({\n        deleted: {$eq: null},\n        ...(isMongoId(nameOrId)\n          ? {\n              _id: nameOrId\n            }\n          : {name: {$eq: nameOrId}})\n      })\n      .lean()\n      .exec();\n  }\n\n  /**\n   * Import form previously exported by export tool.\n   * This method transform alias to a real mongoose _id\n   * @param form\n   * @param onCreate\n   */\n  async importFormIfNotExists(form: FormioForm, onCreate?: (form: FormioForm) => any) {\n    if (!(await this.hasForm(form.name))) {\n      const createForm = await this.importForm(form);\n\n      onCreate && (await onCreate(createForm));\n    }\n\n    return this.getForm(form.name);\n  }\n\n  /**\n   * Import form previously exported by export tool.\n   * This method transform alias to a real mongoose _id\n   * @param form\n   */\n  async importForm(form: FormioForm) {\n    const mapper = await this.getFormioMapper();\n\n    return this.saveForm(mapper.mapToImport(form));\n  }\n\n  async saveForm(form: FormioForm) {\n    form = omit(form, [\"__v\"]) as any;\n\n    return this.formModel.findOneAndUpdate({_id: form._id}, form, {upsert: true, new: true});\n  }\n\n  async getSubmissions<Data>(\n    query: FilterQuery<MongooseModel<FormioSubmission<Data>>> = {}\n  ): Promise<MongooseDocument<FormioSubmission<Data>>[]> {\n    return this.submissionModel.find({\n      ...query,\n      deleted: {$eq: null}\n    }) as any;\n  }\n\n  /**\n   * Import submission previously exported by export tool.\n   * This method transform alias to a real mongoose _id\n   * @param submission\n   */\n  async importSubmission<Data = any>(submission: Omit<Partial<FormioSubmission<Data>>, \"form\"> & {form?: any}) {\n    const mapper = await this.getFormioMapper();\n\n    return this.saveSubmission(mapper.mapToImport(submission));\n  }\n\n  async saveSubmission<Data = any>(submission: Partial<FormioSubmission<Data>>) {\n    submission = omit(submission, [\"__v\"]);\n\n    return this.submissionModel.findOneAndUpdate(\n      {\n        _id: submission._id\n      },\n      submission,\n      {new: true, upsert: true}\n    );\n  }\n\n  idToBson(form?: any) {\n    if (isArray(form)) {\n      return {$in: form.map(this.formio.util.idToBson)};\n    } else if (isObject(form)) {\n      return this.formio.util.idToBson((form as any)._id);\n    } else if (isString(form)) {\n      return this.formio.util.idToBson(form);\n    }\n  }\n}\n"]}
+{"version":3,"file":"FormioDatabase.js","sourceRoot":"","sources":["../../../src/services/FormioDatabase.ts"],"names":[],"mappings":"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","sourcesContent":["import {isArray, isObject, isString, toMap as tMap} from \"@tsed/core\";\nimport {Inject, Injectable} from \"@tsed/di\";\nimport {MongooseDocument, MongooseModel} from \"@tsed/mongoose\";\nimport type {FilterQuery} from \"mongoose\";\nimport omit from \"lodash/omit\";\nimport {FormioAction, FormioActionItem, FormioForm, FormioRole, FormioSubmission, FormioToken} from \"@tsed/formio-types\";\nimport {FormioMapper} from \"../builder/FormioMapper\";\nimport {isMongoId} from \"../utils/isMongoId\";\nimport {FormioService} from \"./FormioService\";\n\nfunction toMap<T>(list: any[]) {\n  return tMap<string, MongooseDocument<T>>(list, (o: any) => [o._id.toString(), `$machineName:${o.name || o.machineName}`]);\n}\n\n@Injectable()\nexport class FormioDatabase {\n  @Inject()\n  protected formio: FormioService;\n\n  get models() {\n    return this.formio.mongoose.models;\n  }\n\n  get roleModel(): MongooseModel<FormioRole> {\n    return this.models.role;\n  }\n\n  get formModel(): MongooseModel<FormioForm> {\n    return this.models.form;\n  }\n\n  get actionModel(): MongooseModel<FormioAction> {\n    return this.models.action;\n  }\n\n  get submissionModel(): MongooseModel<FormioSubmission> {\n    return this.models.submission;\n  }\n\n  get tokenModel(): MongooseModel<FormioToken> {\n    return this.models.token;\n  }\n\n  get actionItemModel(): MongooseModel<FormioActionItem> {\n    return this.models.actionItem;\n  }\n\n  async getFormioMapper(): Promise<FormioMapper> {\n    const [roles, forms, actions] = await Promise.all([\n      this.roleModel.find({\n        deleted: {$eq: null}\n      }),\n      this.formModel.find({\n        deleted: {$eq: null}\n      }),\n      this.actionModel.find({\n        deleted: {$eq: null}\n      })\n    ]);\n\n    return new FormioMapper({\n      forms: toMap<FormioForm>(forms),\n      actions: toMap<FormioAction>(actions),\n      roles: toMap<FormioRole>(roles)\n    });\n  }\n\n  async hasForms(): Promise<boolean> {\n    return (await this.formModel.countDocuments()) > 0;\n  }\n\n  async hasForm(name: string): Promise<boolean> {\n    return !!(await this.formModel.countDocuments({name: {$eq: name}}));\n  }\n\n  async getForm(nameOrId: string) {\n    return this.formModel\n      .findOne({\n        deleted: {$eq: null},\n        ...(isMongoId(nameOrId)\n          ? {\n              _id: nameOrId\n            }\n          : {name: {$eq: nameOrId}})\n      })\n      .lean()\n      .exec();\n  }\n\n  /**\n   * Import form previously exported by export tool.\n   * This method transform alias to a real mongoose _id\n   * @param form\n   * @param onCreate\n   */\n  async importFormIfNotExists(form: FormioForm, onCreate?: (form: FormioForm) => any) {\n    if (!(await this.hasForm(form.name))) {\n      const createForm = await this.importForm(form);\n\n      onCreate && (await onCreate(createForm));\n    }\n\n    return this.getForm(form.name);\n  }\n\n  /**\n   * Import form previously exported by export tool.\n   * This method transform alias to a real mongoose _id\n   * @param form\n   */\n  async importForm(form: FormioForm) {\n    const mapper = await this.getFormioMapper();\n\n    return this.saveForm(mapper.mapToImport(form));\n  }\n\n  async saveForm(form: FormioForm) {\n    form = new this.formModel(omit(form, [\"__v\"]) as any);\n\n    return this.formModel.findOneAndUpdate({_id: form._id}, form, {upsert: true, new: true});\n  }\n\n  async getSubmissions<Data>(\n    query: FilterQuery<MongooseModel<FormioSubmission<Data>>> = {}\n  ): Promise<MongooseDocument<FormioSubmission<Data>>[]> {\n    return this.submissionModel.find({\n      ...query,\n      deleted: {$eq: null}\n    }) as any;\n  }\n\n  /**\n   * Import submission previously exported by export tool.\n   * This method transform alias to a real mongoose _id\n   * @param submission\n   */\n  async importSubmission<Data = any>(submission: Omit<Partial<FormioSubmission<Data>>, \"form\"> & {form?: any}) {\n    const mapper = await this.getFormioMapper();\n\n    return this.saveSubmission(mapper.mapToImport(submission));\n  }\n\n  async saveSubmission<Data = any>(submission: Partial<FormioSubmission<Data>>) {\n    submission = new this.submissionModel(omit(submission, [\"__v\"]));\n\n    return this.submissionModel.findOneAndUpdate(\n      {\n        _id: submission._id\n      },\n      submission,\n      {new: true, upsert: true}\n    );\n  }\n\n  idToBson(form?: any) {\n    if (isArray(form)) {\n      return {$in: form.map(this.formio.util.idToBson)};\n    } else if (isObject(form)) {\n      return this.formio.util.idToBson((form as any)._id);\n    } else if (isString(form)) {\n      return this.formio.util.idToBson(form);\n    }\n  }\n}\n"]}

package/lib/cjs/services/FormioHooksService.js

@@ -6,6 +6,8 @@ const common_1 = require("@tsed/common");
 const util_1 = require("util");
 const FormioService_1 = require("./FormioService");
 let FormioHooksService = class FormioHooksService {
+    injector;
+    formio;
     get settings() {
         return this.formio.hook.settings;
     }