@slavmak2486/bx24ts 1.2.20 → 1.2.22

package/BX24Server.ts

@@ -165,7 +165,7 @@ export class BX24Server extends baseBX24{
 
     refreshAuthAsync():Promise<getAuth> {
         return new Promise((resolve, reject) => {
-            this.call("https://oauth.bitrix.info/oauth/token/", {
+            this.call(`https://${this.OAUTH_DOMAIN}/oauth/token/`, {
                 method:'refresh_token',
                 data:{
                     grant_type: 'refresh_token',

package/base/BX24.ts

@@ -1,7 +1,7 @@
 import { type batchCmdElement } from "../types/batchElement";
 import  {type eventElement } from "../types/eventElement";
 
-import axios, { AxiosError, type AxiosRequestConfig, type AxiosResponse } from 'axios';
+import axios, { AxiosError, type AxiosRequestConfig } from 'axios';
 import { CallResult } from "../callResult";
 import {cloneDeep, get as __get} from 'lodash'
 import { type Logger } from "../types/authBaseServe";
@@ -34,6 +34,8 @@ export abstract class baseBX24{
     CLIENT_ID: string | undefined="";
     CLIENT_SECRET: string | undefined="";
 
+    OAUTH_DOMAIN="oauth.bitrix24.tech";
+
     isInit=false;
     DOMAIN: string;
     PROTOCOL: number;
@@ -222,11 +224,7 @@ export abstract class baseBX24{
     abstract refreshAuth(cb?:(params:any)=>void):void;
     abstract refreshAuthAsync():Promise<getAuth>;
 
-    protected callSuccess(xhr:AxiosResponse):boolean{
-        return typeof xhr.status=='undefined' || (xhr.status >= 200 && xhr.status < 300) || xhr.status === 304 || xhr.status >= 400 && xhr.status < 500 || xhr.status === 1223 || xhr.status === 0;
-    }
-
-    protected call(url:string, config:{
+    public call(url:string, config:{
         method:string,
         data:any,
         callback?:(params: any)=>void
@@ -278,7 +276,7 @@ export abstract class baseBX24{
                 if (!err?.response?.data){
                     reject(err);
                 }
-                else if (__get(err, ['response','data','error'], undefined)=='expired_token'&&!url.includes('oauth.bitrix.info/oauth/token/')){
+                else if (__get(err, ['response','data','error'], undefined)=='expired_token'&&!url.includes(this.OAUTH_DOMAIN)){
                     try {
                         this.refreshAuth(()=>{
                             this.call(url, config).then(resolve).catch(reject);

package/dist/BX24Server.js

@@ -130,7 +130,7 @@ class BX24Server extends BX24_1.baseBX24 {
     }
     refreshAuthAsync() {
         return new Promise((resolve, reject) => {
-            this.call("https://oauth.bitrix.info/oauth/token/", {
+            this.call(`https://${this.OAUTH_DOMAIN}/oauth/token/`, {
                 method: 'refresh_token',
                 data: {
                     grant_type: 'refresh_token',

package/dist/base/BX24.js

@@ -8,11 +8,71 @@ const axios_1 = __importDefault(require("axios"));
 const callResult_1 = require("../callResult");
 const lodash_1 = require("lodash");
 class baseBX24 {
+    getHttpString(value, prefix = '') {
+        if (value instanceof Date) {
+            return prefix + '=' + encodeURIComponent(value.toISOString());
+        }
+        else if (typeof value == 'object') {
+            const resultObj = [];
+            for (const field in value) {
+                resultObj.push(this.getHttpString(value[field], prefix + `${prefix != '' ? '[' : ""}${field}${prefix != '' ? ']' : ''}`));
+            }
+            return resultObj.join('&');
+        }
+        else if (prefix != '') {
+            return encodeURIComponent(prefix) + '=' + encodeURIComponent(value);
+        }
+        return encodeURIComponent(value);
+    }
+    setTimeoutCall(ms) {
+        this.timeoutCall = ms;
+    }
+    clearTimeoutCall() {
+        this.timeoutCall = 0;
+    }
+    isFunction(item) {
+        return item === null ? false : (typeof (item) == "function" || item instanceof Function);
+    }
+    addEvent(event, handler) {
+        this.arrEvents.push({
+            event: event,
+            handler: handler
+        });
+    }
+    emitEvent(event, params) {
+        const arrHandler = this.arrEvents.filter(el => { return el.event == event; });
+        for (const idx in arrHandler) {
+            setTimeout(() => {
+                var _a;
+                if (!((_a = arrHandler[idx]) === null || _a === void 0 ? void 0 : _a.handler))
+                    return;
+                arrHandler[idx].handler.call(this, params);
+            }, 10);
+        }
+    }
+    uniqid() {
+        const charsList = '0123456789abcdefghijklmnopqrstuvwxyz';
+        let s = '';
+        for (let i = 0; i < 32; i++)
+            s += charsList[Math.round(Math.random() * (charsList.length - 1))];
+        return s;
+    }
+    setCallback(cb) {
+        const cbId = this.uniqid();
+        if (cb) {
+            this.cbArray.push({ uid: cbId, cb: cb });
+        }
+        return cbId;
+    }
+    doInit() {
+        this.emitEvent('init', this);
+    }
     constructor() {
         this.cbArray = [];
         this.AUTH_CONNECTOR = "";
         this.CLIENT_ID = "";
         this.CLIENT_SECRET = "";
+        this.OAUTH_DOMAIN = "oauth.bitrix24.tech";
         this.isInit = false;
         this.APP_SID = false;
         this.PATH = "/rest";
@@ -97,65 +157,6 @@ class baseBX24 {
         this.DOMAIN = "";
         this.PROTOCOL = 1;
     }
-    getHttpString(value, prefix = '') {
-        if (value instanceof Date) {
-            return prefix + '=' + encodeURIComponent(value.toISOString());
-        }
-        else if (typeof value == 'object') {
-            const resultObj = [];
-            for (const field in value) {
-                resultObj.push(this.getHttpString(value[field], prefix + `${prefix != '' ? '[' : ""}${field}${prefix != '' ? ']' : ''}`));
-            }
-            return resultObj.join('&');
-        }
-        else if (prefix != '') {
-            return encodeURIComponent(prefix) + '=' + encodeURIComponent(value);
-        }
-        return encodeURIComponent(value);
-    }
-    setTimeoutCall(ms) {
-        this.timeoutCall = ms;
-    }
-    clearTimeoutCall() {
-        this.timeoutCall = 0;
-    }
-    isFunction(item) {
-        return item === null ? false : (typeof (item) == "function" || item instanceof Function);
-    }
-    addEvent(event, handler) {
-        this.arrEvents.push({
-            event: event,
-            handler: handler
-        });
-    }
-    emitEvent(event, params) {
-        const arrHandler = this.arrEvents.filter(el => { return el.event == event; });
-        for (const idx in arrHandler) {
-            setTimeout(() => {
-                var _a;
-                if (!((_a = arrHandler[idx]) === null || _a === void 0 ? void 0 : _a.handler))
-                    return;
-                arrHandler[idx].handler.call(this, params);
-            }, 10);
-        }
-    }
-    uniqid() {
-        const charsList = '0123456789abcdefghijklmnopqrstuvwxyz';
-        let s = '';
-        for (let i = 0; i < 32; i++)
-            s += charsList[Math.round(Math.random() * (charsList.length - 1))];
-        return s;
-    }
-    setCallback(cb) {
-        const cbId = this.uniqid();
-        if (cb) {
-            this.cbArray.push({ uid: cbId, cb: cb });
-        }
-        return cbId;
-    }
-    doInit() {
-        this.emitEvent('init', this);
-    }
     utilReady() {
         if (document.readyState === "complete") {
             return this.runReady();
@@ -198,9 +199,6 @@ class baseBX24 {
         }
         return;
     }
-    callSuccess(xhr) {
-        return typeof xhr.status == 'undefined' || (xhr.status >= 200 && xhr.status < 300) || xhr.status === 304 || xhr.status >= 400 && xhr.status < 500 || xhr.status === 1223 || xhr.status === 0;
-    }
     call(url, config) {
         if (this.logger) {
             this.logger.log(`Вызов: ${url}`, {
@@ -244,7 +242,7 @@ class baseBX24 {
                 if (!((_a = err === null || err === void 0 ? void 0 : err.response) === null || _a === void 0 ? void 0 : _a.data)) {
                     reject(err);
                 }
-                else if ((0, lodash_1.get)(err, ['response', 'data', 'error'], undefined) == 'expired_token' && !url.includes('oauth.bitrix.info/oauth/token/')) {
+                else if ((0, lodash_1.get)(err, ['response', 'data', 'error'], undefined) == 'expired_token' && !url.includes(this.OAUTH_DOMAIN)) {
                     try {
                         this.refreshAuth(() => {
                             this.call(url, config).then(resolve).catch(reject);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@slavmak2486/bx24ts",
-    "version": "1.2.20",
+    "version": "1.2.22",
     "description": "Library for bitrix24",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",