bx-rest 0.0.2 → 0.0.4

package/src/services/http/HttpBX.ts

@@ -0,0 +1,176 @@
+import { Observable, throwError, take, mergeMap, forkJoin } from 'rxjs'
+import { catchError, map } from 'rxjs/operators'
+import { Injectable } from '@angular/core'
+import clone from 'just-clone'
+import { iHttpParamSettings } from 'bx-rest/src/typification/rest/settings'
+import BaseHttpServices from 'bx-rest/src/services/http/http'
+import {
+    iBatchRequestAnswer, iBatchRequestParam,
+    iBatchRequestParamArr,
+    iBatchRequestParamHttp, keyBatch
+} from 'bx-rest/src/typification/rest/batch/batchRequestParam'
+import flatten from 'just-flatten-it'
+
+@Injectable({
+    providedIn: 'root'
+})
+export default class HttpBXServices extends BaseHttpServices {
+
+    timeNowOnServer() {
+        return this.httpGet<{ result?: Date, error?: string }>('server.time').pipe(
+            map(v => {
+                if (v && v.result) {
+                    return new Date(v.result)
+                }
+                return undefined
+            }),
+        )
+    }
+
+    /**
+     * Это пиздец а не метод
+     * @param param
+     */
+    branch<T, A>(param: iBatchRequestParamArr<T> | iBatchRequestParam<T>[]): Observable<iBatchRequestAnswer<A>[] | undefined> {
+        let prepareParam = Object.entries<string>(this.prepareBatch<T>(param))
+        const size = 50 // больше не отдаст
+        let subarray = [] //массив в который будет выведен результат.
+        for (let i = 0; i < Math.ceil(prepareParam.length / size); i++) {
+            subarray[i] = prepareParam.slice((i * size), (i * size) + size)
+        }
+
+        return forkJoin(
+            subarray.map(i => {
+                return this.httpPost('batch.json', {
+                    halt: 0,
+                    cmd: Object.assign({}, ...i.map(x => {
+                        return {[x[0]]: x[1]}
+                    }))
+                })
+            })
+        ) as Observable<iBatchRequestAnswer<A>[]>
+    }
+
+    prepareBatch<T>(param: iBatchRequestParamArr<T> | iBatchRequestParam<T>[]): iBatchRequestParamHttp {
+        let res: iBatchRequestParamHttp = Object.keys(param).reduce(
+            (obj, key) => {
+                obj[key] = '';
+                return obj;
+            },
+            {} as iBatchRequestParamHttp
+        );
+        for (let key in param) {
+            if(typeof key === 'string' || typeof key === 'number' && param[key].param) {
+                res[key] = param[key].name + '?' + this.getHttpParamsGet(param[key].param).toString()
+            }
+        }
+        return res
+    }
+
+    mapBranchResult<T>(res: iBatchRequestAnswer<T>[]){
+        return Object.assign([], ...res.map(i => (i.result && i.result.result) ? i.result.result : undefined)) as {[key:keyBatch]: T}
+    }
+
+    mapBranchResultWithoutKey<T>(res: iBatchRequestAnswer<T>[]): T[]{
+        return flatten<T>(Object.assign([], ...res.map(i => (i.result && i.result.result) ? i.result.result : undefined)))
+    }
+
+    post<T>(name: string[],
+            params: any = {},
+            textError = '',
+            settings: iHttpParamSettings = this.defSettings) {
+        return this.httpPost<T>(this.getNameMethod(name), params, textError, settings)
+    }
+
+    get<T>(name: string[],
+           params: any = {},
+           textError = '',
+           settings: iHttpParamSettings = this.defSettings) {
+        return this.httpGet<T>(this.getNameMethod(name), params, textError, settings)
+    }
+
+    override httpPost<T>(url: string,
+                         params: any = {},
+                         textError = '',
+                         settings: iHttpParamSettings = this.defSettings
+    ): Observable<T | undefined> {
+        return this.session.getAuthParams().pipe(
+            mergeMap(auth => {
+                if (auth) {
+                    const paramsClone = clone(params)
+                    paramsClone[this.session.getKeyAuth()] = auth
+                    return this.session.getBaseUrl().pipe(mergeMap(v => {
+                        if (v) {
+                            return this.http.post<T | undefined>(
+                                this.prepareBaseAddress(v) + url,
+                                this.getHttpParamsPost(paramsClone, new FormData(), false, [], settings))
+                                .pipe(
+                                    take(1),
+                                    catchError(err => {
+                                        if (!textError.length && err.error.error_description) {
+                                            textError = err.error.error_description
+                                        }
+
+                                        this.snackBar.error('Ошибка: ' + textError)
+                                        return throwError(() => err)
+                                    })
+                                )
+                        }
+                        return throwError(() => 'get base url error')
+                    }))
+                } else {
+                    this.snackBar.error('Error: Auth not get')
+                    return throwError(() => 'auth not get')
+                }
+            }))
+    }
+
+    override httpGet<T>(
+        url: string,
+        params: any = {},
+        textError = '',
+        settings: iHttpParamSettings = this.defSettings
+    ): Observable<T | undefined> {
+        return this.session.getAuthParams().pipe(
+            mergeMap(auth => {
+                if (auth) {
+                    if (params === null) {
+                        params = {}
+                    }
+                    const paramsClone = clone(params)
+                    paramsClone[this.session.getKeyAuth()] = auth
+                    let options = {
+                        params: this.getHttpParamsGet(paramsClone)
+                    }
+
+                    return this.session.getBaseUrl().pipe(
+                        mergeMap(v => {
+                            if (v) {
+                                return this.http.get<T>(this.prepareBaseAddress(v) + url, options).pipe(
+                                    take(1),
+                                    catchError(err => {
+                                        if (!textError.length && err.error.error_description) {
+                                            textError = err.error.error_description
+                                        }
+
+                                        this.snackBar.error('Ошибка: ' + textError)
+                                        return throwError(() => err)
+                                    }))
+                            }
+                            return throwError(() => 'get base url error')
+                        })
+                    )
+                } else {
+                    this.snackBar.error('Error: Auth not get')
+                    return throwError(() => 'auth not get')
+                }
+            })
+        )
+    }
+
+    getNameMethod(arr: string[]) {
+        return arr.join('.')
+    }
+
+}
+

package/src/services/http/HttpData.ts

@@ -1,7 +1,7 @@
-import { BaseServices } from '@/services/base'
+import { BaseServices } from 'bx-rest/src/services/base'
 import { HttpParams } from '@angular/common/http'
-import { iHttpParamSettings } from '@/typification/rest/settings'
-import iHttpAnswerBX from '@/typification/rest/base/httpAnswerBX'
+import { iHttpParamSettings } from 'bx-rest/src/typification/rest/settings'
+import iHttpAnswerBX from 'bx-rest/src/typification/rest/base/httpAnswerBX'
 
 export class HttpData extends BaseServices {
 

package/src/services/http/base/HttpData.ts

@@ -1,13 +1,14 @@
-import BaseServices from '@/lib/services/base'
+import { BaseServices } from 'bx-rest/src/services/base'
 import { HttpParams } from '@angular/common/http'
-import { iHttpParamSettings } from '@/lib/typification/bitrix/api/rest/settings'
-import iHttpAnswerBX from '@/lib/typification/bitrix/api/rest/base/httpAnswerBX';
+import { iHttpParamSettings } from 'bx-rest/src/typification/rest/settings'
+import iHttpAnswerBX from 'bx-rest/src/typification/rest/base/httpAnswerBX'
 
 export class HttpData extends BaseServices {
 
     defSettings: iHttpParamSettings = {
         timeZone: {
-            calc: true
+            calc: true,
+            levelOut: false
         }
     }
 

package/src/services/http/base/base.ts

@@ -1,8 +1,9 @@
-import { iHttpParamSettings } from '@/typification/rest/settings'
+// import { iHttpParamSettings } from '../../../typification/rest/settings'
+import { iHttpParamSettings } from 'bx-rest/src/typification/rest/settings'
 import { HttpClient } from '@angular/common/http'
-import SnackBarService from '@/services/snack-bar/snack-bar.service'
+import SnackBarService from 'bx-rest/src/services/snack-bar/snack-bar.service'
 import { Observable, of, } from 'rxjs'
-import { HttpData } from '@/services/http/HttpData'
+import { HttpData } from 'bx-rest/src/services/http/HttpData'
 import { Injectable } from '@angular/core'
 
 @Injectable({

package/src/services/http/base/http.ts

@@ -1,8 +1,8 @@
 import { Observable, throwError } from 'rxjs'
 import { catchError } from 'rxjs/operators'
 import { HttpParams } from '@angular/common/http'
-import { iHttpParamSettings } from '@/typification/rest/settings'
-import { BaseHttp } from '@/services/http/base/base'
+import { iHttpParamSettings } from 'bx-rest/src/typification/rest/settings'
+import { BaseHttp } from 'bx-rest/src/services/http/base/base'
 
 export class BaseHttpServices extends BaseHttp {
 

package/src/services/http/http.ts

@@ -2,17 +2,17 @@ import { Observable, throwError, take, mergeMap, forkJoin } from 'rxjs'
 import { catchError, map } from 'rxjs/operators'
 import { Injectable } from '@angular/core'
 import { HttpClient } from '@angular/common/http'
-import SnackBarService from '@/services/snack-bar/snack-bar.service'
-import SessionKeyServices from '@/services/http/sessionKey'
+import SnackBarService from 'bx-rest/src/services/snack-bar/snack-bar.service'
+import SessionKeyServices from 'bx-rest/src/services/http/sessionKey'
 import clone from 'just-clone'
-import { iHttpParamSettings } from '@/typification/rest/settings'
-import BaseHttpServices from '@/services/http/http'
+import { iHttpParamSettings } from 'bx-rest/src/typification/rest/settings'
 import {
     iBatchRequestAnswer, iBatchRequestParam,
     iBatchRequestParamArr,
     iBatchRequestParamHttp, keyBatch
-} from '@/typification/rest/batch/batchRequestParam'
+} from 'bx-rest/src/typification/rest/batch/batchRequestParam'
 import flatten from 'just-flatten-it'
+import { BaseHttpServices } from './base/http'
 
 @Injectable({
     providedIn: 'root'

package/src/services/http/sessionKey.ts

@@ -1,22 +1,21 @@
 import { Injectable } from '@angular/core'
-import Cookies from '@/services/vanilla/сookies'
+import Cookies from 'bx-rest/src/services/vanilla/сookies'
 import { Store } from '@ngrx/store'
-import saveApplicationAuth from '@/typification/auth/save'
-import { environment as env } from '@/environments/environment'
+import saveApplicationAuth from 'bx-rest/src/typification/auth/save'
+// import { environment as env } from 'bx-rest/src/environments/environment'
 import { filter, Observable, of, Subscription, take } from 'rxjs'
 import { ActivatedRoute, ParamMap } from '@angular/router'
-import { saveAccessToken, saveApplicationAuthPath } from '@/store/auth'
+import { saveAccessToken, saveApplicationAuthPath } from 'bx-rest/src/store/auth'
 import { map } from 'rxjs/operators'
-import { BaseServices } from '@/services/base'
-import { BxApiLibServices } from '@/services/bx-api-lib'
-import { LocalStorageServices as LocalStorage } from '@/lib/services/vanilla/localStorage'
+import { BaseServices } from 'bx-rest/src/services/base'
+import { LocalStorageServices as LocalStorage } from 'bx-rest/src/services/vanilla/localStorage'
+import { RestServices } from 'bx-rest/src/typification/rest/api-lib'
 
 type IKeyAuth = 'sessid' | 'auth' | string
 
 @Injectable({
     providedIn: 'root'
 })
-
 export default class SessionKeyServices extends BaseServices {
 
     authHave = false
@@ -29,12 +28,12 @@ export default class SessionKeyServices extends BaseServices {
     constructor(
         public store: Store<{ auth: saveApplicationAuth }>,
         private route: ActivatedRoute,
-        public BxApiLib: BxApiLibServices,
+        public BxApiLib: RestServices,
     ) {
         super()
         this.authData$ = this.store.select('auth')
         this.authData$.subscribe(authData => {
-            if ((authData && !authData.access_token.length && !env.component) || !authData) {
+            if ((authData && !authData.access_token.length) || !authData) {
                 // получаем токен по собственным каналом (в битриксе приложение trace:apps.trace)
                 window.addEventListener('message', (event: MessageEvent) => {
                     if (event.origin !== window.origin) { // проверяем что это не наше сообщение (с текущего приложения)
@@ -129,16 +128,12 @@ export default class SessionKeyServices extends BaseServices {
                         }
 
                     })
-            } else if (env.component && this.getAuth().length) {
+            } else if (this.getAuth().length) {
                 this.authHave = true
             }
 
             this.authData = authData
         })
-
-        if (!env.production) {
-            this.authHave = true
-        }
     }
 
     subscribeAll() {
@@ -188,27 +183,23 @@ export default class SessionKeyServices extends BaseServices {
     }
 
     getAuthParams(): Observable<string | undefined> {
-        if (env.production && !env.component) {
+        // if (env.production && !env.component) {
             return this.authData$.pipe(
                 take(1),
                 map(v => (v) ? v.access_token : undefined)
             )
-        } else {
-            return of(this.getAuth())
-        }
+        // } else {
+        //     return of(this.getAuth())
+        // }
     }
 
     getBaseUrl(): Observable<string | undefined> {
-        if (env.public) {
             return this.authData$.pipe(
-                map(v => (v && v.domain) ? this.prepareBaseAddress(v.domain, env.urls.api.bitrix) : undefined)
+                map(v => (v && v.domain) ? this.prepareBaseAddress(v.domain, 'b24.trace-studio.com') : undefined)
             )
-        } else {
-            return of(env.urls.api.bitrix)
-        }
     }
 
-    getHomeUrl(): string {
-        return env.urls.home
-    }
+    // getHomeUrl(): string {
+    //     return env.urls.home
+    // }
 }

package/src/services/map/base.ts

@@ -0,0 +1,8 @@
+import { Injectable } from '@angular/core'
+import { BaseServices } from 'bx-rest/src/services/base'
+
+@Injectable({
+    providedIn: 'root'
+})
+export default class BaseMapServices extends BaseServices {
+}

package/src/services/map/rest/user.ts

@@ -0,0 +1,82 @@
+import { Injectable } from '@angular/core'
+import BaseMapServices from 'bx-rest/src/services/map/base'
+import { iBXRestUser, iBXRestUserHttp } from 'bx-rest/src/typification/rest/user/user'
+import clone from 'just-clone'
+
+@Injectable({
+    providedIn: 'root'
+})
+export class BitrixApiUserMapServices extends BaseMapServices {
+
+    HttpToBX(user: iBXRestUserHttp): iBXRestUser {
+        let res: iBXRestUser = Object.assign(clone(user), {
+            ID: this.toNumber(user.ID),
+            IS_ONLINE: this.toBool(user.IS_ONLINE),
+            DATE_REGISTER: this.toDate(user.DATE_REGISTER),
+            PERSONAL_BIRTHDAY: this.toDate(user.PERSONAL_BIRTHDAY),
+        })
+        if (user.LAST_LOGIN) {
+            res.LAST_LOGIN = this.toDate(user.LAST_LOGIN)
+        }
+
+        return res
+    }
+
+    BXtoHttp(user: iBXRestUser): iBXRestUserHttp {
+        return Object.assign(clone(user), {
+            ID: this.toStr(user.ID),
+            IS_ONLINE: this.toBXYorN(user.IS_ONLINE),
+            DATE_REGISTER: this.getBXStrTime(user.DATE_REGISTER),
+            PERSONAL_BIRTHDAY: this.toStr(user.PERSONAL_BIRTHDAY),
+            LAST_LOGIN: this.toStr(user.LAST_LOGIN)
+        })
+    }
+
+    getFIO(user: iBXRestUser): string {
+        let res = ''
+        if (!user.LAST_NAME) {
+            const SECOND_NAME = (user.SECOND_NAME) ? user.SECOND_NAME : ''
+            const NAME = (user.NAME) ? user.NAME : ''
+            res = NAME + ' ' + SECOND_NAME
+        } else if (!user.NAME) {
+            res = user.LAST_NAME
+        } else if (!user.SECOND_NAME) {
+            res = user.LAST_NAME + ' ' + user.NAME
+        } else {
+            res = user.LAST_NAME + ' ' + user.NAME + ' ' + user.SECOND_NAME
+        }
+        return res.trim()
+    }
+
+    getFI(user: iBXRestUser): string {
+        let res = ''
+        if (!user.LAST_NAME) {
+            const NAME = (user.NAME) ? user.NAME : ''
+            res = NAME
+        } else if (!user.NAME) {
+            res = user.LAST_NAME
+        } else {
+            res = user.LAST_NAME + ' ' + user.NAME
+        }
+        return res.trim()
+    }
+
+    getFIOShort(user: iBXRestUser): string {
+        let res = ''
+        if (!user.LAST_NAME) {
+            const SECOND_NAME = (user.SECOND_NAME) ? user.SECOND_NAME : ''
+            const NAME = (user.NAME) ? user.NAME : ''
+            res = NAME + ' ' + SECOND_NAME
+        } else if (!user.NAME) {
+            res = user.LAST_NAME
+        } else if (!user.SECOND_NAME) {
+            res = user.LAST_NAME + ' ' + user.NAME.charAt(0).toUpperCase() + '.'
+        } else {
+            res =
+                user.LAST_NAME + ' ' +
+                user.NAME.charAt(0).toUpperCase() + '.' +
+                user.SECOND_NAME.charAt(0).toUpperCase() + '.'
+        }
+        return res.trim()
+    }
+}

package/src/services/snack-bar/snack-bar.service.ts

@@ -3,7 +3,7 @@
  * TODO: логирование
  */
 import { Injectable } from '@angular/core'
-import { ToastMessageComponent } from '@/lib/services/snack-bar/toast-message/toast-message.component'
+import { ToastMessageComponent } from 'bx-rest/src/services/snack-bar/toast-message/toast-message.component'
 import { MatSnackBar } from '@angular/material/snack-bar'
 
 @Injectable({

package/src/services/vanilla/JSON.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core'
-import serialize from '@/lib/functions/serializeJavascript'
+import serialize from 'bx-rest/src/functions/serializeJavascript'
 
 @Injectable({
   providedIn: 'root'

package/src/services/vanilla/iframe.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core'
-import SessionKeyServices from '@/lib/services/api/bitrix/http/sessionKey'
+import SessionKeyServices from 'bx-rest/src/services/http/sessionKey'
 import { map, mergeMap, of } from 'rxjs'
-import SnackBarService from '@/lib/services/snack-bar/snack-bar.service'
+import SnackBarService from 'bx-rest/src/services/snack-bar/snack-bar.service'
 
 @Injectable({
   providedIn: 'root'

package/src/services/vanilla/localStorage.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core'
-import JSON from '@/lib/services/vanilla/JSON'
+import JSON from 'bx-rest/src/services/vanilla/JSON'
 
 @Injectable({
   providedIn: 'root'

package/src/services/vanilla//321/201ookies.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core'
-import JSON from '@/lib/services/vanilla/JSON'
+import JSON from 'bx-rest/src/services/vanilla/JSON'
 
 @Injectable({
   providedIn: 'root'

package/src/store/auth.ts

@@ -1,6 +1,6 @@
 import { Action, createReducer, on, props } from '@ngrx/store'
 import { createAction } from '@ngrx/store'
-import saveApplicationAuth from '@/typification/auth/save'
+import saveApplicationAuth from 'bx-rest/src/typification/auth/save'
 import clone from 'just-clone'
 export interface saveApplicationAuthPath {
   access_token?: string, // основной авторизационный токен, требуемый для доступа к REST API

package/src/store/users.ts

@@ -0,0 +1,88 @@
+import { Action, createReducer, on, props } from '@ngrx/store'
+import { createAction } from '@ngrx/store'
+import clone from 'just-clone'
+import { iBXRestUser } from 'bx-rest/src/typification/rest/user/user'
+
+export interface storeUsers {
+  load: {
+    all: boolean,
+    department: number[]
+  }
+  self: iBXRestUser  | undefined
+  data: iBXRestUser []
+}
+
+export const save = createAction('[Users Component] Save', props<iBXRestUser >())
+export const saveArr = createAction('[Users Component] Save Arr', props<{ arr: iBXRestUser [] }>())
+export const update = createAction('[Users Component] Update', props<iBXRestUser >())
+export const loadAll = createAction('[Users Component] loadAll', props<{ load: true }>())
+export const saveSelf = createAction('[Users Component] saveSelf', props<{ self: iBXRestUser  }>())
+export const saveIDLoadedDepartment = createAction('[Users Component] saveIDLoadedDepartment', props<{id: number[]}>())
+
+export const initialState: storeUsers = {
+  load: {
+    all: false,
+    department: []
+  },
+  self: undefined,
+  data: []
+}
+
+const _usersReducer = createReducer(
+  initialState,
+  on(saveIDLoadedDepartment, (s, data) => {
+    let copy = clone(s)
+    copy.load.department = [...copy.load.department, ...data.id]
+    return copy
+  }),
+  on(save, (s, data) => {
+    const find = s.data.find(v => v.ID === data.ID)
+    if (!find) {
+      const copy = clone(s)
+      copy.data.push(data)
+      return copy
+    }
+    return s
+  }),
+  on(saveArr, (s, data) => {
+    const copy = clone(s)
+    if(copy.data && copy.data.length) {
+      for (const user of data.arr) {
+        const find = copy.data.find(v => v.ID === user.ID)
+        if (!find) {
+          copy.data.push(user)
+        }
+      }
+    } else {
+      copy.data = [...data.arr]
+    }
+    return copy
+  }),
+  on(update, (s, data) => {
+    const copy = clone(s)
+    let find = copy.data.findIndex(v => v.ID === data.ID)
+    if (find !== -1) {
+      const copy = clone(s)
+      copy.data.splice(find, 1, data);
+      // copy.data.push(data)
+      return copy
+    }
+    return s
+  }),
+  on(loadAll, (s, data) => {
+    if (data.load !== s.load.all) {
+      const copy = clone(s)
+      copy.load.all = data.load
+      return copy
+    }
+    return s
+  }),
+  on(saveSelf, (s, data) => {
+    return { ...s, self: data.self}
+  })
+)
+
+
+export function usersReducer(state = initialState, action: Action) {
+  return _usersReducer(state, action)
+}

package/src/tsconfig.base.json

@@ -0,0 +1,6 @@
+{
+    "extends": "../tsconfig.json",
+    "include": [
+        "./**/*.ts"
+    ]
+}

package/src/tsconfig.cjs.json

@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.base.json",
+  "compilerOptions": {
+    "module": "commonjs",
+    "target": "es5",
+    "downlevelIteration": true,
+    "outDir": "../dist/cjs"
+  },
+  "exclude": ["./internal/umd.ts"]
+}

package/src/tsconfig.cjs.spec.json

@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.cjs.json",
+  /**
+   * this is pseudo config for test case's relative path resolution to `../src`, runs
+   * cjs config once more instead of manual copying to utilize incremental build.
+   */
+  "compilerOptions": {
+    "outDir": "../dist/src"
+  }
+}

package/src/tsconfig.esm.json

@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.base.json",
+  "compilerOptions": {
+    "module": "esnext",
+    "importHelpers": true,
+    "target": "es2015",
+    "outDir": "../dist/esm"
+  }
+}

package/src/tsconfig.esm5.json

@@ -0,0 +1,11 @@
+{
+  "extends": "./tsconfig.base.json",
+  "compilerOptions": {
+    "module": "esnext",
+    "importHelpers": true,
+    "target": "es5",
+    "downlevelIteration": true,
+    "outDir": "../dist/esm5"
+  },
+  "exclude": ["./internal/umd.ts"]
+}

package/src/tsconfig.esm5.rollup.json

@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.esm5.json",
+  "compilerOptions": {
+    "outDir": "../dist/esm5_for_rollup",
+    "noEmitHelpers": true
+  },
+  "exclude": []
+}