oneentry 1.0.76 → 1.0.78

package/README.md

@@ -674,10 +674,10 @@ Example return:
 true
 ```
 
-### AuthProvider.changePassword(marker, userIdentifier, code, newPassword, repeatPassword)
+### AuthProvider.changePassword(marker, userIdentifier, type, code, newPassword, repeatPassword)
 
 ```js
-const value = await AuthProvider.changePassword('email', 'example@oneentry.cloud', 'EW32RF', 654321, 654321)
+const value = await AuthProvider.changePassword('email', 'example@oneentry.cloud', 1, 'EW32RF', 654321, 654321)
 ```
 
 > This method changes the password of an authorized user. If successful, it will return true.
@@ -1281,6 +1281,7 @@ Example return:
     },
     "processingData": "Unknown Type: ProcessingData",
     "version": 10,
+    "type": "data",
     "identifier": "catalog",
     "position": 192,
     "attributes": [
@@ -1349,6 +1350,10 @@ default: marker <br>
 *position number (for sorting)* <br>
 example: 192 <br>
 
+**position:** string <br>
+*Form type* <br>
+example: 'data' <br>
+
 **attributes:**	 <br>
 *array of attribute values from the used attribute set for displaying the form (taking into account the specified language)* <br>
 example: List [ OrderedMap { "type": "list", "marker": "l1", "position": 2, "listTitles": List [ OrderedMap { "title": "red", "value": 1, "position": 1, "extendedValue": null, "extendedValueType": null }, OrderedMap { "title": "yellow", "value": 2, "position": 2, "extendedValue": null, "extendedValueType": null } ], "validators": OrderedMap {}, "localizeInfos": OrderedMap { "title": "l1" } } ] <br>
@@ -1382,6 +1387,7 @@ Example return:
   },
   "processingData": "Unknown Type: ProcessingData",
   "version": 10,
+  "type": "data",
   "identifier": "catalog",
   "position": 192,
   "attributes": [
@@ -1449,6 +1455,10 @@ default: marker <br>
 *position number (for sorting)* <br>
 example: 192 <br>
 
+**position:** string <br>
+*Form type* <br>
+example: 'data' <br>
+
 **attributes:**	 <br>
 *array of attribute values from the used attribute set for displaying the form (taking into account the specified language)* <br>
 example: List [ OrderedMap { "type": "list", "marker": "l1", "position": 2, "listTitles": List [ OrderedMap { "title": "red", "value": 1, "position": 1, "extendedValue": null, "extendedValueType": null }, OrderedMap { "title": "yellow", "value": 2, "position": 2, "extendedValue": null, "extendedValueType": null } ], "validators": OrderedMap {}, "localizeInfos": OrderedMap { "title": "l1" } } ] <br>
@@ -5429,3 +5439,31 @@ example:  List [ OrderedMap { "marker": "password", "value": "12345" } ] <br>
 example: OrderedMap { "email": "example@oneentry.cloud", "phonePush": "", "phoneSMS": "+9999999999" } <br>
 
 </details>
+
+### Users.addFCMToken(token)
+
+```js
+const value = await Users.addFCMToken('my-token')
+```
+
+> This method adds FCM token for sending Push notifications. Return true in case of successful token update.
+
+Example return:
+
+```json
+true
+```
+
+### Users.deleteFCMToken(token)
+
+```js
+const value = await Users.deleteFCMToken('my-token')
+```
+
+> This method delete FCM token for sending Push notifications. Return true in case of successful token deletion.
+
+Example return:
+
+```json
+true
+```

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

@@ -105,10 +105,11 @@ export default class AuthProviderApi extends AsyncModules implements IAuthProvid
      * @param {string} marker - The text identifier of the authorization provider. Example - email
      * @param {string} userIdentifier - The text identifier of the user's object (user login)
      * @param {string} code - Service code
+     * @param {string} type - Operation type (1 - for changing password, 2 - for recovery)
      * @param {string} newPassword - New password
      * @param {string} [repeatPassword] - Optional variable contains repeat new password for validation
      */
-    changePassword(marker: string, userIdentifier: string, code: string, newPassword: string, repeatPassword?: string): Promise<boolean>;
+    changePassword(marker: string, userIdentifier: string, type: number, code: string, newPassword: string, repeatPassword?: string): Promise<boolean>;
     /**
      * Get all auth providers objects
      * @param {string} [langCode] - Language code. Default "en_US"

package/dist/auth-provider/authProviderApi.js

@@ -60,7 +60,6 @@ class AuthProviderApi extends asyncModules_1.default {
             "eventIdentifier": eventIdentifier
         };
         const result = await this._fetchPost(`/marker/${marker}/users/generate-code`, data);
-        return result;
     }
     /**
      * User activation code verification. Returns true (if the code is correct) or false (if it is incorrect).
@@ -162,13 +161,15 @@ class AuthProviderApi extends asyncModules_1.default {
      * @param {string} marker - The text identifier of the authorization provider. Example - email
      * @param {string} userIdentifier - The text identifier of the user's object (user login)
      * @param {string} code - Service code
+     * @param {string} type - Operation type (1 - for changing password, 2 - for recovery)
      * @param {string} newPassword - New password
      * @param {string} [repeatPassword] - Optional variable contains repeat new password for validation
      */
-    async changePassword(marker, userIdentifier, code, newPassword, repeatPassword) {
+    async changePassword(marker, userIdentifier, type, code, newPassword, repeatPassword) {
         const data = {
             "userIdentifier": userIdentifier,
             "code": code,
+            "type": type,
             "password1": newPassword,
             "password2": repeatPassword !== null && repeatPassword !== void 0 ? repeatPassword : newPassword
         };

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

@@ -21,7 +21,7 @@ interface IAuthProvider {
     auth(marker: string, data: IAuthPostBody): Promise<IAuthEntity>;
     refresh(marker: string, token: string): Promise<IAuthEntity>;
     logout(marker: string, token: string): Promise<boolean>;
-    changePassword(marker: string, userIdentifier: string, code: string, newPassword: string, repeatPassword?: string): Promise<boolean>;
+    changePassword(marker: string, userIdentifier: string, type: number, code: string, newPassword: string, repeatPassword?: string): Promise<boolean>;
     getAuthProviders(langCode?: string, offset?: number, limit?: number): Promise<Array<IAuthProvidersEntity>>;
     getMarker(marker: string, langCode?: string): Promise<IAuthProvidersEntity>;
 }

package/dist/base/asyncModules.d.ts

@@ -7,7 +7,7 @@ export default abstract class AsyncModules extends SyncModules {
     protected _url: string;
     protected constructor(state: StateModule);
     protected _fetchGet(path: string): Promise<any>;
-    protected _fetchPost(path: string, data: any): Promise<any>;
+    protected _fetchPost(path: string, data?: any): Promise<any>;
     protected _fetchPut(path: string, data: any): Promise<any>;
     protected _fetchDelete(path: string, data?: any): Promise<any>;
     protected refreshToken(): Promise<boolean>;

package/dist/base/asyncModules.js

@@ -45,7 +45,12 @@ class AsyncModules extends syncModules_1.default {
                         responseData += chunk;
                     });
                     res.on('end', () => {
-                        resolve(JSON.parse(responseData));
+                        try {
+                            resolve(JSON.parse(responseData));
+                        }
+                        catch (error) {
+                            resolve(responseData);
+                        }
                     });
                 });
                 req.on('error', (error) => {
@@ -157,7 +162,12 @@ class AsyncModules extends syncModules_1.default {
             const error = await response.json();
             throw error;
         }
-        return await response.json();
+        try {
+            return await response.json();
+        }
+        catch (e) {
+            return response;
+        }
     }
 }
 exports.default = AsyncModules;

package/dist/events/eventsApi.d.ts

@@ -10,6 +10,8 @@ export default class EventsApi extends AsyncModules implements IEvents {
     constructor(state: StateModule);
     /**
      * Subscribing to an event on a product.
+     *
+     * @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.
      * @param marker - Event marker.
      * @param userId - User id.
      * @param productId - Product id.
@@ -17,6 +19,8 @@ export default class EventsApi extends AsyncModules implements IEvents {
     subscribeByMarker(marker: string, userId: number, productId: number): Promise<any>;
     /**
      * Unsubscribing to an event on a product.
+     *
+     * @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.
      * @param marker - Event marker.
      * @param userId - User id.
      * @param productId - Product id.

package/dist/events/eventsApi.js

@@ -11,6 +11,8 @@ class EventsApi extends asyncModules_1.default {
     }
     /**
      * Subscribing to an event on a product.
+     *
+     * @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.
      * @param marker - Event marker.
      * @param userId - User id.
      * @param productId - Product id.
@@ -24,6 +26,8 @@ class EventsApi extends asyncModules_1.default {
     }
     /**
      * Unsubscribing to an event on a product.
+     *
+     * @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.
      * @param marker - Event marker.
      * @param userId - User id.
      * @param productId - Product id.

package/dist/forms/formsInterfaces.d.ts

@@ -21,6 +21,7 @@ interface IForms {
  * @property {object} processingData - Form data.
  * @property {Array<IAttributes>} attribute - Array of attribute values from the used attribute set for displaying the form (taking into account the specified language)
  * @property {number} version - The version number of the object.
+ * @property {string} type - Form type.
  * @property {string} identifier - The textual identifier for the record field.
  * @property {number} position - The position of the object.
  */
@@ -32,6 +33,7 @@ interface IFormsEntity {
     localizeInfos: Record<string, any>;
     templateId: number | null;
     position: number;
+    type: string | null;
     processingType: string;
     version: number;
 }

package/dist/orders/ordersInterfaces.d.ts

@@ -15,7 +15,6 @@ interface IOrdersApi {
     updateOrderByMarkerAndId(marker: string, id: number, data: IOrderData, langCode?: string): Promise<IBaseOrdersEntity>;
     getAllOrders(langCode?: string, limit?: number, offset?: number): Promise<Array<IOrdersEntity>>;
     getAllOrdersByMarker(marker: string, langCode?: string, limit?: number, offset?: number): Promise<Array<IOrdersByMarkersEntity>>;
-    setAccessToken(accessToken: string): IOrdersApi;
 }
 /**
  * @property {string} filename

package/dist/pages/pagesApi.js

@@ -113,7 +113,7 @@ class PageApi extends asyncModules_1.default {
             if (normalizeResponse.type === 'forSimilarProductBlock') {
                 try {
                     await Blocks.getSimilarProducts(normalizeResponse.identifier, langCode).then((result) => {
-                        normalizeResponse.similarProducts = result;
+                        normalizeResponse.similarProducts = this._normalizeData(result);
                     });
                 }
                 catch {
@@ -123,7 +123,7 @@ class PageApi extends asyncModules_1.default {
             else if (normalizeResponse.type === 'forProductBlock') {
                 try {
                     await Blocks.getProductsByBlockMarker(normalizeResponse.identifier, langCode).then((result) => {
-                        normalizeResponse.products = result;
+                        normalizeResponse.products = this._normalizeData(result);
                     });
                 }
                 catch {
@@ -131,7 +131,7 @@ class PageApi extends asyncModules_1.default {
                 }
             }
         }
-        return normalizeResponse;
+        return this._normalizeData(normalizeResponse);
     }
     /**
      * Get settings for the page.

package/dist/payments/paymentsInterfaces.d.ts

@@ -18,7 +18,6 @@ interface IPaymentsApi {
     getAccounts(): Promise<Array<IAccountsEntity>>;
     getAccountById(id: number): Promise<IAccountsEntity>;
     webhookStripe(): Promise<boolean>;
-    setAccessToken(accessToken: string): IPaymentsApi;
 }
 /**
  *

package/dist/users/usersApi.d.ts

@@ -45,4 +45,18 @@ export default class UsersApi extends AsyncModules implements IUsers {
      * }
      */
     updateUser(data: IUserBody, langCode?: string): Promise<boolean>;
+    /**
+     * Adds FCM token for sending Push notification.
+     * @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.
+     *
+     * @param {string} token - Cloud messaging token.
+     */
+    addFCMToken(token: string): Promise<boolean>;
+    /**
+     * Delete FCM token.
+     * @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.
+     *
+     * @param {string} token - Cloud messaging token.
+     */
+    deleteFCMToken(token: string): Promise<boolean>;
 }

package/dist/users/usersApi.js

@@ -54,5 +54,25 @@ class UsersApi extends asyncModules_1.default {
         const result = await this._fetchPut('/me', this._normalizePostBody(data, langCode));
         return result;
     }
+    /**
+     * Adds FCM token for sending Push notification.
+     * @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.
+     *
+     * @param {string} token - Cloud messaging token.
+     */
+    async addFCMToken(token) {
+        const result = await this._fetchPost(`/me/fcm-token/${token}`);
+        return result;
+    }
+    /**
+     * Delete FCM token.
+     * @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.
+     *
+     * @param {string} token - Cloud messaging token.
+     */
+    async deleteFCMToken(token) {
+        const result = await this._fetchDelete(`/me/fcm-token/${token}`);
+        return result;
+    }
 }
 exports.default = UsersApi;

package/dist/users/usersInterfaces.d.ts

@@ -1,19 +1,24 @@
 import { IAuthFormData } from "../auth-provider/authProvidersInterfaces";
+import { FormDataType } from "../formsData/formsDataInterfaces";
 /**
  * Represents a interface object of Users Api.
  *
  * @property {function} subscribeByMarker - Getting the data of an authorized user.
  * @property {function} unsubscribeByMarker - Updating a single user object.
+ * @property {function} addFCMToken - Adds FCM token for sending Push notification.
+ * @property {function} deleteFCMToken - Delete FCM token.
  * @property {function} setAccessToken - Only for custom authorization. An intermediate method for setting up an access token.
  */
 interface IUsers {
     getUser(langCode?: string): Promise<IUserEntity>;
     updateUser(data: IUserBody, langCode?: string): Promise<boolean>;
-    setAccessToken(accessToken: string): IUsers;
+    addFCMToken(token: string): Promise<boolean>;
+    deleteFCMToken(token: string): Promise<boolean>;
 }
 interface IUserEntity {
     id: number;
     identifier: string;
+    formData: Array<FormDataType>;
     formIdentifier: string;
     authProviderIdentifier: string;
     groups: Array<string>;
@@ -28,7 +33,7 @@ interface IUserBody {
     formData: IAuthFormData | Array<IAuthFormData>;
     notificationData: {
         email: string;
-        phonePush: string;
+        phonePush: Array<string>;
         phoneSMS: string;
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oneentry",
-  "version": "1.0.76",
+  "version": "1.0.78",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",