bx-rest 0.0.5 → 0.0.7

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

@@ -1,67 +0,0 @@
-import { Observable, throwError } from 'rxjs'
-import { catchError } from 'rxjs/operators'
-import { HttpParams } from '@angular/common/http'
-import { iHttpParamSettings } from 'bx-rest/src/typification/rest/settings'
-import { BaseHttp } from 'bx-rest/src/services/http/base/base'
-
-export class BaseHttpServices extends BaseHttp {
-
-    public httpGet<T>(
-        url: string,
-        params = {},
-        textError = '',
-        settings: iHttpParamSettings = this.defSettings
-    ): Observable<T | undefined> {
-        return this.http.get<T | undefined>(url, {
-            params: this.getHttpParamsGet(params, new HttpParams(), false, [], settings)
-        }).pipe(
-            catchError(err => {
-                if (!textError.length && err.error.error_description) {
-                    textError = err.error.error_description
-                }
-
-                this.snackBar.error('Ошибка: ' + textError)
-                return throwError(() => err)
-            })
-        )
-    }
-
-    public httpPost<T>(url: string,
-                       params: any = {},
-                       textError = '',
-                       settings: iHttpParamSettings = this.defSettings
-    ): Observable<T | undefined> {
-        return this.http.post<T | undefined>(
-            url,
-            this.getHttpParamsPost(params, new FormData(), false, [], settings)
-        ).pipe(
-            catchError(err => {
-                if (!textError.length && err.error.error_description) {
-                    textError = err.error.error_description
-                }
-
-                this.snackBar.error('Ошибка: ' + textError)
-                console.error(err)
-                return throwError(() => err)
-            })
-        )
-    }
-
-    // TODO: доделать
-    // httpPostBaseWithFile<T>(url: string,
-    //                         params: any = {},
-    //                         textError = ''): Observable<T | undefined> {
-    //     let searchFile = Object.values(params).find((i: any) => i instanceof Blob)
-    //     if (searchFile) {
-    //         return this.http.post<T | undefined>(url, this.getHttpParamsPost(params)).pipe(
-    //             catchError(err => {
-    //                 this.snackBar.error('Ошибка: ' + textError)
-    //                 console.error(err)
-    //                 return throwError(() => err)
-    //             })
-    //         )
-    //     } else {
-    //         return this.httpPost(url, params, textError)
-    //     }
-    // }
-}

package/src/services/http/http.ts

@@ -1,182 +0,0 @@
-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 '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 'bx-rest/src/typification/rest/settings'
-import {
-    iBatchRequestAnswer, iBatchRequestParam,
-    iBatchRequestParamArr,
-    iBatchRequestParamHttp, keyBatch
-} from 'bx-rest/src/typification/rest/batch/batchRequestParam'
-import flatten from 'just-flatten-it'
-import { BaseHttpServices } from './base/http'
-
-@Injectable({
-    providedIn: 'root'
-})
-export default class HttpServices extends BaseHttpServices {
-
-    constructor(http: HttpClient, snackBar: SnackBarService, public session: SessionKeyServices) {
-        super(http, snackBar)
-    }
-
-    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/sessionKey.ts

@@ -1,205 +0,0 @@
-import { Injectable } from '@angular/core'
-import Cookies from 'bx-rest/src/services/vanilla/сookies'
-import { Store } from '@ngrx/store'
-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 'bx-rest/src/store/auth'
-import { map } from 'rxjs/operators'
-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
-    authData$: Observable<saveApplicationAuth>
-    authData: saveApplicationAuth | undefined
-    subscribe = {
-        authData: new Subscription()
-    }
-
-    constructor(
-        public store: Store<{ auth: saveApplicationAuth }>,
-        private route: ActivatedRoute,
-        public BxApiLib: RestServices,
-    ) {
-        super()
-        this.authData$ = this.store.select('auth')
-        this.authData$.subscribe(authData => {
-            if ((authData && !authData.access_token.length) || !authData) {
-                // получаем токен по собственным каналом (в битриксе приложение trace:apps.trace)
-                window.addEventListener('message', (event: MessageEvent) => {
-                    if (event.origin !== window.origin) { // проверяем что это не наше сообщение (с текущего приложения)
-                        if (event.data && event.data.param) {
-                            if (typeof event.data.param === 'string') {
-                                event.data.param = JSON.parse(event.data.param)
-                            }
-
-                            let save: saveApplicationAuthPath = {}
-
-                            if (event.data.param.access_token) {
-                                let param = event.data.param;
-                                save.access_token = event.data.param.access_token
-                                save = {
-                                    access_token: (param.access_token) ? param.access_token : undefined,
-                                    client_endpoint: (param.client_endpoint) ? param.client_endpoint : undefined,
-                                    domain: (param.domain) ? param.domain : undefined,
-                                    expires: (param.expires) ? param.expires : undefined,
-                                    expires_in: (param.expires_in) ? param.expires_in : undefined,
-                                    member_id: (param.member_id) ? param.member_id : undefined,
-                                    refresh_token: (param.refresh_token) ? param.refresh_token : undefined,
-                                    scope: (param.scope) ? param.scope : undefined,
-                                    server_endpoint: (param.server_endpoint) ? param.server_endpoint : undefined,
-                                    status: (param.status) ? param.status : undefined,
-                                    user_id: (param.user_id) ? param.user_id : undefined,
-                                    type: (param.type) ? param.type : undefined,
-                                }
-                            }
-
-                            if (Object.keys(save).length && save.access_token) {
-                                this.store.dispatch(saveAccessToken(save))
-                                this.subscribeAll()
-                            }
-                        }
-                    }
-                })
-
-                this.subscribe.authData = this.route.queryParamMap
-                    .pipe(
-                        filter(param =>
-                            param.has('AUTH_ID')
-                            || param.has('access_token')
-                            || param.has('REFRESH_ID')
-                            || param.has('DOMAIN')
-                        )
-                    )
-                    .subscribe((param: ParamMap) => {
-                        let save: saveApplicationAuthPath = {}
-                        if (param.has('AUTH_ID') && !authData.access_token.length) {
-                            const get = param.get('AUTH_ID')
-                            if (get) {
-                                Cookies.set('auth', get) // потом убрать
-                                save.access_token = get
-                            }
-                        }
-
-                        if (param.has('access_token') && !authData.access_token.length) {
-                            const get = param.get('access_token')
-                            if (get) {
-                                Cookies.set('auth', get) // потом убрать
-                                save.access_token = get
-                            }
-                        }
-
-                        if (param.has('REFRESH_ID') && !authData.refresh_token.length) {
-                            const get = param.get('REFRESH_ID')
-                            if (get) {
-                                save.refresh_token = get
-                            }
-                        }
-
-                        if (param.has('DOMAIN') && !authData.domain.length) {
-                            const get = param.get('DOMAIN')
-                            if (get) {
-                                save.domain = get
-                            }
-                        }
-                        if (Object.keys(save).length && save.access_token) {
-                            this.store.dispatch(saveAccessToken(save))
-                            this.subscribeAll()
-                        } else {
-                            // если битрикс не шлёт нужные мне параметры на прямую
-                            // просим их мне отдать так как описано это в документации
-                            let f = () => {
-                                if (this.BxApiLib.BX24) {
-                                    const initDate = this.BxApiLib.BX24.getAuth()
-                                    this.store.dispatch(saveAccessToken(initDate))
-                                }
-                            }
-
-                            this.BxApiLib.init(f)
-                        }
-
-                    })
-            } else if (this.getAuth().length) {
-                this.authHave = true
-            }
-
-            this.authData = authData
-        })
-    }
-
-    subscribeAll() {
-        this.subscribe.authData.unsubscribe()
-    }
-
-    getAuth(): string {
-        if ((<any>window).BX && (<any>window).BX.bitrix_sessid()) {
-            return (<any>window).BX.bitrix_sessid()
-        } else if (this.getSessid().length) {
-            let str = this.getSessid()
-            return (str) ? str : ''
-        } else {
-            return Cookies.get('auth')
-        }
-    }
-
-    getKeyAuth(): IKeyAuth {
-        if ((<any>window).BX && (<any>window).BX.bitrix_sessid()
-            || this.getSessid().length) {
-            return 'sessid'
-        } else {
-            return 'auth'
-        }
-    }
-
-    getSessid() {
-        const check = new URLSearchParams(document.location.search).get('sessid')
-        if (check) {
-            LocalStorage.set('sessid', check)
-            return check
-        } else if (LocalStorage.get('sessid')) {
-            return LocalStorage.get('sessid')
-        }
-        return ''
-    }
-
-    setAuthParams<T>(params: any): boolean {
-        const keyAuth = this.getKeyAuth()
-        if (params[keyAuth]) {
-            return true
-        } else if (keyAuth) {
-            params[keyAuth] = this.getAuth()
-            return true
-        }
-        return false
-    }
-
-    getAuthParams(): Observable<string | undefined> {
-        // if (env.production && !env.component) {
-            return this.authData$.pipe(
-                take(1),
-                map(v => (v) ? v.access_token : undefined)
-            )
-        // } else {
-        //     return of(this.getAuth())
-        // }
-    }
-
-    getBaseUrl(): Observable<string | undefined> {
-            return this.authData$.pipe(
-                map(v => (v && v.domain) ? this.prepareBaseAddress(v.domain, 'b24.trace-studio.com') : undefined)
-            )
-    }
-
-    // getHomeUrl(): string {
-    //     return env.urls.home
-    // }
-}

package/src/services/map/base.ts

@@ -1,8 +0,0 @@
-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

@@ -1,82 +0,0 @@
-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

@@ -1,40 +0,0 @@
-/**
- * Сервис для вывода сообщений пользователю
- * TODO: логирование
- */
-import { Injectable } from '@angular/core'
-import { ToastMessageComponent } from 'bx-rest/src/services/snack-bar/toast-message/toast-message.component'
-import { MatSnackBar } from '@angular/material/snack-bar'
-
-@Injectable({
-  providedIn: 'root'
-})
-export default class SnackBarService {
-
-  constructor(private snackBar: MatSnackBar) {
-  }
-
-  error(message: string, sec = 12): void {
-    this.standardMessage(message, sec, 'error')
-  }
-
-  warning(message: string, sec = 7): void {
-    this.standardMessage(message, sec, 'warning');
-  }
-
-  success(message: string, sec = 7): void {
-    this.standardMessage(message, sec, 'success');
-  }
-
-  standardMessage(message: string, sec = 5, name = 'error'): void{
-    this.snackBar.open(message);
-    this.snackBar.openFromComponent(ToastMessageComponent, {
-      duration: sec * 1000,
-      data: {
-        message: message,
-        type: name
-      },
-      panelClass: name + '-box'
-    });
-  }
-}

package/src/services/snack-bar/toast-message/toast-message.component.html

@@ -1,13 +0,0 @@
-<div class="w-100 d-flex">
-  <span matSnackBarLabel [class]="getClass()">
-  {{ data.message }}
-</span>
-  <span matSnackBarActions [class]="getClass()">
-  <button mat-button matSnackBarAction (click)="snackBarRef.dismissWithAction()">
-    <mat-icon>
-      close
-    </mat-icon>
-  </button>
-</span>
-</div>
-

package/src/services/snack-bar/toast-message/toast-message.component.scss

@@ -1,53 +0,0 @@
-:host {
-
-  display: flex;
-  background-color: red;
-
-  .mdc-snackbar__surface{
-    padding: 0;
-    margin: 0;
-  }
-  .error-message {
-    color: red;
-  }
-  &.error-box {
-    background-color: #eec1c1;
-
-    .error-message {
-      color: red;
-    }
-  }
-}
-
-mat-snack-bar-container.mdc-snackbar {
-
-  &.error-box {
-    .mdc-snackbar__surface{
-      background-color: #eec1c1;
-    }
-
-    .error-message {
-      color: red;
-    }
-  }
-
-  &.warning-box {
-    .mdc-snackbar__surface {
-      background-color: #f0f2b9;
-    }
-
-    .warning-message {
-      color: #15140f;
-    }
-  }
-
-  &.success-box {
-    .mdc-snackbar__surface {
-      background-color: #daf7d1;
-    }
-
-    .success-message {
-      color: #423f31;
-    }
-  }
-}

package/src/services/snack-bar/toast-message/toast-message.component.ts

@@ -1,26 +0,0 @@
-import { Component, inject, Inject, ViewEncapsulation } from '@angular/core'
-import { MAT_SNACK_BAR_DATA, MatSnackBarRef } from '@angular/material/snack-bar'
-
-@Component({
-  selector: 'app-view',
-  templateUrl: './toast-message.component.html',
-  styleUrls: ['./toast-message.component.scss'],
-  encapsulation: ViewEncapsulation.None,
-})
-export class ToastMessageComponent {
-
-  snackBarRef = inject(MatSnackBarRef)
-
-  constructor(@Inject(MAT_SNACK_BAR_DATA) public data: { message: string, type: 'error' | 'warning' | 'success' }) {
-  }
-
-  getClass():string{
-    switch (this.data.type){
-      case 'error':
-      case 'warning':
-      case 'success':
-        return this.data.type + '-message';
-    }
-    return '';
-  }
-}