bx-rest 0.6.8 → 0.8.1

package/fesm2022/bx-rest.mjs

@@ -269,9 +269,9 @@ async function getBase64FileLikeStr(file) {
     return undefined;
 }
 function prepareBaseAddress(url, add = '') {
-    if (url.search('https://') !== 0 && url.search('http://')) {
-        url = 'https://' + url;
-    }
+    // if (url.search('https://') !== 0 && url.search('http://')) {
+    //   url = 'https://' + url
+    // }
     if (add && add.length > 0) {
         if (url.lastIndexOf('/') !== (url.length - 1)) {
             url = url + '/';
@@ -424,7 +424,11 @@ class SessionKeyServices {
         return '';
     }
     getAuthParams() {
-        switch (this.BX_REST_SETTINGS.auth.source) {
+        const source = this.BX_REST_SETTINGS.auth.source;
+        if (typeof source === 'function') {
+            return source();
+        }
+        switch (source) {
             case 'cookies':
                 return this.getAuth();
             case 'localStorage':
@@ -506,7 +510,7 @@ class HttpData {
                     case 'function':
                     case 'undefined':
                     default:
-                        console.error('Ты отправил что-то не то', obj[key], typeof obj[key], typeof obj);
+                        console.error('You sent something wrong', obj[key], typeof obj[key], typeof obj);
                 }
             }
         }
@@ -544,6 +548,30 @@ class HttpServices extends BaseHttp {
                     return throwError(() => new Error('get base url error'));
                 }
                 const fullUrl = prepareBaseAddress(baseUrl) + url;
+                if (this.session.getKeyAuth() === 'sessid') {
+                    const body = this.getHttpParamsPost(paramsClone, new FormData(), [], settings);
+                    // Преобразуем параметры в формат x-www-form-urlencoded
+                    const urlEncodedBody = new URLSearchParams();
+                    Object.keys(body).forEach((key) => {
+                        const value = paramsClone[key];
+                        // если value — объект или массив, Bitrix ожидает fields[key] или array[] формат
+                        if (typeof value === 'object' && value !== null) {
+                            for (const subKey in value) {
+                                if (Object.prototype.hasOwnProperty.call(value, subKey)) {
+                                    urlEncodedBody.append(`${key}[${subKey}]`, value[subKey]);
+                                }
+                            }
+                        }
+                        else {
+                            urlEncodedBody.append(key, value);
+                        }
+                    });
+                    return from(this.axiosInstance.post(fullUrl, urlEncodedBody.toString(), {
+                        headers: {
+                            'Content-Type': 'application/x-www-form-urlencoded',
+                        },
+                    }).then((response) => response.data));
+                }
                 const body = this.getHttpParamsPost(paramsClone, new FormData(), [], settings);
                 return from(this.axiosInstance.post(fullUrl, body).then((response) => response.data));
             }));
@@ -636,27 +664,61 @@ class HttpBXServices extends HttpServices {
     }
     httpPost(url, params = {}) {
         const paramsClone = clone(params);
+        const key = this.session.getKeyAuth();
         let auth = this.session.getAuthParams();
         const checkIsOn = this.session.getCheckAuthParamsIsOn();
-        if (checkIsOn) {
+        if (checkIsOn && key === 'OAuth2') {
             if (!auth && BXRestSettings.date.auth.source !== 'off') {
                 throw new Error('Authorization required (post)');
             }
-            paramsClone[this.session.getKeyAuth()] = auth;
+            paramsClone[key] = auth;
         }
         return this.session.getBaseUrl().pipe(switchMap((baseUrl) => {
             if (!baseUrl) {
                 return throwError(() => new Error('get base url error'));
             }
             const fullUrl = prepareBaseAddress(baseUrl) + url;
-            // const body = this.getHttpParamsPost(paramsClone, new FormData(), false, [])
+            if (auth === 'sessid') {
+                // Преобразуем параметры в формат x-www-form-urlencoded
+                const bodyString = this.serializeBitrixParams(paramsClone);
+                return from(this.axiosInstance.post(fullUrl, bodyString, {
+                    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+                }).then((response) => response.data));
+            }
             return from(this.axiosInstance.post(fullUrl, paramsClone, {
+                withCredentials: key === 'OAuth2',
                 headers: {
                     'Content-Type': 'application/json',
                 }
             }).then((response) => response.data));
         }));
     }
+    serializeBitrixParams(obj, prefix = '') {
+        const pairs = [];
+        for (const key in obj) {
+            if (!Object.prototype.hasOwnProperty.call(obj, key))
+                continue;
+            const value = obj[key];
+            const prefixedKey = prefix ? `${prefix}[${key}]` : key;
+            if (Array.isArray(value)) {
+                value.forEach((item) => {
+                    if (typeof item === 'object') {
+                        pairs.push(this.serializeBitrixParams(item, `${prefixedKey}[]`));
+                    }
+                    else {
+                        pairs.push(`${encodeURIComponent(prefixedKey)}[]=${encodeURIComponent(item)}`);
+                    }
+                });
+            }
+            else if (typeof value === 'object' && value !== null) {
+                pairs.push(this.serializeBitrixParams(value, prefixedKey));
+            }
+            else {
+                pairs.push(`${encodeURIComponent(prefixedKey)}=${encodeURIComponent(value)}`);
+            }
+        }
+        return pairs.join('&');
+    }
     // Мб не работает
     httpGet(url, params = {}) {
         if (params === null) {
@@ -6035,15 +6097,17 @@ class BXRestMapPullApplicationConfig {
 
 class BXRestMapPull {
     static get(value) {
-        console.log('Object.entries(value.publicChannels)', value);
-        if (value?.publicChannels) {
-            console.log('Object.entries(value.publicChannels)', value.publicChannels, Object.entries(value.publicChannels), Object.fromEntries(Object.entries(value.publicChannels).map(([key, val]) => ([key,
-                {
-                    ...val,
-                    start: toDate(val.start), end: toDate(val.end)
-                }
-            ]))));
-        }
+        // console.log('Object.entries(value.publicChannels)', value)
+        //if(value?.publicChannels) {
+        // console.log('Object.entries(value.publicChannels)',
+        //   value.publicChannels, Object.entries(value.publicChannels), Object.fromEntries(Object.entries(value.publicChannels).map(([key, val]) => (
+        //   [key,
+        //     {
+        //       ...val,
+        //       start: toDate(val.start), end: toDate(val.end)
+        //     } as iBXRestPullConfigPublicChannelsGet
+        //   ]))) as Record<string, iBXRestPullConfigPublicChannelsGet>,)
+        //}
         return value ? { ...BXRestMapPullApplicationConfig.get(value), ...{ serverTime: toDate(value.serverTime) } } : undefined;
     }
 }
@@ -6070,6 +6134,10 @@ class BXRestNavvyPullConfig {
         this.Navvy = new Navvy();
     }
     static { this.public = new BXRestMapPullChannelPublic(); }
+    /**
+     * @experimental
+     * Этот метод находится в процессе тестирования и может измениться.
+     */
     get() {
         return this.Navvy.simple(this.url.get, undefined, BXRestMapPull.get);
     }