bx-rest 0.21.0 → 0.21.2
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/LICENSE +21 -0
- package/README.md +117 -2
- package/esm2022/functions/errors.mjs +17 -0
- package/esm2022/public-api.mjs +2 -1
- package/esm2022/services/http/HttpBX.mjs +1 -34
- package/esm2022/services/navvy/extends/navvy-pag-base.mjs +14 -5
- package/fesm2022/bx-rest.mjs +30 -38
- package/fesm2022/bx-rest.mjs.map +1 -1
- package/functions/errors.d.ts +13 -0
- package/package.json +2 -1
- package/public-api.d.ts +2 -0
- package/services/http/HttpBX.d.ts +0 -1
- package/services/navvy/extends/navvy-pag-base.d.ts +13 -2
package/LICENSE
ADDED
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
MIT License
|
|
2
|
+
|
|
3
|
+
Copyright (c) 2023 Aricatofuka
|
|
4
|
+
|
|
5
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
|
+
of this software and associated documentation files (the "Software"), to deal
|
|
7
|
+
in the Software without restriction, including without limitation the rights
|
|
8
|
+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
9
|
+
copies of the Software, and to permit persons to whom the Software is
|
|
10
|
+
furnished to do so, subject to the following conditions:
|
|
11
|
+
|
|
12
|
+
The above copyright notice and this permission notice shall be included in all
|
|
13
|
+
copies or substantial portions of the Software.
|
|
14
|
+
|
|
15
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
17
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
18
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
21
|
+
SOFTWARE.
|
package/README.md
CHANGED
|
@@ -1,15 +1,48 @@
|
|
|
1
1
|
# bx-rest - Bitrix24 REST API client for TypeScript, Angular, Vue and React
|
|
2
2
|
|
|
3
|
+
[](https://www.npmjs.com/package/bx-rest)
|
|
4
|
+
[](https://www.npmjs.com/package/bx-rest)
|
|
5
|
+
[](https://github.com/Aricatofuka/bx-rest/blob/main/LICENSE)
|
|
6
|
+
|
|
3
7
|
`bx-rest` is a TypeScript SDK for the Bitrix24 REST API. It helps call BX24 REST methods, work with auth tokens, sessid, OAuth2, pagination, mappers and typed API requests.
|
|
4
8
|
|
|
5
9
|
Also known as: Bitrix24 REST client, BX24 REST SDK, Bitrix24 API client, Bitrix REST TypeScript library.
|
|
6
10
|
|
|
11
|
+
## Contents
|
|
12
|
+
|
|
13
|
+
- [Install](#install)
|
|
14
|
+
- [Requirements](#requirements)
|
|
15
|
+
- [Quick Start](#quick-start)
|
|
16
|
+
- [Result modes](#result-modes)
|
|
17
|
+
- [Authentication and OAuth2](#authentication-and-oauth2)
|
|
18
|
+
- [Error handling](#error-handling)
|
|
19
|
+
- [Usage in Angular](#usage-in-angular)
|
|
20
|
+
- [SessionKeyServices](#sessionkeyservices)
|
|
21
|
+
- [Usage in Vue](#usage-in-vue)
|
|
22
|
+
- [Usage in React](#usage-in-react)
|
|
23
|
+
- [Custom REST methods](#custom-rest-methods)
|
|
24
|
+
- [Mapper](#mapper)
|
|
25
|
+
- [A custom method with `simple()`](#a-custom-method-with-simple)
|
|
26
|
+
- [A paginated custom method with `pagNav()`](#a-paginated-custom-method-with-pagnav)
|
|
27
|
+
- [Specific methods](#specific-methods)
|
|
28
|
+
- [`tasks.task.list`](#taskstasklist)
|
|
29
|
+
- [Future features](#future-features)
|
|
30
|
+
- [License](#license)
|
|
31
|
+
|
|
7
32
|
## Install
|
|
8
33
|
|
|
9
34
|
```shell
|
|
10
35
|
npm install bx-rest
|
|
11
36
|
```
|
|
12
37
|
|
|
38
|
+
## Requirements
|
|
39
|
+
|
|
40
|
+
- **Module format:** `bx-rest` ships ES modules only — there is no CommonJS/`require` build. Use it from an ESM-aware bundler (Angular CLI, Vite, webpack 5+, Next.js, ...) or a native `import()`. Plain `require('bx-rest')` (older Jest configs without ESM support, `ts-node` in CJS mode, etc.) will not resolve the package.
|
|
41
|
+
- **TypeScript:** developed against TypeScript 5.5+. `strict` mode is recommended — the bundled typification relies on it to give accurate field types.
|
|
42
|
+
- **RxJS:** `rxjs` (^7.8) is a regular dependency bundled with the package, not a `peerDependency`, so no specific host version is enforced. Every REST call returns an RxJS `Observable`.
|
|
43
|
+
- **Frameworks:** the Angular, Vue and React examples below are written against Angular 18/19, Vue 3 and React 18+ APIs (the versions this library is built and tested with). None of these frameworks are declared as `peerDependencies` — `bx-rest` has no hard dependency on any of them — but the DI/composition patterns shown assume those major versions.
|
|
44
|
+
- **Environment:** `bx-rest` is browser-oriented. The `cookies`/`localStorage`/`sessid` auth sources and `SessionKeyServices` read `window`, `document` and `localStorage` directly. In a server-side-rendered app (Angular Universal, Next.js, etc.) only exercise those code paths in the browser (e.g. behind `isPlatformBrowser`/`typeof window !== 'undefined'` guards), or use an auth source that doesn't touch browser globals, such as `source: () => accessToken` or `source: 'off'`.
|
|
45
|
+
|
|
13
46
|
## Quick Start
|
|
14
47
|
|
|
15
48
|
Configure the portal URL and an access-token source once, then create a client and subscribe to the returned RxJS `Observable`. Use a complete URL including `https://`.
|
|
@@ -53,11 +86,17 @@ REST calls are lazy: the request starts when the returned `Observable` is subscr
|
|
|
53
86
|
|
|
54
87
|
| Method | Result |
|
|
55
88
|
| --- | --- |
|
|
56
|
-
| `.res()` | Unwraps the Bitrix response and applies the configured mapper. For paginated methods it returns the current page. |
|
|
89
|
+
| `.res(options?)` | Unwraps the Bitrix response and applies the configured mapper. For paginated methods it returns the current page. |
|
|
57
90
|
| `.resAll()` | Loads and combines every page. Available on paginated Navvy helpers. |
|
|
58
91
|
| `.resVanilla()` | Returns the raw Bitrix response, including fields such as `result`, `total` and `next`. |
|
|
59
92
|
| `.mapForVanilla()` | Keeps the raw response envelope but applies the mapper to its `result`. |
|
|
60
93
|
|
|
94
|
+
`.res()` accepts an optional options object:
|
|
95
|
+
|
|
96
|
+
| Option | Default | Effect |
|
|
97
|
+
| --- | --- | --- |
|
|
98
|
+
| `throwOnApiError` | `false` | When `true`, a Bitrix-level API error makes the returned `Observable` error out with a `BXRestApiError` instead of resolving with `undefined`. See [Error handling](#error-handling). |
|
|
99
|
+
|
|
61
100
|
## Authentication and OAuth2
|
|
62
101
|
|
|
63
102
|
`auth.source` controls where credentials are read from. `auth.key` controls the request parameter name, except for the special `OAuth2` cookie-credentials mode.
|
|
@@ -89,6 +128,76 @@ BXRestSettings.update({
|
|
|
89
128
|
})
|
|
90
129
|
```
|
|
91
130
|
|
|
131
|
+
## Error handling
|
|
132
|
+
|
|
133
|
+
`bx-rest` surfaces two different kinds of failure, and `.res()` only reacts to one of them.
|
|
134
|
+
|
|
135
|
+
| Failure | When it happens | How it surfaces on `.res()` |
|
|
136
|
+
| --- | --- | --- |
|
|
137
|
+
| Transport / configuration errors — network failure, missing auth, missing base URL | Before or during the HTTP call | The returned `Observable` errors. Handle it with RxJS `catchError` or the `error` callback of `subscribe()`. |
|
|
138
|
+
| Bitrix API errors — `{ error, error_description }`, e.g. `INSUFFICIENT_SCOPE`, `expired_token` | HTTP 200 response whose body is not a success payload | By default, `.res()` resolves normally with `undefined` — **it does not throw**. Pass `{ throwOnApiError: true }` to make it throw a `BXRestApiError` instead. |
|
|
139
|
+
|
|
140
|
+
Because a Bitrix-level error resolves as `undefined` rather than as an `Observable` error by default, don't rely on plain `.res()` alone to tell "no records" apart from "the call failed". You have two options.
|
|
141
|
+
|
|
142
|
+
**Option 1 — opt in to throwing with `.res({ throwOnApiError: true })`.** The `Observable` errors with a `BXRestApiError`, exposing `error` and `error_description`, so it can be handled alongside transport errors in a single `catchError`/`error` callback:
|
|
143
|
+
|
|
144
|
+
```typescript
|
|
145
|
+
import { BXRestNavvy, BXRestApiError } from 'bx-rest'
|
|
146
|
+
|
|
147
|
+
const bxRest = new BXRestNavvy()
|
|
148
|
+
|
|
149
|
+
bxRest.crm.deal.list({
|
|
150
|
+
select: ['ID', 'TITLE'],
|
|
151
|
+
filter: {},
|
|
152
|
+
start: 0
|
|
153
|
+
}).res({ throwOnApiError: true }).subscribe({
|
|
154
|
+
next: deals => console.log(deals),
|
|
155
|
+
error: err => {
|
|
156
|
+
if (err instanceof BXRestApiError) {
|
|
157
|
+
console.error('Bitrix API error:', err.error, err.error_description)
|
|
158
|
+
} else {
|
|
159
|
+
console.error('Request failed:', err.message)
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
})
|
|
163
|
+
```
|
|
164
|
+
|
|
165
|
+
**Option 2 — keep the default and check the raw response.** Call `.resVanilla()` instead and check the response with the exported `isBXRestAnswerSuccess()` type guard:
|
|
166
|
+
|
|
167
|
+
```typescript
|
|
168
|
+
import { firstValueFrom } from 'rxjs'
|
|
169
|
+
import { BXRestNavvy, isBXRestAnswerSuccess } from 'bx-rest'
|
|
170
|
+
|
|
171
|
+
const bxRest = new BXRestNavvy()
|
|
172
|
+
|
|
173
|
+
const answer = await firstValueFrom(
|
|
174
|
+
bxRest.crm.deal.list({
|
|
175
|
+
select: ['ID', 'TITLE'],
|
|
176
|
+
filter: {},
|
|
177
|
+
start: 0
|
|
178
|
+
}).resVanilla()
|
|
179
|
+
)
|
|
180
|
+
|
|
181
|
+
if (!answer || !isBXRestAnswerSuccess(answer)) {
|
|
182
|
+
console.error('Bitrix API error:', answer?.error, answer?.error_description)
|
|
183
|
+
} else {
|
|
184
|
+
console.log(answer.result)
|
|
185
|
+
}
|
|
186
|
+
```
|
|
187
|
+
|
|
188
|
+
Regardless of `throwOnApiError`, transport-level failures always propagate as `Observable` errors and can be caught the usual RxJS way:
|
|
189
|
+
|
|
190
|
+
```typescript
|
|
191
|
+
bxRest.crm.deal.list({
|
|
192
|
+
select: ['ID', 'TITLE'],
|
|
193
|
+
filter: {},
|
|
194
|
+
start: 0
|
|
195
|
+
}).res().subscribe({
|
|
196
|
+
next: deals => console.log(deals),
|
|
197
|
+
error: err => console.error('Request failed:', err.message)
|
|
198
|
+
})
|
|
199
|
+
```
|
|
200
|
+
|
|
92
201
|
## Usage in Angular
|
|
93
202
|
|
|
94
203
|
Register the public clients and `Navvy` when you want to inject them into Angular services or components:
|
|
@@ -434,4 +543,10 @@ const tasks$ = bxRest.tasks.task.list<
|
|
|
434
543
|
|
|
435
544
|
## Future features
|
|
436
545
|
- Auto get token
|
|
437
|
-
- Mappers for normalization types
|
|
546
|
+
- Mappers for normalization types
|
|
547
|
+
|
|
548
|
+
Have a feature request or found a bug? Check [existing issues](https://github.com/Aricatofuka/bx-rest/issues) or open a new one.
|
|
549
|
+
|
|
550
|
+
## License
|
|
551
|
+
|
|
552
|
+
[MIT](https://github.com/Aricatofuka/bx-rest/blob/main/LICENSE) © Aricatofuka
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Thrown by `.res()` when called with `{ throwOnApiError: true }` and the
|
|
3
|
+
* Bitrix REST call resolves as a Bitrix-level API error, e.g.
|
|
4
|
+
* `INSUFFICIENT_SCOPE` or `expired_token`.
|
|
5
|
+
*
|
|
6
|
+
* By default `.res()` resolves such responses as `undefined` instead of
|
|
7
|
+
* throwing — see the "Error handling" section of the README.
|
|
8
|
+
*/
|
|
9
|
+
export class BXRestApiError extends Error {
|
|
10
|
+
constructor(error, error_description) {
|
|
11
|
+
super(error_description || error || 'Bitrix API error');
|
|
12
|
+
this.error = error;
|
|
13
|
+
this.error_description = error_description;
|
|
14
|
+
this.name = 'BXRestApiError';
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vcHJvamVjdHMvYngtcmVzdC9zcmMvZnVuY3Rpb25zL2Vycm9ycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7OztHQU9HO0FBQ0gsTUFBTSxPQUFPLGNBQWUsU0FBUSxLQUFLO0lBQ3ZDLFlBQ1MsS0FBeUIsRUFDekIsaUJBQXFDO1FBRTVDLEtBQUssQ0FBQyxpQkFBaUIsSUFBSSxLQUFLLElBQUksa0JBQWtCLENBQUMsQ0FBQTtRQUhoRCxVQUFLLEdBQUwsS0FBSyxDQUFvQjtRQUN6QixzQkFBaUIsR0FBakIsaUJBQWlCLENBQW9CO1FBRzVDLElBQUksQ0FBQyxJQUFJLEdBQUcsZ0JBQWdCLENBQUE7SUFDOUIsQ0FBQztDQUNGIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBUaHJvd24gYnkgYC5yZXMoKWAgd2hlbiBjYWxsZWQgd2l0aCBgeyB0aHJvd09uQXBpRXJyb3I6IHRydWUgfWAgYW5kIHRoZVxuICogQml0cml4IFJFU1QgY2FsbCByZXNvbHZlcyBhcyBhIEJpdHJpeC1sZXZlbCBBUEkgZXJyb3IsIGUuZy5cbiAqIGBJTlNVRkZJQ0lFTlRfU0NPUEVgIG9yIGBleHBpcmVkX3Rva2VuYC5cbiAqXG4gKiBCeSBkZWZhdWx0IGAucmVzKClgIHJlc29sdmVzIHN1Y2ggcmVzcG9uc2VzIGFzIGB1bmRlZmluZWRgIGluc3RlYWQgb2ZcbiAqIHRocm93aW5nIOKAlCBzZWUgdGhlIFwiRXJyb3IgaGFuZGxpbmdcIiBzZWN0aW9uIG9mIHRoZSBSRUFETUUuXG4gKi9cbmV4cG9ydCBjbGFzcyBCWFJlc3RBcGlFcnJvciBleHRlbmRzIEVycm9yIHtcbiAgY29uc3RydWN0b3IoXG4gICAgcHVibGljIGVycm9yOiBzdHJpbmcgfCB1bmRlZmluZWQsXG4gICAgcHVibGljIGVycm9yX2Rlc2NyaXB0aW9uOiBzdHJpbmcgfCB1bmRlZmluZWRcbiAgKSB7XG4gICAgc3VwZXIoZXJyb3JfZGVzY3JpcHRpb24gfHwgZXJyb3IgfHwgJ0JpdHJpeCBBUEkgZXJyb3InKVxuICAgIHRoaXMubmFtZSA9ICdCWFJlc3RBcGlFcnJvcidcbiAgfVxufVxuIl19
|
package/esm2022/public-api.mjs
CHANGED
|
@@ -9,7 +9,8 @@ export { Navvy } from './services/navvy';
|
|
|
9
9
|
export { HttpBXServices as BXRestRequest } from './services/http/HttpBX';
|
|
10
10
|
export { SessionKeyServices, SessionKeyError } from './services/http/sessionKey';
|
|
11
11
|
export { instanceOfiBXRestAnswerSuccess as isBXRestAnswerSuccess } from './functions/mapResult';
|
|
12
|
+
export { BXRestApiError } from './functions/errors';
|
|
12
13
|
export { HttpNavvyServices } from './services/http/httpNavvy';
|
|
13
14
|
export * as partNameMethods from './consts/part-name-methods';
|
|
14
15
|
export * as BXBaseServices from './services/base';
|
|
15
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
16
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljLWFwaS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3Byb2plY3RzL2J4LXJlc3Qvc3JjL3B1YmxpYy1hcGkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7O0dBRUc7QUFDSCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBQzNDLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQTtBQUN2RCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sY0FBYyxDQUFBO0FBQzFDLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDdEMsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLGtCQUFrQixDQUFBO0FBQ3hDLE9BQU8sRUFBRSxjQUFjLElBQUksYUFBYSxFQUFFLE1BQU0sd0JBQXdCLENBQUE7QUFDeEUsT0FBTyxFQUFFLGtCQUFrQixFQUFFLGVBQWUsRUFBRSxNQUFNLDRCQUE0QixDQUFBO0FBQ2hGLE9BQU8sRUFBRSw4QkFBOEIsSUFBSSxxQkFBcUIsRUFBRSxNQUFNLHVCQUF1QixDQUFBO0FBQy9GLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQTtBQUVuRCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQTtBQUM3RCxPQUFPLEtBQUssZUFBZSxNQUFNLDRCQUE0QixDQUFBO0FBQzdELE9BQU8sS0FBSyxjQUFjLE1BQU0saUJBQWlCLENBQUEiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcclxuICogUHVibGljIEFQSSBTdXJmYWNlIG9mIGJ4LXJlc3RcclxuICovXHJcbmV4cG9ydCB7IEJYUmVzdFNldHRpbmdzIH0gZnJvbSAnLi9zZXR0aW5ncydcclxuZXhwb3J0IHsgQlhSZXN0TWFwUmVzdWx0IH0gZnJvbSAnLi9mdW5jdGlvbnMvbWFwUmVzdWx0J1xyXG5leHBvcnQgeyBCWFJlc3ROYXZ2eSB9IGZyb20gJy4vcmVzdC9uYXZ2eSdcclxuZXhwb3J0IHsgQlhSZXN0TWFwIH0gZnJvbSAnLi9yZXN0L21hcCdcclxuZXhwb3J0IHsgTmF2dnkgfSBmcm9tICcuL3NlcnZpY2VzL25hdnZ5J1xyXG5leHBvcnQgeyBIdHRwQlhTZXJ2aWNlcyBhcyBCWFJlc3RSZXF1ZXN0IH0gZnJvbSAnLi9zZXJ2aWNlcy9odHRwL0h0dHBCWCdcclxuZXhwb3J0IHsgU2Vzc2lvbktleVNlcnZpY2VzLCBTZXNzaW9uS2V5RXJyb3IgfSBmcm9tICcuL3NlcnZpY2VzL2h0dHAvc2Vzc2lvbktleSdcclxuZXhwb3J0IHsgaW5zdGFuY2VPZmlCWFJlc3RBbnN3ZXJTdWNjZXNzIGFzIGlzQlhSZXN0QW5zd2VyU3VjY2VzcyB9IGZyb20gJy4vZnVuY3Rpb25zL21hcFJlc3VsdCdcclxuZXhwb3J0IHsgQlhSZXN0QXBpRXJyb3IgfSBmcm9tICcuL2Z1bmN0aW9ucy9lcnJvcnMnXHJcbmV4cG9ydCB7IEJYUmVzdFJlc09wdGlvbnMgfSBmcm9tICcuL3NlcnZpY2VzL25hdnZ5L2V4dGVuZHMvbmF2dnktcGFnLWJhc2UnXHJcbmV4cG9ydCB7IEh0dHBOYXZ2eVNlcnZpY2VzIH0gZnJvbSAnLi9zZXJ2aWNlcy9odHRwL2h0dHBOYXZ2eSdcclxuZXhwb3J0ICogYXMgcGFydE5hbWVNZXRob2RzIGZyb20gJy4vY29uc3RzL3BhcnQtbmFtZS1tZXRob2RzJ1xyXG5leHBvcnQgKiBhcyBCWEJhc2VTZXJ2aWNlcyBmcm9tICcuL3NlcnZpY2VzL2Jhc2UnXHJcbiJdfQ==
|
|
@@ -103,41 +103,8 @@ export class HttpBXServices extends HttpServices {
|
|
|
103
103
|
serializeBitrixParams(params) {
|
|
104
104
|
return stringifyBitrixParams(params);
|
|
105
105
|
}
|
|
106
|
-
// Мб не работает
|
|
107
|
-
httpGet(url, params = {}) {
|
|
108
|
-
if (params === null) {
|
|
109
|
-
params = {};
|
|
110
|
-
}
|
|
111
|
-
const auth = this.session.getAuthParams();
|
|
112
|
-
const paramsClone = clone(params);
|
|
113
|
-
const checkIsOn = this.session.getCheckAuthParamsIsOn();
|
|
114
|
-
const key = this.session.getKeyAuth();
|
|
115
|
-
if (checkIsOn) {
|
|
116
|
-
if (!auth) {
|
|
117
|
-
return throwError(() => this.session.getAuthError('get'));
|
|
118
|
-
}
|
|
119
|
-
if (key !== 'OAuth2') {
|
|
120
|
-
paramsClone[key] = auth;
|
|
121
|
-
}
|
|
122
|
-
}
|
|
123
|
-
let options = {
|
|
124
|
-
params: paramsClone
|
|
125
|
-
// params: JSON.stringify(paramsClone)
|
|
126
|
-
};
|
|
127
|
-
return this.session.getBaseUrl().pipe(switchMap((baseUrl) => {
|
|
128
|
-
if (!baseUrl) {
|
|
129
|
-
return throwError(() => this.session.getBaseUrlError('get'));
|
|
130
|
-
}
|
|
131
|
-
return from(this.axiosInstance.post(prepareBaseAddress(baseUrl) + url, options, {
|
|
132
|
-
withCredentials: key === 'OAuth2',
|
|
133
|
-
headers: {
|
|
134
|
-
'Content-Type': 'application/json',
|
|
135
|
-
}
|
|
136
|
-
}).then((response) => response.data));
|
|
137
|
-
}));
|
|
138
|
-
}
|
|
139
106
|
getNameMethod(arr) {
|
|
140
107
|
return arr.join('.');
|
|
141
108
|
}
|
|
142
109
|
}
|
|
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 } 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'\nimport { prepareBaseAddress } from '../base'\nimport { serializeBitrixParams as stringifyBitrixParams } from '../../functions/serializeBitrixParams'\n\r\nexport class HttpBXServices extends HttpServices {\r\n\r\n  /**\r\n   * Это пиздец а не метод\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)\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) {\n    const method = this.getNameMethod(name)\n    return this.httpPost<iBXRestAnswer<T>>(restApi ? `api/${method}` : method, params)\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> {\n    const paramsClone = clone(params)\n    const key = this.session.getKeyAuth()\n    const auth = this.session.getAuthParams()\n    const checkIsOn = this.session.getCheckAuthParamsIsOn()\n\n    if (checkIsOn) {\n      if (!auth) {\n        return throwError(() => this.session.getAuthError('post'))\n      }\n\n      if (key !== 'OAuth2') {\n        paramsClone[key] = auth\n      }\n    }\n\n    return this.session.getBaseUrl().pipe(\n      switchMap((baseUrl) => {\n        if (!baseUrl) {\n          return throwError(() => this.session.getBaseUrlError('post'))\n        }\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)\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: key === 'OAuth2',\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  }\n\n  serializeBitrixParams(params: unknown): string {\n    return stringifyBitrixParams(params)\n  }\n\n  // Мб не работает\n  override httpGet<T>(url: string, params: any = {}): Observable<T | undefined> {\n    if (params === null) {\n      params = {}\n    }\n    const auth = this.session.getAuthParams()\n    const paramsClone = clone(params)\n    const checkIsOn = this.session.getCheckAuthParamsIsOn()\n    const key = this.session.getKeyAuth()\n\n    if (checkIsOn) {\n      if (!auth) {\n        return throwError(() => this.session.getAuthError('get'))\n      }\n\n      if (key !== 'OAuth2') {\n        paramsClone[key] = auth\n      }\n    }\n\n    let options = {\n      params: paramsClone\n      // params: JSON.stringify(paramsClone)\r\n    }\r\n\r\n    return this.session.getBaseUrl().pipe(\n      switchMap((baseUrl) => {\n        if (!baseUrl) {\n          return throwError(() => this.session.getBaseUrlError('get'))\n        }\n\n        return from(\n          this.axiosInstance.post<T>(prepareBaseAddress(baseUrl) + url, options,\n            {\n              withCredentials: key === 'OAuth2',\n              headers: {\n                'Content-Type': 'application/json',\n              }\n            }\r\n          ).then((response) => response.data)\r\n        )\r\n      })\r\n    )\r\n  }\r\n\r\n  getNameMethod(arr: string[]) {\r\n    return arr.join('.')\r\n  }\r\n\r\n}\r\n\r\n"]}
|
|
110
|
+
//# 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 } 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   * Это пиздец а не метод\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    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: key === 'OAuth2',\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  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"]}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { catchError, map } from 'rxjs/operators';
|
|
2
2
|
import { BXRestMapResult, instanceOfiBXRestAnswerSuccess } from '../../../functions/mapResult';
|
|
3
3
|
import { HttpBXServices } from '../../http/HttpBX';
|
|
4
|
+
import { BXRestApiError } from '../../../functions/errors';
|
|
4
5
|
export class NavvyPagBase {
|
|
5
6
|
constructor(url, param, map = undefined, restApi = false) {
|
|
6
7
|
this.url = url;
|
|
@@ -24,16 +25,24 @@ export class NavvyPagBase {
|
|
|
24
25
|
return v;
|
|
25
26
|
}));
|
|
26
27
|
}
|
|
27
|
-
res() {
|
|
28
|
-
return this.mapAndError(this.resVanilla()).pipe(map(v => (v && this.map)
|
|
28
|
+
res(options) {
|
|
29
|
+
return this.mapAndError(this.resVanilla(), options).pipe(map(v => (v && this.map)
|
|
29
30
|
? this.map(v)
|
|
30
31
|
: v));
|
|
31
32
|
}
|
|
32
|
-
mapAndError(request) {
|
|
33
|
-
return request.pipe(map(v =>
|
|
33
|
+
mapAndError(request, options) {
|
|
34
|
+
return request.pipe(map(v => {
|
|
35
|
+
if (options?.throwOnApiError && v && !instanceOfiBXRestAnswerSuccess(v)) {
|
|
36
|
+
throw new BXRestApiError(v.error, v.error_description);
|
|
37
|
+
}
|
|
38
|
+
return BXRestMapResult(v);
|
|
39
|
+
}), catchError((err) => {
|
|
34
40
|
console.error(err);
|
|
41
|
+
if (err instanceof BXRestApiError) {
|
|
42
|
+
throw err;
|
|
43
|
+
}
|
|
35
44
|
throw new Error((err.error) ? err.error : err);
|
|
36
45
|
}));
|
|
37
46
|
}
|
|
38
47
|
}
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
48
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmF2dnktcGFnLWJhc2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9ieC1yZXN0L3NyYy9zZXJ2aWNlcy9uYXZ2eS9leHRlbmRzL25hdnZ5LXBhZy1iYXNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxVQUFVLEVBQUUsR0FBRyxFQUFFLE1BQU0sZ0JBQWdCLENBQUE7QUFDaEQsT0FBTyxFQUFFLGVBQWUsRUFBRSw4QkFBOEIsRUFBRSxNQUFNLDhCQUE4QixDQUFBO0FBQzlGLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQTtBQUVsRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sMkJBQTJCLENBQUE7QUFjMUQsTUFBTSxPQUFnQixZQUFZO0lBS2hDLFlBQ1ksR0FBYSxFQUNiLEtBQVEsRUFDUixNQUE0RCxTQUFTLEVBQ3JFLFVBQVUsS0FBSztRQUhmLFFBQUcsR0FBSCxHQUFHLENBQVU7UUFDYixVQUFLLEdBQUwsS0FBSyxDQUFHO1FBQ1IsUUFBRyxHQUFILEdBQUcsQ0FBa0U7UUFDckUsWUFBTyxHQUFQLE9BQU8sQ0FBUTtRQU4zQixhQUFRLEdBQUcsRUFBRSxDQUFBLENBQUMsOEJBQThCO1FBUTFDLElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxjQUFjLEVBQUUsQ0FBQTtJQUNsQyxDQUFDO0lBRUQsVUFBVTtRQUNSLE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUksSUFBSSxDQUFDLEdBQUcsRUFBRSxJQUFJLENBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQTtJQUM5RCxDQUFDO0lBRUQsYUFBYTtRQUNYLE9BQU8sSUFBSSxDQUFDLFVBQVUsRUFBRTthQUNyQixJQUFJLENBQ0gsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFO1lBQ04sSUFBSSxDQUFDLElBQUksOEJBQThCLENBQUMsQ0FBQyxDQUFDLElBQUksSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDO2dCQUN2RCxvREFBb0Q7Z0JBQ3BELE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLE1BQVcsQ0FBMEIsQ0FBQTtnQkFDL0QsT0FBTyxFQUFFLEdBQUcsQ0FBQyxFQUFFLEdBQUcsRUFBQyxNQUFNLEVBQUUsTUFBTSxFQUFDLEVBQTBDLENBQUE7WUFDOUUsQ0FBQztZQUNELE9BQU8sQ0FBcUQsQ0FBQTtRQUM5RCxDQUFDLENBQUMsQ0FDSCxDQUFBO0lBQ0wsQ0FBQztJQUVELEdBQUcsQ0FBQyxPQUEwQjtRQUM1QixPQUFPLElBQUksQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRSxFQUFFLE9BQU8sQ0FBQyxDQUFDLElBQUksQ0FDdEQsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksSUFBSSxDQUFDLEdBQUcsQ0FBQztZQUN0QixDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7WUFDYixDQUFDLENBQUMsQ0FBQyxDQUNKLENBQytDLENBQUE7SUFDcEQsQ0FBQztJQUVELFdBQVcsQ0FDVCxPQUFpRCxFQUNqRCxPQUEwQjtRQUUxQixPQUFPLE9BQU8sQ0FBQyxJQUFJLENBQ2pCLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRTtZQUNOLElBQUksT0FBTyxFQUFFLGVBQWUsSUFBSSxDQUFDLElBQUksQ0FBQyw4QkFBOEIsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO2dCQUN4RSxNQUFNLElBQUksY0FBYyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDLGlCQUFpQixDQUFDLENBQUE7WUFDeEQsQ0FBQztZQUNELE9BQU8sZUFBZSxDQUFDLENBQUMsQ0FBQyxDQUFBO1FBQzNCLENBQUMsQ0FBQyxFQUNGLFVBQVUsQ0FBQyxDQUFDLEdBQVEsRUFBRSxFQUFFO1lBQ3RCLE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUE7WUFDbEIsSUFBSSxHQUFHLFlBQVksY0FBYyxFQUFFLENBQUM7Z0JBQ2xDLE1BQU0sR0FBRyxDQUFBO1lBQ1gsQ0FBQztZQUNELE1BQU0sSUFBSSxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFBO1FBQ2hELENBQUMsQ0FBQyxDQUNILENBQUE7SUFDSCxDQUFDO0NBRUYiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBPYnNlcnZhYmxlIH0gZnJvbSAncnhqcydcclxuaW1wb3J0IHsgaUJYUmVzdEFuc3dlciB9IGZyb20gJy4uLy4uLy4uL3R5cGlmaWNhdGlvbi9yZXN0L2Jhc2UvYW5zd2VyJ1xyXG5pbXBvcnQgeyBjYXRjaEVycm9yLCBtYXAgfSBmcm9tICdyeGpzL29wZXJhdG9ycydcclxuaW1wb3J0IHsgQlhSZXN0TWFwUmVzdWx0LCBpbnN0YW5jZU9maUJYUmVzdEFuc3dlclN1Y2Nlc3MgfSBmcm9tICcuLi8uLi8uLi9mdW5jdGlvbnMvbWFwUmVzdWx0J1xyXG5pbXBvcnQgeyBIdHRwQlhTZXJ2aWNlcyB9IGZyb20gJy4uLy4uL2h0dHAvSHR0cEJYJ1xyXG5pbXBvcnQgeyBSZXR1cm5UeXBlTmF2dnkgfSBmcm9tICcuLi9uYXZ2eS1zdXBwb3J0J1xyXG5pbXBvcnQgeyBCWFJlc3RBcGlFcnJvciB9IGZyb20gJy4uLy4uLy4uL2Z1bmN0aW9ucy9lcnJvcnMnXHJcblxyXG5leHBvcnQgaW50ZXJmYWNlIEJYUmVzdFJlc09wdGlvbnMge1xyXG4gIC8qKlxyXG4gICAqIFdoZW4gYHRydWVgLCBhIEJpdHJpeC1sZXZlbCBBUEkgZXJyb3IgKGB7IGVycm9yLCBlcnJvcl9kZXNjcmlwdGlvbiB9YCxcclxuICAgKiBlLmcuIGBJTlNVRkZJQ0lFTlRfU0NPUEVgLCBgZXhwaXJlZF90b2tlbmApIG1ha2VzIHRoZSBgT2JzZXJ2YWJsZWBcclxuICAgKiByZXR1cm5lZCBieSBgLnJlcygpYCBlcnJvciBvdXQgd2l0aCBhIGBCWFJlc3RBcGlFcnJvcmAgaW5zdGVhZCBvZlxyXG4gICAqIHJlc29sdmluZyB3aXRoIGB1bmRlZmluZWRgLlxyXG4gICAqXHJcbiAgICogRGVmYXVsdDogYGZhbHNlYCAocHJlc2VydmVzIHRoZSBoaXN0b3JpY2FsIGAucmVzKClgIGJlaGF2aW91cikuXHJcbiAgICovXHJcbiAgdGhyb3dPbkFwaUVycm9yPzogYm9vbGVhblxyXG59XHJcblxyXG5leHBvcnQgYWJzdHJhY3QgY2xhc3MgTmF2dnlQYWdCYXNlPFQsIFIsIFA+IHtcclxuXHJcbiAgcHJvdGVjdGVkIHJlYWRvbmx5IGh0dHA6IEh0dHBCWFNlcnZpY2VzXHJcbiAgcGFnZVNpemUgPSA1MCAvLyDRgdGC0LDQvdC00LDRgNGC0L3Ri9C5INGA0LDQt9C80LXRgCDRgdGC0YDQsNC90LjRhtGLXHJcblxyXG4gIHB1YmxpYyBjb25zdHJ1Y3RvcihcclxuICAgIHByb3RlY3RlZCB1cmw6IHN0cmluZ1tdLFxyXG4gICAgcHJvdGVjdGVkIHBhcmFtOiBQLFxyXG4gICAgcHJvdGVjdGVkIG1hcDogKChwYXJhbTogVHwgdW5kZWZpbmVkKSA9PiBSIHwgdW5kZWZpbmVkKSB8IHVuZGVmaW5lZCA9IHVuZGVmaW5lZCxcclxuICAgIHByb3RlY3RlZCByZXN0QXBpID0gZmFsc2VcclxuICApIHtcclxuICAgIHRoaXMuaHR0cCA9IG5ldyBIdHRwQlhTZXJ2aWNlcygpXHJcbiAgfVxyXG5cclxuICByZXNWYW5pbGxhKCkge1xyXG4gICAgcmV0dXJuIHRoaXMuaHR0cC5wb3N0PFQ+KHRoaXMudXJsLCB0aGlzLnBhcmFtLCB0aGlzLnJlc3RBcGkpXHJcbiAgfVxyXG5cclxuICBtYXBGb3JWYW5pbGxhKCk6IE9ic2VydmFibGU8aUJYUmVzdEFuc3dlcjxSZXR1cm5UeXBlTmF2dnk8VCwgUj4+IHwgdW5kZWZpbmVkPiB7XHJcbiAgICByZXR1cm4gdGhpcy5yZXNWYW5pbGxhKClcclxuICAgICAgLnBpcGUoXHJcbiAgICAgICAgbWFwKHYgPT4ge1xyXG4gICAgICAgICAgaWYgKHYgJiYgaW5zdGFuY2VPZmlCWFJlc3RBbnN3ZXJTdWNjZXNzKHYpICYmIHRoaXMubWFwKSB7XHJcbiAgICAgICAgICAgIC8vINCf0YDQuNC80LXQvdGP0LXQvCB0aGlzLm1hcCDQuCDRj9Cy0L3QviDQv9GA0LjQstC+0LTQuNC8INGC0LjQvyDRgNC10LfRg9C70YzRgtCw0YLQsFxyXG4gICAgICAgICAgICBjb25zdCByZXN1bHQgPSB0aGlzLm1hcCh2LnJlc3VsdCBhcyBUKSBhcyBSZXR1cm5UeXBlTmF2dnk8VCwgUj5cclxuICAgICAgICAgICAgcmV0dXJuIHsgLi4udiwgLi4ue3Jlc3VsdDogcmVzdWx0fSB9IGFzIGlCWFJlc3RBbnN3ZXI8UmV0dXJuVHlwZU5hdnZ5PFQsIFI+PlxyXG4gICAgICAgICAgfVxyXG4gICAgICAgICAgcmV0dXJuIHYgYXMgaUJYUmVzdEFuc3dlcjxSZXR1cm5UeXBlTmF2dnk8VCwgUj4+IHwgdW5kZWZpbmVkXHJcbiAgICAgICAgfSlcclxuICAgICAgKVxyXG4gIH1cclxuXHJcbiAgcmVzKG9wdGlvbnM/OiBCWFJlc3RSZXNPcHRpb25zKSB7XHJcbiAgICByZXR1cm4gdGhpcy5tYXBBbmRFcnJvcih0aGlzLnJlc1ZhbmlsbGEoKSwgb3B0aW9ucykucGlwZShcclxuICAgICAgbWFwKHYgPT4gKHYgJiYgdGhpcy5tYXApXHJcbiAgICAgICAgPyB0aGlzLm1hcCh2KVxyXG4gICAgICAgIDogdlxyXG4gICAgICApXHJcbiAgICApIGFzIE9ic2VydmFibGU8UmV0dXJuVHlwZU5hdnZ5PFQsIFI+IHwgdW5kZWZpbmVkPlxyXG4gIH1cclxuXHJcbiAgbWFwQW5kRXJyb3I8VD4oXHJcbiAgICByZXF1ZXN0OiBPYnNlcnZhYmxlPGlCWFJlc3RBbnN3ZXI8VD4gfCB1bmRlZmluZWQ+LFxyXG4gICAgb3B0aW9ucz86IEJYUmVzdFJlc09wdGlvbnNcclxuICApIHtcclxuICAgIHJldHVybiByZXF1ZXN0LnBpcGUoXHJcbiAgICAgIG1hcCh2ID0+IHtcclxuICAgICAgICBpZiAob3B0aW9ucz8udGhyb3dPbkFwaUVycm9yICYmIHYgJiYgIWluc3RhbmNlT2ZpQlhSZXN0QW5zd2VyU3VjY2Vzcyh2KSkge1xyXG4gICAgICAgICAgdGhyb3cgbmV3IEJYUmVzdEFwaUVycm9yKHYuZXJyb3IsIHYuZXJyb3JfZGVzY3JpcHRpb24pXHJcbiAgICAgICAgfVxyXG4gICAgICAgIHJldHVybiBCWFJlc3RNYXBSZXN1bHQodilcclxuICAgICAgfSksXHJcbiAgICAgIGNhdGNoRXJyb3IoKGVycjogYW55KSA9PiB7XHJcbiAgICAgICAgY29uc29sZS5lcnJvcihlcnIpXHJcbiAgICAgICAgaWYgKGVyciBpbnN0YW5jZW9mIEJYUmVzdEFwaUVycm9yKSB7XHJcbiAgICAgICAgICB0aHJvdyBlcnJcclxuICAgICAgICB9XHJcbiAgICAgICAgdGhyb3cgbmV3IEVycm9yKChlcnIuZXJyb3IpID8gZXJyLmVycm9yIDogZXJyKVxyXG4gICAgICB9KVxyXG4gICAgKVxyXG4gIH1cclxuXHJcbn1cclxuIl19
|
package/fesm2022/bx-rest.mjs
CHANGED
|
@@ -827,44 +827,28 @@ class HttpBXServices extends HttpServices {
|
|
|
827
827
|
serializeBitrixParams(params) {
|
|
828
828
|
return serializeBitrixParams(params);
|
|
829
829
|
}
|
|
830
|
-
// Мб не работает
|
|
831
|
-
httpGet(url, params = {}) {
|
|
832
|
-
if (params === null) {
|
|
833
|
-
params = {};
|
|
834
|
-
}
|
|
835
|
-
const auth = this.session.getAuthParams();
|
|
836
|
-
const paramsClone = clone(params);
|
|
837
|
-
const checkIsOn = this.session.getCheckAuthParamsIsOn();
|
|
838
|
-
const key = this.session.getKeyAuth();
|
|
839
|
-
if (checkIsOn) {
|
|
840
|
-
if (!auth) {
|
|
841
|
-
return throwError(() => this.session.getAuthError('get'));
|
|
842
|
-
}
|
|
843
|
-
if (key !== 'OAuth2') {
|
|
844
|
-
paramsClone[key] = auth;
|
|
845
|
-
}
|
|
846
|
-
}
|
|
847
|
-
let options = {
|
|
848
|
-
params: paramsClone
|
|
849
|
-
// params: JSON.stringify(paramsClone)
|
|
850
|
-
};
|
|
851
|
-
return this.session.getBaseUrl().pipe(switchMap((baseUrl) => {
|
|
852
|
-
if (!baseUrl) {
|
|
853
|
-
return throwError(() => this.session.getBaseUrlError('get'));
|
|
854
|
-
}
|
|
855
|
-
return from(this.axiosInstance.post(prepareBaseAddress(baseUrl) + url, options, {
|
|
856
|
-
withCredentials: key === 'OAuth2',
|
|
857
|
-
headers: {
|
|
858
|
-
'Content-Type': 'application/json',
|
|
859
|
-
}
|
|
860
|
-
}).then((response) => response.data));
|
|
861
|
-
}));
|
|
862
|
-
}
|
|
863
830
|
getNameMethod(arr) {
|
|
864
831
|
return arr.join('.');
|
|
865
832
|
}
|
|
866
833
|
}
|
|
867
834
|
|
|
835
|
+
/**
|
|
836
|
+
* Thrown by `.res()` when called with `{ throwOnApiError: true }` and the
|
|
837
|
+
* Bitrix REST call resolves as a Bitrix-level API error, e.g.
|
|
838
|
+
* `INSUFFICIENT_SCOPE` or `expired_token`.
|
|
839
|
+
*
|
|
840
|
+
* By default `.res()` resolves such responses as `undefined` instead of
|
|
841
|
+
* throwing — see the "Error handling" section of the README.
|
|
842
|
+
*/
|
|
843
|
+
class BXRestApiError extends Error {
|
|
844
|
+
constructor(error, error_description) {
|
|
845
|
+
super(error_description || error || 'Bitrix API error');
|
|
846
|
+
this.error = error;
|
|
847
|
+
this.error_description = error_description;
|
|
848
|
+
this.name = 'BXRestApiError';
|
|
849
|
+
}
|
|
850
|
+
}
|
|
851
|
+
|
|
868
852
|
class NavvyPagBase {
|
|
869
853
|
constructor(url, param, map = undefined, restApi = false) {
|
|
870
854
|
this.url = url;
|
|
@@ -888,14 +872,22 @@ class NavvyPagBase {
|
|
|
888
872
|
return v;
|
|
889
873
|
}));
|
|
890
874
|
}
|
|
891
|
-
res() {
|
|
892
|
-
return this.mapAndError(this.resVanilla()).pipe(map(v => (v && this.map)
|
|
875
|
+
res(options) {
|
|
876
|
+
return this.mapAndError(this.resVanilla(), options).pipe(map(v => (v && this.map)
|
|
893
877
|
? this.map(v)
|
|
894
878
|
: v));
|
|
895
879
|
}
|
|
896
|
-
mapAndError(request) {
|
|
897
|
-
return request.pipe(map(v =>
|
|
880
|
+
mapAndError(request, options) {
|
|
881
|
+
return request.pipe(map(v => {
|
|
882
|
+
if (options?.throwOnApiError && v && !instanceOfiBXRestAnswerSuccess(v)) {
|
|
883
|
+
throw new BXRestApiError(v.error, v.error_description);
|
|
884
|
+
}
|
|
885
|
+
return BXRestMapResult(v);
|
|
886
|
+
}), catchError((err) => {
|
|
898
887
|
console.error(err);
|
|
888
|
+
if (err instanceof BXRestApiError) {
|
|
889
|
+
throw err;
|
|
890
|
+
}
|
|
899
891
|
throw new Error((err.error) ? err.error : err);
|
|
900
892
|
}));
|
|
901
893
|
}
|
|
@@ -15508,5 +15500,5 @@ class BXRestMap {
|
|
|
15508
15500
|
* Generated bundle index. Do not edit.
|
|
15509
15501
|
*/
|
|
15510
15502
|
|
|
15511
|
-
export { base as BXBaseServices, BXRestMap, BXRestMapResult, BXRestNavvy, HttpBXServices as BXRestRequest, BXRestSettings, HttpNavvyServices, Navvy, SessionKeyError, SessionKeyServices, instanceOfiBXRestAnswerSuccess as isBXRestAnswerSuccess, partNameMethods$1 as partNameMethods };
|
|
15503
|
+
export { base as BXBaseServices, BXRestApiError, BXRestMap, BXRestMapResult, BXRestNavvy, HttpBXServices as BXRestRequest, BXRestSettings, HttpNavvyServices, Navvy, SessionKeyError, SessionKeyServices, instanceOfiBXRestAnswerSuccess as isBXRestAnswerSuccess, partNameMethods$1 as partNameMethods };
|
|
15512
15504
|
//# sourceMappingURL=bx-rest.mjs.map
|