oneentry 1.0.68 → 1.0.69

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

@@ -1,4 +1,3 @@
-import { Types } from "../base/utils";
 /**
  * Represents an interface object of AttributesSets Api.
  *
@@ -14,14 +13,17 @@ interface IListTitle {
     title: string;
     value: number | string;
     position: string | number | null;
-    extendedValue: string | number | null;
-    extendedValueType: string | number | null;
+    extended: {
+        value: string | null;
+        type: string | null;
+    };
 }
+type AttributeType = 'string' | 'text' | 'textWithHeader' | 'integer' | 'real' | 'float' | 'dateTime' | 'date' | 'time' | 'file' | 'image' | 'groupOfImages' | 'radioButton' | 'list' | 'button';
 /**
  * Represents a template entity object.
  *
  * @interface
- * @property {Types} type - Attribute type.
+ * @property {AttributeType} type - Attribute type.
  * @property {string} marker - Textual identifier of the attribute (marker).
  * @property {number} position - Position number for sorting.
  * @property {Record<string, any>} validators - Set of validators for validation.
@@ -30,7 +32,7 @@ interface IListTitle {
  *
  */
 interface IAttributesSetsEntity {
-    type: Types;
+    type: AttributeType;
     marker: string;
     position: number;
     validators: {
@@ -44,4 +46,4 @@ interface IAttributesSetsEntity {
     localizeInfos: Record<string, any>;
     listTitles: Array<IListTitle> | Record<string, any>;
 }
-export { IAttributesSets, IAttributesSetsEntity, IListTitle };
+export { IAttributesSets, IAttributesSetsEntity, IListTitle, AttributeType };

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

@@ -1,5 +1,5 @@
 import AsyncModules from "../base/asyncModules";
-import { IAuthProvider, ISignUpData, ISignUpEntity, ICodeEntity, IAuthEntity, IAuthProvidersEntity, IAuthPostBody } from "./authProvidersInterfaces";
+import { IAuthProvider, ISignUpData, ISignUpEntity, IAuthEntity, IAuthProvidersEntity, IAuthPostBody } from "./authProvidersInterfaces";
 import StateModule from "../base/stateModule";
 /**
  * Controllers for working with auth services.
@@ -20,7 +20,7 @@ export default class AuthProviderApi extends AsyncModules implements IAuthProvid
      *   "authData": [
      *     {
      *       "marker": "login",
-     *       "value": "test@test.com"
+     *       "value": "example@oneentry.cloud"
      *     },
      *     {
      *       "marker": "password",
@@ -35,7 +35,7 @@ export default class AuthProviderApi extends AsyncModules implements IAuthProvid
      *       }
      *   ],
      *   "notificationData": {
-     *     "email": "test@test.com",
+     *     "email": "example@oneentry.cloud",
      *     "phonePush": "+99999999999",
      *     "phoneSMS": "+99999999999"
      *   }
@@ -43,11 +43,18 @@ export default class AuthProviderApi extends AsyncModules implements IAuthProvid
      */
     signUp(marker: string, data: ISignUpData, langCode?: string): Promise<ISignUpEntity>;
     /**
-     * Getting a user activation code
+     * Getting a user activation code. The code is returned via the appropriate user notification method
      * @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)
      */
-    generateCode(marker: string, userIdentifier: string): Promise<ICodeEntity>;
+    generateCode(marker: string, userIdentifier: string): Promise<void>;
+    /**
+     * User activation code verification. Returns true (if the code is correct) or false (if it is incorrect).
+     * @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
+     */
+    checkCode(marker: string, userIdentifier: string, code: string): Promise<boolean>;
     /**
      * User activate.
      * @param {string} marker - The text identifier of the authorization provider. Example - email

package/dist/auth-provider/authProviderApi.js

@@ -21,7 +21,7 @@ class AuthProviderApi extends asyncModules_1.default {
      *   "authData": [
      *     {
      *       "marker": "login",
-     *       "value": "test@test.com"
+     *       "value": "example@oneentry.cloud"
      *     },
      *     {
      *       "marker": "password",
@@ -36,7 +36,7 @@ class AuthProviderApi extends asyncModules_1.default {
      *       }
      *   ],
      *   "notificationData": {
-     *     "email": "test@test.com",
+     *     "email": "example@oneentry.cloud",
      *     "phonePush": "+99999999999",
      *     "phoneSMS": "+99999999999"
      *   }
@@ -49,7 +49,7 @@ class AuthProviderApi extends asyncModules_1.default {
         return this._normalizeData(result);
     }
     /**
-     * Getting a user activation code
+     * Getting a user activation code. The code is returned via the appropriate user notification method
      * @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)
      */
@@ -58,6 +58,19 @@ class AuthProviderApi extends asyncModules_1.default {
             "userIdentifier": userIdentifier
         };
         const result = await this._fetchPost(`/marker/${marker}/users/generate-code`, data);
+    }
+    /**
+     * User activation code verification. Returns true (if the code is correct) or false (if it is incorrect).
+     * @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
+     */
+    async checkCode(marker, userIdentifier, code) {
+        const data = {
+            "userIdentifier": userIdentifier,
+            "code": code
+        };
+        const result = await this._fetchPost(`/marker/${marker}/users/check-code`, data);
         return result;
     }
     /**
@@ -98,6 +111,9 @@ class AuthProviderApi extends asyncModules_1.default {
         const result = await this._fetchPost(`/marker/${marker}/users/auth`, data);
         this.state.accessToken = result.accessToken;
         this.state.refreshToken = result.refreshToken;
+        if (this.state.saveFunction) {
+            this.state.saveFunction(result.refreshToken);
+        }
         return result;
     }
     /**
@@ -111,6 +127,9 @@ class AuthProviderApi extends asyncModules_1.default {
         const result = await this._fetchPost(`/marker/${marker}/users/refresh`, data);
         this.state.accessToken = result.accessToken;
         this.state.refreshToken = result.refreshToken;
+        if (this.state.saveFunction) {
+            this.state.saveFunction(result.refreshToken);
+        }
         return result;
     }
     /**
@@ -126,6 +145,9 @@ class AuthProviderApi extends asyncModules_1.default {
         if (result) {
             this.state.accessToken = undefined;
             this.state.refreshToken = undefined;
+            if (this.state.saveFunction) {
+                this.state.saveFunction('');
+            }
         }
         return result;
     }

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

@@ -4,6 +4,7 @@ import { ILocalizeInfo } from "../base/utils";
  *
  * @property {function} signUp - User registration.
  * @property {function} generateCode - Getting a user activation code.
+ * @property {function} checkCode - User activation code verification.
  * @property {function} activateUser - User activate.
  * @property {function} auth - User authorization.
  * @property {function} refresh - Refresh token.
@@ -14,7 +15,8 @@ import { ILocalizeInfo } from "../base/utils";
  */
 interface IAuthProvider {
     signUp(marker: string, data: ISignUpData, langCode?: string): Promise<ISignUpEntity>;
-    generateCode(marker: string, userIdentifier: string): Promise<ICodeEntity>;
+    generateCode(marker: string, userIdentifier: string): Promise<void>;
+    checkCode(marker: string, userIdentifier: string, code: string): Promise<boolean>;
     activateUser(marker: string, userIdentifier: string, code: string): Promise<boolean>;
     auth(marker: string, data: IAuthPostBody): Promise<IAuthEntity>;
     refresh(marker: string, token: string): Promise<IAuthEntity>;

package/dist/base/asyncModules.js

@@ -119,6 +119,9 @@ class AsyncModules extends syncModules_1.default {
             const result = await response.json();
             this.state.refreshToken = result.refreshToken;
             this.state.accessToken = result.accessToken;
+            if (this.state.saveFunction) {
+                this.state.saveFunction(result.refreshToken);
+            }
             return true;
         }
         else {
@@ -146,7 +149,7 @@ class AsyncModules extends syncModules_1.default {
     }
     async browserResponse(path, options) {
         const response = await fetch(this._getFullPath(path), options);
-        if (response.status == 401) {
+        if (response.status == 401 && !this.state.customAuth) {
             const refresh = await this.refreshToken();
             if (refresh) {
                 options.headers['Authorization'] = 'Bearer ' + this.state.accessToken;

package/dist/base/stateModule.d.ts

@@ -6,5 +6,7 @@ export default class StateModule {
     accessToken: string | undefined;
     multipleResponse: boolean;
     refreshToken: string | undefined;
+    customAuth: boolean;
+    saveFunction: (param: string) => void | null;
     constructor(url: string, config: IConfig);
 }

package/dist/base/stateModule.js

@@ -2,12 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 class StateModule {
     constructor(url, config) {
-        var _a, _b;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         this.url = url;
         this.lang = (_a = config.langCode) !== null && _a !== void 0 ? _a : 'en_US';
         this.token = config.token;
-        this.multipleResponse = (_b = config.multipleRequests) !== null && _b !== void 0 ? _b : true;
-        this.refreshToken = config.userToken;
+        this.multipleResponse = !!((_b = config.traficLimit) !== null && _b !== void 0 ? _b : false);
+        this.refreshToken = (_d = (_c = config.auth) === null || _c === void 0 ? void 0 : _c.refreshToken) !== null && _d !== void 0 ? _d : undefined;
+        this.customAuth = (_f = (_e = config.auth) === null || _e === void 0 ? void 0 : _e.customAuth) !== null && _f !== void 0 ? _f : false;
+        this.saveFunction = (_h = (_g = config.auth) === null || _g === void 0 ? void 0 : _g.saveFunction) !== null && _h !== void 0 ? _h : null;
     }
 }
 exports.default = StateModule;

package/dist/base/utils.d.ts

@@ -1,35 +1,39 @@
-declare enum Types {
-    forCatalogProducts = "forCatalogProducts",
-    forBasketPage = "forBasketPage",
-    forErrorPage = "forErrorPage",
-    forCatalogPages = "forCatalogPages",
-    forProductPreview = "forProductPreview",
-    forProductPage = "forProductPage",
-    forSimilarProductBlock = "forSimilarProductBlock",
-    forStatisticProductBlock = "forStatisticProductBlock",
-    forProductBlock = "forProductBlock",
-    forForm = "forForm",
-    forFormField = "forFormField",
-    forNewsPage = "forNewsPage",
-    forNewsBlock = "forNewsBlock",
-    forNewsPreview = "forNewsPreview",
-    forOneNewsPage = "forOneNewsPage",
-    forUsualPage = "forUsualPage",
-    forTextBlock = "forTextBlock",
-    forSlider = "forSlider",
-    service = "service"
-}
+type Types = 'forCatalogProducts' | 'forBasketPage' | 'forErrorPage' | 'forCatalogPages' | 'forProductPreview' | 'forProductPage' | 'forSimilarProductBlock' | 'forStatisticProductBlock' | 'forProductBlock' | 'forForm' | 'forFormField' | 'forNewsPage' | 'forNewsBlock' | 'forNewsPreview' | 'forOneNewsPage' | 'forUsualPage' | 'forTextBlock' | 'forSlider' | 'forOrder' | '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.
  * @param {boolean} [multipleRequests] - Some methods use multiple queries to make it easier to work with the API. Set this parameter to "false" to save traffic and decide for yourself what data you need.
- * @param {boolean} [userToken] - If your project uses user authorization, pass the user refresh token to the "userToken" variable to use methods that require authorization.
+ * @param {boolean} [auth] - An object with authorization settings
+ * @param {boolean} [auth.customAuth] - Set this flag to true if you want to configure the authorization process yourself. Set the flag to false, or do not pass it at all to have automatic authorization and token renewal
+ * @param {boolean} [auth.refreshToken] - Transfer the refresh token here, for example from the local storage, to resume the user's session. Otherwise, the user will need to log in every time a new session is created
+ * @param {boolean} [auth.saveFunction] - If you want to store the token between sessions, for example in local storage, create a custom function that takes refreshToken as a parameter and executes the necessary instructions. This function will be called every time the tokens are updated
+ *
+ * @example
+ * const saveToken = (token) => {
+ *     localStorage.setItem('refresh', token)
+ * }
+ *
+ * const config = {
+ *     token: 'project.token.here',
+ *     langCode: 'en_US',
+ *     multipleRequests: true,
+ *     auth: {
+ *         customAuth: false,
+ *         refreshToken: 'user.refresh.token',
+ *         saveFunction: saveToken
+ *     }
+ * }
+ *
  */
 interface IConfig {
     token?: string;
-    userToken?: string;
     langCode?: string;
-    multipleRequests?: boolean;
+    traficLimit?: boolean;
+    auth?: {
+        customAuth?: boolean;
+        refreshToken?: string;
+        saveFunction?: (refreshToken: string) => void;
+    };
 }
 interface IAttributes {
     listTitles: Array<{

package/dist/base/utils.js

@@ -1,25 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Types = void 0;
-var Types;
-(function (Types) {
-    Types["forCatalogProducts"] = "forCatalogProducts";
-    Types["forBasketPage"] = "forBasketPage";
-    Types["forErrorPage"] = "forErrorPage";
-    Types["forCatalogPages"] = "forCatalogPages";
-    Types["forProductPreview"] = "forProductPreview";
-    Types["forProductPage"] = "forProductPage";
-    Types["forSimilarProductBlock"] = "forSimilarProductBlock";
-    Types["forStatisticProductBlock"] = "forStatisticProductBlock";
-    Types["forProductBlock"] = "forProductBlock";
-    Types["forForm"] = "forForm";
-    Types["forFormField"] = "forFormField";
-    Types["forNewsPage"] = "forNewsPage";
-    Types["forNewsBlock"] = "forNewsBlock";
-    Types["forNewsPreview"] = "forNewsPreview";
-    Types["forOneNewsPage"] = "forOneNewsPage";
-    Types["forUsualPage"] = "forUsualPage";
-    Types["forTextBlock"] = "forTextBlock";
-    Types["forSlider"] = "forSlider";
-    Types["service"] = "service";
-})(Types || (exports.Types = Types = {}));

package/dist/products/productsApi.js

@@ -66,7 +66,7 @@ class ProductApi extends asyncModules_1.default {
      */
     async getProducts(body = [], langCode = this.state.lang, userQuery) {
         const query = { ...this._defaultQuery, ...userQuery, langCode };
-        const result = await this._fetchPost(`/all?` + this._queryParamsToString(query), body);
+        const result = await this._fetchPost(`/all?langCode=${langCode}&` + this._queryParamsToString(query), body);
         return this._dataPostProcess(result.items, langCode);
     }
     /**
@@ -144,7 +144,7 @@ class ProductApi extends asyncModules_1.default {
      */
     async getProductsByPageId(id, body = [], langCode = this.state.lang, userQuery) {
         const query = { ...this._defaultQuery, ...userQuery };
-        const result = await this._fetchPost(`/page/${id}?` + this._queryParamsToString(query), body);
+        const result = await this._fetchPost(`/page/${id}?langCode=${langCode}&` + this._queryParamsToString(query), body);
         return this._dataPostProcess(result.items, langCode);
     }
     /**
@@ -221,7 +221,7 @@ class ProductApi extends asyncModules_1.default {
      */
     async getProductsByPageUrl(url, body = [], langCode = this.state.lang, userQuery) {
         const query = { ...this._defaultQuery, ...userQuery };
-        const result = await this._fetchPost(`/page/url/${url}?` + this._queryParamsToString(query), body);
+        const result = await this._fetchPost(`/page/url/${url}?langCode=${langCode}&` + this._queryParamsToString(query), body);
         return this._dataPostProcess(result.items, langCode);
     }
     /**
@@ -279,7 +279,7 @@ class ProductApi extends asyncModules_1.default {
      * @returns  Array with ProductEntity objects
      */
     async searchProduct(name, langCode = this.state.lang) {
-        const searchProducts = await this._fetchGet(`/quick/search?lang=${langCode}&name=${name}`);
+        const searchProducts = await this._fetchGet(`/quick/search?langCode=${langCode}&name=${name}`);
         if (this.state.multipleResponse) {
             const productsList = [];
             await Promise.all(searchProducts.map(async (product) => {

package/dist/users/usersApi.d.ts

@@ -33,7 +33,7 @@ export default class UsersApi extends AsyncModules implements IUsers {
      *         "value": "Username"
      *   },
      *   "notificationData": {
-     *     "email": "test@test.com",
+     *     "email": "example@oneentry.cloud",
      *     "phonePush": "",
      *     "phoneSMS": "+99999999999"
      *   }

package/dist/users/usersApi.js

@@ -37,7 +37,7 @@ class UsersApi extends asyncModules_1.default {
      *         "value": "Username"
      *   },
      *   "notificationData": {
-     *     "email": "test@test.com",
+     *     "email": "example@oneentry.cloud",
      *     "phonePush": "",
      *     "phoneSMS": "+99999999999"
      *   }

package/package.json

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