oneentry 1.0.119 → 1.0.120

package/dist/attribute-sets/attributeSetsApi.d.ts

@@ -47,7 +47,7 @@ export default class AttributesSetsApi extends AsyncModules implements IAttribut
      * @param {string} [marker] - marker of the attribute set object
      * @param {string} [langCode] - Language code.
      *
-     * @returns Returns one object ContentPositionAttributesSetDto of the attribute set
+     * @returns Returns one object of the attribute set
      */
     getAttributeSetByMarker(marker: string, langCode?: string): Promise<IAttributeSetsEntity | IError>;
 }

package/dist/attribute-sets/attributeSetsApi.js

@@ -67,7 +67,7 @@ class AttributesSetsApi extends asyncModules_1.default {
      * @param {string} [marker] - marker of the attribute set object
      * @param {string} [langCode] - Language code.
      *
-     * @returns Returns one object ContentPositionAttributesSetDto of the attribute set
+     * @returns Returns one object of the attribute set
      */
     async getAttributeSetByMarker(marker, langCode = this.state.lang) {
         const result = await this._fetchGet(`/marker/${marker}/?langCode=${langCode}`);

package/dist/auth-provider/authProviderApi.d.ts

@@ -117,6 +117,10 @@ export default class AuthProviderApi extends AsyncModules implements IAuthProvid
      * @param {string} [code] - Service code
      * @param {string} [newPassword] - New password
      * @param {string} [repeatPassword] - Optional variable contains repeat new password for validation
+     *
+     * @example
+     * await AuthProvider.changePassword('email', userIdentifier, type, code, newPassword, repeatPassword);
+     *
      */
     changePassword(marker: string, userIdentifier: string, type: number, code: string, newPassword: string, repeatPassword?: string): Promise<boolean | IError>;
     /**

package/dist/auth-provider/authProviderApi.js

@@ -177,6 +177,10 @@ class AuthProviderApi extends asyncModules_1.default {
      * @param {string} [code] - Service code
      * @param {string} [newPassword] - New password
      * @param {string} [repeatPassword] - Optional variable contains repeat new password for validation
+     *
+     * @example
+     * await AuthProvider.changePassword('email', userIdentifier, type, code, newPassword, repeatPassword);
+     *
      */
     async changePassword(marker, userIdentifier, type, code, newPassword, repeatPassword) {
         const data = {

package/dist/base/asyncModules.js

@@ -182,9 +182,14 @@ class AsyncModules extends syncModules_1.default {
         };
         if (data instanceof FormData || data instanceof Blob) {
             delete options.headers['Content-Type'];
+            options.headers = {
+                ...options.headers,
+                accept: 'application/json',
+            };
+            options.body = data;
         }
-        if (data) {
-            options['body'] = JSON.stringify(data);
+        else if (data) {
+            options.body = JSON.stringify(data);
         }
         if (this.state.accessToken) {
             options.headers['Authorization'] = 'Bearer ' + this.state.accessToken;

package/dist/base/syncModules.js

@@ -256,6 +256,7 @@ class SyncModules {
      * @returns normalized Attrs
      */
     _normalizeAttr(data) {
+        // for regular attributes
         if ('attributeValues' in data) {
             for (const attr in data.attributeValues) {
                 // normalize numbers
@@ -278,6 +279,26 @@ class SyncModules {
                 attributeValues: this._sortAttributes(data.attributeValues),
             };
         }
+        // for forms attributes
+        if ('attributes' in data) {
+            const d = data.attributes;
+            for (const attr in d) {
+                // normalize numbers
+                if (d[attr].type === 'integer' || d[attr].type === 'float') {
+                    d[attr].value = Number(d[attr].value);
+                }
+                // add timeIntervals
+                if (d[attr].type === 'timeInterval') {
+                    const schedules = d[attr].value;
+                    // console.log(JSON.stringify(schedules));
+                    if (Array.isArray(schedules) && schedules.length > 0) {
+                        const result = this._addTimeIntervalsToSchedules(schedules);
+                        d[attr].value = result;
+                    }
+                }
+            }
+            return data;
+        }
         return data;
     }
     /**

package/dist/base/utils.d.ts

@@ -1,4 +1,4 @@
-type Types = 'forCatalogProducts' | 'forBasketPage' | 'forErrorPage' | 'forCatalogPages' | 'forProductPreview' | 'forProductPage' | 'forSimilarProductBlock' | 'forStatisticProductBlock' | 'forProductBlock' | 'forForm' | 'forFormField' | 'forNewsPage' | 'forNewsBlock' | 'forNewsPreview' | 'forOneNewsPage' | 'forUsualPage' | 'forTextBlock' | 'forSlider' | 'forSliderBlock' | 'forOrder' | 'service' | 'none';
+type Types = 'product' | 'error_page' | 'catalog_page' | 'product_preview' | 'similar_products_block' | 'product_block' | 'form' | 'common_page' | 'common_block' | 'order' | 'service' | 'none';
 /**
  * @param {string} [token] - If your project is protected by a token, specify this token in this parameter.
  * @param {string} [langCode] - specify the default language to avoid specifying it in every request.

package/dist/blocks/blocksApi.d.ts

@@ -12,7 +12,7 @@ export default class BlocksApi extends AsyncModules implements IBlocks {
     /**
      * Get blocks by parameters.
      *
-     * @param {BlockType} [type] - Available values : forCatalogProducts, forBasketPage, forErrorPage, forCatalogPages, forProductPreview, forProductPage, forSimilarProductBlock, forStatisticProductBlock, forProductBlock, forForm, forFormField, forNewsPage, forNewsBlock, forNewsPreview, forOneNewsPage, forUsualPage, forTextBlock, forSlider, forOrder, service
+     * @param {BlockType} [type] - Available values : product | error_page | catalog_page | product_preview | similar_products_block | product_block | form | common_page | common_block | order | none
      * @param {string} [langCode] - Language code. Default "en_US"
      * @param {number} [offset] - Parameter for pagination. Default 0
      * @param {number} [limit] - Parameter for pagination. Default 30

package/dist/blocks/blocksApi.js

@@ -15,7 +15,7 @@ class BlocksApi extends asyncModules_1.default {
     /**
      * Get blocks by parameters.
      *
-     * @param {BlockType} [type] - Available values : forCatalogProducts, forBasketPage, forErrorPage, forCatalogPages, forProductPreview, forProductPage, forSimilarProductBlock, forStatisticProductBlock, forProductBlock, forForm, forFormField, forNewsPage, forNewsBlock, forNewsPreview, forOneNewsPage, forUsualPage, forTextBlock, forSlider, forOrder, service
+     * @param {BlockType} [type] - Available values : product | error_page | catalog_page | product_preview | similar_products_block | product_block | form | common_page | common_block | order | none
      * @param {string} [langCode] - Language code. Default "en_US"
      * @param {number} [offset] - Parameter for pagination. Default 0
      * @param {number} [limit] - Parameter for pagination. Default 30
@@ -42,7 +42,7 @@ class BlocksApi extends asyncModules_1.default {
                 delete block.customSettings;
                 delete block.attributesSetIdentifier;
                 delete block.productPageUrls;
-                if (block.type === 'forSimilarProductBlock') {
+                if (block.type === 'similar_products_block') {
                     try {
                         await this.getSimilarProducts(block.identifier, langCode, offset, limit).then((result) => {
                             block.similarProducts = result;
@@ -52,7 +52,7 @@ class BlocksApi extends asyncModules_1.default {
                         block.similarProducts = [];
                     }
                 }
-                else if (block.type === 'forProductBlock') {
+                else if (block.type === 'product_block') {
                     try {
                         await this.getProductsByBlockMarker(block.identifier, langCode, offset, limit).then((result) => {
                             block.products = result;
@@ -93,7 +93,7 @@ class BlocksApi extends asyncModules_1.default {
         delete normalizeResponse.attributesSetIdentifier;
         delete normalizeResponse.productPageUrls;
         if (this.state.multipleResponse) {
-            if (normalizeResponse.type === 'forSimilarProductBlock') {
+            if (normalizeResponse.type === 'similar_products_block') {
                 try {
                     await this.getSimilarProducts(normalizeResponse.identifier, langCode, offset, limit).then((result) => {
                         normalizeResponse.similarProducts = result;
@@ -103,7 +103,7 @@ class BlocksApi extends asyncModules_1.default {
                     normalizeResponse.similarProducts = [];
                 }
             }
-            else if (normalizeResponse.type === 'forProductBlock') {
+            else if (normalizeResponse.type === 'product_block') {
                 try {
                     await this.getProductsByBlockMarker(normalizeResponse.identifier, langCode, offset, limit).then((result) => {
                         normalizeResponse.products = result;

package/dist/blocks/blocksInterfaces.d.ts

@@ -71,5 +71,5 @@ interface ISearchBlock {
 /**
  * BlockType
  */
-type BlockType = 'forCatalogProducts' | 'forBasketPage' | 'forErrorPage' | 'forCatalogPages' | 'forProductPreview' | 'forProductPage' | 'forSimilarProductBlock' | 'forStatisticProductBlock' | 'forProductBlock' | 'forForm' | 'forFormField' | 'forNewsPage' | 'forNewsBlock' | 'forNewsPreview' | 'forOneNewsPage' | 'forUsualPage' | 'forTextBlock' | 'forSlider' | 'forOrder' | 'service' | 'none';
+type BlockType = 'product' | 'error_page' | 'catalog_page' | 'product_preview' | 'similar_products_block' | 'product_block' | 'form' | 'common_page' | 'common_block' | 'order' | 'service' | 'none';
 export type { BlockType, IBlockEntity, IBlocks, IBlocksResponse, ISearchBlock };

package/dist/file-uploading/fileUploadingApi.d.ts

@@ -26,7 +26,7 @@ export default class FileUploadingApi extends AsyncModules implements IFileUploa
      *
      * @returns Uploads a file to an Amazon S3-compatible cloud file storage
      */
-    upload(data: File | Blob, fileQuery?: IUploadingQuery): Promise<IUploadingReturns | IError>;
+    upload(file: File | Blob, fileQuery?: IUploadingQuery): Promise<IUploadingReturns | IError>;
     /**
      * Deletes a file from the cloud file storage.
      *

package/dist/file-uploading/fileUploadingApi.js

@@ -38,10 +38,10 @@ class FileUploadingApi extends asyncModules_1.default {
      *
      * @returns Uploads a file to an Amazon S3-compatible cloud file storage
      */
-    async upload(data, fileQuery) {
+    async upload(file, fileQuery) {
         const query = { ...this._defaultQuery, ...fileQuery };
         const body = new FormData();
-        body.append('files', data);
+        body.append('files', file);
         const result = await this._fetchPost('?' + this._queryParamsToString(query), body);
         return result;
     }

package/dist/file-uploading/fileUploadingInterfaces.d.ts

@@ -7,7 +7,7 @@ import type { IError } from '../base/utils';
  * @property {function} getFile - Get file by parameters.
  */
 interface IFileUploading {
-    upload(data: File, fileQuery?: IUploadingQuery): Promise<IUploadingReturns | IError>;
+    upload(data: File | Blob, fileQuery?: IUploadingQuery): Promise<IUploadingReturns | IError>;
     delete(filename: string, fileQuery?: IUploadingQuery): Promise<any | IError>;
     getFile(id: number, type: string, entity: string, filename?: string): Promise<Blob | IError>;
 }
@@ -30,9 +30,6 @@ interface IUploadingQuery {
     type: string | null;
     entity: string | null;
     id: number | null;
-    width: number | null;
-    height: string | null;
-    compress: boolean | null;
     [key: string]: string | number | boolean | null;
 }
 /**
@@ -41,9 +38,10 @@ interface IUploadingQuery {
  * @property {string} downloadLink - Link for downloading the file.
  * @property {number} size - Size of the file in bytes.
  */
-interface IUploadingReturns {
+interface IUploadingReturn {
     filename: string;
     downloadLink: string;
     size: number;
 }
+type IUploadingReturns = IUploadingReturn[];
 export type { IFileEntity, IFileUploading, IUploadingQuery, IUploadingReturns };

package/dist/formsData/formsDataApi.js

@@ -50,9 +50,10 @@ class FormsDataApi extends asyncModules_1.default {
      */
     async postFormsData(body, langCode = this.state.lang) {
         const formData = {};
+        // filter spam and button fields
         formData[langCode] = Array.isArray(body.formData)
-            ? body.formData
-            : [body.formData];
+            ? body.formData.filter((fd) => fd.type !== 'spam' && fd.type !== 'button')
+            : [body.formData].filter((fd) => fd.type !== 'spam' && fd.type !== 'button');
         body.formData = formData;
         const result = await this._fetchPost(``, body);
         return this._dataPostProcess(result);

package/dist/formsData/formsDataInterfaces.d.ts

@@ -1,3 +1,4 @@
+import type { IUploadingQuery } from 'file-uploading/fileUploadingInterfaces';
 import type { IError } from '../base/utils';
 /**
  * Represents a interface object of Forms Api.
@@ -56,6 +57,7 @@ interface IFormsPost {
     formIdentifier: string;
     time?: Date | string;
     formData: Array<FormDataType>;
+    fileQuery?: IUploadingQuery;
 }
 /**
  * @property {string} marker - marker name

package/dist/general-types/generalTypesInterfaces.d.ts

@@ -1,4 +1,5 @@
-import type { IError, Types } from '../base/utils';
+import type { BlockType } from 'blocks/blocksInterfaces';
+import type { IError } from '../base/utils';
 /**
  * Represents an interface object of General Type Api.
  *
@@ -16,6 +17,6 @@ interface IGeneralTypes {
  */
 interface IGeneralTypesEntity {
     id: number;
-    type: Types;
+    type: BlockType;
 }
 export type { IGeneralTypes, IGeneralTypesEntity };

package/dist/integration-collections/integrationCollectionsApi.d.ts

@@ -51,7 +51,7 @@ export default class IntegrationCollectionsApi extends AsyncModules implements I
      *
      * @param {string} [marker] - Collection marker.
      *
-     * @returns Returns object MarkerValidDto with value true if text identifier (marker) exists or false if not
+     * @returns Returns object with value true if text identifier (marker) exists or false if not
      */
     validateICollectionMarker(marker: string): Promise<{
         valid: boolean;
@@ -102,7 +102,7 @@ export default class IntegrationCollectionsApi extends AsyncModules implements I
      *
      * @param {string} [marker] - text identifier of the collection
      * @param {number} [id] - row id
-     * @param {any} [body] - Object UpdateCollectionRowDto for updating a record in the collection
+     * @param {any} [body] - Object for updating a record in the collection
      *
      * const body = {
         "formIdentifier": "collection-form",
@@ -119,7 +119,7 @@ export default class IntegrationCollectionsApi extends AsyncModules implements I
      *
      * @param {string} [langCode] - language code
      *
-     * @returns Returns object UpdateCollectionRowDto
+     * @returns Returns object
      */
     updateICollectionRow(marker: string, id: number, body: {
         formIdentifier: string;

package/dist/integration-collections/integrationCollectionsApi.js

@@ -71,7 +71,7 @@ class IntegrationCollectionsApi extends asyncModules_1.default {
      *
      * @param {string} [marker] - Collection marker.
      *
-     * @returns Returns object MarkerValidDto with value true if text identifier (marker) exists or false if not
+     * @returns Returns object with value true if text identifier (marker) exists or false if not
      */
     async validateICollectionMarker(marker) {
         const result = await this._fetchGet(`/marker-validation/${marker}/`);
@@ -132,7 +132,7 @@ class IntegrationCollectionsApi extends asyncModules_1.default {
      *
      * @param {string} [marker] - text identifier of the collection
      * @param {number} [id] - row id
-     * @param {any} [body] - Object UpdateCollectionRowDto for updating a record in the collection
+     * @param {any} [body] - Object for updating a record in the collection
      *
      * const body = {
         "formIdentifier": "collection-form",
@@ -149,7 +149,7 @@ class IntegrationCollectionsApi extends asyncModules_1.default {
      *
      * @param {string} [langCode] - language code
      *
-     * @returns Returns object UpdateCollectionRowDto
+     * @returns Returns object
      */
     async updateICollectionRow(marker, id, body, langCode = this.state.lang) {
         const response = await this._fetchPut(`/marker/${marker}/rows/${id}/?` + `langCode=${langCode}`, body);

package/dist/pages/pagesApi.js

@@ -112,7 +112,7 @@ class PageApi extends asyncModules_1.default {
                 }
             }
             const staffModule = new StaffModule(this.state);
-            if (normalizeResponse.type === 'forSimilarProductBlock') {
+            if (normalizeResponse.type === 'similar_products_block') {
                 try {
                     await staffModule
                         .getSimilarProducts(normalizeResponse.identifier, langCode)
@@ -124,7 +124,7 @@ class PageApi extends asyncModules_1.default {
                     normalizeResponse.similarProducts = [];
                 }
             }
-            else if (normalizeResponse.type === 'forProductBlock') {
+            else if (normalizeResponse.type === 'product_block') {
                 try {
                     await staffModule
                         .getProductsByBlockMarker(normalizeResponse.identifier, langCode)

package/dist/payments/paymentsApi.d.ts

@@ -35,19 +35,6 @@ export default class PaymentsApi extends AsyncModules implements IPaymentsApi {
      * @returns
      */
     getSessionByOrderId(id: number): Promise<IAccountsEntity | IError>;
-    /**
-     * Update payment session 🔐
-     *
-     * @param id - order identifier
-     * @param body - Request body
-     *
-     * @param body.status
-     * @param body.paymentUrl
-     */
-    updateSessionById(id: number, body: {
-        status: string;
-        paymentUrl: string;
-    }): Promise<any | IError>;
     /**
      * Creation of payment session.
      * @description This method requires user authorization. For more information about configuring the authorization module, see the documentation in the configuration settings section of the SDK.

package/dist/payments/paymentsApi.js

@@ -51,19 +51,6 @@ class PaymentsApi extends asyncModules_1.default {
         const result = await this._fetchGet(`/sessions/order/${id}`);
         return result;
     }
-    /**
-     * Update payment session 🔐
-     *
-     * @param id - order identifier
-     * @param body - Request body
-     *
-     * @param body.status
-     * @param body.paymentUrl
-     */
-    async updateSessionById(id, body) {
-        const result = await this._fetchPut(`/sessions/${id}`, body);
-        return this._normalizeData(result);
-    }
     /**
      * Creation of payment session.
      * @description This method requires user authorization. For more information about configuring the authorization module, see the documentation in the configuration settings section of the SDK.

package/dist/system/systemApi.d.ts

@@ -1,5 +1,6 @@
 import AsyncModules from '../base/asyncModules';
 import type StateModule from '../base/stateModule';
+import type { IError } from '../base/utils';
 import type { ISystem } from './systemInterfaces';
 /**
  * Controllers for working with system - system
@@ -8,6 +9,27 @@ export default class SystemApi extends AsyncModules implements ISystem {
     protected state: StateModule;
     protected _url: string;
     constructor(state: StateModule);
+    /**
+     * test404
+     * @returns
+     */
     test404(): Promise<any>;
+    /**
+     * test500
+     * @returns
+     */
     test500(): Promise<any>;
+    /**
+     * validateCapcha
+     * @param event
+     * @param event.token -
+     * @param event.expectedAction -
+     * @param event.siteKey -
+     * @returns
+     */
+    validateCapcha(event: {
+        token: string;
+        expectedAction: string;
+        siteKey: string;
+    }): Promise<any | IError>;
 }

package/dist/system/systemApi.js

@@ -13,13 +13,36 @@ class SystemApi extends asyncModules_1.default {
         super(state);
         this._url = state.url + '/api/content/system';
     }
+    /**
+     * test404
+     * @returns
+     */
     async test404() {
         const result = await this._fetchGet('/test404');
         return result;
     }
+    /**
+     * test500
+     * @returns
+     */
     async test500() {
         const result = await this._fetchGet('/test500');
         return result;
     }
+    /**
+     * validateCapcha
+     * @param event
+     * @param event.token -
+     * @param event.expectedAction -
+     * @param event.siteKey -
+     * @returns
+     */
+    async validateCapcha(event) {
+        const data = {
+            event,
+        };
+        const result = await this._fetchPost('/captcha/validate', data);
+        return result;
+    }
 }
 exports.default = SystemApi;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oneentry",
-  "version": "1.0.119",
+  "version": "1.0.120",
   "description": "OneEntry NPM package",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -8,7 +8,7 @@
     "/dist"
   ],
   "scripts": {
-    "productionBuild": "run-s lint testAll build readme",
+    "productionBuild": "run-s lint testAll build",
     "testAll": "run-s admins attributesets authProvider blocks fileuploading forms formsdata generaltypes integrationcollections locales menus orders pages payments payments productstatuses products templates templatespreview users",
     "admins": "npx jest src/admins/tests/admins.spec.ts",
     "attributesets": "npx jest src/attribute-sets/tests/attributesets.spec.ts",
@@ -30,8 +30,7 @@
     "templatespreview": "npx jest src/templates-preview/tests/templatespreview.spec.ts",
     "users": "npx jest src/users/tests/users.spec.ts",
     "lint": "npx eslint",
-    "build": "npx tsc",
-    "readme": "node ./src/readme.js"
+    "build": "npx tsc"
   },
   "bin": {
     "oneentry": "./configure.js"