bx-rest 1.1.0 → 1.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +34 -0
- package/README.en.md +54 -22
- package/README.md +54 -22
- package/esm2022/functions/errors.mjs +64 -8
- package/esm2022/rest/base.mjs +3 -3
- package/esm2022/services/http/HttpBX.mjs +26 -12
- package/esm2022/services/http/sessionKey.mjs +8 -1
- package/esm2022/services/navvy/extends/navvy-pag-base.mjs +26 -4
- package/esm2022/services/navvy/navvy-alternative-pagination-navigation.mjs +2 -2
- package/esm2022/services/navvy/navvy-pag-nav-result-key-object.mjs +2 -2
- package/esm2022/services/navvy/navvy-pag-nav-result-key.mjs +2 -2
- package/esm2022/services/navvy/navvy-pag-nav-tasks.mjs +2 -2
- package/esm2022/services/navvy/navvy-pag-nav-with-useless-key.mjs +2 -2
- package/esm2022/services/navvy/navvy-pag.mjs +2 -2
- package/esm2022/typification/settings.mjs +1 -1
- package/fesm2022/bx-rest.mjs +126 -28
- package/fesm2022/bx-rest.mjs.map +1 -1
- package/functions/errors.d.ts +46 -6
- package/package.json +1 -1
- package/rest/base.d.ts +1 -1
- package/services/http/HttpBX.d.ts +15 -4
- package/services/http/sessionKey.d.ts +5 -0
- package/services/navvy/extends/navvy-pag-base.d.ts +18 -4
- package/typification/settings.d.ts +7 -0
package/CHANGELOG.md
CHANGED
|
@@ -7,6 +7,40 @@
|
|
|
7
7
|
История до версии 1.0.0 здесь не восстанавливалась — смотрите `git log` для
|
|
8
8
|
более ранних изменений.
|
|
9
9
|
|
|
10
|
+
## [1.3.0] - 2026-10-28
|
|
11
|
+
|
|
12
|
+
### Added
|
|
13
|
+
|
|
14
|
+
- `BXRestSettings.headers` — статичные HTTP-заголовки, которые прикладываются
|
|
15
|
+
к каждому запросу (например, `{ 'X-Bitrix-App': 'smart-process-pro' }`).
|
|
16
|
+
- `.withHeaders()` у Navvy-запросов — заголовки только для одного запроса,
|
|
17
|
+
поверх `BXRestSettings.headers`. Действуют и на batch-запросы `.resAll()`.
|
|
18
|
+
`BXRestRequest.post()`/`.get()` и `BXRest.batch()` принимают те же заголовки
|
|
19
|
+
последним необязательным аргументом.
|
|
20
|
+
- `Content-Type` библиотека по-прежнему выставляет сама — заголовками он не
|
|
21
|
+
перебивается.
|
|
22
|
+
|
|
23
|
+
## [1.2.0] - 2026-10-28
|
|
24
|
+
|
|
25
|
+
### Fixed
|
|
26
|
+
|
|
27
|
+
- `.res()` терял код и описание ошибки Bitrix, если портал отвечал со
|
|
28
|
+
статусом не 2xx — а так Bitrix отдаёт большинство ошибок (`expired_token`
|
|
29
|
+
— 401, `QUERY_LIMIT_EXCEEDED` — 503, `Not found` у `crm.*.get` — 400).
|
|
30
|
+
Вместо `Error("AxiosError: Request failed with status code 400")` теперь
|
|
31
|
+
приходит `BXRestApiError` с `error` и `error_description` — с
|
|
32
|
+
`throwOnApiError` и без него. Поддерживается и формат ошибок REST v3
|
|
33
|
+
(`{ error: { code, message } }`). Сетевые ошибки и ответы не от Bitrix
|
|
34
|
+
(например, HTML-страница прокси) по-прежнему приходят обычным `Error`.
|
|
35
|
+
|
|
36
|
+
### Added
|
|
37
|
+
|
|
38
|
+
- У `BXRestApiError` появились поля `status` (HTTP-статус; `undefined`, если
|
|
39
|
+
ошибка пришла в теле ответа 2xx), `method` (REST-метод) и `cause` (исходная
|
|
40
|
+
ошибка axios с полным телом ответа в `cause.response.data`). Конструктор
|
|
41
|
+
принимает их третьим необязательным аргументом — существующие вызовы
|
|
42
|
+
`new BXRestApiError(error, error_description)` работают как раньше.
|
|
43
|
+
|
|
10
44
|
## [1.1.0] - 2026-10-09
|
|
11
45
|
|
|
12
46
|
### Fixed
|
package/README.en.md
CHANGED
|
@@ -18,6 +18,7 @@ Also known as: Bitrix24 REST client, BX24 REST SDK, Bitrix24 API client, Bitrix
|
|
|
18
18
|
- [Result modes](#result-modes)
|
|
19
19
|
- [Authentication and OAuth2](#authentication-and-oauth2)
|
|
20
20
|
- [`withCredentials`](#withcredentials)
|
|
21
|
+
- [HTTP headers](#http-headers)
|
|
21
22
|
- [Error handling](#error-handling)
|
|
22
23
|
- [Usage in Angular](#usage-in-angular)
|
|
23
24
|
- [SessionKeyServices](#sessionkeyservices)
|
|
@@ -154,18 +155,57 @@ BXRestSettings.update({
|
|
|
154
155
|
})
|
|
155
156
|
```
|
|
156
157
|
|
|
158
|
+
## HTTP headers
|
|
159
|
+
|
|
160
|
+
Put static headers that every request needs into `BXRestSettings.headers`:
|
|
161
|
+
|
|
162
|
+
```typescript
|
|
163
|
+
BXRestSettings.update({
|
|
164
|
+
headers: {
|
|
165
|
+
'X-Bitrix-App': 'smart-process-pro'
|
|
166
|
+
}
|
|
167
|
+
})
|
|
168
|
+
```
|
|
169
|
+
|
|
170
|
+
They are attached to every request the library makes, including the `.resAll()` batch requests, and, like the other settings, are read at subscribe time. `update()` merges settings only at the top level, so `headers` is replaced as a whole — to add a header to the ones already set, pass the full set.
|
|
171
|
+
|
|
172
|
+
For a single request, use `.withHeaders()`. Its headers are applied on top of `BXRestSettings.headers`; when a name matches (case-insensitively), the `.withHeaders()` value wins. It applies to `.res()`, `.resAll()`, `.resVanilla()` and `.mapForVanilla()`:
|
|
173
|
+
|
|
174
|
+
```typescript
|
|
175
|
+
const deals = await firstValueFrom(
|
|
176
|
+
bxRest.crm.deal.list({ select: ['ID', 'TITLE'], filter: {}, start: 0 })
|
|
177
|
+
.withHeaders({ 'X-Request-Source': 'report' })
|
|
178
|
+
.resAll()
|
|
179
|
+
)
|
|
180
|
+
```
|
|
181
|
+
|
|
182
|
+
The library always sets `Content-Type` itself (`application/json`, or `application/x-www-form-urlencoded` for `auth.key: 'sessid'`): the server parses the request body based on it, so headers can't override it.
|
|
183
|
+
|
|
184
|
+
For cross-origin requests, the server — the portal or your proxy — must allow a non-standard header in `Access-Control-Allow-Headers` of its CORS preflight (`OPTIONS`) response, or the browser will block the request. The header doesn't add an extra request: the library's JSON requests already go through a preflight because of `Content-Type: application/json`.
|
|
185
|
+
|
|
157
186
|
## Error handling
|
|
158
187
|
|
|
159
|
-
`
|
|
188
|
+
`.res()` can fail in three ways — which one depends on how the portal answered.
|
|
160
189
|
|
|
161
|
-
| Failure |
|
|
162
|
-
| --- | --- |
|
|
163
|
-
|
|
|
164
|
-
| Bitrix API
|
|
190
|
+
| Failure | How it surfaces on `.res()` |
|
|
191
|
+
| --- | --- |
|
|
192
|
+
| Bitrix API error with a non-2xx HTTP status — this is how Bitrix sends most errors: `expired_token` (401), `ERROR_METHOD_NOT_FOUND` (404), `QUERY_LIMIT_EXCEEDED` (503), `Not found` from `crm.*.get` (400) | The returned `Observable` errors with a `BXRestApiError`, with or without `throwOnApiError`. |
|
|
193
|
+
| Bitrix API error in the body of a 2xx response | By default, `.res()` resolves normally with `undefined` — **it does not throw**. Pass `{ throwOnApiError: true }` to make it throw a `BXRestApiError` instead. |
|
|
194
|
+
| Transport / configuration errors — network failure, missing auth, missing base URL, a response that is not from Bitrix (e.g. a proxy's HTML error page) | The returned `Observable` errors with a plain `Error`. |
|
|
195
|
+
|
|
196
|
+
`BXRestApiError` fields:
|
|
197
|
+
|
|
198
|
+
| Field | Value |
|
|
199
|
+
| --- | --- |
|
|
200
|
+
| `error` | Bitrix error code, e.g. `expired_token`. Can be an empty string: `crm.*.get` answers a missing ID with an empty code and `Not found` in the description. |
|
|
201
|
+
| `error_description` | Bitrix error description; also used as `message`. |
|
|
202
|
+
| `status` | HTTP status, e.g. `401`; `undefined` when the error came in the body of a 2xx response. |
|
|
203
|
+
| `method` | REST method, e.g. `crm.deal.get`. |
|
|
204
|
+
| `cause` | The original axios error when the status was non-2xx; the full response body is in `cause.response.data` (for REST v3 — including `validation`). |
|
|
165
205
|
|
|
166
|
-
|
|
206
|
+
For REST v3 methods, `error` holds the error `code` and `error_description` its `message`.
|
|
167
207
|
|
|
168
|
-
**
|
|
208
|
+
**Recommended — `.res({ throwOnApiError: true })`.** Every Bitrix error then arrives as a `BXRestApiError` whatever the HTTP status, and can be handled alongside transport errors in a single `catchError`/`error` callback:
|
|
169
209
|
|
|
170
210
|
```typescript
|
|
171
211
|
import { BXRestNavvy, BXRestApiError } from 'bx-rest'
|
|
@@ -180,7 +220,10 @@ bxRest.crm.deal.list({
|
|
|
180
220
|
next: deals => console.log(deals),
|
|
181
221
|
error: err => {
|
|
182
222
|
if (err instanceof BXRestApiError) {
|
|
183
|
-
console.error('Bitrix API error:', err.error, err.error_description)
|
|
223
|
+
console.error('Bitrix API error:', err.status, err.error, err.error_description)
|
|
224
|
+
if (err.error === 'expired_token') {
|
|
225
|
+
// refresh the token and retry the request
|
|
226
|
+
}
|
|
184
227
|
} else {
|
|
185
228
|
console.error('Request failed:', err.message)
|
|
186
229
|
}
|
|
@@ -188,7 +231,9 @@ bxRest.crm.deal.list({
|
|
|
188
231
|
})
|
|
189
232
|
```
|
|
190
233
|
|
|
191
|
-
|
|
234
|
+
Without `throwOnApiError`, plain `.res()` can't tell "no records" apart from "an error in a 2xx response" — both resolve as `undefined`.
|
|
235
|
+
|
|
236
|
+
**Alternative — check the raw response.** `.resVanilla()` returns the raw Bitrix body for 2xx responses; check it with the exported `isBXRestAnswerSuccess()` type guard. Note that `.resVanilla()`, `.mapForVanilla()` and `.resAll()` don't convert errors: on a Bitrix error with a non-2xx status they fail with the original axios error, with the response body in `err.response.data`.
|
|
192
237
|
|
|
193
238
|
```typescript
|
|
194
239
|
import { firstValueFrom } from 'rxjs'
|
|
@@ -211,19 +256,6 @@ if (!answer || !isBXRestAnswerSuccess(answer)) {
|
|
|
211
256
|
}
|
|
212
257
|
```
|
|
213
258
|
|
|
214
|
-
Regardless of `throwOnApiError`, transport-level failures always propagate as `Observable` errors and can be caught the usual RxJS way:
|
|
215
|
-
|
|
216
|
-
```typescript
|
|
217
|
-
bxRest.crm.deal.list({
|
|
218
|
-
select: ['ID', 'TITLE'],
|
|
219
|
-
filter: {},
|
|
220
|
-
start: 0
|
|
221
|
-
}).res().subscribe({
|
|
222
|
-
next: deals => console.log(deals),
|
|
223
|
-
error: err => console.error('Request failed:', err.message)
|
|
224
|
-
})
|
|
225
|
-
```
|
|
226
|
-
|
|
227
259
|
## Usage in Angular
|
|
228
260
|
|
|
229
261
|
Register the public clients and `Navvy` when you want to inject them into Angular services or components:
|
package/README.md
CHANGED
|
@@ -18,6 +18,7 @@
|
|
|
18
18
|
- [Режимы результата](#режимы-результата)
|
|
19
19
|
- [Аутентификация и OAuth2](#аутентификация-и-oauth2)
|
|
20
20
|
- [`withCredentials`](#withcredentials)
|
|
21
|
+
- [HTTP-заголовки](#http-заголовки)
|
|
21
22
|
- [Обработка ошибок](#обработка-ошибок)
|
|
22
23
|
- [Использование в Angular](#использование-в-angular)
|
|
23
24
|
- [SessionKeyServices](#sessionkeyservices)
|
|
@@ -164,18 +165,57 @@ BXRestSettings.update({
|
|
|
164
165
|
})
|
|
165
166
|
```
|
|
166
167
|
|
|
168
|
+
## HTTP-заголовки
|
|
169
|
+
|
|
170
|
+
Статичные заголовки, которые нужны в каждом запросе, задайте в `BXRestSettings.headers`:
|
|
171
|
+
|
|
172
|
+
```typescript
|
|
173
|
+
BXRestSettings.update({
|
|
174
|
+
headers: {
|
|
175
|
+
'X-Bitrix-App': 'smart-process-pro'
|
|
176
|
+
}
|
|
177
|
+
})
|
|
178
|
+
```
|
|
179
|
+
|
|
180
|
+
Они прикладываются ко всем запросам библиотеки, включая batch-запросы `.resAll()`, и, как и остальные настройки, читаются в момент подписки. `update()` сливает настройки только на верхнем уровне, поэтому `headers` заменяется целиком — чтобы добавить заголовок к уже заданным, передайте весь набор.
|
|
181
|
+
|
|
182
|
+
Для одного запроса используйте `.withHeaders()`. Его заголовки добавляются поверх `BXRestSettings.headers`, при совпадении имени (без учёта регистра) побеждает значение из `.withHeaders()`. Действует на `.res()`, `.resAll()`, `.resVanilla()` и `.mapForVanilla()`:
|
|
183
|
+
|
|
184
|
+
```typescript
|
|
185
|
+
const deals = await firstValueFrom(
|
|
186
|
+
bxRest.crm.deal.list({ select: ['ID', 'TITLE'], filter: {}, start: 0 })
|
|
187
|
+
.withHeaders({ 'X-Request-Source': 'report' })
|
|
188
|
+
.resAll()
|
|
189
|
+
)
|
|
190
|
+
```
|
|
191
|
+
|
|
192
|
+
`Content-Type` библиотека всегда выставляет сама (`application/json`, а для `auth.key: 'sessid'` — `application/x-www-form-urlencoded`): от него зависит, как сервер разберёт тело запроса, поэтому заголовками он не перебивается.
|
|
193
|
+
|
|
194
|
+
Для запросов на другой домен сервер — портал или ваш прокси — должен разрешить нестандартный заголовок в `Access-Control-Allow-Headers` ответа на CORS preflight (`OPTIONS`), иначе браузер заблокирует запрос. Лишнего запроса заголовок не добавляет: JSON-запросы библиотеки и так проходят через preflight из-за `Content-Type: application/json`.
|
|
195
|
+
|
|
167
196
|
## Обработка ошибок
|
|
168
197
|
|
|
169
|
-
`
|
|
198
|
+
`.res()` может завершиться неудачей тремя способами — какой именно, зависит от того, как ответил портал.
|
|
170
199
|
|
|
171
|
-
| Сбой |
|
|
172
|
-
| --- | --- |
|
|
173
|
-
|
|
|
174
|
-
|
|
|
200
|
+
| Сбой | Как проявляется в `.res()` |
|
|
201
|
+
| --- | --- |
|
|
202
|
+
| Ошибка API Bitrix с HTTP-статусом не 2xx — так Bitrix отдаёт большинство ошибок: `expired_token` (401), `ERROR_METHOD_NOT_FOUND` (404), `QUERY_LIMIT_EXCEEDED` (503), `Not found` у `crm.*.get` (400) | Возвращённый `Observable` завершается ошибкой `BXRestApiError` — с `throwOnApiError` и без него. |
|
|
203
|
+
| Ошибка API Bitrix в теле ответа со статусом 2xx | По умолчанию `.res()` резолвится обычным образом со значением `undefined` — **исключение не выбрасывается**. Передайте `{ throwOnApiError: true }`, чтобы вместо этого выбрасывалось `BXRestApiError`. |
|
|
204
|
+
| Ошибки транспорта / конфигурации — сбой сети, отсутствие авторизации, отсутствие базового URL, ответ не от Bitrix (например, HTML-страница ошибки прокси) | Возвращённый `Observable` завершается обычной ошибкой `Error`. |
|
|
205
|
+
|
|
206
|
+
Поля `BXRestApiError`:
|
|
207
|
+
|
|
208
|
+
| Поле | Значение |
|
|
209
|
+
| --- | --- |
|
|
210
|
+
| `error` | Код ошибки Bitrix, например `expired_token`. Может быть пустой строкой: на несуществующий ID `crm.*.get` отвечает пустым кодом и `Not found` в описании. |
|
|
211
|
+
| `error_description` | Описание ошибки Bitrix; оно же используется как `message`. |
|
|
212
|
+
| `status` | HTTP-статус, например `401`; `undefined`, если ошибка пришла в теле ответа со статусом 2xx. |
|
|
213
|
+
| `method` | REST-метод, например `crm.deal.get`. |
|
|
214
|
+
| `cause` | Исходная ошибка axios, если статус был не 2xx; полное тело ответа — в `cause.response.data` (для REST v3 — в том числе `validation`). |
|
|
175
215
|
|
|
176
|
-
|
|
216
|
+
Для методов REST v3 в `error` попадает `code` ошибки, а в `error_description` — её `message`.
|
|
177
217
|
|
|
178
|
-
|
|
218
|
+
**Рекомендуемый вариант — `.res({ throwOnApiError: true })`.** Тогда любая ошибка Bitrix приходит как `BXRestApiError` независимо от HTTP-статуса, и её можно обработать вместе с транспортными ошибками в одном колбэке `catchError`/`error`:
|
|
179
219
|
|
|
180
220
|
```typescript
|
|
181
221
|
import { BXRestNavvy, BXRestApiError } from 'bx-rest'
|
|
@@ -190,7 +230,10 @@ bxRest.crm.deal.list({
|
|
|
190
230
|
next: deals => console.log(deals),
|
|
191
231
|
error: err => {
|
|
192
232
|
if (err instanceof BXRestApiError) {
|
|
193
|
-
console.error('Bitrix API error:', err.error, err.error_description)
|
|
233
|
+
console.error('Bitrix API error:', err.status, err.error, err.error_description)
|
|
234
|
+
if (err.error === 'expired_token') {
|
|
235
|
+
// обновить токен и повторить запрос
|
|
236
|
+
}
|
|
194
237
|
} else {
|
|
195
238
|
console.error('Request failed:', err.message)
|
|
196
239
|
}
|
|
@@ -198,7 +241,9 @@ bxRest.crm.deal.list({
|
|
|
198
241
|
})
|
|
199
242
|
```
|
|
200
243
|
|
|
201
|
-
|
|
244
|
+
Без `throwOnApiError` по голому `.res()` нельзя отличить «нет записей» от «ошибки в ответе 2xx» — оба случая резолвятся как `undefined`.
|
|
245
|
+
|
|
246
|
+
**Альтернатива — проверять сырой ответ.** `.resVanilla()` возвращает сырое тело ответа Bitrix для ответов 2xx; проверяйте его экспортируемым type guard `isBXRestAnswerSuccess()`. Учтите, что `.resVanilla()`, `.mapForVanilla()` и `.resAll()` ошибки не преобразуют: на ошибку Bitrix со статусом не 2xx они завершаются исходной ошибкой axios, тело ответа — в `err.response.data`.
|
|
202
247
|
|
|
203
248
|
```typescript
|
|
204
249
|
import { firstValueFrom } from 'rxjs'
|
|
@@ -221,19 +266,6 @@ if (!answer || !isBXRestAnswerSuccess(answer)) {
|
|
|
221
266
|
}
|
|
222
267
|
```
|
|
223
268
|
|
|
224
|
-
Независимо от `throwOnApiError`, ошибки транспортного уровня всегда всплывают как ошибки `Observable` и могут быть перехвачены обычным способом RxJS:
|
|
225
|
-
|
|
226
|
-
```typescript
|
|
227
|
-
bxRest.crm.deal.list({
|
|
228
|
-
select: ['ID', 'TITLE'],
|
|
229
|
-
filter: {},
|
|
230
|
-
start: 0
|
|
231
|
-
}).res().subscribe({
|
|
232
|
-
next: deals => console.log(deals),
|
|
233
|
-
error: err => console.error('Request failed:', err.message)
|
|
234
|
-
})
|
|
235
|
-
```
|
|
236
|
-
|
|
237
269
|
## Использование в Angular
|
|
238
270
|
|
|
239
271
|
Зарегистрируйте публичные клиенты и `Navvy`, когда нужно внедрять их в сервисы или компоненты Angular:
|
|
@@ -1,17 +1,73 @@
|
|
|
1
|
+
import axios from 'axios';
|
|
1
2
|
/**
|
|
2
|
-
*
|
|
3
|
-
* Bitrix REST call resolves as a Bitrix-level API error, e.g.
|
|
4
|
-
* `INSUFFICIENT_SCOPE` or `expired_token`.
|
|
3
|
+
* A Bitrix-level API error, e.g. `INSUFFICIENT_SCOPE` or `expired_token`.
|
|
5
4
|
*
|
|
6
|
-
*
|
|
7
|
-
*
|
|
5
|
+
* `.res()` fails with it whenever the portal answers with a Bitrix error and
|
|
6
|
+
* a non-2xx HTTP status — which is how Bitrix sends most of its errors. When
|
|
7
|
+
* the error comes in the body of a 2xx response, `.res()` resolves as
|
|
8
|
+
* `undefined` by default and fails with it only with
|
|
9
|
+
* `{ throwOnApiError: true }` — see the "Error handling" section of the README.
|
|
8
10
|
*/
|
|
9
11
|
export class BXRestApiError extends Error {
|
|
10
|
-
constructor(error, error_description) {
|
|
11
|
-
super(error_description || error || 'Bitrix API error');
|
|
12
|
+
constructor(error, error_description, details) {
|
|
13
|
+
super(error_description || error || 'Bitrix API error', details?.cause !== undefined ? { cause: details.cause } : undefined);
|
|
12
14
|
this.error = error;
|
|
13
15
|
this.error_description = error_description;
|
|
14
16
|
this.name = 'BXRestApiError';
|
|
17
|
+
this.status = details?.status;
|
|
18
|
+
this.method = details?.method;
|
|
15
19
|
}
|
|
16
20
|
}
|
|
17
|
-
|
|
21
|
+
/**
|
|
22
|
+
* Recognises a Bitrix error body: REST v2 `{ error, error_description }` and
|
|
23
|
+
* REST v3 `{ error: { code, message } }`. Returns `undefined` for anything
|
|
24
|
+
* else — a success payload, an HTML page from a proxy, an empty body.
|
|
25
|
+
*
|
|
26
|
+
* An empty `error` still counts: Bitrix answers e.g. `crm.deal.get` for a
|
|
27
|
+
* missing ID with `{ error: '', error_description: 'Not found' }`.
|
|
28
|
+
*/
|
|
29
|
+
export function parseBXRestErrorBody(body) {
|
|
30
|
+
if (!body || typeof body !== 'object' || !('error' in body)) {
|
|
31
|
+
return undefined;
|
|
32
|
+
}
|
|
33
|
+
const { error, error_description } = body;
|
|
34
|
+
if (typeof error === 'string') {
|
|
35
|
+
return {
|
|
36
|
+
error,
|
|
37
|
+
error_description: typeof error_description === 'string' ? error_description : undefined
|
|
38
|
+
};
|
|
39
|
+
}
|
|
40
|
+
if (error && typeof error === 'object' && 'code' in error) {
|
|
41
|
+
const { code, message } = error;
|
|
42
|
+
return {
|
|
43
|
+
error: String(code),
|
|
44
|
+
error_description: typeof message === 'string' ? message : undefined
|
|
45
|
+
};
|
|
46
|
+
}
|
|
47
|
+
return undefined;
|
|
48
|
+
}
|
|
49
|
+
/**
|
|
50
|
+
* Turns an HTTP failure into a `BXRestApiError` when the portal answered with
|
|
51
|
+
* a Bitrix error body. Bitrix sends most errors with a non-2xx status
|
|
52
|
+
* (401 `expired_token`, 404 `ERROR_METHOD_NOT_FOUND`, 503
|
|
53
|
+
* `QUERY_LIMIT_EXCEEDED`, 400 "Not found" from `crm.*.get`, ...), and axios
|
|
54
|
+
* rejects on those.
|
|
55
|
+
*
|
|
56
|
+
* Returns `undefined` for network errors and for responses that are not a
|
|
57
|
+
* Bitrix error body, so the caller can keep its own handling for them.
|
|
58
|
+
*/
|
|
59
|
+
export function bxRestApiErrorFromHttp(err, method) {
|
|
60
|
+
if (!axios.isAxiosError(err) || !err.response) {
|
|
61
|
+
return undefined;
|
|
62
|
+
}
|
|
63
|
+
const parsed = parseBXRestErrorBody(err.response.data);
|
|
64
|
+
if (!parsed) {
|
|
65
|
+
return undefined;
|
|
66
|
+
}
|
|
67
|
+
return new BXRestApiError(parsed.error, parsed.error_description, {
|
|
68
|
+
status: err.response.status,
|
|
69
|
+
method,
|
|
70
|
+
cause: err
|
|
71
|
+
});
|
|
72
|
+
}
|
|
73
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vcHJvamVjdHMvYngtcmVzdC9zcmMvZnVuY3Rpb25zL2Vycm9ycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssTUFBTSxPQUFPLENBQUE7QUFpQnpCOzs7Ozs7OztHQVFHO0FBQ0gsTUFBTSxPQUFPLGNBQWUsU0FBUSxLQUFLO0lBSXZDLFlBQ1MsS0FBeUIsRUFDekIsaUJBQXFDLEVBQzVDLE9BQStCO1FBRS9CLEtBQUssQ0FDSCxpQkFBaUIsSUFBSSxLQUFLLElBQUksa0JBQWtCLEVBQ2hELE9BQU8sRUFBRSxLQUFLLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQyxFQUFFLEtBQUssRUFBRSxPQUFPLENBQUMsS0FBSyxFQUFFLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FDcEUsQ0FBQTtRQVBNLFVBQUssR0FBTCxLQUFLLENBQW9CO1FBQ3pCLHNCQUFpQixHQUFqQixpQkFBaUIsQ0FBb0I7UUFPNUMsSUFBSSxDQUFDLElBQUksR0FBRyxnQkFBZ0IsQ0FBQTtRQUM1QixJQUFJLENBQUMsTUFBTSxHQUFHLE9BQU8sRUFBRSxNQUFNLENBQUE7UUFDN0IsSUFBSSxDQUFDLE1BQU0sR0FBRyxPQUFPLEVBQUUsTUFBTSxDQUFBO0lBQy9CLENBQUM7Q0FDRjtBQUVEOzs7Ozs7O0dBT0c7QUFDSCxNQUFNLFVBQVUsb0JBQW9CLENBQUMsSUFBYTtJQUVoRCxJQUFJLENBQUMsSUFBSSxJQUFJLE9BQU8sSUFBSSxLQUFLLFFBQVEsSUFBSSxDQUFDLENBQUMsT0FBTyxJQUFJLElBQUksQ0FBQyxFQUFFLENBQUM7UUFDNUQsT0FBTyxTQUFTLENBQUE7SUFDbEIsQ0FBQztJQUNELE1BQU0sRUFBRSxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsR0FBRyxJQUF1RCxDQUFBO0lBRTVGLElBQUksT0FBTyxLQUFLLEtBQUssUUFBUSxFQUFFLENBQUM7UUFDOUIsT0FBTztZQUNMLEtBQUs7WUFDTCxpQkFBaUIsRUFBRSxPQUFPLGlCQUFpQixLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUMsaUJBQWlCLENBQUMsQ0FBQyxDQUFDLFNBQVM7U0FDekYsQ0FBQTtJQUNILENBQUM7SUFFRCxJQUFJLEtBQUssSUFBSSxPQUFPLEtBQUssS0FBSyxRQUFRLElBQUksTUFBTSxJQUFJLEtBQUssRUFBRSxDQUFDO1FBQzFELE1BQU0sRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLEdBQUcsS0FBNkMsQ0FBQTtRQUN2RSxPQUFPO1lBQ0wsS0FBSyxFQUFFLE1BQU0sQ0FBQyxJQUFJLENBQUM7WUFDbkIsaUJBQWlCLEVBQUUsT0FBTyxPQUFPLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLFNBQVM7U0FDckUsQ0FBQTtJQUNILENBQUM7SUFFRCxPQUFPLFNBQVMsQ0FBQTtBQUNsQixDQUFDO0FBRUQ7Ozs7Ozs7OztHQVNHO0FBQ0gsTUFBTSxVQUFVLHNCQUFzQixDQUFDLEdBQVksRUFBRSxNQUFjO0lBQ2pFLElBQUksQ0FBQyxLQUFLLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLFFBQVEsRUFBRSxDQUFDO1FBQzlDLE9BQU8sU0FBUyxDQUFBO0lBQ2xCLENBQUM7SUFDRCxNQUFNLE1BQU0sR0FBRyxvQkFBb0IsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxDQUFBO0lBQ3RELElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQztRQUNaLE9BQU8sU0FBUyxDQUFBO0lBQ2xCLENBQUM7SUFDRCxPQUFPLElBQUksY0FBYyxDQUFDLE1BQU0sQ0FBQyxLQUFLLEVBQUUsTUFBTSxDQUFDLGlCQUFpQixFQUFFO1FBQ2hFLE1BQU0sRUFBRSxHQUFHLENBQUMsUUFBUSxDQUFDLE1BQU07UUFDM0IsTUFBTTtRQUNOLEtBQUssRUFBRSxHQUFHO0tBQ1gsQ0FBQyxDQUFBO0FBQ0osQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBheGlvcyBmcm9tICdheGlvcydcblxuZXhwb3J0IGludGVyZmFjZSBCWFJlc3RBcGlFcnJvckRldGFpbHMge1xuICAvKipcbiAgICogSFRUUCBzdGF0dXMgb2YgdGhlIHBvcnRhbCByZXNwb25zZS4gYHVuZGVmaW5lZGAgd2hlbiB0aGUgZXJyb3IgY2FtZSBpblxuICAgKiB0aGUgYm9keSBvZiBhIHN1Y2Nlc3NmdWwgKDJ4eCkgcmVzcG9uc2UuXG4gICAqL1xuICBzdGF0dXM/OiBudW1iZXJcbiAgLyoqIFJFU1QgbWV0aG9kIHRoYXQgZmFpbGVkLCBlLmcuIGBjcm0uZGVhbC5nZXRgLiAqL1xuICBtZXRob2Q/OiBzdHJpbmdcbiAgLyoqXG4gICAqIFRoZSBvcmlnaW5hbCBlcnJvciwgZS5nLiB0aGUgYEF4aW9zRXJyb3JgIOKAlCBpdHMgYHJlc3BvbnNlLmRhdGFgIGhvbGRzXG4gICAqIHRoZSBmdWxsIHJlc3BvbnNlIGJvZHkgKGluY2x1ZGluZyBSRVNUIHYzIGB2YWxpZGF0aW9uYCkuXG4gICAqL1xuICBjYXVzZT86IHVua25vd25cbn1cblxuLyoqXG4gKiBBIEJpdHJpeC1sZXZlbCBBUEkgZXJyb3IsIGUuZy4gYElOU1VGRklDSUVOVF9TQ09QRWAgb3IgYGV4cGlyZWRfdG9rZW5gLlxuICpcbiAqIGAucmVzKClgIGZhaWxzIHdpdGggaXQgd2hlbmV2ZXIgdGhlIHBvcnRhbCBhbnN3ZXJzIHdpdGggYSBCaXRyaXggZXJyb3IgYW5kXG4gKiBhIG5vbi0yeHggSFRUUCBzdGF0dXMg4oCUIHdoaWNoIGlzIGhvdyBCaXRyaXggc2VuZHMgbW9zdCBvZiBpdHMgZXJyb3JzLiBXaGVuXG4gKiB0aGUgZXJyb3IgY29tZXMgaW4gdGhlIGJvZHkgb2YgYSAyeHggcmVzcG9uc2UsIGAucmVzKClgIHJlc29sdmVzIGFzXG4gKiBgdW5kZWZpbmVkYCBieSBkZWZhdWx0IGFuZCBmYWlscyB3aXRoIGl0IG9ubHkgd2l0aFxuICogYHsgdGhyb3dPbkFwaUVycm9yOiB0cnVlIH1gIOKAlCBzZWUgdGhlIFwiRXJyb3IgaGFuZGxpbmdcIiBzZWN0aW9uIG9mIHRoZSBSRUFETUUuXG4gKi9cbmV4cG9ydCBjbGFzcyBCWFJlc3RBcGlFcnJvciBleHRlbmRzIEVycm9yIHtcbiAgcmVhZG9ubHkgc3RhdHVzOiBudW1iZXIgfCB1bmRlZmluZWRcbiAgcmVhZG9ubHkgbWV0aG9kOiBzdHJpbmcgfCB1bmRlZmluZWRcblxuICBjb25zdHJ1Y3RvcihcbiAgICBwdWJsaWMgZXJyb3I6IHN0cmluZyB8IHVuZGVmaW5lZCxcbiAgICBwdWJsaWMgZXJyb3JfZGVzY3JpcHRpb246IHN0cmluZyB8IHVuZGVmaW5lZCxcbiAgICBkZXRhaWxzPzogQlhSZXN0QXBpRXJyb3JEZXRhaWxzXG4gICkge1xuICAgIHN1cGVyKFxuICAgICAgZXJyb3JfZGVzY3JpcHRpb24gfHwgZXJyb3IgfHwgJ0JpdHJpeCBBUEkgZXJyb3InLFxuICAgICAgZGV0YWlscz8uY2F1c2UgIT09IHVuZGVmaW5lZCA/IHsgY2F1c2U6IGRldGFpbHMuY2F1c2UgfSA6IHVuZGVmaW5lZFxuICAgIClcbiAgICB0aGlzLm5hbWUgPSAnQlhSZXN0QXBpRXJyb3InXG4gICAgdGhpcy5zdGF0dXMgPSBkZXRhaWxzPy5zdGF0dXNcbiAgICB0aGlzLm1ldGhvZCA9IGRldGFpbHM/Lm1ldGhvZFxuICB9XG59XG5cbi8qKlxuICogUmVjb2duaXNlcyBhIEJpdHJpeCBlcnJvciBib2R5OiBSRVNUIHYyIGB7IGVycm9yLCBlcnJvcl9kZXNjcmlwdGlvbiB9YCBhbmRcbiAqIFJFU1QgdjMgYHsgZXJyb3I6IHsgY29kZSwgbWVzc2FnZSB9IH1gLiBSZXR1cm5zIGB1bmRlZmluZWRgIGZvciBhbnl0aGluZ1xuICogZWxzZSDigJQgYSBzdWNjZXNzIHBheWxvYWQsIGFuIEhUTUwgcGFnZSBmcm9tIGEgcHJveHksIGFuIGVtcHR5IGJvZHkuXG4gKlxuICogQW4gZW1wdHkgYGVycm9yYCBzdGlsbCBjb3VudHM6IEJpdHJpeCBhbnN3ZXJzIGUuZy4gYGNybS5kZWFsLmdldGAgZm9yIGFcbiAqIG1pc3NpbmcgSUQgd2l0aCBgeyBlcnJvcjogJycsIGVycm9yX2Rlc2NyaXB0aW9uOiAnTm90IGZvdW5kJyB9YC5cbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIHBhcnNlQlhSZXN0RXJyb3JCb2R5KGJvZHk6IHVua25vd24pXG4gIDogeyBlcnJvcjogc3RyaW5nLCBlcnJvcl9kZXNjcmlwdGlvbjogc3RyaW5nIHwgdW5kZWZpbmVkIH0gfCB1bmRlZmluZWQge1xuICBpZiAoIWJvZHkgfHwgdHlwZW9mIGJvZHkgIT09ICdvYmplY3QnIHx8ICEoJ2Vycm9yJyBpbiBib2R5KSkge1xuICAgIHJldHVybiB1bmRlZmluZWRcbiAgfVxuICBjb25zdCB7IGVycm9yLCBlcnJvcl9kZXNjcmlwdGlvbiB9ID0gYm9keSBhcyB7IGVycm9yOiB1bmtub3duLCBlcnJvcl9kZXNjcmlwdGlvbj86IHVua25vd24gfVxuXG4gIGlmICh0eXBlb2YgZXJyb3IgPT09ICdzdHJpbmcnKSB7XG4gICAgcmV0dXJuIHtcbiAgICAgIGVycm9yLFxuICAgICAgZXJyb3JfZGVzY3JpcHRpb246IHR5cGVvZiBlcnJvcl9kZXNjcmlwdGlvbiA9PT0gJ3N0cmluZycgPyBlcnJvcl9kZXNjcmlwdGlvbiA6IHVuZGVmaW5lZFxuICAgIH1cbiAgfVxuXG4gIGlmIChlcnJvciAmJiB0eXBlb2YgZXJyb3IgPT09ICdvYmplY3QnICYmICdjb2RlJyBpbiBlcnJvcikge1xuICAgIGNvbnN0IHsgY29kZSwgbWVzc2FnZSB9ID0gZXJyb3IgYXMgeyBjb2RlOiB1bmtub3duLCBtZXNzYWdlPzogdW5rbm93biB9XG4gICAgcmV0dXJuIHtcbiAgICAgIGVycm9yOiBTdHJpbmcoY29kZSksXG4gICAgICBlcnJvcl9kZXNjcmlwdGlvbjogdHlwZW9mIG1lc3NhZ2UgPT09ICdzdHJpbmcnID8gbWVzc2FnZSA6IHVuZGVmaW5lZFxuICAgIH1cbiAgfVxuXG4gIHJldHVybiB1bmRlZmluZWRcbn1cblxuLyoqXG4gKiBUdXJucyBhbiBIVFRQIGZhaWx1cmUgaW50byBhIGBCWFJlc3RBcGlFcnJvcmAgd2hlbiB0aGUgcG9ydGFsIGFuc3dlcmVkIHdpdGhcbiAqIGEgQml0cml4IGVycm9yIGJvZHkuIEJpdHJpeCBzZW5kcyBtb3N0IGVycm9ycyB3aXRoIGEgbm9uLTJ4eCBzdGF0dXNcbiAqICg0MDEgYGV4cGlyZWRfdG9rZW5gLCA0MDQgYEVSUk9SX01FVEhPRF9OT1RfRk9VTkRgLCA1MDNcbiAqIGBRVUVSWV9MSU1JVF9FWENFRURFRGAsIDQwMCBcIk5vdCBmb3VuZFwiIGZyb20gYGNybS4qLmdldGAsIC4uLiksIGFuZCBheGlvc1xuICogcmVqZWN0cyBvbiB0aG9zZS5cbiAqXG4gKiBSZXR1cm5zIGB1bmRlZmluZWRgIGZvciBuZXR3b3JrIGVycm9ycyBhbmQgZm9yIHJlc3BvbnNlcyB0aGF0IGFyZSBub3QgYVxuICogQml0cml4IGVycm9yIGJvZHksIHNvIHRoZSBjYWxsZXIgY2FuIGtlZXAgaXRzIG93biBoYW5kbGluZyBmb3IgdGhlbS5cbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIGJ4UmVzdEFwaUVycm9yRnJvbUh0dHAoZXJyOiB1bmtub3duLCBtZXRob2Q6IHN0cmluZyk6IEJYUmVzdEFwaUVycm9yIHwgdW5kZWZpbmVkIHtcbiAgaWYgKCFheGlvcy5pc0F4aW9zRXJyb3IoZXJyKSB8fCAhZXJyLnJlc3BvbnNlKSB7XG4gICAgcmV0dXJuIHVuZGVmaW5lZFxuICB9XG4gIGNvbnN0IHBhcnNlZCA9IHBhcnNlQlhSZXN0RXJyb3JCb2R5KGVyci5yZXNwb25zZS5kYXRhKVxuICBpZiAoIXBhcnNlZCkge1xuICAgIHJldHVybiB1bmRlZmluZWRcbiAgfVxuICByZXR1cm4gbmV3IEJYUmVzdEFwaUVycm9yKHBhcnNlZC5lcnJvciwgcGFyc2VkLmVycm9yX2Rlc2NyaXB0aW9uLCB7XG4gICAgc3RhdHVzOiBlcnIucmVzcG9uc2Uuc3RhdHVzLFxuICAgIG1ldGhvZCxcbiAgICBjYXVzZTogZXJyXG4gIH0pXG59XG4iXX0=
|
package/esm2022/rest/base.mjs
CHANGED
|
@@ -32,8 +32,8 @@ export class BXRest {
|
|
|
32
32
|
profile() {
|
|
33
33
|
return this.http.post(['profile']);
|
|
34
34
|
}
|
|
35
|
-
batch(param) {
|
|
36
|
-
return this.http.post(['batch'], param);
|
|
35
|
+
batch(param, headers) {
|
|
36
|
+
return this.http.post(['batch'], param, false, headers);
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
39
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL2J4LXJlc3Qvc3JjL3Jlc3QvYmFzZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0saUJBQWlCLENBQUE7QUFDNUMsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGtCQUFrQixDQUFBO0FBQzlDLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQTtBQUM1QyxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sa0JBQWtCLENBQUE7QUFDOUMsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlCQUFpQixDQUFBO0FBQzVDLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQTtBQUNsRCxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sZ0JBQWdCLENBQUE7QUFDMUMsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sd0JBQXdCLENBQUE7QUFDekQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLG1CQUFtQixDQUFBO0FBQ2hELE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHVCQUF1QixDQUFBO0FBQ3hELE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQTtBQUMxQyxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0seUJBQXlCLENBQUE7QUFHeEQsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMEJBQTBCLENBQUE7QUFDOUQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlCQUFpQixDQUFBO0FBRTVDLE1BQU0sT0FBTyxNQUFNO0lBQW5CO1FBQ21CLFNBQUksR0FBRyxJQUFJLGNBQWMsRUFBRSxDQUFBO1FBQzVCLFNBQUksR0FBRyxJQUFJLFVBQVUsRUFBRSxDQUFBO1FBQ3ZCLFVBQUssR0FBRyxJQUFJLFdBQVcsRUFBRSxDQUFBO1FBQ3pCLFNBQUksR0FBRyxJQUFJLFVBQVUsRUFBRSxDQUFBO1FBQ3ZCLFVBQUssR0FBRyxJQUFJLFdBQVcsRUFBRSxDQUFBO1FBQ3pCLFNBQUksR0FBRyxJQUFJLFVBQVUsRUFBRSxDQUFBO1FBQ3ZCLFlBQU8sR0FBRyxJQUFJLGFBQWEsRUFBRSxDQUFBO1FBQzdCLFFBQUcsR0FBRyxJQUFJLFNBQVMsRUFBRSxDQUFBO1FBQ3JCLGdCQUFXLEdBQUcsSUFBSSxnQkFBZ0IsRUFBRSxDQUFBO1FBQ3BDLFdBQU0sR0FBRyxJQUFJLFlBQVksRUFBRSxDQUFBO1FBQzNCLGVBQVUsR0FBRyxJQUFJLGdCQUFnQixFQUFFLENBQUE7UUFDbkMsUUFBRyxHQUFHLElBQUksU0FBUyxFQUFFLENBQUE7UUFDckIsa0JBQWEsR0FBRyxJQUFJLG1CQUFtQixFQUFFLENBQUE7UUFDekMsU0FBSSxHQUFHLElBQUksVUFBVSxFQUFFLENBQUE7SUFTekMsQ0FBQztJQVBRLE9BQU87UUFDWixPQUFPLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFxQixDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUE7SUFDeEQsQ0FBQztJQUVNLEtBQUssQ0FBSSxLQUF3QixFQUFFLE9BQWdDO1FBQ3hFLE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQWtCLENBQUMsT0FBTyxDQUFDLEVBQUUsS0FBSyxFQUFFLEtBQUssRUFBRSxPQUFPLENBQUMsQ0FBQTtJQUMxRSxDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBCWFJlc3RVc2VyIH0gZnJvbSAnLi4vcmVxdWVzdC91c2VyJ1xuaW1wb3J0IHsgQlhSZXN0TGlzdHMgfSBmcm9tICcuLi9yZXF1ZXN0L2xpc3RzJ1xuaW1wb3J0IHsgQlhSZXN0VGFzayB9IGZyb20gJy4uL3JlcXVlc3QvdGFzaydcbmltcG9ydCB7IEJYUmVzdFRhc2tzIH0gZnJvbSAnLi4vcmVxdWVzdC90YXNrcydcbmltcG9ydCB7IEJYUmVzdERpc2sgfSBmcm9tICcuLi9yZXF1ZXN0L2Rpc2snXG5pbXBvcnQgeyBCWFJlc3RCaXpQcm9jIH0gZnJvbSAnLi4vcmVxdWVzdC9iaXpwcm9jJ1xuaW1wb3J0IHsgQlhSZXN0TG9nIH0gZnJvbSAnLi4vcmVxdWVzdC9sb2cnXG5pbXBvcnQgeyBCWFJlc3RTb25ldEdyb3VwIH0gZnJvbSAnLi4vcmVxdWVzdC9zb25ldF9ncm91cCdcbmltcG9ydCB7IEJYUmVzdFNlcnZlciB9IGZyb20gJy4uL3JlcXVlc3Qvc2VydmVyJ1xuaW1wb3J0IHsgQlhSZXN0RGVwYXJ0bWVudCB9IGZyb20gJy4uL3JlcXVlc3QvZGVwYXJ0bWVudCdcbmltcG9ydCB7IEJYUmVzdEFwcCB9IGZyb20gJy4uL3JlcXVlc3QvYXBwJ1xuaW1wb3J0IHsgSHR0cEJYU2VydmljZXMgfSBmcm9tICcuLi9zZXJ2aWNlcy9odHRwL0h0dHBCWCdcbmltcG9ydCB7IGlCWFJlc3RQcm9maWxlSHR0cCB9IGZyb20gJy4uL3R5cGlmaWNhdGlvbi9yZXN0L3Byb2ZpbGUnXG5pbXBvcnQgeyBpQlhSZXN0QmF0Y2gsIGlCWFJlc3RQYXJhbUJhdGNoIH0gZnJvbSAnLi4vdHlwaWZpY2F0aW9uL3Jlc3QvYmF0Y2gnXG5pbXBvcnQgeyBCWFJlc3RTb2NpYWxOZXRXb3JrIH0gZnJvbSAnLi4vcmVxdWVzdC9zb2NpYWxuZXR3b3JrJ1xuaW1wb3J0IHsgQlhSZXN0UHVsbCB9IGZyb20gJy4uL3JlcXVlc3QvcHVsbCdcblxuZXhwb3J0IGNsYXNzIEJYUmVzdCB7XG4gIHByaXZhdGUgcmVhZG9ubHkgaHR0cCA9IG5ldyBIdHRwQlhTZXJ2aWNlcygpXG4gIHB1YmxpYyByZWFkb25seSB1c2VyID0gbmV3IEJYUmVzdFVzZXIoKVxuICBwdWJsaWMgcmVhZG9ubHkgbGlzdHMgPSBuZXcgQlhSZXN0TGlzdHMoKVxuICBwdWJsaWMgcmVhZG9ubHkgdGFzayA9IG5ldyBCWFJlc3RUYXNrKClcbiAgcHVibGljIHJlYWRvbmx5IHRhc2tzID0gbmV3IEJYUmVzdFRhc2tzKClcbiAgcHVibGljIHJlYWRvbmx5IGRpc2sgPSBuZXcgQlhSZXN0RGlzaygpXG4gIHB1YmxpYyByZWFkb25seSBiaXpQcm9jID0gbmV3IEJYUmVzdEJpelByb2MoKVxuICBwdWJsaWMgcmVhZG9ubHkgbG9nID0gbmV3IEJYUmVzdExvZygpXG4gIHB1YmxpYyByZWFkb25seSBzb25ldF9ncm91cCA9IG5ldyBCWFJlc3RTb25ldEdyb3VwKClcbiAgcHVibGljIHJlYWRvbmx5IHNlcnZlciA9IG5ldyBCWFJlc3RTZXJ2ZXIoKVxuICBwdWJsaWMgcmVhZG9ubHkgZGVwYXJ0bWVudCA9IG5ldyBCWFJlc3REZXBhcnRtZW50KClcbiAgcHVibGljIHJlYWRvbmx5IGFwcCA9IG5ldyBCWFJlc3RBcHAoKVxuICBwdWJsaWMgcmVhZG9ubHkgc29jaWFsTmV0V29yayA9IG5ldyBCWFJlc3RTb2NpYWxOZXRXb3JrKClcbiAgcHVibGljIHJlYWRvbmx5IHB1bGwgPSBuZXcgQlhSZXN0UHVsbCgpXG5cbiAgcHVibGljIHByb2ZpbGUoKSB7XG4gICAgcmV0dXJuIHRoaXMuaHR0cC5wb3N0PGlCWFJlc3RQcm9maWxlSHR0cD4oWydwcm9maWxlJ10pXG4gIH1cblxuICBwdWJsaWMgYmF0Y2g8VD4ocGFyYW06IGlCWFJlc3RQYXJhbUJhdGNoLCBoZWFkZXJzPzogUmVjb3JkPHN0cmluZywgc3RyaW5nPikge1xuICAgIHJldHVybiB0aGlzLmh0dHAucG9zdDxpQlhSZXN0QmF0Y2g8VD4+KFsnYmF0Y2gnXSwgcGFyYW0sIGZhbHNlLCBoZWFkZXJzKVxuICB9XG59Il19
|
|
@@ -53,21 +53,26 @@ export class HttpBXServices extends HttpServices {
|
|
|
53
53
|
*
|
|
54
54
|
* @param name
|
|
55
55
|
* @param params
|
|
56
|
+
* @param restApi
|
|
57
|
+
* @param headers заголовки только для этого запроса, поверх `BXRestSettings.headers`
|
|
56
58
|
*/
|
|
57
|
-
post(name, params = {}, restApi = false) {
|
|
59
|
+
post(name, params = {}, restApi = false, headers) {
|
|
58
60
|
const method = this.getNameMethod(name);
|
|
59
|
-
return this.httpPost(restApi ? `api/${method}` : method, params);
|
|
61
|
+
return this.httpPost(restApi ? `api/${method}` : method, params, undefined, headers);
|
|
60
62
|
}
|
|
61
63
|
/**
|
|
62
64
|
* Второстепенный метод для запросов. По возможности лучше не использовать
|
|
63
65
|
*
|
|
64
66
|
* @param name
|
|
65
67
|
* @param params
|
|
68
|
+
* @param headers заголовки только для этого запроса, поверх `BXRestSettings.headers`
|
|
66
69
|
*/
|
|
67
|
-
get(name, params = {}) {
|
|
68
|
-
return this.httpGet(this.getNameMethod(name), params);
|
|
70
|
+
get(name, params = {}, headers) {
|
|
71
|
+
return this.httpGet(this.getNameMethod(name), params, undefined, headers);
|
|
69
72
|
}
|
|
70
|
-
|
|
73
|
+
// settings — только для совместимости сигнатуры с HttpServices: здесь тело
|
|
74
|
+
// уходит JSON-ом/urlencoded, и пересчёт дат из iHttpParamSettings не нужен.
|
|
75
|
+
httpPost(url, params = {}, settings, headers) {
|
|
71
76
|
// defer() откладывает всё содержимое (в том числе чтение BXRestSettings
|
|
72
77
|
// через this.session.*) до реальной подписки — иначе даже с "живым"
|
|
73
78
|
// геттером в SessionKeyServices настройки читались бы в момент вызова
|
|
@@ -95,19 +100,17 @@ export class HttpBXServices extends HttpServices {
|
|
|
95
100
|
// Преобразуем параметры в формат x-www-form-urlencoded
|
|
96
101
|
const bodyString = this.serializeBitrixParams(paramsClone);
|
|
97
102
|
return from(this.axiosInstance.post(fullUrl, bodyString, {
|
|
98
|
-
headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
|
|
103
|
+
headers: this.buildHeaders(headers, { 'Content-Type': 'application/x-www-form-urlencoded' }),
|
|
99
104
|
}).then((response) => response.data));
|
|
100
105
|
}
|
|
101
106
|
return from(this.axiosInstance.post(fullUrl, paramsClone, {
|
|
102
107
|
withCredentials: this.session.getWithCredentials(),
|
|
103
|
-
headers: {
|
|
104
|
-
'Content-Type': 'application/json',
|
|
105
|
-
}
|
|
108
|
+
headers: this.buildHeaders(headers, { 'Content-Type': 'application/json' }),
|
|
106
109
|
}).then((response) => response.data));
|
|
107
110
|
}));
|
|
108
111
|
});
|
|
109
112
|
}
|
|
110
|
-
httpGet(url, params = {}) {
|
|
113
|
+
httpGet(url, params = {}, settings, headers) {
|
|
111
114
|
// Та же причина, что и у httpPost выше: откладываем чтение BXRestSettings
|
|
112
115
|
// до подписки, чтобы `get()` вёл себя так же "лениво", как и `post()`
|
|
113
116
|
// (симметрия, которой не было до этого — GET резолвил настройки в момент
|
|
@@ -129,10 +132,21 @@ export class HttpBXServices extends HttpServices {
|
|
|
129
132
|
const fullUrl = prepareBaseAddress(baseUrl) + url;
|
|
130
133
|
const queryString = new URLSearchParams(paramsClone).toString();
|
|
131
134
|
const finalUrl = `${fullUrl}?${queryString}`;
|
|
132
|
-
return from(this.axiosInstance.get(finalUrl
|
|
135
|
+
return from(this.axiosInstance.get(finalUrl, {
|
|
136
|
+
headers: this.buildHeaders(headers),
|
|
137
|
+
}).then((response) => response.data));
|
|
133
138
|
}));
|
|
134
139
|
});
|
|
135
140
|
}
|
|
141
|
+
/**
|
|
142
|
+
* Заголовки запроса: `BXRestSettings.headers`, поверх них — заголовки
|
|
143
|
+
* конкретного запроса, поверх всего — `required`. В `required` идёт
|
|
144
|
+
* `Content-Type`: от него зависит, как сервер разберёт тело, поэтому
|
|
145
|
+
* пользовательские заголовки его не перебивают.
|
|
146
|
+
*/
|
|
147
|
+
buildHeaders(headers, required = {}) {
|
|
148
|
+
return { ...this.session.getHeaders(), ...headers, ...required };
|
|
149
|
+
}
|
|
136
150
|
serializeBitrixParams(params) {
|
|
137
151
|
return stringifyBitrixParams(params);
|
|
138
152
|
}
|
|
@@ -140,4 +154,4 @@ export class HttpBXServices extends HttpServices {
|
|
|
140
154
|
return arr.join('.');
|
|
141
155
|
}
|
|
142
156
|
}
|
|
143
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"HttpBX.js","sourceRoot":"","sources":["../../../../../projects/bx-rest/src/services/http/HttpBX.ts"],"names":[],"mappings":"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","sourcesContent":["import { Observable, throwError, forkJoin, from, defer } from 'rxjs'\r\nimport clone from 'just-clone'\r\nimport { HttpServices } from './http'\r\nimport {\r\n  iBatchRequestAnswer, iBatchRequestParam, iBatchRequestParamArr, iBatchRequestParamHttp, keyBatch,\r\n} from '../../typification/rest/batch/batchRequestParam'\r\nimport { iBXRestAnswer } from '../../typification/rest/base/answer'\r\nimport flatten from 'just-flatten-it'\r\nimport { instanceOfiBXRestAnswerSuccess } from '../../functions/mapResult'\r\nimport { switchMap } from 'rxjs/operators'\r\nimport { prepareBaseAddress } from '../base'\r\nimport { serializeBitrixParams as stringifyBitrixParams } from '../../functions/serializeBitrixParams'\r\n\r\nexport class HttpBXServices extends HttpServices {\r\n\r\n  /**\r\n   * Не считайте этот метод образцом/финальным API.\r\n   * TODO: Удалить данный метод после реализации его в разделе Navvy\r\n   * @param param\r\n   */\r\n  branch<T, A>(param: iBatchRequestParamArr<T> | iBatchRequestParam<T>[])\r\n    : Observable<iBatchRequestAnswer<A>[] | undefined> {\r\n    let prepareParam = Object.entries<string>(this.prepareBatch<T>(param))\r\n    const size = 50 // больше не отдаст\r\n    let subarray = [] //массив в который будет выведен результат.\r\n    for (let i = 0; i < Math.ceil(prepareParam.length / size); i++) {\r\n      subarray[i] = prepareParam.slice((i * size), (i * size) + size)\r\n    }\r\n\r\n    return forkJoin(\r\n      subarray.map(i => {\r\n        return this.httpPost('batch.json', {\r\n          halt: 0,\r\n          cmd: Object.assign({}, ...i.map(x => {\r\n            return {[x[0]]: x[1]}\r\n          }))\r\n        })\r\n      })\r\n    ) as Observable<iBatchRequestAnswer<A>[]>\r\n  }\r\n\r\n  prepareBatch<T>(param: iBatchRequestParamArr<T> | iBatchRequestParam<T>[]): iBatchRequestParamHttp {\r\n    let res: iBatchRequestParamHttp = Object.keys(param).reduce(\r\n      (obj, key) => {\r\n        obj[key] = ''\r\n        return obj\r\n      },\r\n      {} as iBatchRequestParamHttp\r\n    )\r\n    for (let key in param) {\r\n      if (typeof key === 'string' || typeof key === 'number' && param[key].param) {\r\n        res[key] = param[key].name + '?' + stringifyBitrixParams(param[key].param)\r\n      }\r\n    }\r\n    return res\r\n  }\r\n\r\n  mapBranchResult<T>(res: iBatchRequestAnswer<T>[]) {\r\n    return Object.assign([], ...res.map(i =>\r\n      (instanceOfiBXRestAnswerSuccess(i) && instanceOfiBXRestAnswerSuccess(i.result)) ? i.result.result : undefined)\r\n    ) as Record<keyBatch, T>\r\n  }\r\n\r\n  mapBranchResultWithoutKey<T>(res: iBatchRequestAnswer<T>[]): T[] {\r\n    return flatten<T>(Object.assign([], ...res.map(i =>\r\n      (instanceOfiBXRestAnswerSuccess(i) && instanceOfiBXRestAnswerSuccess(i.result))\r\n        ? i.result.result\r\n        : undefined))\r\n    )\r\n  }\r\n\r\n  /**\r\n   * Основной метод для запросов\r\n   *\r\n   * @param name\r\n   * @param params\r\n   */\r\n  post<T>(name: string[], params: any = {}, restApi = false) {\r\n    const method = this.getNameMethod(name)\r\n    return this.httpPost<iBXRestAnswer<T>>(restApi ? `api/${method}` : method, params)\r\n  }\r\n\r\n  /**\r\n   * Второстепенный метод для запросов. По возможности лучше не использовать\r\n   *\r\n   * @param name\r\n   * @param params\r\n   */\r\n  get<T>(name: string[], params: any = {}) {\r\n    return this.httpGet<iBXRestAnswer<T>>(this.getNameMethod(name), params)\r\n  }\r\n\r\n  override httpPost<T>(url: string, params: any = {}): Observable<T | undefined> {\r\n    // defer() откладывает всё содержимое (в том числе чтение BXRestSettings\r\n    // через this.session.*) до реальной подписки — иначе даже с \"живым\"\r\n    // геттером в SessionKeyServices настройки читались бы в момент вызова\r\n    // .res(), а не в момент subscribe()/firstValueFrom(), что и обещано\r\n    // в README как поведение \"ленивого\" REST-вызова.\r\n    return defer(() => {\r\n      const paramsClone = clone(params)\r\n      const key = this.session.getKeyAuth()\r\n      const auth = this.session.getAuthParams()\r\n      const checkIsOn = this.session.getCheckAuthParamsIsOn()\r\n\r\n      if (checkIsOn) {\r\n        if (!auth) {\r\n          return throwError(() => this.session.getAuthError('post'))\r\n        }\r\n\r\n        if (key !== 'OAuth2') {\r\n          paramsClone[key] = auth\r\n        }\r\n      }\r\n\r\n      return this.session.getBaseUrl().pipe(\r\n        switchMap((baseUrl) => {\r\n          if (!baseUrl) {\r\n            return throwError(() => this.session.getBaseUrlError('post'))\r\n          }\r\n\r\n          const fullUrl = prepareBaseAddress(baseUrl) + url\r\n\r\n          if (key === 'sessid') {\r\n            // Преобразуем параметры в формат x-www-form-urlencoded\r\n            const bodyString = this.serializeBitrixParams(paramsClone)\r\n            return from(\r\n              this.axiosInstance.post<T>(fullUrl, bodyString, {\r\n                headers: {'Content-Type': 'application/x-www-form-urlencoded'},\r\n              }).then((response) => response.data)\r\n            )\r\n          }\r\n\r\n          return from(\r\n            this.axiosInstance.post<T>(fullUrl, paramsClone,\r\n              {\r\n                withCredentials: this.session.getWithCredentials(),\r\n                headers: {\r\n                  'Content-Type': 'application/json',\r\n                }\r\n              }\r\n            ).then((response) => response.data)\r\n          )\r\n        })\r\n      )\r\n    })\r\n  }\r\n\r\n  override httpGet<T>(url: string, params: any = {}): Observable<T | undefined> {\r\n    // Та же причина, что и у httpPost выше: откладываем чтение BXRestSettings\r\n    // до подписки, чтобы `get()` вёл себя так же \"лениво\", как и `post()`\r\n    // (симметрия, которой не было до этого — GET резолвил настройки в момент\r\n    // вызова, а не в момент subscribe()).\r\n    return defer(() => {\r\n      const paramsClone = clone(params)\r\n      const auth = this.session.getAuthParams()\r\n      const checkIsOn = this.session.getCheckAuthParamsIsOn()\r\n\r\n      if (checkIsOn) {\r\n        if (!auth) {\r\n          return throwError(() => this.session.getAuthError('get'))\r\n        }\r\n\r\n        paramsClone[this.session.getKeyAuth()] = auth\r\n      }\r\n\r\n      return this.session.getBaseUrl().pipe(\r\n        switchMap((baseUrl) => {\r\n          if (!baseUrl) {\r\n            return throwError(() => this.session.getBaseUrlError('get'))\r\n          }\r\n\r\n          const fullUrl = prepareBaseAddress(baseUrl) + url\r\n          const queryString = new URLSearchParams(paramsClone).toString()\r\n          const finalUrl = `${fullUrl}?${queryString}`\r\n\r\n          return from(\r\n            this.axiosInstance.get<T>(finalUrl).then((response) => response.data)\r\n          )\r\n        })\r\n      )\r\n    })\r\n  }\r\n\r\n  serializeBitrixParams(params: unknown): string {\r\n    return stringifyBitrixParams(params)\r\n  }\r\n\r\n  getNameMethod(arr: string[]) {\r\n    return arr.join('.')\r\n  }\r\n\r\n}\r\n\r\n"]}
|
|
157
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"HttpBX.js","sourceRoot":"","sources":["../../../../../projects/bx-rest/src/services/http/HttpBX.ts"],"names":[],"mappings":"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","sourcesContent":["import { Observable, throwError, forkJoin, from, defer } from 'rxjs'\r\nimport clone from 'just-clone'\r\nimport { HttpServices } from './http'\r\nimport {\r\n  iBatchRequestAnswer, iBatchRequestParam, iBatchRequestParamArr, iBatchRequestParamHttp, keyBatch,\r\n} from '../../typification/rest/batch/batchRequestParam'\r\nimport { iBXRestAnswer } from '../../typification/rest/base/answer'\r\nimport flatten from 'just-flatten-it'\r\nimport { instanceOfiBXRestAnswerSuccess } from '../../functions/mapResult'\r\nimport { switchMap } from 'rxjs/operators'\r\nimport { prepareBaseAddress } from '../base'\r\nimport { serializeBitrixParams as stringifyBitrixParams } from '../../functions/serializeBitrixParams'\r\nimport { iHttpParamSettings } from '../../typification/rest/settings'\r\n\r\nexport class HttpBXServices extends HttpServices {\r\n\r\n  /**\r\n   * Не считайте этот метод образцом/финальным API.\r\n   * TODO: Удалить данный метод после реализации его в разделе Navvy\r\n   * @param param\r\n   */\r\n  branch<T, A>(param: iBatchRequestParamArr<T> | iBatchRequestParam<T>[])\r\n    : Observable<iBatchRequestAnswer<A>[] | undefined> {\r\n    let prepareParam = Object.entries<string>(this.prepareBatch<T>(param))\r\n    const size = 50 // больше не отдаст\r\n    let subarray = [] //массив в который будет выведен результат.\r\n    for (let i = 0; i < Math.ceil(prepareParam.length / size); i++) {\r\n      subarray[i] = prepareParam.slice((i * size), (i * size) + size)\r\n    }\r\n\r\n    return forkJoin(\r\n      subarray.map(i => {\r\n        return this.httpPost('batch.json', {\r\n          halt: 0,\r\n          cmd: Object.assign({}, ...i.map(x => {\r\n            return {[x[0]]: x[1]}\r\n          }))\r\n        })\r\n      })\r\n    ) as Observable<iBatchRequestAnswer<A>[]>\r\n  }\r\n\r\n  prepareBatch<T>(param: iBatchRequestParamArr<T> | iBatchRequestParam<T>[]): iBatchRequestParamHttp {\r\n    let res: iBatchRequestParamHttp = Object.keys(param).reduce(\r\n      (obj, key) => {\r\n        obj[key] = ''\r\n        return obj\r\n      },\r\n      {} as iBatchRequestParamHttp\r\n    )\r\n    for (let key in param) {\r\n      if (typeof key === 'string' || typeof key === 'number' && param[key].param) {\r\n        res[key] = param[key].name + '?' + stringifyBitrixParams(param[key].param)\r\n      }\r\n    }\r\n    return res\r\n  }\r\n\r\n  mapBranchResult<T>(res: iBatchRequestAnswer<T>[]) {\r\n    return Object.assign([], ...res.map(i =>\r\n      (instanceOfiBXRestAnswerSuccess(i) && instanceOfiBXRestAnswerSuccess(i.result)) ? i.result.result : undefined)\r\n    ) as Record<keyBatch, T>\r\n  }\r\n\r\n  mapBranchResultWithoutKey<T>(res: iBatchRequestAnswer<T>[]): T[] {\r\n    return flatten<T>(Object.assign([], ...res.map(i =>\r\n      (instanceOfiBXRestAnswerSuccess(i) && instanceOfiBXRestAnswerSuccess(i.result))\r\n        ? i.result.result\r\n        : undefined))\r\n    )\r\n  }\r\n\r\n  /**\r\n   * Основной метод для запросов\r\n   *\r\n   * @param name\r\n   * @param params\r\n   * @param restApi\r\n   * @param headers заголовки только для этого запроса, поверх `BXRestSettings.headers`\r\n   */\r\n  post<T>(name: string[], params: any = {}, restApi = false, headers?: Record<string, string>) {\r\n    const method = this.getNameMethod(name)\r\n    return this.httpPost<iBXRestAnswer<T>>(restApi ? `api/${method}` : method, params, undefined, headers)\r\n  }\r\n\r\n  /**\r\n   * Второстепенный метод для запросов. По возможности лучше не использовать\r\n   *\r\n   * @param name\r\n   * @param params\r\n   * @param headers заголовки только для этого запроса, поверх `BXRestSettings.headers`\r\n   */\r\n  get<T>(name: string[], params: any = {}, headers?: Record<string, string>) {\r\n    return this.httpGet<iBXRestAnswer<T>>(this.getNameMethod(name), params, undefined, headers)\r\n  }\r\n\r\n  // settings — только для совместимости сигнатуры с HttpServices: здесь тело\r\n  // уходит JSON-ом/urlencoded, и пересчёт дат из iHttpParamSettings не нужен.\r\n  override httpPost<T>(\r\n    url: string,\r\n    params: any = {},\r\n    settings?: iHttpParamSettings,\r\n    headers?: Record<string, string>\r\n  ): Observable<T | undefined> {\r\n    // defer() откладывает всё содержимое (в том числе чтение BXRestSettings\r\n    // через this.session.*) до реальной подписки — иначе даже с \"живым\"\r\n    // геттером в SessionKeyServices настройки читались бы в момент вызова\r\n    // .res(), а не в момент subscribe()/firstValueFrom(), что и обещано\r\n    // в README как поведение \"ленивого\" REST-вызова.\r\n    return defer(() => {\r\n      const paramsClone = clone(params)\r\n      const key = this.session.getKeyAuth()\r\n      const auth = this.session.getAuthParams()\r\n      const checkIsOn = this.session.getCheckAuthParamsIsOn()\r\n\r\n      if (checkIsOn) {\r\n        if (!auth) {\r\n          return throwError(() => this.session.getAuthError('post'))\r\n        }\r\n\r\n        if (key !== 'OAuth2') {\r\n          paramsClone[key] = auth\r\n        }\r\n      }\r\n\r\n      return this.session.getBaseUrl().pipe(\r\n        switchMap((baseUrl) => {\r\n          if (!baseUrl) {\r\n            return throwError(() => this.session.getBaseUrlError('post'))\r\n          }\r\n\r\n          const fullUrl = prepareBaseAddress(baseUrl) + url\r\n\r\n          if (key === 'sessid') {\r\n            // Преобразуем параметры в формат x-www-form-urlencoded\r\n            const bodyString = this.serializeBitrixParams(paramsClone)\r\n            return from(\r\n              this.axiosInstance.post<T>(fullUrl, bodyString, {\r\n                headers: this.buildHeaders(headers, {'Content-Type': 'application/x-www-form-urlencoded'}),\r\n              }).then((response) => response.data)\r\n            )\r\n          }\r\n\r\n          return from(\r\n            this.axiosInstance.post<T>(fullUrl, paramsClone,\r\n              {\r\n                withCredentials: this.session.getWithCredentials(),\r\n                headers: this.buildHeaders(headers, {'Content-Type': 'application/json'}),\r\n              }\r\n            ).then((response) => response.data)\r\n          )\r\n        })\r\n      )\r\n    })\r\n  }\r\n\r\n  override httpGet<T>(\r\n    url: string,\r\n    params: any = {},\r\n    settings?: iHttpParamSettings,\r\n    headers?: Record<string, string>\r\n  ): Observable<T | undefined> {\r\n    // Та же причина, что и у httpPost выше: откладываем чтение BXRestSettings\r\n    // до подписки, чтобы `get()` вёл себя так же \"лениво\", как и `post()`\r\n    // (симметрия, которой не было до этого — GET резолвил настройки в момент\r\n    // вызова, а не в момент subscribe()).\r\n    return defer(() => {\r\n      const paramsClone = clone(params)\r\n      const auth = this.session.getAuthParams()\r\n      const checkIsOn = this.session.getCheckAuthParamsIsOn()\r\n\r\n      if (checkIsOn) {\r\n        if (!auth) {\r\n          return throwError(() => this.session.getAuthError('get'))\r\n        }\r\n\r\n        paramsClone[this.session.getKeyAuth()] = auth\r\n      }\r\n\r\n      return this.session.getBaseUrl().pipe(\r\n        switchMap((baseUrl) => {\r\n          if (!baseUrl) {\r\n            return throwError(() => this.session.getBaseUrlError('get'))\r\n          }\r\n\r\n          const fullUrl = prepareBaseAddress(baseUrl) + url\r\n          const queryString = new URLSearchParams(paramsClone).toString()\r\n          const finalUrl = `${fullUrl}?${queryString}`\r\n\r\n          return from(\r\n            this.axiosInstance.get<T>(finalUrl, {\r\n              headers: this.buildHeaders(headers),\r\n            }).then((response) => response.data)\r\n          )\r\n        })\r\n      )\r\n    })\r\n  }\r\n\r\n  /**\r\n   * Заголовки запроса: `BXRestSettings.headers`, поверх них — заголовки\r\n   * конкретного запроса, поверх всего — `required`. В `required` идёт\r\n   * `Content-Type`: от него зависит, как сервер разберёт тело, поэтому\r\n   * пользовательские заголовки его не перебивают.\r\n   */\r\n  private buildHeaders(headers?: Record<string, string>, required: Record<string, string> = {}) {\r\n    return { ...this.session.getHeaders(), ...headers, ...required }\r\n  }\r\n\r\n  serializeBitrixParams(params: unknown): string {\r\n    return stringifyBitrixParams(params)\r\n  }\r\n\r\n  getNameMethod(arr: string[]) {\r\n    return arr.join('.')\r\n  }\r\n\r\n}\r\n\r\n"]}
|