@aemforms/af-core 0.22.85 → 0.22.87

package/esm/afb-runtime.js

@@ -2553,6 +2553,24 @@ const urlEncoded = (data) => {
     });
     return formData;
 };
+const submit = async (context, success, error, submitAs = 'multipart/form-data', input_data = null, action = '', metadata = null) => {
+    const endpoint = action || context.form.action;
+    let data = input_data;
+    if (typeof data != 'object' || data == null) {
+        data = context.form.exportData();
+    }
+    const attachments = getAttachments(context.form, true);
+    let submitContentType = submitAs;
+    const submitDataAndMetaData = { 'data': data, ...metadata };
+    let formData = submitDataAndMetaData;
+    if (Object.keys(attachments).length > 0 || submitAs === 'multipart/form-data') {
+        formData = multipartFormData(submitDataAndMetaData, attachments);
+        submitContentType = 'multipart/form-data';
+    }
+    await request(context, endpoint, 'POST', formData, success, error, {
+        'Content-Type': submitContentType
+    });
+};
 const multipartFormData = (data, attachments) => {
     const formData = new FormData();
     Object.entries(data).forEach(([key, value]) => {
@@ -2585,24 +2603,6 @@ const multipartFormData = (data, attachments) => {
     }
     return formData;
 };
-const submit = async (context, success, error, submitAs = 'multipart/form-data', input_data = null, action = '', metadata = null) => {
-    const endpoint = action || context.form.action;
-    let data = input_data;
-    if (typeof data != 'object' || data == null) {
-        data = context.form.exportData();
-    }
-    const attachments = getAttachments(context.form, true);
-    let submitContentType = submitAs;
-    const submitDataAndMetaData = { 'data': data, ...metadata };
-    let formData = submitDataAndMetaData;
-    if (Object.keys(attachments).length > 0 || submitAs === 'multipart/form-data') {
-        formData = multipartFormData(submitDataAndMetaData, attachments);
-        submitContentType = 'multipart/form-data';
-    }
-    await request(context, endpoint, 'POST', formData, success, error, {
-        'Content-Type': submitContentType
-    });
-};
 const createAction = (name, payload = {}) => {
     switch (name) {
         case 'change':
@@ -2799,7 +2799,7 @@ class FunctionRuntimeImpl {
                 _signature: []
             },
             submitForm: {
-                _func: (args, data, interpreter) => {
+                _func: async (args, data, interpreter) => {
                     let success = null;
                     let error = null;
                     let submit_data;
@@ -2818,6 +2818,24 @@ class FunctionRuntimeImpl {
                         submit_data = args.length > 3 ? valueOf(args[3]) : null;
                         validate_form = args.length > 4 ? valueOf(args[4]) : true;
                     }
+                    const form = interpreter.globals.form;
+                    if (form.captcha && form.captcha.properties['fd:captcha'].config.version === 'enterprise'
+                        && form.captcha.properties['fd:captcha'].config.keyType === 'score') {
+                        if (typeof interpreter.runtime.functionTable.fetchCaptchaToken?._func !== 'function') {
+                            interpreter.globals.form.logger.error('fetchCaptchaToken is not defined');
+                            interpreter.globals.form.dispatch(new SubmitError({ type: 'FetchCaptchaTokenNotDefined' }));
+                            return {};
+                        }
+                        try {
+                            const token = await interpreter.runtime.functionTable.fetchCaptchaToken._func([], data, interpreter);
+                            form.captcha.value = token;
+                        }
+                        catch (e) {
+                            interpreter.globals.form.logger.error('Error while fetching captcha token');
+                            interpreter.globals.form.dispatch(new SubmitError({ type: 'FetchCaptchaTokenFailed' }));
+                            return {};
+                        }
+                    }
                     interpreter.globals.form.dispatch(new Submit({
                         success,
                         error,
@@ -2981,6 +2999,7 @@ class Form extends Container {
     _fields = {};
     _ids;
     _invalidFields = [];
+    _captcha = null;
     constructor(n, fieldFactory, _ruleEngine, _eventQueue = new EventQueue(), logLevel = 'off', mode = 'create') {
         super(n, { fieldFactory: fieldFactory, mode });
         this._ruleEngine = _ruleEngine;
@@ -3081,7 +3100,7 @@ class Form extends Container {
         const options = {
             lang: this.lang,
             captchaInfo: captchaInfoObj,
-            additionalSubmitMetadata: { ...this.additionalSubmitMetadata }
+            ...this.additionalSubmitMetadata
         };
         return new SubmitMetaData(options);
     }
@@ -3184,6 +3203,9 @@ class Form extends Container {
         return this._ids.next().value;
     }
     fieldAdded(field) {
+        if (field.fieldType === 'captcha' && !this._captcha) {
+            this._captcha = field;
+        }
         this._fields[field.id] = field;
         field.subscribe((action) => {
             if (this._invalidFields.indexOf(action.target.id) === -1) {
@@ -3315,6 +3337,9 @@ class Form extends Container {
     get title() {
         return this._jsonModel.title || '';
     }
+    get captcha() {
+        return this._captcha;
+    }
 }
 
 function stringToNumber(str, language) {
@@ -4452,6 +4477,9 @@ class Captcha extends Field {
     getDataNode() {
         return undefined;
     }
+    custom_setProperty(action) {
+        this.applyUpdates(action.payload);
+    }
 }
 
 class Button extends Field {

package/esm/types/src/Captcha.d.ts

@@ -1,5 +1,7 @@
 import Field from './Field';
+import { Action } from './types';
 declare class Captcha extends Field {
     getDataNode(): undefined;
+    custom_setProperty(action: Action): void;
 }
 export default Captcha;

package/esm/types/src/Form.d.ts

@@ -1,10 +1,10 @@
 import Container from './Container';
-import { Action, BaseModel, FieldModel, FieldsetModel, FormCreationMode, FormJson, FocusOption, FormModel, IFormFieldFactory } from './types/index';
 import FormMetaData from './FormMetaData';
 import SubmitMetaData from './SubmitMetaData';
 import EventQueue from './controller/EventQueue';
-import { Logger, LogLevel } from './controller/Logger';
+import { LogLevel, Logger } from './controller/Logger';
 import RuleEngine from './rules/RuleEngine';
+import { Action, BaseModel, FieldModel, FieldsetModel, FocusOption, FormCreationMode, FormJson, FormModel, IFormFieldFactory } from './types/index';
 import { Version } from './utils/Version';
 export declare const currentVersion: Version;
 declare class Form extends Container<FormJson> implements FormModel {
@@ -15,6 +15,7 @@ declare class Form extends Container<FormJson> implements FormModel {
     private _fields;
     _ids: Generator<string, void, string>;
     private _invalidFields;
+    private _captcha;
     constructor(n: FormJson, fieldFactory: IFormFieldFactory, _ruleEngine: RuleEngine, _eventQueue?: EventQueue, logLevel?: LogLevel, mode?: FormCreationMode);
     protected _applyDefaultsInModel(): void;
     private _logger;
@@ -135,5 +136,6 @@ declare class Form extends Container<FormJson> implements FormModel {
     get value(): null;
     get id(): string;
     get title(): string;
+    get captcha(): FieldModel | null;
 }
 export default Form;

package/esm/types/src/Scriptable.d.ts

@@ -8,7 +8,7 @@ declare abstract class Scriptable<T extends RulesJson> extends BaseNode<T> imple
     getRules(): import("./types/Json").Items<string>;
     private getCompiledRule;
     private getCompiledEvent;
-    private applyUpdates;
+    protected applyUpdates(updates: any): void;
     protected executeAllRules(context: any): void;
     private getExpressionScope;
     private executeEvent;

package/esm/types/src/rules/FunctionRuntime.d.ts

@@ -37,7 +37,7 @@ declare class FunctionRuntimeImpl {
             _signature: never[];
         };
         submitForm: {
-            _func: (args: Array<unknown>, data: unknown, interpreter: any) => {};
+            _func: (args: Array<unknown>, data: unknown, interpreter: any) => Promise<{}>;
             _signature: never[];
         };
         saveForm: {

package/lib/Captcha.d.ts

@@ -1,5 +1,7 @@
 import Field from './Field';
+import { Action } from './types';
 declare class Captcha extends Field {
     getDataNode(): undefined;
+    custom_setProperty(action: Action): void;
 }
 export default Captcha;

package/lib/Captcha.js

@@ -8,5 +8,8 @@ class Captcha extends Field_1.default {
     getDataNode() {
         return undefined;
     }
+    custom_setProperty(action) {
+        this.applyUpdates(action.payload);
+    }
 }
 exports.default = Captcha;

package/lib/Form.d.ts

@@ -1,10 +1,10 @@
 import Container from './Container';
-import { Action, BaseModel, FieldModel, FieldsetModel, FormCreationMode, FormJson, FocusOption, FormModel, IFormFieldFactory } from './types/index';
 import FormMetaData from './FormMetaData';
 import SubmitMetaData from './SubmitMetaData';
 import EventQueue from './controller/EventQueue';
-import { Logger, LogLevel } from './controller/Logger';
+import { LogLevel, Logger } from './controller/Logger';
 import RuleEngine from './rules/RuleEngine';
+import { Action, BaseModel, FieldModel, FieldsetModel, FocusOption, FormCreationMode, FormJson, FormModel, IFormFieldFactory } from './types/index';
 import { Version } from './utils/Version';
 export declare const currentVersion: Version;
 declare class Form extends Container<FormJson> implements FormModel {
@@ -15,6 +15,7 @@ declare class Form extends Container<FormJson> implements FormModel {
     private _fields;
     _ids: Generator<string, void, string>;
     private _invalidFields;
+    private _captcha;
     constructor(n: FormJson, fieldFactory: IFormFieldFactory, _ruleEngine: RuleEngine, _eventQueue?: EventQueue, logLevel?: LogLevel, mode?: FormCreationMode);
     protected _applyDefaultsInModel(): void;
     private _logger;
@@ -135,5 +136,6 @@ declare class Form extends Container<FormJson> implements FormModel {
     get value(): null;
     get id(): string;
     get title(): string;
+    get captcha(): FieldModel | null;
 }
 export default Form;

package/lib/Form.js

@@ -11,15 +11,15 @@ var _Form_instances, _Form_getNavigableChildren, _Form_getFirstNavigableChild, _
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.currentVersion = void 0;
 const Container_1 = __importDefault(require("./Container"));
-const index_1 = require("./types/index");
 const FormMetaData_1 = __importDefault(require("./FormMetaData"));
 const SubmitMetaData_1 = __importDefault(require("./SubmitMetaData"));
 const EventQueue_1 = __importDefault(require("./controller/EventQueue"));
+const Events_1 = require("./controller/Events");
 const Logger_1 = require("./controller/Logger");
-const FormUtils_1 = require("./utils/FormUtils");
 const DataGroup_1 = __importDefault(require("./data/DataGroup"));
 const FunctionRuntime_1 = require("./rules/FunctionRuntime");
-const Events_1 = require("./controller/Events");
+const index_1 = require("./types/index");
+const FormUtils_1 = require("./utils/FormUtils");
 const Version_1 = require("./utils/Version");
 exports.currentVersion = new Version_1.Version('0.13');
 const changeEventVersion = new Version_1.Version('0.13');
@@ -32,6 +32,7 @@ class Form extends Container_1.default {
         this.additionalSubmitMetadata = {};
         this._fields = {};
         this._invalidFields = [];
+        this._captcha = null;
         this.dataRefRegex = /("[^"]+?"|[^.]+?)(?:\.|$)/g;
         this._logger = new Logger_1.Logger(logLevel);
         this._applyDefaultsInModel();
@@ -125,11 +126,7 @@ class Form extends Container_1.default {
                 captchaInfoObj[field.qualifiedName] = field.value;
             }
         });
-        const options = {
-            lang: this.lang,
-            captchaInfo: captchaInfoObj,
-            additionalSubmitMetadata: Object.assign({}, this.additionalSubmitMetadata)
-        };
+        const options = Object.assign({ lang: this.lang, captchaInfo: captchaInfoObj }, this.additionalSubmitMetadata);
         return new SubmitMetaData_1.default(options);
     }
     setFocus(field, focusOption) {
@@ -192,6 +189,9 @@ class Form extends Container_1.default {
         return this._ids.next().value;
     }
     fieldAdded(field) {
+        if (field.fieldType === 'captcha' && !this._captcha) {
+            this._captcha = field;
+        }
         this._fields[field.id] = field;
         field.subscribe((action) => {
             if (this._invalidFields.indexOf(action.target.id) === -1) {
@@ -326,6 +326,9 @@ class Form extends Container_1.default {
     get title() {
         return this._jsonModel.title || '';
     }
+    get captcha() {
+        return this._captcha;
+    }
 }
 _Form_instances = new WeakSet(), _Form_getNavigableChildren = function _Form_getNavigableChildren(children) {
     return children.filter(child => child.visible === true);

package/lib/Scriptable.d.ts

@@ -8,7 +8,7 @@ declare abstract class Scriptable<T extends RulesJson> extends BaseNode<T> imple
     getRules(): import("./types/Json").Items<string>;
     private getCompiledRule;
     private getCompiledEvent;
-    private applyUpdates;
+    protected applyUpdates(updates: any): void;
     protected executeAllRules(context: any): void;
     private getExpressionScope;
     private executeEvent;

package/lib/rules/FunctionRuntime.d.ts

@@ -37,7 +37,7 @@ declare class FunctionRuntimeImpl {
             _signature: never[];
         };
         submitForm: {
-            _func: (args: Array<unknown>, data: unknown, interpreter: any) => {};
+            _func: (args: Array<unknown>, data: unknown, interpreter: any) => Promise<{}>;
             _signature: never[];
         };
         saveForm: {

package/lib/rules/FunctionRuntime.js

@@ -91,6 +91,25 @@ const urlEncoded = (data) => {
     });
     return formData;
 };
+const submit = (context, success, error, submitAs = 'multipart/form-data', input_data = null, action = '', metadata = null) => __awaiter(void 0, void 0, void 0, function* () {
+    const endpoint = action || context.form.action;
+    let data = input_data;
+    if (typeof data != 'object' || data == null) {
+        data = context.form.exportData();
+    }
+    const attachments = (0, FormUtils_1.getAttachments)(context.form, true);
+    let submitContentType = submitAs;
+    const submitDataAndMetaData = Object.assign({ 'data': data }, metadata);
+    let formData = submitDataAndMetaData;
+    if (Object.keys(attachments).length > 0 || submitAs === 'multipart/form-data') {
+        formData = multipartFormData(submitDataAndMetaData, attachments);
+        submitContentType = 'multipart/form-data';
+    }
+    yield (0, exports.request)(context, endpoint, 'POST', formData, success, error, {
+        'Content-Type': submitContentType
+    });
+});
+exports.submit = submit;
 const multipartFormData = (data, attachments) => {
     const formData = new FormData();
     Object.entries(data).forEach(([key, value]) => {
@@ -123,25 +142,6 @@ const multipartFormData = (data, attachments) => {
     }
     return formData;
 };
-const submit = (context, success, error, submitAs = 'multipart/form-data', input_data = null, action = '', metadata = null) => __awaiter(void 0, void 0, void 0, function* () {
-    const endpoint = action || context.form.action;
-    let data = input_data;
-    if (typeof data != 'object' || data == null) {
-        data = context.form.exportData();
-    }
-    const attachments = (0, FormUtils_1.getAttachments)(context.form, true);
-    let submitContentType = submitAs;
-    const submitDataAndMetaData = Object.assign({ 'data': data }, metadata);
-    let formData = submitDataAndMetaData;
-    if (Object.keys(attachments).length > 0 || submitAs === 'multipart/form-data') {
-        formData = multipartFormData(submitDataAndMetaData, attachments);
-        submitContentType = 'multipart/form-data';
-    }
-    yield (0, exports.request)(context, endpoint, 'POST', formData, success, error, {
-        'Content-Type': submitContentType
-    });
-});
-exports.submit = submit;
 const createAction = (name, payload = {}) => {
     switch (name) {
         case 'change':
@@ -338,7 +338,8 @@ class FunctionRuntimeImpl {
                 _signature: []
             },
             submitForm: {
-                _func: (args, data, interpreter) => {
+                _func: (args, data, interpreter) => __awaiter(this, void 0, void 0, function* () {
+                    var _a;
                     let success = null;
                     let error = null;
                     let submit_data;
@@ -357,6 +358,24 @@ class FunctionRuntimeImpl {
                         submit_data = args.length > 3 ? valueOf(args[3]) : null;
                         validate_form = args.length > 4 ? valueOf(args[4]) : true;
                     }
+                    const form = interpreter.globals.form;
+                    if (form.captcha && form.captcha.properties['fd:captcha'].config.version === 'enterprise'
+                        && form.captcha.properties['fd:captcha'].config.keyType === 'score') {
+                        if (typeof ((_a = interpreter.runtime.functionTable.fetchCaptchaToken) === null || _a === void 0 ? void 0 : _a._func) !== 'function') {
+                            interpreter.globals.form.logger.error('fetchCaptchaToken is not defined');
+                            interpreter.globals.form.dispatch(new Events_1.SubmitError({ type: 'FetchCaptchaTokenNotDefined' }));
+                            return {};
+                        }
+                        try {
+                            const token = yield interpreter.runtime.functionTable.fetchCaptchaToken._func([], data, interpreter);
+                            form.captcha.value = token;
+                        }
+                        catch (e) {
+                            interpreter.globals.form.logger.error('Error while fetching captcha token');
+                            interpreter.globals.form.dispatch(new Events_1.SubmitError({ type: 'FetchCaptchaTokenFailed' }));
+                            return {};
+                        }
+                    }
                     interpreter.globals.form.dispatch(new Events_1.Submit({
                         success,
                         error,
@@ -365,7 +384,7 @@ class FunctionRuntimeImpl {
                         data: submit_data
                     }));
                     return {};
-                },
+                }),
                 _signature: []
             },
             saveForm: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aemforms/af-core",
-  "version": "0.22.85",
+  "version": "0.22.87",
   "description": "Core Module for Forms Runtime",
   "author": "Adobe Systems",
   "license": "Adobe Proprietary",
@@ -37,7 +37,7 @@
   },
   "dependencies": {
     "@adobe/json-formula": "0.1.50",
-    "@aemforms/af-formatters": "^0.22.85"
+    "@aemforms/af-formatters": "^0.22.87"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.20.2",
@@ -59,6 +59,7 @@
     "jest-junit": "^12.2.0",
     "nock": "^13.1.3",
     "node-fetch": "^2.6.1",
+    "parse-multipart-data": "^1.5.0",
     "ts-jest": "29.0",
     "typedoc": "0.22.11",
     "typedoc-plugin-markdown": "3.11.13",