@net7/boilerplate-common 4.4.0 → 4.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2020/lib/services/communication-providers/apollo.provider.mjs +5 -2
- package/esm2020/lib/services/communication-providers/rest.provider.mjs +19 -6
- package/esm2020/lib/services/communication.service.mjs +18 -9
- package/fesm2015/net7-boilerplate-common.mjs +34 -14
- package/fesm2015/net7-boilerplate-common.mjs.map +1 -1
- package/fesm2020/net7-boilerplate-common.mjs +39 -14
- package/fesm2020/net7-boilerplate-common.mjs.map +1 -1
- package/lib/services/communication-providers/apollo.provider.d.ts +2 -1
- package/lib/services/communication-providers/rest.provider.d.ts +4 -1
- package/lib/services/communication.service.d.ts +25 -3
- package/package.json +1 -1
|
@@ -36,7 +36,10 @@ export class ApolloProvider {
|
|
|
36
36
|
source$ = this.http.get(providerConfig.baseUrl);
|
|
37
37
|
}
|
|
38
38
|
else {
|
|
39
|
-
source$ = this.http.post(providerConfig.baseUrl, { query: queryBody },
|
|
39
|
+
source$ = this.http.post(providerConfig.baseUrl, { query: queryBody }, {
|
|
40
|
+
...httpOptions,
|
|
41
|
+
responseType: 'json' // force to json
|
|
42
|
+
});
|
|
40
43
|
}
|
|
41
44
|
return source$.pipe(map((response) => response.data[queryName]));
|
|
42
45
|
}
|
|
@@ -84,4 +87,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImpo
|
|
|
84
87
|
providedIn: 'root',
|
|
85
88
|
}]
|
|
86
89
|
}], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: i2.ConfigurationService }]; } });
|
|
87
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
90
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"apollo.provider.js","sourceRoot":"","sources":["../../../../../../projects/n7-boilerplate-common/src/lib/services/communication-providers/apollo.provider.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport { HttpClient } from '@angular/common/http';\nimport { map } from 'rxjs/operators';\nimport { Observable } from 'rxjs';\nimport { CommunicationProvider } from './communication-provider.interface';\nimport { ConfigurationService } from '../configuration.service';\nimport { CommunicationOptions } from '../communication.service';\n\nconst DEFAULT_TREE_DEPTH = 15;\n\n@Injectable({\n  providedIn: 'root',\n})\nexport class ApolloProvider implements CommunicationProvider {\n  constructor(\n    private http: HttpClient,\n    private configuration: ConfigurationService,\n  ) {}\n\n  request$<T>(providerConfig, requestId: string, options: CommunicationOptions<T>) {\n    const { params, method, httpOptions } = options;\n    const treeDepth = this.configuration.get('treeDepth') || DEFAULT_TREE_DEPTH;\n    const config = providerConfig.config ? providerConfig.config(treeDepth) : {};\n    let query;\n\n    if (config && config[requestId]) {\n      query = config[requestId];\n    }\n\n    query = query || {};\n    const { queryName } = query;\n    let { queryBody } = query;\n\n    // config query control\n    if (!queryName || !queryBody) {\n      throw Error(`No config found for requestId '${requestId}'`);\n    }\n\n    if (params) {\n      const paramsStr = this.makeParamsStr(params);\n      queryBody = queryBody.replace('__PARAMS__', paramsStr);\n    } else {\n      queryBody = queryBody.replace('(__PARAMS__)', '');\n    }\n\n    let source$: Observable<any>;\n\n    if (method && method === 'GET') {\n      source$ = this.http.get(providerConfig.baseUrl);\n    } else {\n      source$ = this.http.post(\n        providerConfig.baseUrl,\n        { query: queryBody },\n        {\n          ...httpOptions,\n          responseType: 'json' // force to json\n        },\n      );\n    }\n\n    return source$.pipe(map((response: any) => response.data[queryName]));\n  }\n\n  private makeParamsStr(params) {\n    const paramsStr = [];\n    Object.keys(params).forEach((key) => {\n      if (Array.isArray(params[key])) {\n        const arrStr = [];\n        params[key].forEach((val) => {\n          if (typeof val === 'object') {\n            const subParamsStr = this.makeParamsStr(val);\n            arrStr.push(`{ ${subParamsStr} }`);\n          } else if (typeof val === 'number' || typeof val === 'boolean' || val === null) {\n            arrStr.push(`${val}`);\n          } else {\n            arrStr.push(`\"${val}\"`);\n          }\n        });\n        paramsStr.push(`${key}: [${arrStr.join(',')}]`);\n      } else if (typeof params[key] === 'object' && params[key]) {\n        const subParamsStr = this.makeParamsStr(params[key]);\n        paramsStr.push(`${key}: { ${subParamsStr} }`);\n      } else if (typeof params[key] === 'string' && key.indexOf('$') === 0) {\n        paramsStr.push(`${key.replace('$', '')}: ${params[key]}`);\n      } else if (typeof params[key] === 'number' || typeof params[key] === 'boolean' || params[key] === null) {\n        paramsStr.push(`${key}: ${params[key]}`);\n      } else {\n        paramsStr.push(`${key}: \"${params[key]}\"`);\n      }\n    });\n    return paramsStr.join(' ');\n  }\n}\n"]}
|
|
@@ -5,7 +5,7 @@ export class RestProvider {
|
|
|
5
5
|
constructor(http) {
|
|
6
6
|
this.http = http;
|
|
7
7
|
}
|
|
8
|
-
request$(providerConfig, requestId, options
|
|
8
|
+
request$(providerConfig, requestId, options) {
|
|
9
9
|
const { params, httpOptions, urlParams = '', } = options;
|
|
10
10
|
let { method } = options;
|
|
11
11
|
let point;
|
|
@@ -20,14 +20,27 @@ export class RestProvider {
|
|
|
20
20
|
if (!point) {
|
|
21
21
|
throw Error(`No config found for requestId "${requestId}"`);
|
|
22
22
|
}
|
|
23
|
-
|
|
24
|
-
|
|
23
|
+
const formattedUrl = this.getFormattedUrl(providerConfig.baseUrl, point, urlParams);
|
|
24
|
+
if (['POST', 'PUT', 'PATCH'].includes(method)) {
|
|
25
|
+
return this.http[method.toLowerCase()](formattedUrl, params, httpOptions);
|
|
25
26
|
}
|
|
26
|
-
if (
|
|
27
|
-
return this.http[method.toLowerCase()](
|
|
27
|
+
if (['GET', 'DELETE'].includes(method)) {
|
|
28
|
+
return this.http[method.toLowerCase()](formattedUrl, httpOptions);
|
|
28
29
|
}
|
|
29
30
|
throw Error(`Rest method ${method} not supported`);
|
|
30
31
|
}
|
|
32
|
+
getFormattedUrl(baseUrl, point, urlParams) {
|
|
33
|
+
if (typeof urlParams === 'string') {
|
|
34
|
+
return baseUrl + point + urlParams;
|
|
35
|
+
}
|
|
36
|
+
return baseUrl + this.parseUrlPlaceholders(point, urlParams);
|
|
37
|
+
}
|
|
38
|
+
parseUrlPlaceholders(source, placeholders) {
|
|
39
|
+
return source.replace(/{\s*\w+\s*}/g, (match) => {
|
|
40
|
+
const key = match.replace(/{|}/g, '').trim();
|
|
41
|
+
return placeholders[key] || match;
|
|
42
|
+
});
|
|
43
|
+
}
|
|
31
44
|
}
|
|
32
45
|
RestProvider.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: RestProvider, deps: [{ token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
33
46
|
RestProvider.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: RestProvider, providedIn: 'root' });
|
|
@@ -37,4 +50,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImpo
|
|
|
37
50
|
providedIn: 'root',
|
|
38
51
|
}]
|
|
39
52
|
}], ctorParameters: function () { return [{ type: i1.HttpClient }]; } });
|
|
40
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
53
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVzdC5wcm92aWRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL243LWJvaWxlcnBsYXRlLWNvbW1vbi9zcmMvbGliL3NlcnZpY2VzL2NvbW11bmljYXRpb24tcHJvdmlkZXJzL3Jlc3QucHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQzs7O0FBUTNDLE1BQU0sT0FBTyxZQUFZO0lBQ3ZCLFlBQ1UsSUFBZ0I7UUFBaEIsU0FBSSxHQUFKLElBQUksQ0FBWTtJQUN2QixDQUFDO0lBRUosUUFBUSxDQUFJLGNBQWMsRUFBRSxTQUFTLEVBQUUsT0FBZ0M7UUFDckUsTUFBTSxFQUNKLE1BQU0sRUFBRSxXQUFXLEVBQUUsU0FBUyxHQUFHLEVBQUUsR0FDcEMsR0FBRyxPQUFPLENBQUM7UUFDWixJQUFJLEVBQUUsTUFBTSxFQUFFLEdBQUcsT0FBTyxDQUFDO1FBQ3pCLElBQUksS0FBSyxDQUFDO1FBRVYsaUJBQWlCO1FBQ2pCLElBQUksQ0FBQyxNQUFNLEVBQUU7WUFBRSxNQUFNLEdBQUcsY0FBYyxDQUFDLGFBQWEsSUFBSSxLQUFLLENBQUM7U0FBRTtRQUVoRSxJQUFJLGNBQWMsQ0FBQyxNQUFNLElBQUksY0FBYyxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsRUFBRTtZQUM3RCxLQUFLLEdBQUcsY0FBYyxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsQ0FBQztTQUMxQztRQUVELHVCQUF1QjtRQUN2QixJQUFJLENBQUMsS0FBSyxFQUFFO1lBQ1YsTUFBTSxLQUFLLENBQUMsa0NBQWtDLFNBQVMsR0FBRyxDQUFDLENBQUM7U0FDN0Q7UUFFRCxNQUFNLFlBQVksR0FBRyxJQUFJLENBQUMsZUFBZSxDQUFDLGNBQWMsQ0FBQyxPQUFPLEVBQUUsS0FBSyxFQUFFLFNBQVMsQ0FBQyxDQUFDO1FBQ3BGLElBQUksQ0FBQyxNQUFNLEVBQUUsS0FBSyxFQUFFLE9BQU8sQ0FBQyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsRUFBRTtZQUM3QyxPQUFPLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLFdBQVcsRUFBRSxDQUFDLENBQ3BDLFlBQVksRUFDWixNQUFNLEVBQ04sV0FBVyxDQUNaLENBQUM7U0FDSDtRQUFDLElBQUksQ0FBQyxLQUFLLEVBQUUsUUFBUSxDQUFDLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxFQUFFO1lBQ3hDLE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsV0FBVyxFQUFFLENBQUMsQ0FDcEMsWUFBWSxFQUNaLFdBQVcsQ0FDWixDQUFDO1NBQ0g7UUFDRCxNQUFNLEtBQUssQ0FBQyxlQUFlLE1BQU0sZ0JBQWdCLENBQUMsQ0FBQztJQUNyRCxDQUFDO0lBRU8sZUFBZSxDQUFDLE9BQWUsRUFBRSxLQUFhLEVBQUUsU0FBMEI7UUFDaEYsSUFBSSxPQUFPLFNBQVMsS0FBSyxRQUFRLEVBQUU7WUFDakMsT0FBTyxPQUFPLEdBQUcsS0FBSyxHQUFHLFNBQVMsQ0FBQztTQUNwQztRQUNELE9BQU8sT0FBTyxHQUFHLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxLQUFLLEVBQUUsU0FBUyxDQUFDLENBQUM7SUFDL0QsQ0FBQztJQUVPLG9CQUFvQixDQUFDLE1BQWMsRUFBRSxZQUFvQjtRQUMvRCxPQUFPLE1BQU0sQ0FBQyxPQUFPLENBQUMsY0FBYyxFQUFFLENBQUMsS0FBSyxFQUFFLEVBQUU7WUFDOUMsTUFBTSxHQUFHLEdBQUcsS0FBSyxDQUFDLE9BQU8sQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDN0MsT0FBTyxZQUFZLENBQUMsR0FBRyxDQUFDLElBQUksS0FBSyxDQUFDO1FBQ3BDLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQzs7MEdBcERVLFlBQVk7OEdBQVosWUFBWSxjQUZYLE1BQU07NEZBRVAsWUFBWTtrQkFIeEIsVUFBVTttQkFBQztvQkFDVixVQUFVLEVBQUUsTUFBTTtpQkFDbkIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBIdHRwQ2xpZW50IH0gZnJvbSAnQGFuZ3VsYXIvY29tbW9uL2h0dHAnO1xuaW1wb3J0IHsgQ29tbXVuaWNhdGlvblByb3ZpZGVyIH0gZnJvbSAnLi9jb21tdW5pY2F0aW9uLXByb3ZpZGVyLmludGVyZmFjZSc7XG5pbXBvcnQgeyBDb21tdW5pY2F0aW9uT3B0aW9ucyB9IGZyb20gJy4uL2NvbW11bmljYXRpb24uc2VydmljZSc7XG5cbkBJbmplY3RhYmxlKHtcbiAgcHJvdmlkZWRJbjogJ3Jvb3QnLFxufSlcbmV4cG9ydCBjbGFzcyBSZXN0UHJvdmlkZXIgaW1wbGVtZW50cyBDb21tdW5pY2F0aW9uUHJvdmlkZXIge1xuICBjb25zdHJ1Y3RvcihcbiAgICBwcml2YXRlIGh0dHA6IEh0dHBDbGllbnQsXG4gICkge31cblxuICByZXF1ZXN0JDxUPihwcm92aWRlckNvbmZpZywgcmVxdWVzdElkLCBvcHRpb25zOiBDb21tdW5pY2F0aW9uT3B0aW9uczxUPikge1xuICAgIGNvbnN0IHtcbiAgICAgIHBhcmFtcywgaHR0cE9wdGlvbnMsIHVybFBhcmFtcyA9ICcnLFxuICAgIH0gPSBvcHRpb25zO1xuICAgIGxldCB7IG1ldGhvZCB9ID0gb3B0aW9ucztcbiAgICBsZXQgcG9pbnQ7XG5cbiAgICAvLyBkZWZhdWx0IG1ldGhvZFxuICAgIGlmICghbWV0aG9kKSB7IG1ldGhvZCA9IHByb3ZpZGVyQ29uZmlnLmRlZmF1bHRNZXRob2QgfHwgJ0dFVCc7IH1cblxuICAgIGlmIChwcm92aWRlckNvbmZpZy5jb25maWcgJiYgcHJvdmlkZXJDb25maWcuY29uZmlnW3JlcXVlc3RJZF0pIHtcbiAgICAgIHBvaW50ID0gcHJvdmlkZXJDb25maWcuY29uZmlnW3JlcXVlc3RJZF07XG4gICAgfVxuXG4gICAgLy8gY29uZmlnIHBvaW50IGNvbnRyb2xcbiAgICBpZiAoIXBvaW50KSB7XG4gICAgICB0aHJvdyBFcnJvcihgTm8gY29uZmlnIGZvdW5kIGZvciByZXF1ZXN0SWQgXCIke3JlcXVlc3RJZH1cImApO1xuICAgIH1cblxuICAgIGNvbnN0IGZvcm1hdHRlZFVybCA9IHRoaXMuZ2V0Rm9ybWF0dGVkVXJsKHByb3ZpZGVyQ29uZmlnLmJhc2VVcmwsIHBvaW50LCB1cmxQYXJhbXMpO1xuICAgIGlmIChbJ1BPU1QnLCAnUFVUJywgJ1BBVENIJ10uaW5jbHVkZXMobWV0aG9kKSkge1xuICAgICAgcmV0dXJuIHRoaXMuaHR0cFttZXRob2QudG9Mb3dlckNhc2UoKV0oXG4gICAgICAgIGZvcm1hdHRlZFVybCxcbiAgICAgICAgcGFyYW1zLFxuICAgICAgICBodHRwT3B0aW9uc1xuICAgICAgKTtcbiAgICB9IGlmIChbJ0dFVCcsICdERUxFVEUnXS5pbmNsdWRlcyhtZXRob2QpKSB7XG4gICAgICByZXR1cm4gdGhpcy5odHRwW21ldGhvZC50b0xvd2VyQ2FzZSgpXShcbiAgICAgICAgZm9ybWF0dGVkVXJsLFxuICAgICAgICBodHRwT3B0aW9uc1xuICAgICAgKTtcbiAgICB9XG4gICAgdGhyb3cgRXJyb3IoYFJlc3QgbWV0aG9kICR7bWV0aG9kfSBub3Qgc3VwcG9ydGVkYCk7XG4gIH1cblxuICBwcml2YXRlIGdldEZvcm1hdHRlZFVybChiYXNlVXJsOiBzdHJpbmcsIHBvaW50OiBzdHJpbmcsIHVybFBhcmFtczogc3RyaW5nIHwgb2JqZWN0KSB7XG4gICAgaWYgKHR5cGVvZiB1cmxQYXJhbXMgPT09ICdzdHJpbmcnKSB7XG4gICAgICByZXR1cm4gYmFzZVVybCArIHBvaW50ICsgdXJsUGFyYW1zO1xuICAgIH1cbiAgICByZXR1cm4gYmFzZVVybCArIHRoaXMucGFyc2VVcmxQbGFjZWhvbGRlcnMocG9pbnQsIHVybFBhcmFtcyk7XG4gIH1cblxuICBwcml2YXRlIHBhcnNlVXJsUGxhY2Vob2xkZXJzKHNvdXJjZTogc3RyaW5nLCBwbGFjZWhvbGRlcnM6IG9iamVjdCkge1xuICAgIHJldHVybiBzb3VyY2UucmVwbGFjZSgve1xccypcXHcrXFxzKn0vZywgKG1hdGNoKSA9PiB7XG4gICAgICBjb25zdCBrZXkgPSBtYXRjaC5yZXBsYWNlKC97fH0vZywgJycpLnRyaW0oKTtcbiAgICAgIHJldHVybiBwbGFjZWhvbGRlcnNba2V5XSB8fCBtYXRjaDtcbiAgICB9KTtcbiAgfVxufVxuIl19
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Injectable } from '@angular/core';
|
|
2
2
|
import { catchError } from 'rxjs/operators';
|
|
3
|
-
import {
|
|
3
|
+
import { EMPTY } from 'rxjs';
|
|
4
4
|
import * as i0 from "@angular/core";
|
|
5
5
|
import * as i1 from "./configuration.service";
|
|
6
6
|
import * as i2 from "./communication-providers/apollo.provider";
|
|
@@ -18,19 +18,28 @@ export class CommunicationService {
|
|
|
18
18
|
throw Error('No communications.defaultProvider setted in config');
|
|
19
19
|
}
|
|
20
20
|
}
|
|
21
|
-
request$(requestId, options
|
|
21
|
+
request$(requestId, options, provider) {
|
|
22
22
|
const activeProvider = provider || this.defaultProvider;
|
|
23
23
|
const activeProviderConfig = this.communicationConfig.providers[activeProvider];
|
|
24
24
|
if (!activeProviderConfig) {
|
|
25
25
|
throw Error(`There is no config for "${activeProvider}" provider`);
|
|
26
26
|
}
|
|
27
|
-
// provider.type
|
|
27
|
+
// provider.type check for retrocompatibility
|
|
28
28
|
const activeProviderType = activeProviderConfig.type || activeProvider;
|
|
29
29
|
if (!this[activeProviderType]) {
|
|
30
30
|
throw Error(`There is no "${activeProviderType}" provider type`);
|
|
31
31
|
}
|
|
32
|
-
const
|
|
33
|
-
|
|
32
|
+
const requestOptions = options || {};
|
|
33
|
+
// adding query params
|
|
34
|
+
// to http client httpoptions params
|
|
35
|
+
if (requestOptions.queryParams) {
|
|
36
|
+
requestOptions.httpOptions = {
|
|
37
|
+
...(requestOptions.httpOptions || {}),
|
|
38
|
+
params: requestOptions.queryParams
|
|
39
|
+
};
|
|
40
|
+
}
|
|
41
|
+
const { onError } = options || {};
|
|
42
|
+
return this[activeProviderType].request$(activeProviderConfig, requestId, requestOptions)
|
|
34
43
|
.pipe(catchError((error) => this.handleError(error, onError)));
|
|
35
44
|
}
|
|
36
45
|
handleError(error, onError) {
|
|
@@ -40,7 +49,7 @@ export class CommunicationService {
|
|
|
40
49
|
else {
|
|
41
50
|
console.warn('No error handler for communication request', error);
|
|
42
51
|
}
|
|
43
|
-
return
|
|
52
|
+
return EMPTY;
|
|
44
53
|
}
|
|
45
54
|
getUrl(requestId, provider) {
|
|
46
55
|
const activeProvider = provider || this.defaultProvider;
|
|
@@ -48,12 +57,12 @@ export class CommunicationService {
|
|
|
48
57
|
if (!activeProviderConfig) {
|
|
49
58
|
throw Error(`There is no config for "${activeProvider}" provider`);
|
|
50
59
|
}
|
|
51
|
-
const baseUrl = activeProviderConfig
|
|
60
|
+
const { baseUrl } = activeProviderConfig;
|
|
52
61
|
if (!requestId) {
|
|
53
62
|
return baseUrl;
|
|
54
63
|
}
|
|
55
64
|
if (!activeProviderConfig.config[requestId]) {
|
|
56
|
-
throw Error(`There is no config for "${requestId}"
|
|
65
|
+
throw Error(`There is no config for "${requestId}"`);
|
|
57
66
|
}
|
|
58
67
|
return baseUrl + activeProviderConfig.config[requestId];
|
|
59
68
|
}
|
|
@@ -66,4 +75,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImpo
|
|
|
66
75
|
providedIn: 'root',
|
|
67
76
|
}]
|
|
68
77
|
}], ctorParameters: function () { return [{ type: i1.ConfigurationService }, { type: i2.ApolloProvider }, { type: i3.RestProvider }]; } });
|
|
69
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
78
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"communication.service.js","sourceRoot":"","sources":["../../../../../projects/n7-boilerplate-common/src/lib/services/communication.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport { catchError } from 'rxjs/operators';\nimport { Observable, EMPTY } from 'rxjs';\nimport {\n  HttpContext, HttpHeaders, HttpParams\n} from '@angular/common/http';\nimport { ConfigurationService } from './configuration.service';\nimport { ApolloProvider } from './communication-providers/apollo.provider';\nimport { RestProvider } from './communication-providers/rest.provider';\nimport { ConfigCommonCommunication } from '../config-types';\n\nexport type CommunicationQueryParams = HttpParams | {\n  [param: string]: string | number | boolean | ReadonlyArray<string | number | boolean>;\n};\n\nexport type CommunicationHttpOptions = {\n  body?: any;\n  context?: HttpContext;\n  responseType?: 'arraybuffer' | 'blob' | 'json' | 'text';\n  withCredentials?: boolean;\n  params?: CommunicationQueryParams;\n  headers?: HttpHeaders | {\n    [header: string]: string | string[];\n  };\n}\n\nexport type CommunicationOptions<U> = {\n  method?: 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE';\n  params?: U;\n  urlParams?: string | object;\n  queryParams?: CommunicationQueryParams;\n  httpOptions?: CommunicationHttpOptions;\n  onError?: (err) => void;\n}\n\n@Injectable({\n  providedIn: 'root',\n})\nexport class CommunicationService {\n  private defaultProvider: string;\n\n  private communicationConfig: ConfigCommonCommunication;\n\n  constructor(\n    private config: ConfigurationService,\n    private apollo: ApolloProvider,\n    private rest: RestProvider,\n  ) {\n    try {\n      this.communicationConfig = this.config.get('communication');\n      this.defaultProvider = this.communicationConfig.defaultProvider;\n    } catch (err) {\n      throw Error('No communications.defaultProvider setted in config');\n    }\n  }\n\n  request$<T = any, U = any>(\n    requestId: string,\n    options?: CommunicationOptions<U>,\n    provider?: string\n  ): Observable<T> {\n    const activeProvider = provider || this.defaultProvider;\n    const activeProviderConfig = this.communicationConfig.providers[activeProvider];\n\n    if (!activeProviderConfig) {\n      throw Error(`There is no config for \"${activeProvider}\" provider`);\n    }\n\n    // provider.type check for retrocompatibility\n    const activeProviderType = activeProviderConfig.type || activeProvider;\n\n    if (!this[activeProviderType]) {\n      throw Error(`There is no \"${activeProviderType}\" provider type`);\n    }\n\n    const requestOptions = options || {};\n\n    // adding query params\n    // to http client httpoptions params\n    if (requestOptions.queryParams) {\n      requestOptions.httpOptions = {\n        ...(requestOptions.httpOptions || {}),\n        params: requestOptions.queryParams\n      };\n    }\n\n    const { onError } = options || {};\n    return this[activeProviderType].request$<T>(activeProviderConfig, requestId, requestOptions)\n      .pipe(\n        catchError((error) => this.handleError(error, onError)),\n      );\n  }\n\n  handleError(error, onError: (err) => void): Observable<any> {\n    if (onError) {\n      onError(error);\n    } else {\n      console.warn('No error handler for communication request', error);\n    }\n\n    return EMPTY;\n  }\n\n  getUrl(requestId?, provider?) {\n    const activeProvider = provider || this.defaultProvider;\n    const activeProviderConfig = this.communicationConfig.providers[activeProvider];\n\n    if (!activeProviderConfig) {\n      throw Error(`There is no config for \"${activeProvider}\" provider`);\n    }\n\n    const { baseUrl } = activeProviderConfig;\n\n    if (!requestId) {\n      return baseUrl;\n    }\n\n    if (!activeProviderConfig.config[requestId]) {\n      throw Error(`There is no config for \"${requestId}\"`);\n    }\n    return baseUrl + activeProviderConfig.config[requestId];\n  }\n}\n"]}
|
|
@@ -6,7 +6,7 @@ import * as i1 from '@angular/common/http';
|
|
|
6
6
|
import { HttpClientModule } from '@angular/common/http';
|
|
7
7
|
import * as i6 from '@net7/components';
|
|
8
8
|
import { DvComponentsLibModule } from '@net7/components';
|
|
9
|
-
import { ReplaySubject,
|
|
9
|
+
import { ReplaySubject, EMPTY, Subject, of } from 'rxjs';
|
|
10
10
|
import { map, catchError, takeUntil, filter, tap } from 'rxjs/operators';
|
|
11
11
|
import { LayoutBuilder, LayoutDataSource, EventHandler, DataSource, _t } from '@net7/core';
|
|
12
12
|
import { hideAll } from 'tippy.js';
|
|
@@ -145,7 +145,8 @@ class ApolloProvider {
|
|
|
145
145
|
source$ = this.http.get(providerConfig.baseUrl);
|
|
146
146
|
}
|
|
147
147
|
else {
|
|
148
|
-
source$ = this.http.post(providerConfig.baseUrl, { query: queryBody }, httpOptions)
|
|
148
|
+
source$ = this.http.post(providerConfig.baseUrl, { query: queryBody }, Object.assign(Object.assign({}, httpOptions), { responseType: 'json' // force to json
|
|
149
|
+
}));
|
|
149
150
|
}
|
|
150
151
|
return source$.pipe(map((response) => response.data[queryName]));
|
|
151
152
|
}
|
|
@@ -198,7 +199,7 @@ class RestProvider {
|
|
|
198
199
|
constructor(http) {
|
|
199
200
|
this.http = http;
|
|
200
201
|
}
|
|
201
|
-
request$(providerConfig, requestId, options
|
|
202
|
+
request$(providerConfig, requestId, options) {
|
|
202
203
|
const { params, httpOptions, urlParams = '', } = options;
|
|
203
204
|
let { method } = options;
|
|
204
205
|
let point;
|
|
@@ -213,14 +214,27 @@ class RestProvider {
|
|
|
213
214
|
if (!point) {
|
|
214
215
|
throw Error(`No config found for requestId "${requestId}"`);
|
|
215
216
|
}
|
|
216
|
-
|
|
217
|
-
|
|
217
|
+
const formattedUrl = this.getFormattedUrl(providerConfig.baseUrl, point, urlParams);
|
|
218
|
+
if (['POST', 'PUT', 'PATCH'].includes(method)) {
|
|
219
|
+
return this.http[method.toLowerCase()](formattedUrl, params, httpOptions);
|
|
218
220
|
}
|
|
219
|
-
if (
|
|
220
|
-
return this.http[method.toLowerCase()](
|
|
221
|
+
if (['GET', 'DELETE'].includes(method)) {
|
|
222
|
+
return this.http[method.toLowerCase()](formattedUrl, httpOptions);
|
|
221
223
|
}
|
|
222
224
|
throw Error(`Rest method ${method} not supported`);
|
|
223
225
|
}
|
|
226
|
+
getFormattedUrl(baseUrl, point, urlParams) {
|
|
227
|
+
if (typeof urlParams === 'string') {
|
|
228
|
+
return baseUrl + point + urlParams;
|
|
229
|
+
}
|
|
230
|
+
return baseUrl + this.parseUrlPlaceholders(point, urlParams);
|
|
231
|
+
}
|
|
232
|
+
parseUrlPlaceholders(source, placeholders) {
|
|
233
|
+
return source.replace(/{\s*\w+\s*}/g, (match) => {
|
|
234
|
+
const key = match.replace(/{|}/g, '').trim();
|
|
235
|
+
return placeholders[key] || match;
|
|
236
|
+
});
|
|
237
|
+
}
|
|
224
238
|
}
|
|
225
239
|
RestProvider.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: RestProvider, deps: [{ token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
226
240
|
RestProvider.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: RestProvider, providedIn: 'root' });
|
|
@@ -244,19 +258,25 @@ class CommunicationService {
|
|
|
244
258
|
throw Error('No communications.defaultProvider setted in config');
|
|
245
259
|
}
|
|
246
260
|
}
|
|
247
|
-
request$(requestId, options
|
|
261
|
+
request$(requestId, options, provider) {
|
|
248
262
|
const activeProvider = provider || this.defaultProvider;
|
|
249
263
|
const activeProviderConfig = this.communicationConfig.providers[activeProvider];
|
|
250
264
|
if (!activeProviderConfig) {
|
|
251
265
|
throw Error(`There is no config for "${activeProvider}" provider`);
|
|
252
266
|
}
|
|
253
|
-
// provider.type
|
|
267
|
+
// provider.type check for retrocompatibility
|
|
254
268
|
const activeProviderType = activeProviderConfig.type || activeProvider;
|
|
255
269
|
if (!this[activeProviderType]) {
|
|
256
270
|
throw Error(`There is no "${activeProviderType}" provider type`);
|
|
257
271
|
}
|
|
258
|
-
const
|
|
259
|
-
|
|
272
|
+
const requestOptions = options || {};
|
|
273
|
+
// adding query params
|
|
274
|
+
// to http client httpoptions params
|
|
275
|
+
if (requestOptions.queryParams) {
|
|
276
|
+
requestOptions.httpOptions = Object.assign(Object.assign({}, (requestOptions.httpOptions || {})), { params: requestOptions.queryParams });
|
|
277
|
+
}
|
|
278
|
+
const { onError } = options || {};
|
|
279
|
+
return this[activeProviderType].request$(activeProviderConfig, requestId, requestOptions)
|
|
260
280
|
.pipe(catchError((error) => this.handleError(error, onError)));
|
|
261
281
|
}
|
|
262
282
|
handleError(error, onError) {
|
|
@@ -266,7 +286,7 @@ class CommunicationService {
|
|
|
266
286
|
else {
|
|
267
287
|
console.warn('No error handler for communication request', error);
|
|
268
288
|
}
|
|
269
|
-
return
|
|
289
|
+
return EMPTY;
|
|
270
290
|
}
|
|
271
291
|
getUrl(requestId, provider) {
|
|
272
292
|
const activeProvider = provider || this.defaultProvider;
|
|
@@ -274,12 +294,12 @@ class CommunicationService {
|
|
|
274
294
|
if (!activeProviderConfig) {
|
|
275
295
|
throw Error(`There is no config for "${activeProvider}" provider`);
|
|
276
296
|
}
|
|
277
|
-
const baseUrl = activeProviderConfig
|
|
297
|
+
const { baseUrl } = activeProviderConfig;
|
|
278
298
|
if (!requestId) {
|
|
279
299
|
return baseUrl;
|
|
280
300
|
}
|
|
281
301
|
if (!activeProviderConfig.config[requestId]) {
|
|
282
|
-
throw Error(`There is no config for "${requestId}"
|
|
302
|
+
throw Error(`There is no config for "${requestId}"`);
|
|
283
303
|
}
|
|
284
304
|
return baseUrl + activeProviderConfig.config[requestId];
|
|
285
305
|
}
|