@von-development-studio/angular-rest-service 1.0.6 → 2.0.0-SNAPSHOT

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.
Files changed (36) hide show
  1. package/esm2020/lib/model/von-error-response.model.mjs +2 -0
  2. package/esm2020/lib/model/von-error-rest-interceptor.model.mjs +2 -0
  3. package/esm2020/lib/model/von-http-options.model.mjs +2 -0
  4. package/esm2020/lib/model/von-page-response.model.mjs +2 -0
  5. package/esm2020/lib/model/von-rest-definition.type.mjs +2 -0
  6. package/esm2020/lib/von-rest-interceptor.service.mjs +62 -0
  7. package/esm2020/lib/von-rest.service.mjs +97 -0
  8. package/{esm2015/public-api.js → esm2020/public-api.mjs} +2 -2
  9. package/{esm2015/von-development-studio-angular-rest-service.js → esm2020/von-development-studio-angular-rest-service.mjs} +1 -1
  10. package/fesm2015/von-development-studio-angular-rest-service.mjs +160 -0
  11. package/fesm2015/von-development-studio-angular-rest-service.mjs.map +1 -0
  12. package/{fesm2015/von-development-studio-angular-rest-service.js → fesm2020/von-development-studio-angular-rest-service.mjs} +70 -56
  13. package/fesm2020/von-development-studio-angular-rest-service.mjs.map +1 -0
  14. package/lib/model/von-error-response.model.d.ts +0 -0
  15. package/lib/model/von-error-rest-interceptor.model.d.ts +1 -0
  16. package/lib/model/von-http-options.model.d.ts +0 -0
  17. package/lib/model/von-page-response.model.d.ts +0 -0
  18. package/lib/model/von-rest-definition.type.d.ts +25 -0
  19. package/lib/von-rest-interceptor.service.d.ts +5 -1
  20. package/lib/von-rest.service.d.ts +14 -16
  21. package/package.json +24 -12
  22. package/public-api.d.ts +1 -1
  23. package/von-development-studio-angular-rest-service.d.ts +1 -0
  24. package/CHANGELOG.md +0 -7
  25. package/bundles/von-development-studio-angular-rest-service.umd.js +0 -162
  26. package/bundles/von-development-studio-angular-rest-service.umd.js.map +0 -1
  27. package/bundles/von-development-studio-angular-rest-service.umd.min.js +0 -2
  28. package/bundles/von-development-studio-angular-rest-service.umd.min.js.map +0 -1
  29. package/esm2015/lib/model/von-error-response.model.js +0 -2
  30. package/esm2015/lib/model/von-error-rest-interceptor.model.js +0 -2
  31. package/esm2015/lib/model/von-http-options.model.js +0 -2
  32. package/esm2015/lib/model/von-page-response.model.js +0 -2
  33. package/esm2015/lib/von-rest-interceptor.service.js +0 -55
  34. package/esm2015/lib/von-rest.service.js +0 -90
  35. package/fesm2015/von-development-studio-angular-rest-service.js.map +0 -1
  36. package/von-development-studio-angular-rest-service.metadata.json +0 -1
@@ -0,0 +1 @@
1
+ {"version":3,"file":"von-development-studio-angular-rest-service.mjs","sources":["../../../projects/angular-rest-service/src/lib/von-rest-interceptor.service.ts","../../../projects/angular-rest-service/src/lib/von-rest.service.ts","../../../projects/angular-rest-service/src/von-development-studio-angular-rest-service.ts"],"sourcesContent":["import { HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest, HttpResponse } from '@angular/common/http';\nimport { Router } from '@angular/router';\nimport { Observable, throwError } from 'rxjs';\nimport { catchError, map } from 'rxjs/operators';\nimport { VonErrorRestInterceptorModel } from './model/von-error-rest-interceptor.model';\n\nexport abstract class VonRestInterceptorService implements HttpInterceptor {\n protected consoleDebug = false;\n protected errorResponseUnknown = 'Unknown Error';\n protected errorResponseForbidden = 'Forbidden Error';\n protected urlWhoAmI = 'api/who-am-i';\n protected redirectOn403 = true;\n protected redirect403Url = ['403'];\n\n constructor(protected router: Router) {}\n\n intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {\n return next.handle(request).pipe(map(this.mapEvent), catchError(this.catchError));\n }\n\n protected postHttpRequest = () => {};\n\n protected mapEvent = (event: HttpEvent<any>) => {\n if (event instanceof HttpResponse) {\n if (event.status === 200 || event.status === 204) {\n this.postHttpRequest();\n return event;\n }\n if (event.status !== 200) {\n const error: VonErrorRestInterceptorModel = {\n status: event.status,\n message: event.statusText,\n body: event.body,\n };\n if (this.consoleDebug) {\n console.error('[ErrorWS]: ', error);\n }\n throw error;\n }\n }\n return event;\n };\n\n protected catchError = (errorResponse: HttpErrorResponse) => {\n if (this.consoleDebug) {\n console.error('[Fatal]: ', errorResponse);\n }\n const error: VonErrorRestInterceptorModel = {\n status: errorResponse.status,\n message: '',\n body: errorResponse.error || {},\n };\n if (errorResponse.status === 0) {\n error.message = this.errorResponseUnknown;\n }\n if (errorResponse.status === 401) {\n error.message = errorResponse.error ? errorResponse.error : this.errorResponseForbidden;\n }\n if (this.redirectOn403) {\n if (errorResponse.status === 403 || (errorResponse.url && errorResponse.url.indexOf(this.urlWhoAmI) > -1)) {\n this.router.navigate(this.redirect403Url);\n }\n }\n this.postHttpRequest();\n return throwError(error);\n };\n}\n","import { HttpClient, HttpHeaders } from '@angular/common/http';\nimport { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';\nimport { Observable } from 'rxjs';\nimport { map, share, take } from 'rxjs/operators';\nimport { VonHttpOptionsModel } from './model/von-http-options.model';\nimport {\n DeleteParams,\n GenericParams,\n GetParams,\n HeaderParams,\n PostParams,\n PutParams,\n} from './model/von-rest-definition.type';\n\nexport abstract class VonRestService {\n constructor(protected http: HttpClient, protected sanitizer: DomSanitizer) {}\n\n protected setHeaders = (headerParams?: HeaderParams): HttpHeaders => {\n return new HttpHeaders({\n 'Content-Type': headerParams?.contentType ?? 'application/json',\n Accept: headerParams?.accept ?? 'application/json',\n 'Access-Control-Allow-Origin': '*',\n });\n };\n\n protected setOptions = (headerParams?: HeaderParams): VonHttpOptionsModel => {\n return {\n headers: this.setHeaders(headerParams),\n params: headerParams?.params,\n withCredentials: true,\n };\n };\n\n protected setOptionsForFile = (\n headerParams?: HeaderParams\n ): VonHttpOptionsModel => {\n return {\n ...this.setOptions(headerParams?.params),\n headers: new HttpHeaders({\n Accept: headerParams?.accept ?? 'application/json',\n 'Access-Control-Allow-Origin': '*',\n }),\n };\n };\n\n protected setUrlParams = (url: string, params?: GenericParams) => {\n if (params != null) {\n for (const p in params) {\n if (p != null) {\n url = url.replace(`{${p}}`, params[p]);\n }\n }\n }\n return url;\n };\n\n protected authenticate = (\n url: string,\n username: string,\n password: string\n ): Observable<any> => {\n const authorization = btoa(`${username}:${password}`);\n const headers = new HttpHeaders({\n authorization: `Basic ${authorization}`,\n });\n return this.http\n .get(url, {\n headers,\n withCredentials: true,\n })\n .pipe(take(1), share());\n };\n\n protected get = <R = any>({\n url,\n urlParams,\n params,\n }: GetParams): Observable<R> => {\n url = this.setUrlParams(url, urlParams);\n return this.http.get<R>(url, this.setOptions(params));\n };\n\n protected file = ({\n url,\n urlParams,\n params,\n }: GetParams): Observable<SafeResourceUrl> => {\n url = this.setUrlParams(url, urlParams);\n return this.http\n .get(url, {\n ...this.setOptionsForFile(params),\n responseType: 'blob' as 'json',\n })\n .pipe(\n map((res: any) => {\n const fileBlob = new Blob([res], { type: params?.contentType });\n const objUrl = URL.createObjectURL(fileBlob);\n const sanitized =\n this.sanitizer.bypassSecurityTrustResourceUrl(objUrl);\n return sanitized;\n })\n );\n };\n\n protected delete = <R = any>({\n url,\n urlParams,\n params,\n }: DeleteParams): Observable<R> => {\n url = this.setUrlParams(url, urlParams);\n return this.http.delete<R>(url, this.setOptions(params));\n };\n\n protected post = <R = any, B = any | FormData>({\n url,\n body,\n urlParams,\n params,\n }: PostParams<B>): Observable<R> => {\n url = this.setUrlParams(url, urlParams);\n let options =\n body instanceof FormData\n ? this.setOptionsForFile(params)\n : this.setOptions(params);\n return this.http.post<R>(url, body, options);\n };\n\n protected put = <R = any, B = any | FormData>({\n url,\n body,\n urlParams,\n params,\n }: PutParams<B>): Observable<R> => {\n url = this.setUrlParams(url, urlParams);\n let options =\n body instanceof FormData\n ? this.setOptionsForFile(params)\n : this.setOptions(params);\n return this.http.put<R>(url, body, options);\n };\n\n protected patch = <R = any, B = any | FormData>({\n url,\n body,\n urlParams,\n params,\n }: PutParams<B>): Observable<R> => {\n url = this.setUrlParams(url, urlParams);\n let options =\n body instanceof FormData\n ? this.setOptionsForFile(params)\n : this.setOptions(params);\n return this.http.patch<R>(url, body, options);\n };\n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './public-api';\n"],"names":[],"mappings":"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"}
File without changes
@@ -1,4 +1,5 @@
1
1
  export interface VonErrorRestInterceptorModel {
2
2
  status: number;
3
3
  message: string;
4
+ body?: any;
4
5
  }
File without changes
File without changes
@@ -0,0 +1,25 @@
1
+ export interface GenericParams {
2
+ [key: string]: any;
3
+ }
4
+ export declare type HeaderParams = {
5
+ contentType?: string;
6
+ accept?: string;
7
+ } & {
8
+ params?: GenericParams;
9
+ };
10
+ export interface BaseParams {
11
+ url: string;
12
+ urlParams?: GenericParams;
13
+ params?: HeaderParams;
14
+ }
15
+ export declare type GetParams = BaseParams;
16
+ export declare type DeleteParams = BaseParams;
17
+ export declare type PostParams<B = any | FormData> = BaseParams & {
18
+ body: B;
19
+ };
20
+ export declare type PutParams<B = any | FormData> = BaseParams & {
21
+ body: B;
22
+ };
23
+ export declare type PatchParams<B = any | FormData> = BaseParams & {
24
+ body: B;
25
+ };
@@ -1,4 +1,4 @@
1
- import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
1
+ import { HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
2
2
  import { Router } from '@angular/router';
3
3
  import { Observable } from 'rxjs';
4
4
  export declare abstract class VonRestInterceptorService implements HttpInterceptor {
@@ -7,7 +7,11 @@ export declare abstract class VonRestInterceptorService implements HttpIntercept
7
7
  protected errorResponseUnknown: string;
8
8
  protected errorResponseForbidden: string;
9
9
  protected urlWhoAmI: string;
10
+ protected redirectOn403: boolean;
11
+ protected redirect403Url: string[];
10
12
  constructor(router: Router);
11
13
  intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>>;
12
14
  protected postHttpRequest: () => void;
15
+ protected mapEvent: (event: HttpEvent<any>) => HttpEvent<any>;
16
+ protected catchError: (errorResponse: HttpErrorResponse) => Observable<never>;
13
17
  }
@@ -1,23 +1,21 @@
1
- import { HttpClient } from '@angular/common/http';
1
+ import { HttpClient, HttpHeaders } from '@angular/common/http';
2
2
  import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
3
3
  import { Observable } from 'rxjs';
4
+ import { VonHttpOptionsModel } from './model/von-http-options.model';
5
+ import { DeleteParams, GenericParams, GetParams, HeaderParams, PostParams, PutParams } from './model/von-rest-definition.type';
4
6
  export declare abstract class VonRestService {
5
7
  protected http: HttpClient;
6
8
  protected sanitizer: DomSanitizer;
7
9
  constructor(http: HttpClient, sanitizer: DomSanitizer);
8
- private setHeaders;
9
- private setOptions;
10
- private setUrlParams;
11
- authenticate: (url: string, username: string, password: string) => Observable<any>;
12
- logout: (url: string) => Observable<any>;
13
- get: <T = any>(url: string, urlParams?: any, queryParams?: any) => Observable<T>;
14
- delete: <T = any>(url: string, urlParams?: any, queryParams?: any) => Observable<T>;
15
- post: <T = any>(url: string, body: any, urlParams?: any, queryParams?: any) => Observable<T>;
16
- put: <T = any>(url: string, body: any, urlParams?: any, queryParams?: any) => Observable<T>;
17
- patch: <T = any>(url: string, body: any, urlParams?: any, queryParams?: any) => Observable<T>;
18
- private setFileOptions;
19
- getFile: (contentType: string, url: string, urlParams?: any, queryParams?: any) => Observable<SafeResourceUrl>;
20
- postFile: (contentType: string, url: string, body: any, urlParams?: any, queryParams?: any) => Observable<any>;
21
- putFile: (contentType: string, url: string, body: any, urlParams?: any, queryParams?: any) => Observable<any>;
22
- patchFile: (contentType: string, url: string, body: any, urlParams?: any, queryParams?: any) => Observable<any>;
10
+ protected setHeaders: (headerParams?: HeaderParams | undefined) => HttpHeaders;
11
+ protected setOptions: (headerParams?: HeaderParams | undefined) => VonHttpOptionsModel;
12
+ protected setOptionsForFile: (headerParams?: HeaderParams | undefined) => VonHttpOptionsModel;
13
+ protected setUrlParams: (url: string, params?: GenericParams | undefined) => string;
14
+ protected authenticate: (url: string, username: string, password: string) => Observable<any>;
15
+ protected get: <R = any>({ url, urlParams, params, }: GetParams) => Observable<R>;
16
+ protected file: ({ url, urlParams, params, }: GetParams) => Observable<SafeResourceUrl>;
17
+ protected delete: <R = any>({ url, urlParams, params, }: DeleteParams) => Observable<R>;
18
+ protected post: <R = any, B = any>({ url, body, urlParams, params, }: PostParams<B>) => Observable<R>;
19
+ protected put: <R = any, B = any>({ url, body, urlParams, params, }: PutParams<B>) => Observable<R>;
20
+ protected patch: <R = any, B = any>({ url, body, urlParams, params, }: PutParams<B>) => Observable<R>;
23
21
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@von-development-studio/angular-rest-service",
3
- "version": "1.0.6",
3
+ "version": "2.0.0-SNAPSHOT",
4
4
  "description": "Angular Rest Service wrapper.",
5
5
  "repository": {
6
6
  "type": "git",
@@ -8,24 +8,36 @@
8
8
  },
9
9
  "keywords": [
10
10
  "angular",
11
- "angular 11",
11
+ "angular 13",
12
12
  "rest client"
13
13
  ],
14
14
  "author": "Luis García Castro",
15
15
  "license": "MIT",
16
16
  "peerDependencies": {
17
- "@angular/common": "^11.0.3",
18
- "@angular/core": "^11.0.3"
17
+ "@angular/common": "^13.3.11",
18
+ "@angular/core": "^13.3.11"
19
19
  },
20
20
  "dependencies": {
21
- "tslib": "^2.0.0"
21
+ "tslib": "^2.4.0"
22
22
  },
23
- "main": "bundles/von-development-studio-angular-rest-service.umd.js",
24
- "module": "fesm2015/von-development-studio-angular-rest-service.js",
25
- "es2015": "fesm2015/von-development-studio-angular-rest-service.js",
26
- "esm2015": "esm2015/von-development-studio-angular-rest-service.js",
27
- "fesm2015": "fesm2015/von-development-studio-angular-rest-service.js",
23
+ "module": "fesm2015/von-development-studio-angular-rest-service.mjs",
24
+ "es2020": "fesm2020/von-development-studio-angular-rest-service.mjs",
25
+ "esm2020": "esm2020/von-development-studio-angular-rest-service.mjs",
26
+ "fesm2020": "fesm2020/von-development-studio-angular-rest-service.mjs",
27
+ "fesm2015": "fesm2015/von-development-studio-angular-rest-service.mjs",
28
28
  "typings": "von-development-studio-angular-rest-service.d.ts",
29
- "metadata": "von-development-studio-angular-rest-service.metadata.json",
29
+ "exports": {
30
+ "./package.json": {
31
+ "default": "./package.json"
32
+ },
33
+ ".": {
34
+ "types": "./von-development-studio-angular-rest-service.d.ts",
35
+ "esm2020": "./esm2020/von-development-studio-angular-rest-service.mjs",
36
+ "es2020": "./fesm2020/von-development-studio-angular-rest-service.mjs",
37
+ "es2015": "./fesm2015/von-development-studio-angular-rest-service.mjs",
38
+ "node": "./fesm2015/von-development-studio-angular-rest-service.mjs",
39
+ "default": "./fesm2020/von-development-studio-angular-rest-service.mjs"
40
+ }
41
+ },
30
42
  "sideEffects": false
31
- }
43
+ }
package/public-api.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  export * from './lib/model/von-error-response.model';
2
2
  export * from './lib/model/von-error-rest-interceptor.model';
3
3
  export * from './lib/model/von-page-response.model';
4
- export * from './lib/model/von-page-response.model';
4
+ export * from './lib/model/von-rest-definition.type';
5
5
  export * from './lib/von-rest-interceptor.service';
6
6
  export * from './lib/von-rest.service';
@@ -1,4 +1,5 @@
1
1
  /**
2
2
  * Generated bundle index. Do not edit.
3
3
  */
4
+ /// <amd-module name="@von-development-studio/angular-rest-service" />
4
5
  export * from './public-api';
package/CHANGELOG.md DELETED
@@ -1,7 +0,0 @@
1
- ## v1.0.4
2
-
3
- - Add callable method after http success request.
4
-
5
- ## v1.0.1
6
-
7
- - Project Creation.
@@ -1,162 +0,0 @@
1
- (function (global, factory) {
2
- typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/common/http'), require('rxjs'), require('rxjs/operators')) :
3
- typeof define === 'function' && define.amd ? define('@von-development-studio/angular-rest-service', ['exports', '@angular/common/http', 'rxjs', 'rxjs/operators'], factory) :
4
- (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global['von-development-studio'] = global['von-development-studio'] || {}, global['von-development-studio']['angular-rest-service'] = {}), global.ng.common.http, global.rxjs, global.rxjs.operators));
5
- }(this, (function (exports, http, rxjs, operators) { 'use strict';
6
-
7
- var VonRestInterceptorService = /** @class */ (function () {
8
- function VonRestInterceptorService(router) {
9
- this.router = router;
10
- this.consoleDebug = false;
11
- this.errorResponseUnknown = 'Unknown Error';
12
- this.errorResponseForbidden = 'Forbidden Error';
13
- this.urlWhoAmI = 'api/who-am-i';
14
- this.postHttpRequest = function () {
15
- };
16
- }
17
- VonRestInterceptorService.prototype.intercept = function (request, next) {
18
- var _this = this;
19
- return next.handle(request).pipe(operators.map(function (event) {
20
- if (event instanceof http.HttpResponse) {
21
- if (event.status === 200 || event.status === 204) {
22
- _this.postHttpRequest();
23
- return event;
24
- }
25
- if (event.status !== 200) {
26
- var error = {
27
- status: event.status,
28
- message: event.statusText
29
- };
30
- if (_this.consoleDebug) {
31
- console.error('[ErrorWS]: ', error);
32
- }
33
- throw error;
34
- }
35
- }
36
- return event;
37
- }), operators.catchError(function (errorResponse) {
38
- if (_this.consoleDebug) {
39
- console.error('[Fatal]: ', errorResponse);
40
- }
41
- var error = {
42
- status: errorResponse.status,
43
- message: ''
44
- };
45
- if (errorResponse.status === 0) {
46
- error.message = _this.errorResponseUnknown;
47
- }
48
- if (errorResponse.status === 401) {
49
- error.message = errorResponse.error ? errorResponse.error : _this.errorResponseForbidden;
50
- }
51
- if (errorResponse.status === 403 || (errorResponse.url && errorResponse.url.indexOf(_this.urlWhoAmI) > -1)) {
52
- _this.router.navigate(['403']);
53
- }
54
- _this.postHttpRequest();
55
- return rxjs.throwError(error);
56
- }));
57
- };
58
- return VonRestInterceptorService;
59
- }());
60
-
61
- var VonRestService = /** @class */ (function () {
62
- function VonRestService(http$1, sanitizer) {
63
- var _this = this;
64
- this.http = http$1;
65
- this.sanitizer = sanitizer;
66
- this.setHeaders = function (contentType) {
67
- if (contentType === void 0) { contentType = 'application/json'; }
68
- return new http.HttpHeaders({
69
- 'Content-Type': 'application/json',
70
- Accept: contentType,
71
- 'Access-Control-Allow-Origin': '*'
72
- });
73
- };
74
- this.setOptions = function (params) {
75
- return {
76
- headers: _this.setHeaders(),
77
- params: params,
78
- withCredentials: true
79
- };
80
- };
81
- this.setUrlParams = function (url, params) {
82
- if (params != null) {
83
- for (var p in params) {
84
- if (p != null) {
85
- url = url.replace("{" + p + "}", params[p]);
86
- }
87
- }
88
- }
89
- return url;
90
- };
91
- this.authenticate = function (url, username, password) {
92
- var authorization = btoa(username + ":" + password);
93
- var headers = new http.HttpHeaders({
94
- authorization: "Basic " + authorization,
95
- });
96
- return _this.http.get(url, {
97
- headers: headers,
98
- withCredentials: true
99
- }).pipe(operators.take(1), operators.share());
100
- };
101
- this.logout = function (url) {
102
- return _this.http.delete(url, _this.setOptions()).pipe(operators.take(1), operators.share());
103
- };
104
- this.get = function (url, urlParams, queryParams) {
105
- url = _this.setUrlParams(url, urlParams);
106
- return _this.http.get(url, _this.setOptions(queryParams));
107
- };
108
- this.delete = function (url, urlParams, queryParams) {
109
- url = _this.setUrlParams(url, urlParams);
110
- return _this.http.delete(url, _this.setOptions(queryParams));
111
- };
112
- this.post = function (url, body, urlParams, queryParams) {
113
- url = _this.setUrlParams(url, urlParams);
114
- return _this.http.post(url, body, _this.setOptions(queryParams));
115
- };
116
- this.put = function (url, body, urlParams, queryParams) {
117
- url = _this.setUrlParams(url, urlParams);
118
- return _this.http.put(url, body, _this.setOptions(queryParams));
119
- };
120
- this.patch = function (url, body, urlParams, queryParams) {
121
- url = _this.setUrlParams(url, urlParams);
122
- return _this.http.patch(url, body, _this.setOptions(queryParams));
123
- };
124
- this.setFileOptions = function (contentType, queryParams) {
125
- return Object.assign(Object.assign({}, _this.setOptions(queryParams)), { headers: _this.setHeaders(contentType), responseType: 'blob' });
126
- };
127
- this.getFile = function (contentType, url, urlParams, queryParams) {
128
- url = _this.setUrlParams(url, urlParams);
129
- return _this.http.get(url, _this.setFileOptions(contentType, queryParams)).pipe(operators.map(function (res) {
130
- var fileBlob = new Blob([res], { type: contentType });
131
- var objUrl = URL.createObjectURL(fileBlob);
132
- var sanitized = _this.sanitizer.bypassSecurityTrustResourceUrl(objUrl);
133
- return sanitized;
134
- }));
135
- };
136
- this.postFile = function (contentType, url, body, urlParams, queryParams) {
137
- url = _this.setUrlParams(url, urlParams);
138
- return _this.http.post(url, body, _this.setFileOptions(contentType, queryParams));
139
- };
140
- this.putFile = function (contentType, url, body, urlParams, queryParams) {
141
- url = _this.setUrlParams(url, urlParams);
142
- return _this.http.put(url, body, _this.setFileOptions(contentType, queryParams));
143
- };
144
- this.patchFile = function (contentType, url, body, urlParams, queryParams) {
145
- url = _this.setUrlParams(url, urlParams);
146
- return _this.http.patch(url, body, _this.setFileOptions(contentType, queryParams));
147
- };
148
- }
149
- return VonRestService;
150
- }());
151
-
152
- /**
153
- * Generated bundle index. Do not edit.
154
- */
155
-
156
- exports.VonRestInterceptorService = VonRestInterceptorService;
157
- exports.VonRestService = VonRestService;
158
-
159
- Object.defineProperty(exports, '__esModule', { value: true });
160
-
161
- })));
162
- //# sourceMappingURL=von-development-studio-angular-rest-service.umd.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"von-development-studio-angular-rest-service.umd.js","sources":["../../projects/angular-rest-service/src/lib/von-rest-interceptor.service.ts","../../projects/angular-rest-service/src/lib/von-rest.service.ts","../../../projects/angular-rest-service/src/von-development-studio-angular-rest-service.ts"],"sourcesContent":["import { HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest, HttpResponse } from '@angular/common/http';\nimport { Router } from '@angular/router';\nimport { Observable, throwError } from 'rxjs';\nimport { catchError, map } from 'rxjs/operators';\nimport { VonErrorRestInterceptorModel } from './model/von-error-rest-interceptor.model';\n\nexport abstract class VonRestInterceptorService implements HttpInterceptor {\n\n protected consoleDebug = false;\n protected errorResponseUnknown = 'Unknown Error';\n protected errorResponseForbidden = 'Forbidden Error';\n protected urlWhoAmI = 'api/who-am-i';\n\n constructor(\n protected router: Router\n ) { }\n\n intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {\n return next.handle(request).pipe(\n\n map((event: HttpEvent<any>) => {\n if (event instanceof HttpResponse) {\n if (event.status === 200 || event.status === 204) {\n this.postHttpRequest();\n return event;\n }\n if (event.status !== 200) {\n const error: VonErrorRestInterceptorModel = {\n status: event.status,\n message: event.statusText\n };\n if (this.consoleDebug) {\n console.error('[ErrorWS]: ', error);\n }\n throw error;\n }\n }\n return event;\n }),\n\n catchError((errorResponse: HttpErrorResponse) => {\n if (this.consoleDebug) {\n console.error('[Fatal]: ', errorResponse);\n }\n const error: VonErrorRestInterceptorModel = {\n status: errorResponse.status,\n message: ''\n };\n if (errorResponse.status === 0) {\n error.message = this.errorResponseUnknown;\n }\n if (errorResponse.status === 401) {\n error.message = errorResponse.error ? errorResponse.error : this.errorResponseForbidden;\n }\n if (errorResponse.status === 403 || (errorResponse.url && errorResponse.url.indexOf(this.urlWhoAmI) > -1)) {\n this.router.navigate(['403']);\n }\n this.postHttpRequest();\n return throwError(error);\n })\n );\n }\n\n protected postHttpRequest = () => {\n }\n\n}\n","import { HttpClient, HttpHeaders } from '@angular/common/http';\nimport { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';\nimport { Observable } from 'rxjs';\nimport { map, share, take } from 'rxjs/operators';\nimport { VonHttpOptionsModel } from './model/von-http-options.model';\n\nexport abstract class VonRestService {\n\n constructor(\n protected http: HttpClient,\n protected sanitizer: DomSanitizer\n ) { }\n\n private setHeaders = (contentType: string = 'application/json'): HttpHeaders => {\n return new HttpHeaders({\n 'Content-Type': 'application/json',\n Accept: contentType,\n 'Access-Control-Allow-Origin': '*'\n });\n }\n\n private setOptions = (params?: { [key: string]: any }): VonHttpOptionsModel => {\n return {\n headers: this.setHeaders(),\n params,\n withCredentials: true\n };\n }\n\n private setUrlParams = (url: string, params?: { [key: string]: any }) => {\n if (params != null) {\n for (const p in params) {\n if (p != null) {\n url = url.replace(`{${p}}`, params[p]);\n }\n }\n }\n return url;\n }\n\n authenticate = (url: string, username: string, password: string): Observable<any> => {\n const authorization = btoa(`${username}:${password}`);\n const headers = new HttpHeaders({\n authorization: `Basic ${authorization}`,\n });\n return this.http.get(url, {\n headers,\n withCredentials: true\n }).pipe(\n take(1),\n share()\n );\n }\n\n logout = (url: string): Observable<any> => {\n return this.http.delete<string>(url, this.setOptions()).pipe(\n take(1),\n share()\n );\n }\n\n get = <T = any>(url: string, urlParams?: any, queryParams?: any): Observable<T> => {\n url = this.setUrlParams(url, urlParams);\n return this.http.get<T>(url, this.setOptions(queryParams));\n }\n\n delete = <T = any>(url: string, urlParams?: any, queryParams?: any): Observable<T> => {\n url = this.setUrlParams(url, urlParams);\n return this.http.delete<T>(url, this.setOptions(queryParams));\n }\n\n post = <T = any>(url: string, body: any, urlParams?: any, queryParams?: any): Observable<T> => {\n url = this.setUrlParams(url, urlParams);\n return this.http.post<T>(url, body, this.setOptions(queryParams));\n }\n\n put = <T = any>(url: string, body: any, urlParams?: any, queryParams?: any): Observable<T> => {\n url = this.setUrlParams(url, urlParams);\n return this.http.put<T>(url, body, this.setOptions(queryParams));\n }\n\n patch = <T = any>(url: string, body: any, urlParams?: any, queryParams?: any): Observable<T> => {\n url = this.setUrlParams(url, urlParams);\n return this.http.patch<T>(url, body, this.setOptions(queryParams));\n }\n\n private setFileOptions = (contentType: string, queryParams?: { [key: string]: any }): VonHttpOptionsModel => {\n return {\n ...this.setOptions(queryParams),\n headers: this.setHeaders(contentType),\n responseType: 'blob' as 'json'\n };\n }\n\n getFile = (contentType: string, url: string, urlParams?: any, queryParams?: any): Observable<SafeResourceUrl> => {\n url = this.setUrlParams(url, urlParams);\n return this.http.get(url, this.setFileOptions(contentType, queryParams)).pipe(\n map((res: any) => {\n const fileBlob = new Blob([res], { type: contentType });\n const objUrl = URL.createObjectURL(fileBlob);\n const sanitized = this.sanitizer.bypassSecurityTrustResourceUrl(objUrl);\n return sanitized;\n })\n );\n }\n\n postFile = (contentType: string, url: string, body: any, urlParams?: any, queryParams?: any): Observable<any> => {\n url = this.setUrlParams(url, urlParams);\n return this.http.post(url, body, this.setFileOptions(contentType, queryParams));\n }\n\n putFile = (contentType: string, url: string, body: any, urlParams?: any, queryParams?: any): Observable<any> => {\n url = this.setUrlParams(url, urlParams);\n return this.http.put(url, body, this.setFileOptions(contentType, queryParams));\n }\n\n patchFile = (contentType: string, url: string, body: any, urlParams?: any, queryParams?: any): Observable<any> => {\n url = this.setUrlParams(url, urlParams);\n return this.http.patch(url, body, this.setFileOptions(contentType, queryParams));\n }\n\n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './public-api';\n"],"names":["map","HttpResponse","catchError","throwError","http","HttpHeaders","take","share"],"mappings":"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"}
@@ -1,2 +0,0 @@
1
- !function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports,require("@angular/common/http"),require("rxjs"),require("rxjs/operators")):"function"==typeof define&&define.amd?define("@von-development-studio/angular-rest-service",["exports","@angular/common/http","rxjs","rxjs/operators"],e):e(((t="undefined"!=typeof globalThis?globalThis:t||self)["von-development-studio"]=t["von-development-studio"]||{},t["von-development-studio"]["angular-rest-service"]={}),t.ng.common.http,t.rxjs,t.rxjs.operators)}(this,(function(t,e,s,r){"use strict";var n=function(){function t(t){this.router=t,this.consoleDebug=!1,this.errorResponseUnknown="Unknown Error",this.errorResponseForbidden="Forbidden Error",this.urlWhoAmI="api/who-am-i",this.postHttpRequest=function(){}}return t.prototype.intercept=function(t,n){var o=this;return n.handle(t).pipe(r.map((function(t){if(t instanceof e.HttpResponse){if(200===t.status||204===t.status)return o.postHttpRequest(),t;if(200!==t.status){var s={status:t.status,message:t.statusText};throw o.consoleDebug&&console.error("[ErrorWS]: ",s),s}}return t})),r.catchError((function(t){o.consoleDebug&&console.error("[Fatal]: ",t);var e={status:t.status,message:""};return 0===t.status&&(e.message=o.errorResponseUnknown),401===t.status&&(e.message=t.error?t.error:o.errorResponseForbidden),(403===t.status||t.url&&t.url.indexOf(o.urlWhoAmI)>-1)&&o.router.navigate(["403"]),o.postHttpRequest(),s.throwError(e)})))},t}(),o=function(t,s){var n=this;this.http=t,this.sanitizer=s,this.setHeaders=function(t){return void 0===t&&(t="application/json"),new e.HttpHeaders({"Content-Type":"application/json",Accept:t,"Access-Control-Allow-Origin":"*"})},this.setOptions=function(t){return{headers:n.setHeaders(),params:t,withCredentials:!0}},this.setUrlParams=function(t,e){if(null!=e)for(var s in e)null!=s&&(t=t.replace("{"+s+"}",e[s]));return t},this.authenticate=function(t,s,o){var i=btoa(s+":"+o),a=new e.HttpHeaders({authorization:"Basic "+i});return n.http.get(t,{headers:a,withCredentials:!0}).pipe(r.take(1),r.share())},this.logout=function(t){return n.http.delete(t,n.setOptions()).pipe(r.take(1),r.share())},this.get=function(t,e,s){return t=n.setUrlParams(t,e),n.http.get(t,n.setOptions(s))},this.delete=function(t,e,s){return t=n.setUrlParams(t,e),n.http.delete(t,n.setOptions(s))},this.post=function(t,e,s,r){return t=n.setUrlParams(t,s),n.http.post(t,e,n.setOptions(r))},this.put=function(t,e,s,r){return t=n.setUrlParams(t,s),n.http.put(t,e,n.setOptions(r))},this.patch=function(t,e,s,r){return t=n.setUrlParams(t,s),n.http.patch(t,e,n.setOptions(r))},this.setFileOptions=function(t,e){return Object.assign(Object.assign({},n.setOptions(e)),{headers:n.setHeaders(t),responseType:"blob"})},this.getFile=function(t,e,s,o){return e=n.setUrlParams(e,s),n.http.get(e,n.setFileOptions(t,o)).pipe(r.map((function(e){var s=new Blob([e],{type:t}),r=URL.createObjectURL(s);return n.sanitizer.bypassSecurityTrustResourceUrl(r)})))},this.postFile=function(t,e,s,r,o){return e=n.setUrlParams(e,r),n.http.post(e,s,n.setFileOptions(t,o))},this.putFile=function(t,e,s,r,o){return e=n.setUrlParams(e,r),n.http.put(e,s,n.setFileOptions(t,o))},this.patchFile=function(t,e,s,r,o){return e=n.setUrlParams(e,r),n.http.patch(e,s,n.setFileOptions(t,o))}};t.VonRestInterceptorService=n,t.VonRestService=o,Object.defineProperty(t,"__esModule",{value:!0})}));
2
- //# sourceMappingURL=von-development-studio-angular-rest-service.umd.min.js.map
@@ -1 +0,0 @@
1
- {"version":3,"sources":["../../projects/angular-rest-service/src/lib/von-rest-interceptor.service.ts","../../projects/angular-rest-service/src/lib/von-rest.service.ts"],"names":["VonRestInterceptorService","router","this","consoleDebug","errorResponseUnknown","errorResponseForbidden","urlWhoAmI","postHttpRequest","prototype","intercept","request","next","_this","handle","pipe","map","event","HttpResponse","status","error","message","statusText","console","catchError","errorResponse","url","indexOf","navigate","throwError","http","sanitizer","setHeaders","contentType","HttpHeaders","Content-Type","Accept","Access-Control-Allow-Origin","setOptions","params","headers","withCredentials","setUrlParams","p","replace","authenticate","username","password","authorization","btoa","get","take","share","logout","delete","urlParams","queryParams","post","body","put","patch","setFileOptions","Object","assign","responseType","getFile","res","fileBlob","Blob","type","objUrl","URL","createObjectURL","bypassSecurityTrustResourceUrl","postFile","putFile","patchFile"],"mappings":"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","sourcesContent":["import { HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest, HttpResponse } from '@angular/common/http';\nimport { Router } from '@angular/router';\nimport { Observable, throwError } from 'rxjs';\nimport { catchError, map } from 'rxjs/operators';\nimport { VonErrorRestInterceptorModel } from './model/von-error-rest-interceptor.model';\n\nexport abstract class VonRestInterceptorService implements HttpInterceptor {\n\n protected consoleDebug = false;\n protected errorResponseUnknown = 'Unknown Error';\n protected errorResponseForbidden = 'Forbidden Error';\n protected urlWhoAmI = 'api/who-am-i';\n\n constructor(\n protected router: Router\n ) { }\n\n intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {\n return next.handle(request).pipe(\n\n map((event: HttpEvent<any>) => {\n if (event instanceof HttpResponse) {\n if (event.status === 200 || event.status === 204) {\n this.postHttpRequest();\n return event;\n }\n if (event.status !== 200) {\n const error: VonErrorRestInterceptorModel = {\n status: event.status,\n message: event.statusText\n };\n if (this.consoleDebug) {\n console.error('[ErrorWS]: ', error);\n }\n throw error;\n }\n }\n return event;\n }),\n\n catchError((errorResponse: HttpErrorResponse) => {\n if (this.consoleDebug) {\n console.error('[Fatal]: ', errorResponse);\n }\n const error: VonErrorRestInterceptorModel = {\n status: errorResponse.status,\n message: ''\n };\n if (errorResponse.status === 0) {\n error.message = this.errorResponseUnknown;\n }\n if (errorResponse.status === 401) {\n error.message = errorResponse.error ? errorResponse.error : this.errorResponseForbidden;\n }\n if (errorResponse.status === 403 || (errorResponse.url && errorResponse.url.indexOf(this.urlWhoAmI) > -1)) {\n this.router.navigate(['403']);\n }\n this.postHttpRequest();\n return throwError(error);\n })\n );\n }\n\n protected postHttpRequest = () => {\n }\n\n}\n","import { HttpClient, HttpHeaders } from '@angular/common/http';\nimport { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';\nimport { Observable } from 'rxjs';\nimport { map, share, take } from 'rxjs/operators';\nimport { VonHttpOptionsModel } from './model/von-http-options.model';\n\nexport abstract class VonRestService {\n\n constructor(\n protected http: HttpClient,\n protected sanitizer: DomSanitizer\n ) { }\n\n private setHeaders = (contentType: string = 'application/json'): HttpHeaders => {\n return new HttpHeaders({\n 'Content-Type': 'application/json',\n Accept: contentType,\n 'Access-Control-Allow-Origin': '*'\n });\n }\n\n private setOptions = (params?: { [key: string]: any }): VonHttpOptionsModel => {\n return {\n headers: this.setHeaders(),\n params,\n withCredentials: true\n };\n }\n\n private setUrlParams = (url: string, params?: { [key: string]: any }) => {\n if (params != null) {\n for (const p in params) {\n if (p != null) {\n url = url.replace(`{${p}}`, params[p]);\n }\n }\n }\n return url;\n }\n\n authenticate = (url: string, username: string, password: string): Observable<any> => {\n const authorization = btoa(`${username}:${password}`);\n const headers = new HttpHeaders({\n authorization: `Basic ${authorization}`,\n });\n return this.http.get(url, {\n headers,\n withCredentials: true\n }).pipe(\n take(1),\n share()\n );\n }\n\n logout = (url: string): Observable<any> => {\n return this.http.delete<string>(url, this.setOptions()).pipe(\n take(1),\n share()\n );\n }\n\n get = <T = any>(url: string, urlParams?: any, queryParams?: any): Observable<T> => {\n url = this.setUrlParams(url, urlParams);\n return this.http.get<T>(url, this.setOptions(queryParams));\n }\n\n delete = <T = any>(url: string, urlParams?: any, queryParams?: any): Observable<T> => {\n url = this.setUrlParams(url, urlParams);\n return this.http.delete<T>(url, this.setOptions(queryParams));\n }\n\n post = <T = any>(url: string, body: any, urlParams?: any, queryParams?: any): Observable<T> => {\n url = this.setUrlParams(url, urlParams);\n return this.http.post<T>(url, body, this.setOptions(queryParams));\n }\n\n put = <T = any>(url: string, body: any, urlParams?: any, queryParams?: any): Observable<T> => {\n url = this.setUrlParams(url, urlParams);\n return this.http.put<T>(url, body, this.setOptions(queryParams));\n }\n\n patch = <T = any>(url: string, body: any, urlParams?: any, queryParams?: any): Observable<T> => {\n url = this.setUrlParams(url, urlParams);\n return this.http.patch<T>(url, body, this.setOptions(queryParams));\n }\n\n private setFileOptions = (contentType: string, queryParams?: { [key: string]: any }): VonHttpOptionsModel => {\n return {\n ...this.setOptions(queryParams),\n headers: this.setHeaders(contentType),\n responseType: 'blob' as 'json'\n };\n }\n\n getFile = (contentType: string, url: string, urlParams?: any, queryParams?: any): Observable<SafeResourceUrl> => {\n url = this.setUrlParams(url, urlParams);\n return this.http.get(url, this.setFileOptions(contentType, queryParams)).pipe(\n map((res: any) => {\n const fileBlob = new Blob([res], { type: contentType });\n const objUrl = URL.createObjectURL(fileBlob);\n const sanitized = this.sanitizer.bypassSecurityTrustResourceUrl(objUrl);\n return sanitized;\n })\n );\n }\n\n postFile = (contentType: string, url: string, body: any, urlParams?: any, queryParams?: any): Observable<any> => {\n url = this.setUrlParams(url, urlParams);\n return this.http.post(url, body, this.setFileOptions(contentType, queryParams));\n }\n\n putFile = (contentType: string, url: string, body: any, urlParams?: any, queryParams?: any): Observable<any> => {\n url = this.setUrlParams(url, urlParams);\n return this.http.put(url, body, this.setFileOptions(contentType, queryParams));\n }\n\n patchFile = (contentType: string, url: string, body: any, urlParams?: any, queryParams?: any): Observable<any> => {\n url = this.setUrlParams(url, urlParams);\n return this.http.patch(url, body, this.setFileOptions(contentType, queryParams));\n }\n\n}\n"]}
@@ -1,2 +0,0 @@
1
- export {};
2
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidm9uLWVycm9yLXJlc3BvbnNlLm1vZGVsLmpzIiwic291cmNlUm9vdCI6Ii4uLy4uLy4uL3Byb2plY3RzL2FuZ3VsYXItcmVzdC1zZXJ2aWNlL3NyYy8iLCJzb3VyY2VzIjpbImxpYi9tb2RlbC92b24tZXJyb3ItcmVzcG9uc2UubW9kZWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBpbnRlcmZhY2UgVm9uRXJyb3JSZXNwb25zZU1vZGVsIHtcbiAgY29kZT86IHN0cmluZyB8IG51bGw7XG4gIG1lc3NhZ2U/OiBzdHJpbmcgfCBudWxsO1xuICBwYXlsb2FkPzogYW55IHwgbnVsbDtcbn1cbiJdfQ==
@@ -1,2 +0,0 @@
1
- export {};
2
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidm9uLWVycm9yLXJlc3QtaW50ZXJjZXB0b3IubW9kZWwuanMiLCJzb3VyY2VSb290IjoiLi4vLi4vLi4vcHJvamVjdHMvYW5ndWxhci1yZXN0LXNlcnZpY2Uvc3JjLyIsInNvdXJjZXMiOlsibGliL21vZGVsL3Zvbi1lcnJvci1yZXN0LWludGVyY2VwdG9yLm1vZGVsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgaW50ZXJmYWNlIFZvbkVycm9yUmVzdEludGVyY2VwdG9yTW9kZWwge1xuICBzdGF0dXM6IG51bWJlcjtcbiAgbWVzc2FnZTogc3RyaW5nO1xufVxuIl19
@@ -1,2 +0,0 @@
1
- export {};
2
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidm9uLWh0dHAtb3B0aW9ucy5tb2RlbC5qcyIsInNvdXJjZVJvb3QiOiIuLi8uLi8uLi9wcm9qZWN0cy9hbmd1bGFyLXJlc3Qtc2VydmljZS9zcmMvIiwic291cmNlcyI6WyJsaWIvbW9kZWwvdm9uLWh0dHAtb3B0aW9ucy5tb2RlbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSHR0cEhlYWRlcnMsIEh0dHBQYXJhbXMgfSBmcm9tICdAYW5ndWxhci9jb21tb24vaHR0cCc7XG5cbmV4cG9ydCBpbnRlcmZhY2UgVm9uSHR0cE9wdGlvbnNNb2RlbCB7XG4gIGhlYWRlcnM/OiBIdHRwSGVhZGVycyB8IHtcbiAgICBbaGVhZGVyOiBzdHJpbmddOiBzdHJpbmcgfCBzdHJpbmdbXTtcbiAgfTtcbiAgb2JzZXJ2ZT86ICdib2R5JztcbiAgcGFyYW1zPzogSHR0cFBhcmFtcyB8IHtcbiAgICBbcGFyYW06IHN0cmluZ106IHN0cmluZyB8IHN0cmluZ1tdO1xuICB9O1xuICByZXBvcnRQcm9ncmVzcz86IGJvb2xlYW47XG4gIHJlc3BvbnNlVHlwZT86ICdqc29uJztcbiAgd2l0aENyZWRlbnRpYWxzPzogYm9vbGVhbjtcbn1cbiJdfQ==
@@ -1,2 +0,0 @@
1
- export {};
2
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidm9uLXBhZ2UtcmVzcG9uc2UubW9kZWwuanMiLCJzb3VyY2VSb290IjoiLi4vLi4vLi4vcHJvamVjdHMvYW5ndWxhci1yZXN0LXNlcnZpY2Uvc3JjLyIsInNvdXJjZXMiOlsibGliL21vZGVsL3Zvbi1wYWdlLXJlc3BvbnNlLm1vZGVsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgaW50ZXJmYWNlIFZvblBhZ2VSZXNwb25zZU1vZGVsPFQ+IHtcbiAgY29udGVudDogVFtdO1xuICBsYXN0OiBib29sZWFuO1xuICB0b3RhbFBhZ2VzOiBudW1iZXI7XG4gIHRvdGFsRWxlbWVudHM6IG51bWJlcjtcbiAgc2l6ZTogbnVtYmVyO1xuICBudW1iZXJPZkVsZW1lbnRzOiBudW1iZXI7XG4gIG51bWJlcjogbnVtYmVyO1xufVxuIl19
@@ -1,55 +0,0 @@
1
- import { HttpResponse } from '@angular/common/http';
2
- import { throwError } from 'rxjs';
3
- import { catchError, map } from 'rxjs/operators';
4
- export class VonRestInterceptorService {
5
- constructor(router) {
6
- this.router = router;
7
- this.consoleDebug = false;
8
- this.errorResponseUnknown = 'Unknown Error';
9
- this.errorResponseForbidden = 'Forbidden Error';
10
- this.urlWhoAmI = 'api/who-am-i';
11
- this.postHttpRequest = () => {
12
- };
13
- }
14
- intercept(request, next) {
15
- return next.handle(request).pipe(map((event) => {
16
- if (event instanceof HttpResponse) {
17
- if (event.status === 200 || event.status === 204) {
18
- this.postHttpRequest();
19
- return event;
20
- }
21
- if (event.status !== 200) {
22
- const error = {
23
- status: event.status,
24
- message: event.statusText
25
- };
26
- if (this.consoleDebug) {
27
- console.error('[ErrorWS]: ', error);
28
- }
29
- throw error;
30
- }
31
- }
32
- return event;
33
- }), catchError((errorResponse) => {
34
- if (this.consoleDebug) {
35
- console.error('[Fatal]: ', errorResponse);
36
- }
37
- const error = {
38
- status: errorResponse.status,
39
- message: ''
40
- };
41
- if (errorResponse.status === 0) {
42
- error.message = this.errorResponseUnknown;
43
- }
44
- if (errorResponse.status === 401) {
45
- error.message = errorResponse.error ? errorResponse.error : this.errorResponseForbidden;
46
- }
47
- if (errorResponse.status === 403 || (errorResponse.url && errorResponse.url.indexOf(this.urlWhoAmI) > -1)) {
48
- this.router.navigate(['403']);
49
- }
50
- this.postHttpRequest();
51
- return throwError(error);
52
- }));
53
- }
54
- }
55
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidm9uLXJlc3QtaW50ZXJjZXB0b3Iuc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIuLi8uLi8uLi9wcm9qZWN0cy9hbmd1bGFyLXJlc3Qtc2VydmljZS9zcmMvIiwic291cmNlcyI6WyJsaWIvdm9uLXJlc3QtaW50ZXJjZXB0b3Iuc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQTJFLFlBQVksRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBRTdILE9BQU8sRUFBYyxVQUFVLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDOUMsT0FBTyxFQUFFLFVBQVUsRUFBRSxHQUFHLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUdqRCxNQUFNLE9BQWdCLHlCQUF5QjtJQU83QyxZQUNZLE1BQWM7UUFBZCxXQUFNLEdBQU4sTUFBTSxDQUFRO1FBTmhCLGlCQUFZLEdBQUcsS0FBSyxDQUFDO1FBQ3JCLHlCQUFvQixHQUFHLGVBQWUsQ0FBQztRQUN2QywyQkFBc0IsR0FBRyxpQkFBaUIsQ0FBQztRQUMzQyxjQUFTLEdBQUcsY0FBYyxDQUFDO1FBb0QzQixvQkFBZSxHQUFHLEdBQUcsRUFBRTtRQUNqQyxDQUFDLENBQUE7SUFqREcsQ0FBQztJQUVMLFNBQVMsQ0FBQyxPQUF5QixFQUFFLElBQWlCO1FBQ3BELE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLENBRTlCLEdBQUcsQ0FBQyxDQUFDLEtBQXFCLEVBQUUsRUFBRTtZQUM1QixJQUFJLEtBQUssWUFBWSxZQUFZLEVBQUU7Z0JBQ2pDLElBQUksS0FBSyxDQUFDLE1BQU0sS0FBSyxHQUFHLElBQUksS0FBSyxDQUFDLE1BQU0sS0FBSyxHQUFHLEVBQUU7b0JBQ2hELElBQUksQ0FBQyxlQUFlLEVBQUUsQ0FBQztvQkFDdkIsT0FBTyxLQUFLLENBQUM7aUJBQ2Q7Z0JBQ0QsSUFBSSxLQUFLLENBQUMsTUFBTSxLQUFLLEdBQUcsRUFBRTtvQkFDeEIsTUFBTSxLQUFLLEdBQWlDO3dCQUMxQyxNQUFNLEVBQUUsS0FBSyxDQUFDLE1BQU07d0JBQ3BCLE9BQU8sRUFBRSxLQUFLLENBQUMsVUFBVTtxQkFDMUIsQ0FBQztvQkFDRixJQUFJLElBQUksQ0FBQyxZQUFZLEVBQUU7d0JBQ3JCLE9BQU8sQ0FBQyxLQUFLLENBQUMsYUFBYSxFQUFFLEtBQUssQ0FBQyxDQUFDO3FCQUNyQztvQkFDRCxNQUFNLEtBQUssQ0FBQztpQkFDYjthQUNGO1lBQ0QsT0FBTyxLQUFLLENBQUM7UUFDZixDQUFDLENBQUMsRUFFRixVQUFVLENBQUMsQ0FBQyxhQUFnQyxFQUFFLEVBQUU7WUFDOUMsSUFBSSxJQUFJLENBQUMsWUFBWSxFQUFFO2dCQUNyQixPQUFPLENBQUMsS0FBSyxDQUFDLFdBQVcsRUFBRSxhQUFhLENBQUMsQ0FBQzthQUMzQztZQUNELE1BQU0sS0FBSyxHQUFpQztnQkFDMUMsTUFBTSxFQUFFLGFBQWEsQ0FBQyxNQUFNO2dCQUM1QixPQUFPLEVBQUUsRUFBRTthQUNaLENBQUM7WUFDRixJQUFJLGFBQWEsQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFO2dCQUM5QixLQUFLLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQyxvQkFBb0IsQ0FBQzthQUMzQztZQUNELElBQUksYUFBYSxDQUFDLE1BQU0sS0FBSyxHQUFHLEVBQUU7Z0JBQ2hDLEtBQUssQ0FBQyxPQUFPLEdBQUcsYUFBYSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLHNCQUFzQixDQUFDO2FBQ3pGO1lBQ0QsSUFBSSxhQUFhLENBQUMsTUFBTSxLQUFLLEdBQUcsSUFBSSxDQUFDLGFBQWEsQ0FBQyxHQUFHLElBQUksYUFBYSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUU7Z0JBQ3pHLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQzthQUMvQjtZQUNELElBQUksQ0FBQyxlQUFlLEVBQUUsQ0FBQztZQUN2QixPQUFPLFVBQVUsQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUMzQixDQUFDLENBQUMsQ0FDSCxDQUFDO0lBQ0osQ0FBQztDQUtGIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSHR0cEVycm9yUmVzcG9uc2UsIEh0dHBFdmVudCwgSHR0cEhhbmRsZXIsIEh0dHBJbnRlcmNlcHRvciwgSHR0cFJlcXVlc3QsIEh0dHBSZXNwb25zZSB9IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJztcbmltcG9ydCB7IFJvdXRlciB9IGZyb20gJ0Bhbmd1bGFyL3JvdXRlcic7XG5pbXBvcnQgeyBPYnNlcnZhYmxlLCB0aHJvd0Vycm9yIH0gZnJvbSAncnhqcyc7XG5pbXBvcnQgeyBjYXRjaEVycm9yLCBtYXAgfSBmcm9tICdyeGpzL29wZXJhdG9ycyc7XG5pbXBvcnQgeyBWb25FcnJvclJlc3RJbnRlcmNlcHRvck1vZGVsIH0gZnJvbSAnLi9tb2RlbC92b24tZXJyb3ItcmVzdC1pbnRlcmNlcHRvci5tb2RlbCc7XG5cbmV4cG9ydCBhYnN0cmFjdCBjbGFzcyBWb25SZXN0SW50ZXJjZXB0b3JTZXJ2aWNlIGltcGxlbWVudHMgSHR0cEludGVyY2VwdG9yIHtcblxuICBwcm90ZWN0ZWQgY29uc29sZURlYnVnID0gZmFsc2U7XG4gIHByb3RlY3RlZCBlcnJvclJlc3BvbnNlVW5rbm93biA9ICdVbmtub3duIEVycm9yJztcbiAgcHJvdGVjdGVkIGVycm9yUmVzcG9uc2VGb3JiaWRkZW4gPSAnRm9yYmlkZGVuIEVycm9yJztcbiAgcHJvdGVjdGVkIHVybFdob0FtSSA9ICdhcGkvd2hvLWFtLWknO1xuXG4gIGNvbnN0cnVjdG9yKFxuICAgIHByb3RlY3RlZCByb3V0ZXI6IFJvdXRlclxuICApIHsgfVxuXG4gIGludGVyY2VwdChyZXF1ZXN0OiBIdHRwUmVxdWVzdDxhbnk+LCBuZXh0OiBIdHRwSGFuZGxlcik6IE9ic2VydmFibGU8SHR0cEV2ZW50PGFueT4+IHtcbiAgICByZXR1cm4gbmV4dC5oYW5kbGUocmVxdWVzdCkucGlwZShcblxuICAgICAgbWFwKChldmVudDogSHR0cEV2ZW50PGFueT4pID0+IHtcbiAgICAgICAgaWYgKGV2ZW50IGluc3RhbmNlb2YgSHR0cFJlc3BvbnNlKSB7XG4gICAgICAgICAgaWYgKGV2ZW50LnN0YXR1cyA9PT0gMjAwIHx8IGV2ZW50LnN0YXR1cyA9PT0gMjA0KSB7XG4gICAgICAgICAgICB0aGlzLnBvc3RIdHRwUmVxdWVzdCgpO1xuICAgICAgICAgICAgcmV0dXJuIGV2ZW50O1xuICAgICAgICAgIH1cbiAgICAgICAgICBpZiAoZXZlbnQuc3RhdHVzICE9PSAyMDApIHtcbiAgICAgICAgICAgIGNvbnN0IGVycm9yOiBWb25FcnJvclJlc3RJbnRlcmNlcHRvck1vZGVsID0ge1xuICAgICAgICAgICAgICBzdGF0dXM6IGV2ZW50LnN0YXR1cyxcbiAgICAgICAgICAgICAgbWVzc2FnZTogZXZlbnQuc3RhdHVzVGV4dFxuICAgICAgICAgICAgfTtcbiAgICAgICAgICAgIGlmICh0aGlzLmNvbnNvbGVEZWJ1Zykge1xuICAgICAgICAgICAgICBjb25zb2xlLmVycm9yKCdbRXJyb3JXU106ICcsIGVycm9yKTtcbiAgICAgICAgICAgIH1cbiAgICAgICAgICAgIHRocm93IGVycm9yO1xuICAgICAgICAgIH1cbiAgICAgICAgfVxuICAgICAgICByZXR1cm4gZXZlbnQ7XG4gICAgICB9KSxcblxuICAgICAgY2F0Y2hFcnJvcigoZXJyb3JSZXNwb25zZTogSHR0cEVycm9yUmVzcG9uc2UpID0+IHtcbiAgICAgICAgaWYgKHRoaXMuY29uc29sZURlYnVnKSB7XG4gICAgICAgICAgY29uc29sZS5lcnJvcignW0ZhdGFsXTogJywgZXJyb3JSZXNwb25zZSk7XG4gICAgICAgIH1cbiAgICAgICAgY29uc3QgZXJyb3I6IFZvbkVycm9yUmVzdEludGVyY2VwdG9yTW9kZWwgPSB7XG4gICAgICAgICAgc3RhdHVzOiBlcnJvclJlc3BvbnNlLnN0YXR1cyxcbiAgICAgICAgICBtZXNzYWdlOiAnJ1xuICAgICAgICB9O1xuICAgICAgICBpZiAoZXJyb3JSZXNwb25zZS5zdGF0dXMgPT09IDApIHtcbiAgICAgICAgICBlcnJvci5tZXNzYWdlID0gdGhpcy5lcnJvclJlc3BvbnNlVW5rbm93bjtcbiAgICAgICAgfVxuICAgICAgICBpZiAoZXJyb3JSZXNwb25zZS5zdGF0dXMgPT09IDQwMSkge1xuICAgICAgICAgIGVycm9yLm1lc3NhZ2UgPSBlcnJvclJlc3BvbnNlLmVycm9yID8gZXJyb3JSZXNwb25zZS5lcnJvciA6IHRoaXMuZXJyb3JSZXNwb25zZUZvcmJpZGRlbjtcbiAgICAgICAgfVxuICAgICAgICBpZiAoZXJyb3JSZXNwb25zZS5zdGF0dXMgPT09IDQwMyB8fCAoZXJyb3JSZXNwb25zZS51cmwgJiYgZXJyb3JSZXNwb25zZS51cmwuaW5kZXhPZih0aGlzLnVybFdob0FtSSkgPiAtMSkpIHtcbiAgICAgICAgICB0aGlzLnJvdXRlci5uYXZpZ2F0ZShbJzQwMyddKTtcbiAgICAgICAgfVxuICAgICAgICB0aGlzLnBvc3RIdHRwUmVxdWVzdCgpO1xuICAgICAgICByZXR1cm4gdGhyb3dFcnJvcihlcnJvcik7XG4gICAgICB9KVxuICAgICk7XG4gIH1cblxuICBwcm90ZWN0ZWQgcG9zdEh0dHBSZXF1ZXN0ID0gKCkgPT4ge1xuICB9XG5cbn1cbiJdfQ==