bx-rest 0.3.4 → 0.4.0

package/fesm2022/bx-rest.mjs

@@ -1,22 +1,39 @@
 import * as i0 from '@angular/core';
-import { Injectable } from '@angular/core';
+import { InjectionToken, Injectable } from '@angular/core';
 import { Subscription, of, mergeMap, throwError, forkJoin, share, ReplaySubject, last, shareReplay, concat, from, concatMap, tap } from 'rxjs';
 import clone from 'just-clone';
 import { DateTime } from 'luxon';
-import * as i1 from '@angular/common/http';
+import * as i2 from '@angular/common/http';
 import { HttpParams, HttpHeaders } from '@angular/common/http';
 import flatten from 'just-flatten-it';
 import { map, catchError, take, mergeMap as mergeMap$1 } from 'rxjs/operators';
 
-const BX_REST_SETTINGS = {
-    auth: {
-        source: 'cookies',
-        key: 'auth'
-    },
-    urls: {
-        home: 'b24.trace-studio.com'
+class BX_REST_SETTINGS extends InjectionToken {
+    constructor() {
+        super(...arguments);
+        this.auth = {
+            source: 'cookies',
+            key: 'auth'
+        };
+        this.urls = {
+            home: 'b24.trace-studio.com'
+        };
     }
-};
+}
+/*
+
+export const BX_REST_SETTINGS: iRestSettings = {
+  auth: {
+    source: 'cookies',
+    key: 'auth'
+  },
+  urls: {
+    home: 'b24.trace-studio.com'
+  }
+}
+
+
+ */
 
 function BXRestMapResult(v) {
     if (v && (v.result || typeof v.result === 'boolean')) {
@@ -122,102 +139,102 @@ const $setOwner = 'setOwner';
 const $mute = 'mute';
 
 var partNameMethods$1 = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    $access: $access,
-    $accessibility: $accessibility,
-    $activity: $activity,
-    $add: $add,
-    $api: $api,
-    $approve: $approve,
-    $attach: $attach,
-    $bizproc: $bizproc,
-    $blogcomment: $blogcomment,
-    $blogpost: $blogpost,
-    $booking: $booking,
-    $calendar: $calendar,
-    $chat: $chat,
-    $commentitem: $commentitem,
-    $complete: $complete,
-    $copyto: $copyto,
-    $counters: $counters,
-    $create: $create,
-    $defer: $defer,
-    $delegate: $delegate,
-    $delete: $delete,
-    $department: $department,
-    $disapprove: $disapprove,
-    $disk: $disk,
-    $elapseditem: $elapseditem,
-    $element: $element,
-    $event: $event,
-    $favorite: $favorite,
-    $feature: $feature,
-    $field: $field,
-    $file: $file,
-    $files: $files,
-    $folder: $folder,
-    $get: $get,
-    $getFields: $getFields,
-    $getTypes: $getTypes,
-    $getaccess: $getaccess,
-    $getchildren: $getchildren,
-    $getlist: $getlist,
-    $getmanifest: $getmanifest,
-    $history: $history,
-    $iblock: $iblock,
-    $id: $id,
-    $im: $im,
-    $instances: $instances,
-    $isactionallowed: $isactionallowed,
-    $kill: $kill,
-    $list: $list,
-    $lists: $lists,
-    $log: $log,
-    $markdeleted: $markdeleted,
-    $meeting: $meeting,
-    $message: $message,
-    $moveto: $moveto,
-    $mute: $mute,
-    $nearest: $nearest,
-    $params: $params,
-    $pause: $pause,
-    $planner: $planner,
-    $rename: $rename,
-    $renew: $renew,
-    $request: $request,
-    $resource: $resource,
-    $restore: $restore,
-    $result: $result,
-    $robot: $robot,
-    $search: $search,
-    $section: $section,
-    $send: $send,
-    $server: $server,
-    $set: $set,
-    $setOwner: $setOwner,
-    $settings: $settings,
-    $share: $share,
-    $socialnetwork: $socialnetwork,
-    $sonet_group: $sonet_group,
-    $stages: $stages,
-    $start: $start,
-    $status: $status,
-    $storage: $storage,
-    $task: $task,
-    $tasks: $tasks,
-    $template: $template,
-    $terminate: $terminate,
-    $time: $time,
-    $type: $type,
-    $update: $update,
-    $updateAvatar: $updateAvatar,
-    $updateColor: $updateColor,
-    $updateTitle: $updateTitle,
-    $uploadfile: $uploadfile,
-    $url: $url,
-    $user: $user,
-    $workflow: $workflow,
-    $workgroup: $workgroup
+  __proto__: null,
+  $access: $access,
+  $accessibility: $accessibility,
+  $activity: $activity,
+  $add: $add,
+  $api: $api,
+  $approve: $approve,
+  $attach: $attach,
+  $bizproc: $bizproc,
+  $blogcomment: $blogcomment,
+  $blogpost: $blogpost,
+  $booking: $booking,
+  $calendar: $calendar,
+  $chat: $chat,
+  $commentitem: $commentitem,
+  $complete: $complete,
+  $copyto: $copyto,
+  $counters: $counters,
+  $create: $create,
+  $defer: $defer,
+  $delegate: $delegate,
+  $delete: $delete,
+  $department: $department,
+  $disapprove: $disapprove,
+  $disk: $disk,
+  $elapseditem: $elapseditem,
+  $element: $element,
+  $event: $event,
+  $favorite: $favorite,
+  $feature: $feature,
+  $field: $field,
+  $file: $file,
+  $files: $files,
+  $folder: $folder,
+  $get: $get,
+  $getFields: $getFields,
+  $getTypes: $getTypes,
+  $getaccess: $getaccess,
+  $getchildren: $getchildren,
+  $getlist: $getlist,
+  $getmanifest: $getmanifest,
+  $history: $history,
+  $iblock: $iblock,
+  $id: $id,
+  $im: $im,
+  $instances: $instances,
+  $isactionallowed: $isactionallowed,
+  $kill: $kill,
+  $list: $list,
+  $lists: $lists,
+  $log: $log,
+  $markdeleted: $markdeleted,
+  $meeting: $meeting,
+  $message: $message,
+  $moveto: $moveto,
+  $mute: $mute,
+  $nearest: $nearest,
+  $params: $params,
+  $pause: $pause,
+  $planner: $planner,
+  $rename: $rename,
+  $renew: $renew,
+  $request: $request,
+  $resource: $resource,
+  $restore: $restore,
+  $result: $result,
+  $robot: $robot,
+  $search: $search,
+  $section: $section,
+  $send: $send,
+  $server: $server,
+  $set: $set,
+  $setOwner: $setOwner,
+  $settings: $settings,
+  $share: $share,
+  $socialnetwork: $socialnetwork,
+  $sonet_group: $sonet_group,
+  $stages: $stages,
+  $start: $start,
+  $status: $status,
+  $storage: $storage,
+  $task: $task,
+  $tasks: $tasks,
+  $template: $template,
+  $terminate: $terminate,
+  $time: $time,
+  $type: $type,
+  $update: $update,
+  $updateAvatar: $updateAvatar,
+  $updateColor: $updateColor,
+  $updateTitle: $updateTitle,
+  $uploadfile: $uploadfile,
+  $url: $url,
+  $user: $user,
+  $workflow: $workflow,
+  $workgroup: $workgroup
 });
 
 class CookiesServices {
@@ -266,6 +283,9 @@ const time = {
 };
 
 class BaseServices {
+    constructor(BX_REST_SETTINGS) {
+        this.BX_REST_SETTINGS = BX_REST_SETTINGS;
+    }
     toStr(val) {
         return (val) ? String(val) : '';
     }
@@ -362,7 +382,7 @@ class BaseServices {
     }
     getHomeAddress() {
         // return this.prepareBaseAddress(environment.urls.home)
-        return this.prepareBaseAddress(BX_REST_SETTINGS.urls.home);
+        return this.prepareBaseAddress(this.BX_REST_SETTINGS.urls.home);
     }
     dateDiff(a, b) {
         return new Date(a.valueOf() - b.valueOf());
@@ -424,7 +444,7 @@ class BaseServices {
         url = (url) ? url.replace('http:', '') : '';
         return url;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BaseServices, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BaseServices, deps: [{ token: BX_REST_SETTINGS }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BaseServices, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BaseServices, decorators: [{
@@ -432,7 +452,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }] });
+        }], ctorParameters: function () { return [{ type: BX_REST_SETTINGS }]; } });
 
 class LocalStorageServices {
     static get(name) {
@@ -510,8 +530,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImpo
 class SessionKeyServices extends BaseServices {
     constructor(
     // private route: ActivatedRoute,
-    BxApiLib) {
-        super();
+    BX_REST_SETTINGS, BxApiLib) {
+        super(BX_REST_SETTINGS);
+        this.BX_REST_SETTINGS = BX_REST_SETTINGS;
         this.BxApiLib = BxApiLib;
         this.authHave = false;
         this.subscribe = {
@@ -635,11 +656,11 @@ class SessionKeyServices extends BaseServices {
         this.subscribe.authData.unsubscribe();
     }
     getAuth() {
-        switch (BX_REST_SETTINGS.auth.key) {
+        switch (this.BX_REST_SETTINGS.auth.key) {
             case 'auth':
                 return CookiesServices.get('auth');
             default:
-                if (window.BX && window.BX.bitrix_sessid()) {
+                if (window.BX && window.BX.bitrix_sessid()) { // чё за хуйня?
                     return window.BX.bitrix_sessid();
                 }
                 else if (this.getSessid().length) {
@@ -652,17 +673,12 @@ class SessionKeyServices extends BaseServices {
         }
     }
     getKeyAuth() {
-        if (BX_REST_SETTINGS.auth.key.length) {
-            return BX_REST_SETTINGS.auth.key;
+        console.log('BX_REST_SETTINGS', BX_REST_SETTINGS);
+        if (this.BX_REST_SETTINGS.auth.key.length) {
+            return this.BX_REST_SETTINGS.auth.key;
         }
         else {
-            if (window.BX && window.BX.bitrix_sessid()
-                || this.getSessid().length) {
-                return 'sessid';
-            }
-            else {
-                return 'auth';
-            }
+            return 'auth';
         }
     }
     getSessid() {
@@ -688,21 +704,23 @@ class SessionKeyServices extends BaseServices {
         return false;
     }
     getAuthParams() {
-        switch (BX_REST_SETTINGS.auth.source) {
+        switch (this.BX_REST_SETTINGS.auth.source) {
             case 'cookies':
                 return this.getAuth();
+            case 'localStorage':
+                return LocalStorageServices.get(this.BX_REST_SETTINGS.auth.key);
             default:
                 return (this.authData) ? this.authData.access_token : undefined;
         }
     }
     getBaseUrl() {
-        return of(this.prepareBaseAddress(BX_REST_SETTINGS.urls.home, 'rest'));
+        return of(this.prepareBaseAddress(this.BX_REST_SETTINGS.urls.home, 'rest'));
         // return this.authData$.pipe( // TODO: разобраться позже
         //   take(1),
         //   map(v => (v && v.domain) ? this.prepareBaseAddress(v.domain) : undefined)
         // )
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: SessionKeyServices, deps: [{ token: RestServices }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: SessionKeyServices, deps: [{ token: BX_REST_SETTINGS }, { token: RestServices }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: SessionKeyServices, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: SessionKeyServices, decorators: [{
@@ -710,7 +728,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: RestServices }]; } });
+        }], ctorParameters: function () { return [{ type: BX_REST_SETTINGS }, { type: RestServices }]; } });
 
 class HttpData extends BaseServices {
     constructor() {
@@ -829,8 +847,8 @@ class HttpData extends BaseServices {
 }
 
 class BaseHttp extends HttpData {
-    constructor(http) {
-        super();
+    constructor(BX_REST_SETTINGS, http) {
+        super(BX_REST_SETTINGS);
         this.http = http;
     }
     handleError(result) {
@@ -839,7 +857,7 @@ class BaseHttp extends HttpData {
             return of(result);
         };
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BaseHttp, deps: [{ token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BaseHttp, deps: [{ token: BX_REST_SETTINGS }, { token: i2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BaseHttp, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BaseHttp, decorators: [{
@@ -847,7 +865,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }]; } });
+        }], ctorParameters: function () { return [{ type: BX_REST_SETTINGS }, { type: i2.HttpClient }]; } });
 
 class BaseHttpServices extends BaseHttp {
     httpGet(url, params = {}, settings = this.defSettings) {
@@ -861,8 +879,8 @@ class BaseHttpServices extends BaseHttp {
 }
 
 class HttpServices extends BaseHttpServices {
-    constructor(http, session) {
-        super(http);
+    constructor(BX_REST_SETTINGS, http, session) {
+        super(BX_REST_SETTINGS, http);
         this.session = session;
     }
     httpPost(url, params = {}, settings = this.defSettings) {
@@ -903,7 +921,7 @@ class HttpServices extends BaseHttpServices {
             return throwError(() => 'auth not get');
         }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: HttpServices, deps: [{ token: i1.HttpClient }, { token: SessionKeyServices }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: HttpServices, deps: [{ token: BX_REST_SETTINGS }, { token: i2.HttpClient }, { token: SessionKeyServices }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: HttpServices, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: HttpServices, decorators: [{
@@ -911,7 +929,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: SessionKeyServices }]; } });
+        }], ctorParameters: function () { return [{ type: BX_REST_SETTINGS }, { type: i2.HttpClient }, { type: SessionKeyServices }]; } });
 
 // type TransformFunction<T, R> = (input: T) => R;
 class HttpBXServices extends HttpServices {
@@ -1489,7 +1507,7 @@ class BXRestTasksTask {
     }
     */
     getFields() {
-        return this.http.post(this.url.list);
+        return this.http.post(this.url.getFields);
     }
     getaccess(param) {
         return this.http.post(this.url.getaccess, param);
@@ -2344,8 +2362,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImpo
         }] });
 
 class BXRestMapUser extends BaseMapServices {
-    constructor() {
-        super();
+    constructor(BX_REST_SETTINGS) {
+        super(BX_REST_SETTINGS);
     }
     get(v) {
         return (v) ? v.map(i => this.userHttpToTrace(i)) : undefined;
@@ -2427,7 +2445,7 @@ class BXRestMapUser extends BaseMapServices {
         }
         return res.trim();
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestMapUser, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestMapUser, deps: [{ token: BX_REST_SETTINGS }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestMapUser, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestMapUser, decorators: [{
@@ -2435,7 +2453,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return []; } });
+        }], ctorParameters: function () { return [{ type: BX_REST_SETTINGS }]; } });
 
 class BXRestNavvyUserUserfield {
     constructor(BXRestUserUserfield) {
@@ -2715,8 +2733,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImpo
         }], ctorParameters: function () { return [{ type: BXRestListsElement }, { type: BXRestMapListsElement }]; } });
 
 class BXRestMapLists extends BaseMapServices {
-    constructor(element, field) {
-        super();
+    constructor(BX_REST_SETTINGS, element, field) {
+        super(BX_REST_SETTINGS);
         this.element = element;
         this.field = field;
     }
@@ -2773,7 +2791,7 @@ class BXRestMapLists extends BaseMapServices {
             XML_ID: this.toStr(itemLists.XML_ID),
         };
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestMapLists, deps: [{ token: BXRestMapListsElement }, { token: BXRestMapListsField }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestMapLists, deps: [{ token: BX_REST_SETTINGS }, { token: BXRestMapListsElement }, { token: BXRestMapListsField }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestMapLists, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestMapLists, decorators: [{
@@ -2781,7 +2799,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: BXRestMapListsElement }, { type: BXRestMapListsField }]; } });
+        }], ctorParameters: function () { return [{ type: BX_REST_SETTINGS }, { type: BXRestMapListsElement }, { type: BXRestMapListsField }]; } });
 
 class BXRestNavvyLists {
     constructor(element, field, mapList, BXRestLists) {
@@ -2957,8 +2975,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImpo
 
 /// type SelectInterfaceTypeTasksTaskList<T> = T extends iBXRestHttpTasksTaskList ? iBXRestTasksTaskList : iBXRestTasksTaskListDefault
 class BXRestMapTasksTask extends BaseMapServices {
-    constructor(result) {
-        super();
+    constructor(BX_REST_SETTINGS, result) {
+        super(BX_REST_SETTINGS);
         this.result = result;
     }
     getaccess(v) {
@@ -3075,7 +3093,7 @@ class BXRestMapTasksTask extends BaseMapServices {
         }
         return Object.assign(item, result);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestMapTasksTask, deps: [{ token: BXRestMapTasksTaskResult }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestMapTasksTask, deps: [{ token: BX_REST_SETTINGS }, { token: BXRestMapTasksTaskResult }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestMapTasksTask, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestMapTasksTask, decorators: [{
@@ -3083,7 +3101,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: BXRestMapTasksTaskResult }]; } });
+        }], ctorParameters: function () { return [{ type: BX_REST_SETTINGS }, { type: BXRestMapTasksTaskResult }]; } });
 
 // export interface TimeProcess {
 //   total: number,