@von-development-studio/angular-rest-service 2.0.4-SNAPSHOT → 18.2.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/README.md +54 -54
- package/esm2022/lib/models/von-error-rest-interceptor.model.mjs +2 -0
- package/esm2022/lib/models/von-header-params.model.mjs +2 -0
- package/esm2022/lib/models/von-http-options.model.mjs +2 -0
- package/esm2022/lib/models/von-page-response.model.mjs +2 -0
- package/esm2022/lib/models/von-rest-definition.model.mjs +2 -0
- package/esm2022/lib/von-rest-interceptor.service.mjs +68 -0
- package/esm2022/lib/von-rest.service.mjs +185 -0
- package/esm2022/public-api.mjs +7 -0
- package/esm2022/von-development-studio-angular-rest-service.mjs +5 -0
- package/fesm2022/von-development-studio-angular-rest-service.mjs +258 -0
- package/fesm2022/von-development-studio-angular-rest-service.mjs.map +1 -0
- package/{von-development-studio-angular-rest-service.d.ts → index.d.ts} +0 -0
- package/lib/{model → models}/von-error-rest-interceptor.model.d.ts +0 -0
- package/lib/models/von-header-params.model.d.ts +5 -0
- package/lib/{model → models}/von-http-options.model.d.ts +0 -0
- package/lib/{model → models}/von-page-response.model.d.ts +3 -0
- package/lib/models/von-rest-definition.model.d.ts +21 -0
- package/lib/von-rest-interceptor.service.d.ts +0 -0
- package/lib/von-rest.service.d.ts +35 -16
- package/package.json +13 -19
- package/public-api.d.ts +4 -4
- package/LICENSE +0 -21
- package/esm2020/lib/model/von-error-response.model.mjs +0 -2
- package/esm2020/lib/model/von-error-rest-interceptor.model.mjs +0 -2
- package/esm2020/lib/model/von-http-options.model.mjs +0 -2
- package/esm2020/lib/model/von-page-response.model.mjs +0 -2
- package/esm2020/lib/model/von-rest-definition.type.mjs +0 -2
- package/esm2020/lib/von-rest-interceptor.service.mjs +0 -62
- package/esm2020/lib/von-rest.service.mjs +0 -105
- package/esm2020/public-api.mjs +0 -7
- package/esm2020/von-development-studio-angular-rest-service.mjs +0 -5
- package/fesm2015/von-development-studio-angular-rest-service.mjs +0 -168
- package/fesm2015/von-development-studio-angular-rest-service.mjs.map +0 -1
- package/fesm2020/von-development-studio-angular-rest-service.mjs +0 -172
- package/fesm2020/von-development-studio-angular-rest-service.mjs.map +0 -1
- package/lib/model/von-error-response.model.d.ts +0 -5
- package/lib/model/von-rest-definition.type.d.ts +0 -25
|
@@ -0,0 +1,258 @@
|
|
|
1
|
+
import { HttpResponse, HttpHeaders } from '@angular/common/http';
|
|
2
|
+
import { throwError } from 'rxjs';
|
|
3
|
+
import { map, catchError, take, share } from 'rxjs/operators';
|
|
4
|
+
|
|
5
|
+
class VonRestInterceptorService {
|
|
6
|
+
router;
|
|
7
|
+
consoleDebug = false;
|
|
8
|
+
errorResponseUnknown = 'Unknown Error';
|
|
9
|
+
errorResponseForbidden = 'Forbidden Error';
|
|
10
|
+
urlWhoAmI = 'api/who-am-i';
|
|
11
|
+
redirectOn403 = true;
|
|
12
|
+
redirect403Url = ['403'];
|
|
13
|
+
constructor(router) {
|
|
14
|
+
this.router = router;
|
|
15
|
+
}
|
|
16
|
+
intercept(request, next) {
|
|
17
|
+
return next
|
|
18
|
+
.handle(request)
|
|
19
|
+
.pipe(map(this.mapEvent), catchError(this.catchError));
|
|
20
|
+
}
|
|
21
|
+
postHttpRequest = () => { };
|
|
22
|
+
mapEvent = (event) => {
|
|
23
|
+
if (event instanceof HttpResponse) {
|
|
24
|
+
if (event.status === 200 || event.status === 204) {
|
|
25
|
+
this.postHttpRequest();
|
|
26
|
+
return event;
|
|
27
|
+
}
|
|
28
|
+
if (event.status !== 200) {
|
|
29
|
+
const error = {
|
|
30
|
+
status: event.status,
|
|
31
|
+
message: event.statusText,
|
|
32
|
+
body: event.body,
|
|
33
|
+
};
|
|
34
|
+
if (this.consoleDebug) {
|
|
35
|
+
console.error('[ErrorWS]: ', error);
|
|
36
|
+
}
|
|
37
|
+
throw error;
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
return event;
|
|
41
|
+
};
|
|
42
|
+
catchError = (errorResponse) => {
|
|
43
|
+
if (this.consoleDebug) {
|
|
44
|
+
console.error('[Fatal]: ', errorResponse);
|
|
45
|
+
}
|
|
46
|
+
const error = {
|
|
47
|
+
status: errorResponse.status,
|
|
48
|
+
message: '',
|
|
49
|
+
body: errorResponse.error || {},
|
|
50
|
+
};
|
|
51
|
+
if (errorResponse.status === 0) {
|
|
52
|
+
error.message = this.errorResponseUnknown;
|
|
53
|
+
}
|
|
54
|
+
if (errorResponse.status === 401) {
|
|
55
|
+
error.message = errorResponse.error
|
|
56
|
+
? errorResponse.error
|
|
57
|
+
: this.errorResponseForbidden;
|
|
58
|
+
}
|
|
59
|
+
if (this.redirectOn403) {
|
|
60
|
+
if (errorResponse.status === 403 ||
|
|
61
|
+
(errorResponse.url && errorResponse.url.indexOf(this.urlWhoAmI) > -1)) {
|
|
62
|
+
this.router.navigate(this.redirect403Url);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
this.postHttpRequest();
|
|
66
|
+
return throwError(error);
|
|
67
|
+
};
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
/**
|
|
71
|
+
* Rest service wrapper for API calls. This class needs to be extended in a `@Injectable({ providedIn: 'root' })` service.
|
|
72
|
+
* Parameters needed:
|
|
73
|
+
* @HttpClient
|
|
74
|
+
* @DomSanitizer
|
|
75
|
+
*/
|
|
76
|
+
class VonRestService {
|
|
77
|
+
http;
|
|
78
|
+
sanitizer;
|
|
79
|
+
constructor(http, sanitizer) {
|
|
80
|
+
this.http = http;
|
|
81
|
+
this.sanitizer = sanitizer;
|
|
82
|
+
}
|
|
83
|
+
/**
|
|
84
|
+
* Allows to set the default headers
|
|
85
|
+
* @param headerParams Check HeaderParams interface to verify allowed overrides
|
|
86
|
+
* @returns
|
|
87
|
+
* ```json
|
|
88
|
+
* {
|
|
89
|
+
* "Content-Type": "application/json",
|
|
90
|
+
* "Accept": "application/json",
|
|
91
|
+
* "Access-Control-Allow-Origin": "*"
|
|
92
|
+
* }
|
|
93
|
+
* ```
|
|
94
|
+
*/
|
|
95
|
+
setHeaders = (headerParams) => {
|
|
96
|
+
return new HttpHeaders({
|
|
97
|
+
'Content-Type': headerParams?.contentType ?? 'application/json',
|
|
98
|
+
Accept: headerParams?.accept ?? 'application/json',
|
|
99
|
+
'Access-Control-Allow-Origin': '*',
|
|
100
|
+
});
|
|
101
|
+
};
|
|
102
|
+
setOptions = ({ headerParams, queryParams: params, } = {}) => {
|
|
103
|
+
const options = {
|
|
104
|
+
headers: this.setHeaders(headerParams),
|
|
105
|
+
params,
|
|
106
|
+
withCredentials: true,
|
|
107
|
+
};
|
|
108
|
+
if (headerParams?.responseType) {
|
|
109
|
+
options.responseType = headerParams.responseType;
|
|
110
|
+
}
|
|
111
|
+
return options;
|
|
112
|
+
};
|
|
113
|
+
setOptionsForFile = ({ headerParams, queryParams, } = {}) => {
|
|
114
|
+
const options = {
|
|
115
|
+
...this.setOptions({
|
|
116
|
+
headerParams,
|
|
117
|
+
queryParams,
|
|
118
|
+
}),
|
|
119
|
+
headers: new HttpHeaders({
|
|
120
|
+
Accept: headerParams?.accept ?? 'application/json',
|
|
121
|
+
'Access-Control-Allow-Origin': '*',
|
|
122
|
+
}),
|
|
123
|
+
};
|
|
124
|
+
if (headerParams?.responseType) {
|
|
125
|
+
options.responseType = headerParams.responseType;
|
|
126
|
+
}
|
|
127
|
+
return options;
|
|
128
|
+
};
|
|
129
|
+
setUrlParams = (url, params) => {
|
|
130
|
+
if (params != null) {
|
|
131
|
+
for (const p in params) {
|
|
132
|
+
if (p != null) {
|
|
133
|
+
url = url.replace(`{${p}}`, params[p]);
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
return url;
|
|
138
|
+
};
|
|
139
|
+
authenticate = (url, username, password) => {
|
|
140
|
+
const authorization = btoa(`${username}:${password}`);
|
|
141
|
+
const headers = new HttpHeaders({
|
|
142
|
+
authorization: `Basic ${authorization}`,
|
|
143
|
+
});
|
|
144
|
+
return this.http
|
|
145
|
+
.get(url, {
|
|
146
|
+
headers,
|
|
147
|
+
withCredentials: true,
|
|
148
|
+
})
|
|
149
|
+
.pipe(take(1), share());
|
|
150
|
+
};
|
|
151
|
+
get = ({ url, urlParams, queryParams: params, headerParams, header: oldHeaderParams, params: oldParams, }) => {
|
|
152
|
+
url = this.setUrlParams(url, urlParams);
|
|
153
|
+
return this.http.get(url, this.setOptions({
|
|
154
|
+
headerParams: {
|
|
155
|
+
...headerParams,
|
|
156
|
+
...oldHeaderParams,
|
|
157
|
+
},
|
|
158
|
+
queryParams: {
|
|
159
|
+
...params,
|
|
160
|
+
...oldParams,
|
|
161
|
+
},
|
|
162
|
+
}));
|
|
163
|
+
};
|
|
164
|
+
delete = ({ url, urlParams, queryParams: params, headerParams, header: oldHeaderParams, params: oldParams, }) => {
|
|
165
|
+
url = this.setUrlParams(url, urlParams);
|
|
166
|
+
return this.http.delete(url, this.setOptions({
|
|
167
|
+
headerParams: {
|
|
168
|
+
...headerParams,
|
|
169
|
+
...oldHeaderParams,
|
|
170
|
+
},
|
|
171
|
+
queryParams: {
|
|
172
|
+
...params,
|
|
173
|
+
...oldParams,
|
|
174
|
+
},
|
|
175
|
+
}));
|
|
176
|
+
};
|
|
177
|
+
post = ({ url, body, urlParams, queryParams: params, headerParams, header: oldHeaderParams, params: oldParams, }) => {
|
|
178
|
+
url = this.setUrlParams(url, urlParams);
|
|
179
|
+
const optionsParams = {
|
|
180
|
+
headerParams: {
|
|
181
|
+
...headerParams,
|
|
182
|
+
...oldHeaderParams,
|
|
183
|
+
},
|
|
184
|
+
queryParams: {
|
|
185
|
+
...params,
|
|
186
|
+
...oldParams,
|
|
187
|
+
},
|
|
188
|
+
};
|
|
189
|
+
let options = body && body instanceof FormData
|
|
190
|
+
? this.setOptionsForFile(optionsParams)
|
|
191
|
+
: this.setOptions(optionsParams);
|
|
192
|
+
return this.http.post(url, body, options);
|
|
193
|
+
};
|
|
194
|
+
put = ({ url, body, urlParams, queryParams: params, headerParams, header: oldHeaderParams, params: oldParams, }) => {
|
|
195
|
+
url = this.setUrlParams(url, urlParams);
|
|
196
|
+
const optionsParams = {
|
|
197
|
+
headerParams: {
|
|
198
|
+
...headerParams,
|
|
199
|
+
...oldHeaderParams,
|
|
200
|
+
},
|
|
201
|
+
queryParams: {
|
|
202
|
+
...params,
|
|
203
|
+
...oldParams,
|
|
204
|
+
},
|
|
205
|
+
};
|
|
206
|
+
let options = body && body instanceof FormData
|
|
207
|
+
? this.setOptionsForFile(optionsParams)
|
|
208
|
+
: this.setOptions(optionsParams);
|
|
209
|
+
return this.http.put(url, body, options);
|
|
210
|
+
};
|
|
211
|
+
patch = ({ url, body, urlParams, queryParams: params, headerParams, header: oldHeaderParams, params: oldParams, }) => {
|
|
212
|
+
url = this.setUrlParams(url, urlParams);
|
|
213
|
+
const optionsParams = {
|
|
214
|
+
headerParams: {
|
|
215
|
+
...headerParams,
|
|
216
|
+
...oldHeaderParams,
|
|
217
|
+
},
|
|
218
|
+
queryParams: {
|
|
219
|
+
...params,
|
|
220
|
+
...oldParams,
|
|
221
|
+
},
|
|
222
|
+
};
|
|
223
|
+
let options = body && body instanceof FormData
|
|
224
|
+
? this.setOptionsForFile(optionsParams)
|
|
225
|
+
: this.setOptions(optionsParams);
|
|
226
|
+
return this.http.patch(url, body, options);
|
|
227
|
+
};
|
|
228
|
+
file = ({ url, urlParams, queryParams: params, headerParams, header: oldHeaderParams, params: oldParams, }) => {
|
|
229
|
+
url = this.setUrlParams(url, urlParams);
|
|
230
|
+
return this.http
|
|
231
|
+
.get(url, {
|
|
232
|
+
...this.setOptionsForFile({
|
|
233
|
+
headerParams: {
|
|
234
|
+
...headerParams,
|
|
235
|
+
...oldHeaderParams,
|
|
236
|
+
},
|
|
237
|
+
queryParams: {
|
|
238
|
+
...params,
|
|
239
|
+
...oldParams,
|
|
240
|
+
},
|
|
241
|
+
}),
|
|
242
|
+
responseType: 'blob',
|
|
243
|
+
})
|
|
244
|
+
.pipe(map((res) => {
|
|
245
|
+
const fileBlob = new Blob([res], { type: params?.['contentType'] });
|
|
246
|
+
const objUrl = URL.createObjectURL(fileBlob);
|
|
247
|
+
const sanitized = this.sanitizer.bypassSecurityTrustResourceUrl(objUrl);
|
|
248
|
+
return sanitized;
|
|
249
|
+
}));
|
|
250
|
+
};
|
|
251
|
+
}
|
|
252
|
+
|
|
253
|
+
/**
|
|
254
|
+
* Generated bundle index. Do not edit.
|
|
255
|
+
*/
|
|
256
|
+
|
|
257
|
+
export { VonRestInterceptorService, VonRestService };
|
|
258
|
+
//# sourceMappingURL=von-development-studio-angular-rest-service.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"von-development-studio-angular-rest-service.mjs","sources":["../../../projects/ng-rest-service/src/lib/von-rest-interceptor.service.ts","../../../projects/ng-rest-service/src/lib/von-rest.service.ts","../../../projects/ng-rest-service/src/von-development-studio-angular-rest-service.ts"],"sourcesContent":["import {\n HttpErrorResponse,\n HttpEvent,\n HttpHandler,\n HttpInterceptor,\n HttpRequest,\n HttpResponse,\n} from '@angular/common/http';\nimport { Router } from '@angular/router';\nimport { Observable, throwError } from 'rxjs';\nimport { catchError, map } from 'rxjs/operators';\nimport { VonErrorRestInterceptorModel } from './models/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(\n request: HttpRequest<any>,\n next: HttpHandler\n ): Observable<HttpEvent<any>> {\n return next\n .handle(request)\n .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\n ? errorResponse.error\n : this.errorResponseForbidden;\n }\n if (this.redirectOn403) {\n if (\n errorResponse.status === 403 ||\n (errorResponse.url && errorResponse.url.indexOf(this.urlWhoAmI) > -1)\n ) {\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 { HeaderParams } from './models/von-header-params.model';\nimport { VonHttpOptionsModel } from './models/von-http-options.model';\nimport {\n BaseParams,\n BodyParams,\n GenericParams,\n} from './models/von-rest-definition.model';\n\n/**\n * Rest service wrapper for API calls. This class needs to be extended in a `@Injectable({ providedIn: 'root' })` service.\n * Parameters needed:\n * @HttpClient\n * @DomSanitizer\n */\nexport abstract class VonRestService {\n constructor(protected http: HttpClient, protected sanitizer: DomSanitizer) {}\n\n /**\n * Allows to set the default headers\n * @param headerParams Check HeaderParams interface to verify allowed overrides\n * @returns\n * ```json\n * {\n * \"Content-Type\": \"application/json\",\n * \"Accept\": \"application/json\",\n * \"Access-Control-Allow-Origin\": \"*\"\n * }\n * ```\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 = ({\n headerParams,\n queryParams: params,\n }: {\n headerParams?: HeaderParams;\n queryParams?: GenericParams;\n } = {}): VonHttpOptionsModel => {\n const options: VonHttpOptionsModel = {\n headers: this.setHeaders(headerParams),\n params,\n withCredentials: true,\n };\n if (headerParams?.responseType) {\n options.responseType = headerParams.responseType;\n }\n return options;\n };\n\n protected setOptionsForFile = ({\n headerParams,\n queryParams,\n }: {\n headerParams?: HeaderParams;\n queryParams?: GenericParams;\n } = {}): VonHttpOptionsModel => {\n const options: VonHttpOptionsModel = {\n ...this.setOptions({\n headerParams,\n queryParams,\n }),\n headers: new HttpHeaders({\n Accept: headerParams?.accept ?? 'application/json',\n 'Access-Control-Allow-Origin': '*',\n }),\n };\n if (headerParams?.responseType) {\n options.responseType = headerParams.responseType;\n }\n return options;\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 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 get = <R = any>({\n url,\n urlParams,\n queryParams: params,\n headerParams,\n header: oldHeaderParams,\n params: oldParams,\n }: BaseParams): Observable<R> => {\n url = this.setUrlParams(url, urlParams);\n return this.http.get<R>(\n url,\n this.setOptions({\n headerParams: {\n ...headerParams,\n ...oldHeaderParams,\n },\n queryParams: {\n ...params,\n ...oldParams,\n },\n })\n );\n };\n\n delete = <R = any>({\n url,\n urlParams,\n queryParams: params,\n headerParams,\n header: oldHeaderParams,\n params: oldParams,\n }: BaseParams): Observable<R> => {\n url = this.setUrlParams(url, urlParams);\n return this.http.delete<R>(\n url,\n this.setOptions({\n headerParams: {\n ...headerParams,\n ...oldHeaderParams,\n },\n queryParams: {\n ...params,\n ...oldParams,\n },\n })\n );\n };\n\n post = <R = any, B = GenericParams | FormData>({\n url,\n body,\n urlParams,\n queryParams: params,\n headerParams,\n header: oldHeaderParams,\n params: oldParams,\n }: BodyParams<B>): Observable<R> => {\n url = this.setUrlParams(url, urlParams);\n const optionsParams = {\n headerParams: {\n ...headerParams,\n ...oldHeaderParams,\n },\n queryParams: {\n ...params,\n ...oldParams,\n },\n };\n let options =\n body && body instanceof FormData\n ? this.setOptionsForFile(optionsParams)\n : this.setOptions(optionsParams);\n return this.http.post<R>(url, body, options);\n };\n\n put = <R = any, B = GenericParams | FormData>({\n url,\n body,\n urlParams,\n queryParams: params,\n headerParams,\n header: oldHeaderParams,\n params: oldParams,\n }: BodyParams<B>): Observable<R> => {\n url = this.setUrlParams(url, urlParams);\n const optionsParams = {\n headerParams: {\n ...headerParams,\n ...oldHeaderParams,\n },\n queryParams: {\n ...params,\n ...oldParams,\n },\n };\n let options =\n body && body instanceof FormData\n ? this.setOptionsForFile(optionsParams)\n : this.setOptions(optionsParams);\n return this.http.put<R>(url, body, options);\n };\n\n patch = <R = any, B = GenericParams | FormData>({\n url,\n body,\n urlParams,\n queryParams: params,\n headerParams,\n header: oldHeaderParams,\n params: oldParams,\n }: BodyParams<B>): Observable<R> => {\n url = this.setUrlParams(url, urlParams);\n const optionsParams = {\n headerParams: {\n ...headerParams,\n ...oldHeaderParams,\n },\n queryParams: {\n ...params,\n ...oldParams,\n },\n };\n let options =\n body && body instanceof FormData\n ? this.setOptionsForFile(optionsParams)\n : this.setOptions(optionsParams);\n return this.http.patch<R>(url, body, options);\n };\n\n file = ({\n url,\n urlParams,\n queryParams: params,\n headerParams,\n header: oldHeaderParams,\n params: oldParams,\n }: BaseParams): Observable<SafeResourceUrl> => {\n url = this.setUrlParams(url, urlParams);\n return this.http\n .get(url, {\n ...this.setOptionsForFile({\n headerParams: {\n ...headerParams,\n ...oldHeaderParams,\n },\n queryParams: {\n ...params,\n ...oldParams,\n },\n }),\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","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './public-api';\n"],"names":[],"mappings":"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"}
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { HeaderParams } from './von-header-params.model';
|
|
2
|
+
export interface GenericParams {
|
|
3
|
+
[key: string]: any;
|
|
4
|
+
}
|
|
5
|
+
export interface BaseParams {
|
|
6
|
+
url: string;
|
|
7
|
+
urlParams?: GenericParams;
|
|
8
|
+
queryParams?: GenericParams;
|
|
9
|
+
headerParams?: HeaderParams;
|
|
10
|
+
/**
|
|
11
|
+
* @deprecated Use headerParams instead
|
|
12
|
+
*/
|
|
13
|
+
header?: HeaderParams;
|
|
14
|
+
/**
|
|
15
|
+
* @deprecated Use queryParams instead
|
|
16
|
+
*/
|
|
17
|
+
params?: GenericParams;
|
|
18
|
+
}
|
|
19
|
+
export type BodyParams<B = GenericParams | FormData> = BaseParams & {
|
|
20
|
+
body?: B;
|
|
21
|
+
};
|
|
File without changes
|
|
@@ -1,27 +1,46 @@
|
|
|
1
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 {
|
|
5
|
-
import {
|
|
4
|
+
import { HeaderParams } from './models/von-header-params.model';
|
|
5
|
+
import { VonHttpOptionsModel } from './models/von-http-options.model';
|
|
6
|
+
import { BaseParams, BodyParams, GenericParams } from './models/von-rest-definition.model';
|
|
7
|
+
/**
|
|
8
|
+
* Rest service wrapper for API calls. This class needs to be extended in a `@Injectable({ providedIn: 'root' })` service.
|
|
9
|
+
* Parameters needed:
|
|
10
|
+
* @HttpClient
|
|
11
|
+
* @DomSanitizer
|
|
12
|
+
*/
|
|
6
13
|
export declare abstract class VonRestService {
|
|
7
14
|
protected http: HttpClient;
|
|
8
15
|
protected sanitizer: DomSanitizer;
|
|
9
16
|
constructor(http: HttpClient, sanitizer: DomSanitizer);
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
17
|
+
/**
|
|
18
|
+
* Allows to set the default headers
|
|
19
|
+
* @param headerParams Check HeaderParams interface to verify allowed overrides
|
|
20
|
+
* @returns
|
|
21
|
+
* ```json
|
|
22
|
+
* {
|
|
23
|
+
* "Content-Type": "application/json",
|
|
24
|
+
* "Accept": "application/json",
|
|
25
|
+
* "Access-Control-Allow-Origin": "*"
|
|
26
|
+
* }
|
|
27
|
+
* ```
|
|
28
|
+
*/
|
|
29
|
+
protected setHeaders: (headerParams?: HeaderParams) => HttpHeaders;
|
|
30
|
+
protected setOptions: ({ headerParams, queryParams: params, }?: {
|
|
31
|
+
headerParams?: HeaderParams;
|
|
32
|
+
queryParams?: GenericParams;
|
|
14
33
|
}) => VonHttpOptionsModel;
|
|
15
|
-
protected setOptionsForFile: ({ headerParams,
|
|
16
|
-
headerParams?: HeaderParams
|
|
17
|
-
|
|
34
|
+
protected setOptionsForFile: ({ headerParams, queryParams, }?: {
|
|
35
|
+
headerParams?: HeaderParams;
|
|
36
|
+
queryParams?: GenericParams;
|
|
18
37
|
}) => VonHttpOptionsModel;
|
|
19
|
-
protected setUrlParams: (url: string, params?: GenericParams
|
|
38
|
+
protected setUrlParams: (url: string, params?: GenericParams) => string;
|
|
20
39
|
authenticate: (url: string, username: string, password: string) => Observable<any>;
|
|
21
|
-
get: <R = any>({ url, urlParams, params, header:
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
40
|
+
get: <R = any>({ url, urlParams, queryParams: params, headerParams, header: oldHeaderParams, params: oldParams, }: BaseParams) => Observable<R>;
|
|
41
|
+
delete: <R = any>({ url, urlParams, queryParams: params, headerParams, header: oldHeaderParams, params: oldParams, }: BaseParams) => Observable<R>;
|
|
42
|
+
post: <R = any, B = GenericParams | FormData>({ url, body, urlParams, queryParams: params, headerParams, header: oldHeaderParams, params: oldParams, }: BodyParams<B>) => Observable<R>;
|
|
43
|
+
put: <R = any, B = GenericParams | FormData>({ url, body, urlParams, queryParams: params, headerParams, header: oldHeaderParams, params: oldParams, }: BodyParams<B>) => Observable<R>;
|
|
44
|
+
patch: <R = any, B = GenericParams | FormData>({ url, body, urlParams, queryParams: params, headerParams, header: oldHeaderParams, params: oldParams, }: BodyParams<B>) => Observable<R>;
|
|
45
|
+
file: ({ url, urlParams, queryParams: params, headerParams, header: oldHeaderParams, params: oldParams, }: BaseParams) => Observable<SafeResourceUrl>;
|
|
27
46
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@von-development-studio/angular-rest-service",
|
|
3
|
-
"version": "2.0
|
|
3
|
+
"version": "18.2.0",
|
|
4
4
|
"description": "Angular Rest Service wrapper.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -8,36 +8,30 @@
|
|
|
8
8
|
},
|
|
9
9
|
"keywords": [
|
|
10
10
|
"angular",
|
|
11
|
-
"angular
|
|
11
|
+
"angular 18",
|
|
12
12
|
"rest client"
|
|
13
13
|
],
|
|
14
14
|
"author": "Luis García Castro",
|
|
15
15
|
"license": "MIT",
|
|
16
16
|
"peerDependencies": {
|
|
17
|
-
"@angular/common": "^
|
|
18
|
-
"@angular/core": "^
|
|
17
|
+
"@angular/common": "^18.2.0",
|
|
18
|
+
"@angular/core": "^18.2.0"
|
|
19
19
|
},
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"tslib": "^2.
|
|
21
|
+
"tslib": "^2.3.0"
|
|
22
22
|
},
|
|
23
|
-
"
|
|
24
|
-
"
|
|
25
|
-
"
|
|
26
|
-
"fesm2020": "fesm2020/von-development-studio-angular-rest-service.mjs",
|
|
27
|
-
"fesm2015": "fesm2015/von-development-studio-angular-rest-service.mjs",
|
|
28
|
-
"typings": "von-development-studio-angular-rest-service.d.ts",
|
|
23
|
+
"sideEffects": false,
|
|
24
|
+
"module": "fesm2022/von-development-studio-angular-rest-service.mjs",
|
|
25
|
+
"typings": "index.d.ts",
|
|
29
26
|
"exports": {
|
|
30
27
|
"./package.json": {
|
|
31
28
|
"default": "./package.json"
|
|
32
29
|
},
|
|
33
30
|
".": {
|
|
34
|
-
"types": "./
|
|
35
|
-
"
|
|
36
|
-
"
|
|
37
|
-
"
|
|
38
|
-
"node": "./fesm2015/von-development-studio-angular-rest-service.mjs",
|
|
39
|
-
"default": "./fesm2020/von-development-studio-angular-rest-service.mjs"
|
|
31
|
+
"types": "./index.d.ts",
|
|
32
|
+
"esm2022": "./esm2022/von-development-studio-angular-rest-service.mjs",
|
|
33
|
+
"esm": "./esm2022/von-development-studio-angular-rest-service.mjs",
|
|
34
|
+
"default": "./fesm2022/von-development-studio-angular-rest-service.mjs"
|
|
40
35
|
}
|
|
41
|
-
}
|
|
42
|
-
"sideEffects": false
|
|
36
|
+
}
|
|
43
37
|
}
|
package/public-api.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
export * from './lib/
|
|
2
|
-
export * from './lib/
|
|
3
|
-
export * from './lib/
|
|
4
|
-
export * from './lib/
|
|
1
|
+
export * from './lib/models/von-error-rest-interceptor.model';
|
|
2
|
+
export * from './lib/models/von-header-params.model';
|
|
3
|
+
export * from './lib/models/von-page-response.model';
|
|
4
|
+
export * from './lib/models/von-rest-definition.model';
|
|
5
5
|
export * from './lib/von-rest-interceptor.service';
|
|
6
6
|
export * from './lib/von-rest.service';
|
package/LICENSE
DELETED
|
@@ -1,21 +0,0 @@
|
|
|
1
|
-
MIT License
|
|
2
|
-
|
|
3
|
-
Copyright (c) 2020 von-development-studio / angular-libraries
|
|
4
|
-
|
|
5
|
-
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
|
-
of this software and associated documentation files (the "Software"), to deal
|
|
7
|
-
in the Software without restriction, including without limitation the rights
|
|
8
|
-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
9
|
-
copies of the Software, and to permit persons to whom the Software is
|
|
10
|
-
furnished to do so, subject to the following conditions:
|
|
11
|
-
|
|
12
|
-
The above copyright notice and this permission notice shall be included in all
|
|
13
|
-
copies or substantial portions of the Software.
|
|
14
|
-
|
|
15
|
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
17
|
-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
18
|
-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
|
-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
|
-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
21
|
-
SOFTWARE.
|
|
@@ -1,2 +0,0 @@
|
|
|
1
|
-
export {};
|
|
2
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidm9uLWVycm9yLXJlc3BvbnNlLm1vZGVsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvYW5ndWxhci1yZXN0LXNlcnZpY2Uvc3JjL2xpYi9tb2RlbC92b24tZXJyb3ItcmVzcG9uc2UubW9kZWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBpbnRlcmZhY2UgVm9uRXJyb3JSZXNwb25zZU1vZGVsIHtcbiAgY29kZT86IHN0cmluZyB8IG51bGw7XG4gIG1lc3NhZ2U/OiBzdHJpbmcgfCBudWxsO1xuICBwYXlsb2FkPzogYW55IHwgbnVsbDtcbn1cbiJdfQ==
|
|
@@ -1,2 +0,0 @@
|
|
|
1
|
-
export {};
|
|
2
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidm9uLWVycm9yLXJlc3QtaW50ZXJjZXB0b3IubW9kZWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9hbmd1bGFyLXJlc3Qtc2VydmljZS9zcmMvbGliL21vZGVsL3Zvbi1lcnJvci1yZXN0LWludGVyY2VwdG9yLm1vZGVsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgaW50ZXJmYWNlIFZvbkVycm9yUmVzdEludGVyY2VwdG9yTW9kZWwge1xuICBzdGF0dXM6IG51bWJlcjtcbiAgbWVzc2FnZTogc3RyaW5nO1xuICBib2R5PzogYW55O1xufVxuIl19
|
|
@@ -1,2 +0,0 @@
|
|
|
1
|
-
export {};
|
|
2
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidm9uLWh0dHAtb3B0aW9ucy5tb2RlbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2FuZ3VsYXItcmVzdC1zZXJ2aWNlL3NyYy9saWIvbW9kZWwvdm9uLWh0dHAtb3B0aW9ucy5tb2RlbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSHR0cEhlYWRlcnMsIEh0dHBQYXJhbXMgfSBmcm9tICdAYW5ndWxhci9jb21tb24vaHR0cCc7XG5cbmV4cG9ydCBpbnRlcmZhY2UgVm9uSHR0cE9wdGlvbnNNb2RlbCB7XG4gIGhlYWRlcnM/OiBIdHRwSGVhZGVycyB8IHtcbiAgICBbaGVhZGVyOiBzdHJpbmddOiBzdHJpbmcgfCBzdHJpbmdbXTtcbiAgfTtcbiAgb2JzZXJ2ZT86ICdib2R5JztcbiAgcGFyYW1zPzogSHR0cFBhcmFtcyB8IHtcbiAgICBbcGFyYW06IHN0cmluZ106IHN0cmluZyB8IHN0cmluZ1tdO1xuICB9O1xuICByZXBvcnRQcm9ncmVzcz86IGJvb2xlYW47XG4gIHJlc3BvbnNlVHlwZT86ICdqc29uJztcbiAgd2l0aENyZWRlbnRpYWxzPzogYm9vbGVhbjtcbn1cbiJdfQ==
|
|
@@ -1,2 +0,0 @@
|
|
|
1
|
-
export {};
|
|
2
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidm9uLXBhZ2UtcmVzcG9uc2UubW9kZWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9hbmd1bGFyLXJlc3Qtc2VydmljZS9zcmMvbGliL21vZGVsL3Zvbi1wYWdlLXJlc3BvbnNlLm1vZGVsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgaW50ZXJmYWNlIFZvblBhZ2VSZXNwb25zZU1vZGVsPFQ+IHtcbiAgY29udGVudDogVFtdO1xuICBsYXN0OiBib29sZWFuO1xuICB0b3RhbFBhZ2VzOiBudW1iZXI7XG4gIHRvdGFsRWxlbWVudHM6IG51bWJlcjtcbiAgc2l6ZTogbnVtYmVyO1xuICBudW1iZXJPZkVsZW1lbnRzOiBudW1iZXI7XG4gIG51bWJlcjogbnVtYmVyO1xufVxuIl19
|
|
@@ -1,2 +0,0 @@
|
|
|
1
|
-
export {};
|
|
2
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidm9uLXJlc3QtZGVmaW5pdGlvbi50eXBlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvYW5ndWxhci1yZXN0LXNlcnZpY2Uvc3JjL2xpYi9tb2RlbC92b24tcmVzdC1kZWZpbml0aW9uLnR5cGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBpbnRlcmZhY2UgR2VuZXJpY1BhcmFtcyB7XG4gIFtrZXk6IHN0cmluZ106IGFueSB8IHVuZGVmaW5lZCB8IG51bGw7XG59XG5cbmV4cG9ydCB0eXBlIEhlYWRlclBhcmFtcyA9IHtcbiAgY29udGVudFR5cGU/OiBzdHJpbmc7XG4gIGFjY2VwdD86IHN0cmluZztcbiAgcmVzcG9uc2VUeXBlPzogJ2pzb24nO1xufTtcblxuZXhwb3J0IGludGVyZmFjZSBCYXNlUGFyYW1zIHtcbiAgdXJsOiBzdHJpbmc7XG4gIHVybFBhcmFtcz86IEdlbmVyaWNQYXJhbXM7XG4gIHBhcmFtcz86IEdlbmVyaWNQYXJhbXM7XG4gIGhlYWRlcj86IEhlYWRlclBhcmFtcztcbn1cblxuZXhwb3J0IHR5cGUgR2V0UGFyYW1zID0gQmFzZVBhcmFtcztcblxuZXhwb3J0IHR5cGUgRGVsZXRlUGFyYW1zID0gQmFzZVBhcmFtcztcblxuZXhwb3J0IHR5cGUgUG9zdFBhcmFtczxCID0gYW55IHwgRm9ybURhdGE+ID0gQmFzZVBhcmFtcyAmIHsgYm9keT86IEIgfTtcblxuZXhwb3J0IHR5cGUgUHV0UGFyYW1zPEIgPSBhbnkgfCBGb3JtRGF0YT4gPSBCYXNlUGFyYW1zICYgeyBib2R5PzogQiB9O1xuXG5leHBvcnQgdHlwZSBQYXRjaFBhcmFtczxCID0gYW55IHwgRm9ybURhdGE+ID0gQmFzZVBhcmFtcyAmIHsgYm9keT86IEIgfTtcbiJdfQ==
|
|
@@ -1,62 +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.redirectOn403 = true;
|
|
12
|
-
this.redirect403Url = ['403'];
|
|
13
|
-
this.postHttpRequest = () => { };
|
|
14
|
-
this.mapEvent = (event) => {
|
|
15
|
-
if (event instanceof HttpResponse) {
|
|
16
|
-
if (event.status === 200 || event.status === 204) {
|
|
17
|
-
this.postHttpRequest();
|
|
18
|
-
return event;
|
|
19
|
-
}
|
|
20
|
-
if (event.status !== 200) {
|
|
21
|
-
const error = {
|
|
22
|
-
status: event.status,
|
|
23
|
-
message: event.statusText,
|
|
24
|
-
body: event.body,
|
|
25
|
-
};
|
|
26
|
-
if (this.consoleDebug) {
|
|
27
|
-
console.error('[ErrorWS]: ', error);
|
|
28
|
-
}
|
|
29
|
-
throw error;
|
|
30
|
-
}
|
|
31
|
-
}
|
|
32
|
-
return event;
|
|
33
|
-
};
|
|
34
|
-
this.catchError = (errorResponse) => {
|
|
35
|
-
if (this.consoleDebug) {
|
|
36
|
-
console.error('[Fatal]: ', errorResponse);
|
|
37
|
-
}
|
|
38
|
-
const error = {
|
|
39
|
-
status: errorResponse.status,
|
|
40
|
-
message: '',
|
|
41
|
-
body: errorResponse.error || {},
|
|
42
|
-
};
|
|
43
|
-
if (errorResponse.status === 0) {
|
|
44
|
-
error.message = this.errorResponseUnknown;
|
|
45
|
-
}
|
|
46
|
-
if (errorResponse.status === 401) {
|
|
47
|
-
error.message = errorResponse.error ? errorResponse.error : this.errorResponseForbidden;
|
|
48
|
-
}
|
|
49
|
-
if (this.redirectOn403) {
|
|
50
|
-
if (errorResponse.status === 403 || (errorResponse.url && errorResponse.url.indexOf(this.urlWhoAmI) > -1)) {
|
|
51
|
-
this.router.navigate(this.redirect403Url);
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
|
-
this.postHttpRequest();
|
|
55
|
-
return throwError(error);
|
|
56
|
-
};
|
|
57
|
-
}
|
|
58
|
-
intercept(request, next) {
|
|
59
|
-
return next.handle(request).pipe(map(this.mapEvent), catchError(this.catchError));
|
|
60
|
-
}
|
|
61
|
-
}
|
|
62
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidm9uLXJlc3QtaW50ZXJjZXB0b3Iuc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL2FuZ3VsYXItcmVzdC1zZXJ2aWNlL3NyYy9saWIvdm9uLXJlc3QtaW50ZXJjZXB0b3Iuc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQTJFLFlBQVksRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBRTdILE9BQU8sRUFBYyxVQUFVLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDOUMsT0FBTyxFQUFFLFVBQVUsRUFBRSxHQUFHLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUdqRCxNQUFNLE9BQWdCLHlCQUF5QjtJQVE3QyxZQUFzQixNQUFjO1FBQWQsV0FBTSxHQUFOLE1BQU0sQ0FBUTtRQVAxQixpQkFBWSxHQUFHLEtBQUssQ0FBQztRQUNyQix5QkFBb0IsR0FBRyxlQUFlLENBQUM7UUFDdkMsMkJBQXNCLEdBQUcsaUJBQWlCLENBQUM7UUFDM0MsY0FBUyxHQUFHLGNBQWMsQ0FBQztRQUMzQixrQkFBYSxHQUFHLElBQUksQ0FBQztRQUNyQixtQkFBYyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUM7UUFRekIsb0JBQWUsR0FBRyxHQUFHLEVBQUUsR0FBRSxDQUFDLENBQUM7UUFFM0IsYUFBUSxHQUFHLENBQUMsS0FBcUIsRUFBRSxFQUFFO1lBQzdDLElBQUksS0FBSyxZQUFZLFlBQVksRUFBRTtnQkFDakMsSUFBSSxLQUFLLENBQUMsTUFBTSxLQUFLLEdBQUcsSUFBSSxLQUFLLENBQUMsTUFBTSxLQUFLLEdBQUcsRUFBRTtvQkFDaEQsSUFBSSxDQUFDLGVBQWUsRUFBRSxDQUFDO29CQUN2QixPQUFPLEtBQUssQ0FBQztpQkFDZDtnQkFDRCxJQUFJLEtBQUssQ0FBQyxNQUFNLEtBQUssR0FBRyxFQUFFO29CQUN4QixNQUFNLEtBQUssR0FBaUM7d0JBQzFDLE1BQU0sRUFBRSxLQUFLLENBQUMsTUFBTTt3QkFDcEIsT0FBTyxFQUFFLEtBQUssQ0FBQyxVQUFVO3dCQUN6QixJQUFJLEVBQUUsS0FBSyxDQUFDLElBQUk7cUJBQ2pCLENBQUM7b0JBQ0YsSUFBSSxJQUFJLENBQUMsWUFBWSxFQUFFO3dCQUNyQixPQUFPLENBQUMsS0FBSyxDQUFDLGFBQWEsRUFBRSxLQUFLLENBQUMsQ0FBQztxQkFDckM7b0JBQ0QsTUFBTSxLQUFLLENBQUM7aUJBQ2I7YUFDRjtZQUNELE9BQU8sS0FBSyxDQUFDO1FBQ2YsQ0FBQyxDQUFDO1FBRVEsZUFBVSxHQUFHLENBQUMsYUFBZ0MsRUFBRSxFQUFFO1lBQzFELElBQUksSUFBSSxDQUFDLFlBQVksRUFBRTtnQkFDckIsT0FBTyxDQUFDLEtBQUssQ0FBQyxXQUFXLEVBQUUsYUFBYSxDQUFDLENBQUM7YUFDM0M7WUFDRCxNQUFNLEtBQUssR0FBaUM7Z0JBQzFDLE1BQU0sRUFBRSxhQUFhLENBQUMsTUFBTTtnQkFDNUIsT0FBTyxFQUFFLEVBQUU7Z0JBQ1gsSUFBSSxFQUFFLGFBQWEsQ0FBQyxLQUFLLElBQUksRUFBRTthQUNoQyxDQUFDO1lBQ0YsSUFBSSxhQUFhLENBQUMsTUFBTSxLQUFLLENBQUMsRUFBRTtnQkFDOUIsS0FBSyxDQUFDLE9BQU8sR0FBRyxJQUFJLENBQUMsb0JBQW9CLENBQUM7YUFDM0M7WUFDRCxJQUFJLGFBQWEsQ0FBQyxNQUFNLEtBQUssR0FBRyxFQUFFO2dCQUNoQyxLQUFLLENBQUMsT0FBTyxHQUFHLGFBQWEsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxzQkFBc0IsQ0FBQzthQUN6RjtZQUNELElBQUksSUFBSSxDQUFDLGFBQWEsRUFBRTtnQkFDdEIsSUFBSSxhQUFhLENBQUMsTUFBTSxLQUFLLEdBQUcsSUFBSSxDQUFDLGFBQWEsQ0FBQyxHQUFHLElBQUksYUFBYSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUU7b0JBQ3pHLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxjQUFjLENBQUMsQ0FBQztpQkFDM0M7YUFDRjtZQUNELElBQUksQ0FBQyxlQUFlLEVBQUUsQ0FBQztZQUN2QixPQUFPLFVBQVUsQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUMzQixDQUFDLENBQUM7SUFuRHFDLENBQUM7SUFFeEMsU0FBUyxDQUFDLE9BQXlCLEVBQUUsSUFBaUI7UUFDcEQsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxFQUFFLFVBQVUsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztJQUNwRixDQUFDO0NBZ0RGIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSHR0cEVycm9yUmVzcG9uc2UsIEh0dHBFdmVudCwgSHR0cEhhbmRsZXIsIEh0dHBJbnRlcmNlcHRvciwgSHR0cFJlcXVlc3QsIEh0dHBSZXNwb25zZSB9IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJztcbmltcG9ydCB7IFJvdXRlciB9IGZyb20gJ0Bhbmd1bGFyL3JvdXRlcic7XG5pbXBvcnQgeyBPYnNlcnZhYmxlLCB0aHJvd0Vycm9yIH0gZnJvbSAncnhqcyc7XG5pbXBvcnQgeyBjYXRjaEVycm9yLCBtYXAgfSBmcm9tICdyeGpzL29wZXJhdG9ycyc7XG5pbXBvcnQgeyBWb25FcnJvclJlc3RJbnRlcmNlcHRvck1vZGVsIH0gZnJvbSAnLi9tb2RlbC92b24tZXJyb3ItcmVzdC1pbnRlcmNlcHRvci5tb2RlbCc7XG5cbmV4cG9ydCBhYnN0cmFjdCBjbGFzcyBWb25SZXN0SW50ZXJjZXB0b3JTZXJ2aWNlIGltcGxlbWVudHMgSHR0cEludGVyY2VwdG9yIHtcbiAgcHJvdGVjdGVkIGNvbnNvbGVEZWJ1ZyA9IGZhbHNlO1xuICBwcm90ZWN0ZWQgZXJyb3JSZXNwb25zZVVua25vd24gPSAnVW5rbm93biBFcnJvcic7XG4gIHByb3RlY3RlZCBlcnJvclJlc3BvbnNlRm9yYmlkZGVuID0gJ0ZvcmJpZGRlbiBFcnJvcic7XG4gIHByb3RlY3RlZCB1cmxXaG9BbUkgPSAnYXBpL3doby1hbS1pJztcbiAgcHJvdGVjdGVkIHJlZGlyZWN0T240MDMgPSB0cnVlO1xuICBwcm90ZWN0ZWQgcmVkaXJlY3Q0MDNVcmwgPSBbJzQwMyddO1xuXG4gIGNvbnN0cnVjdG9yKHByb3RlY3RlZCByb3V0ZXI6IFJvdXRlcikge31cblxuICBpbnRlcmNlcHQocmVxdWVzdDogSHR0cFJlcXVlc3Q8YW55PiwgbmV4dDogSHR0cEhhbmRsZXIpOiBPYnNlcnZhYmxlPEh0dHBFdmVudDxhbnk+PiB7XG4gICAgcmV0dXJuIG5leHQuaGFuZGxlKHJlcXVlc3QpLnBpcGUobWFwKHRoaXMubWFwRXZlbnQpLCBjYXRjaEVycm9yKHRoaXMuY2F0Y2hFcnJvcikpO1xuICB9XG5cbiAgcHJvdGVjdGVkIHBvc3RIdHRwUmVxdWVzdCA9ICgpID0+IHt9O1xuXG4gIHByb3RlY3RlZCBtYXBFdmVudCA9IChldmVudDogSHR0cEV2ZW50PGFueT4pID0+IHtcbiAgICBpZiAoZXZlbnQgaW5zdGFuY2VvZiBIdHRwUmVzcG9uc2UpIHtcbiAgICAgIGlmIChldmVudC5zdGF0dXMgPT09IDIwMCB8fCBldmVudC5zdGF0dXMgPT09IDIwNCkge1xuICAgICAgICB0aGlzLnBvc3RIdHRwUmVxdWVzdCgpO1xuICAgICAgICByZXR1cm4gZXZlbnQ7XG4gICAgICB9XG4gICAgICBpZiAoZXZlbnQuc3RhdHVzICE9PSAyMDApIHtcbiAgICAgICAgY29uc3QgZXJyb3I6IFZvbkVycm9yUmVzdEludGVyY2VwdG9yTW9kZWwgPSB7XG4gICAgICAgICAgc3RhdHVzOiBldmVudC5zdGF0dXMsXG4gICAgICAgICAgbWVzc2FnZTogZXZlbnQuc3RhdHVzVGV4dCxcbiAgICAgICAgICBib2R5OiBldmVudC5ib2R5LFxuICAgICAgICB9O1xuICAgICAgICBpZiAodGhpcy5jb25zb2xlRGVidWcpIHtcbiAgICAgICAgICBjb25zb2xlLmVycm9yKCdbRXJyb3JXU106ICcsIGVycm9yKTtcbiAgICAgICAgfVxuICAgICAgICB0aHJvdyBlcnJvcjtcbiAgICAgIH1cbiAgICB9XG4gICAgcmV0dXJuIGV2ZW50O1xuICB9O1xuXG4gIHByb3RlY3RlZCBjYXRjaEVycm9yID0gKGVycm9yUmVzcG9uc2U6IEh0dHBFcnJvclJlc3BvbnNlKSA9PiB7XG4gICAgaWYgKHRoaXMuY29uc29sZURlYnVnKSB7XG4gICAgICBjb25zb2xlLmVycm9yKCdbRmF0YWxdOiAnLCBlcnJvclJlc3BvbnNlKTtcbiAgICB9XG4gICAgY29uc3QgZXJyb3I6IFZvbkVycm9yUmVzdEludGVyY2VwdG9yTW9kZWwgPSB7XG4gICAgICBzdGF0dXM6IGVycm9yUmVzcG9uc2Uuc3RhdHVzLFxuICAgICAgbWVzc2FnZTogJycsXG4gICAgICBib2R5OiBlcnJvclJlc3BvbnNlLmVycm9yIHx8IHt9LFxuICAgIH07XG4gICAgaWYgKGVycm9yUmVzcG9uc2Uuc3RhdHVzID09PSAwKSB7XG4gICAgICBlcnJvci5tZXNzYWdlID0gdGhpcy5lcnJvclJlc3BvbnNlVW5rbm93bjtcbiAgICB9XG4gICAgaWYgKGVycm9yUmVzcG9uc2Uuc3RhdHVzID09PSA0MDEpIHtcbiAgICAgIGVycm9yLm1lc3NhZ2UgPSBlcnJvclJlc3BvbnNlLmVycm9yID8gZXJyb3JSZXNwb25zZS5lcnJvciA6IHRoaXMuZXJyb3JSZXNwb25zZUZvcmJpZGRlbjtcbiAgICB9XG4gICAgaWYgKHRoaXMucmVkaXJlY3RPbjQwMykge1xuICAgICAgaWYgKGVycm9yUmVzcG9uc2Uuc3RhdHVzID09PSA0MDMgfHwgKGVycm9yUmVzcG9uc2UudXJsICYmIGVycm9yUmVzcG9uc2UudXJsLmluZGV4T2YodGhpcy51cmxXaG9BbUkpID4gLTEpKSB7XG4gICAgICAgIHRoaXMucm91dGVyLm5hdmlnYXRlKHRoaXMucmVkaXJlY3Q0MDNVcmwpO1xuICAgICAgfVxuICAgIH1cbiAgICB0aGlzLnBvc3RIdHRwUmVxdWVzdCgpO1xuICAgIHJldHVybiB0aHJvd0Vycm9yKGVycm9yKTtcbiAgfTtcbn1cbiJdfQ==
|