@vcd/sdk 15.0.8 → 17.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/{esm2020 → esm2022}/client/client/api.result.service.mjs +4 -4
- package/esm2022/client/client/logging.interceptor.mjs +44 -0
- package/esm2022/client/client/request.headers.interceptor.mjs +100 -0
- package/esm2022/client/client/response.normalization.interceptor.mjs +59 -0
- package/esm2022/client/client/vcd.api.client.mjs +603 -0
- package/{esm2020 → esm2022}/client/client/vcd.http.client.mjs +6 -6
- package/esm2022/client/client/vcd.transfer.client.mjs +166 -0
- package/esm2022/client/query/filter.builder.mjs +195 -0
- package/esm2022/client/query/query.builder.mjs +79 -0
- package/esm2022/common/container-hooks.mjs +85 -0
- package/{esm2020 → esm2022}/main.mjs +7 -7
- package/{fesm2020 → fesm2022}/vcd-sdk.mjs +54 -54
- package/{fesm2020 → fesm2022}/vcd-sdk.mjs.map +1 -1
- package/open_source_license_vcd_ui_sdk_17.0.0_ga.txt +393 -0
- package/package.json +8 -14
- package/VMware-vcd_ui_sdk-15.0.8-ODP.tar.gz +0 -0
- package/esm2020/client/client/logging.interceptor.mjs +0 -44
- package/esm2020/client/client/request.headers.interceptor.mjs +0 -100
- package/esm2020/client/client/response.normalization.interceptor.mjs +0 -59
- package/esm2020/client/client/vcd.api.client.mjs +0 -603
- package/esm2020/client/client/vcd.transfer.client.mjs +0 -166
- package/esm2020/client/query/filter.builder.mjs +0 -195
- package/esm2020/client/query/query.builder.mjs +0 -79
- package/esm2020/common/container-hooks.mjs +0 -85
- package/fesm2015/vcd-sdk.mjs +0 -1505
- package/fesm2015/vcd-sdk.mjs.map +0 -1
- package/open_source_license_@vcdsdk_15.0.8_GA.txt +0 -22623
- /package/{esm2020 → esm2022}/client/client/constants.mjs +0 -0
- /package/{esm2020 → esm2022}/client/client/index.mjs +0 -0
- /package/{esm2020 → esm2022}/client/client/types.mjs +0 -0
- /package/{esm2020 → esm2022}/client/index.mjs +0 -0
- /package/{esm2020 → esm2022}/client/openapi.mjs +0 -0
- /package/{esm2020 → esm2022}/client/query/index.mjs +0 -0
- /package/{esm2020 → esm2022}/common/index.mjs +0 -0
- /package/{esm2020 → esm2022}/core/index.mjs +0 -0
- /package/{esm2020 → esm2022}/core/plugin.module.mjs +0 -0
- /package/{esm2020 → esm2022}/public-api.mjs +0 -0
- /package/{esm2020 → esm2022}/vcd-sdk.mjs +0 -0
|
@@ -14,10 +14,10 @@ export class ApiResultService {
|
|
|
14
14
|
clear() {
|
|
15
15
|
this._results = [];
|
|
16
16
|
}
|
|
17
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.1.2", ngImport: i0, type: ApiResultService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
18
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.1.2", ngImport: i0, type: ApiResultService }); }
|
|
17
19
|
}
|
|
18
|
-
|
|
19
|
-
ApiResultService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.0", ngImport: i0, type: ApiResultService });
|
|
20
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.0", ngImport: i0, type: ApiResultService, decorators: [{
|
|
20
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.1.2", ngImport: i0, type: ApiResultService, decorators: [{
|
|
21
21
|
type: Injectable
|
|
22
22
|
}] });
|
|
23
23
|
export class ApiResult {
|
|
@@ -40,4 +40,4 @@ export class ApiResult {
|
|
|
40
40
|
this._finished = finished;
|
|
41
41
|
}
|
|
42
42
|
}
|
|
43
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
43
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBpLnJlc3VsdC5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdmNkL3Nkay9zcmMvY2xpZW50L2NsaWVudC9hcGkucmVzdWx0LnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQzs7QUFFM0MsK0JBQStCO0FBRS9CLE1BQU0sT0FBTyxnQkFBZ0I7SUFEN0I7UUFFWSxhQUFRLEdBQWdCLEVBQUUsQ0FBQztLQVl0QztJQVhHLElBQVcsT0FBTztRQUNkLE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQztJQUN6QixDQUFDO0lBRUQsR0FBRyxDQUFDLE1BQWlCO1FBQ2pCLElBQUksQ0FBQyxRQUFRLEdBQUcsQ0FBQyxNQUFNLEVBQUUsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQztJQUM1RCxDQUFDO0lBRUQsS0FBSztRQUNELElBQUksQ0FBQyxRQUFRLEdBQUcsRUFBRSxDQUFDO0lBQ3ZCLENBQUM7OEdBWlEsZ0JBQWdCO2tIQUFoQixnQkFBZ0I7OzJGQUFoQixnQkFBZ0I7a0JBRDVCLFVBQVU7O0FBZ0JYLE1BQU0sT0FBTyxTQUFTO0lBRWxCLElBQVcsT0FBTztRQUNkLE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQztJQUN6QixDQUFDO0lBR0QsSUFBVyxTQUFTO1FBQ2hCLE9BQU8sSUFBSSxDQUFDLFVBQVUsQ0FBQztJQUMzQixDQUFDO0lBR0QsSUFBVyxPQUFPO1FBQ2QsT0FBTyxJQUFJLENBQUMsUUFBUSxDQUFDO0lBQ3pCLENBQUM7SUFHRCxJQUFXLFFBQVE7UUFDZixPQUFPLElBQUksQ0FBQyxTQUFTLENBQUM7SUFDMUIsQ0FBQztJQUVELFlBQVksT0FBZSxFQUFFLFNBQWtCLEVBQUUsT0FBYSxFQUFFLFFBQWM7UUFDMUUsSUFBSSxDQUFDLFFBQVEsR0FBRyxPQUFPLENBQUM7UUFDeEIsSUFBSSxDQUFDLFVBQVUsR0FBRyxTQUFTLENBQUM7UUFDNUIsSUFBSSxDQUFDLFFBQVEsR0FBRyxPQUFPLENBQUM7UUFDeEIsSUFBSSxDQUFDLFNBQVMsR0FBRyxRQUFRLENBQUM7SUFDOUIsQ0FBQztDQUNKIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuXG4vLyB0c2xpbnQ6ZGlzYWJsZTp2YXJpYWJsZS1uYW1lXG5ASW5qZWN0YWJsZSgpXG5leHBvcnQgY2xhc3MgQXBpUmVzdWx0U2VydmljZSB7XG4gICAgcHJpdmF0ZSBfcmVzdWx0czogQXBpUmVzdWx0W10gPSBbXTtcbiAgICBwdWJsaWMgZ2V0IHJlc3VsdHMoKTogQXBpUmVzdWx0W10ge1xuICAgICAgICByZXR1cm4gdGhpcy5fcmVzdWx0cztcbiAgICB9XG5cbiAgICBhZGQocmVzdWx0OiBBcGlSZXN1bHQpIHtcbiAgICAgICAgdGhpcy5fcmVzdWx0cyA9IFtyZXN1bHQsIC4uLnRoaXMuX3Jlc3VsdHMuc2xpY2UoMCwgOTkpXTtcbiAgICB9XG5cbiAgICBjbGVhcigpIHtcbiAgICAgICAgdGhpcy5fcmVzdWx0cyA9IFtdO1xuICAgIH1cbn1cblxuZXhwb3J0IGNsYXNzIEFwaVJlc3VsdCB7XG4gICAgcHJpdmF0ZSBfbWVzc2FnZTogc3RyaW5nO1xuICAgIHB1YmxpYyBnZXQgbWVzc2FnZSgpOiBzdHJpbmcge1xuICAgICAgICByZXR1cm4gdGhpcy5fbWVzc2FnZTtcbiAgICB9XG5cbiAgICBwcml2YXRlIF9zdWNjZWVkZWQ6IGJvb2xlYW47XG4gICAgcHVibGljIGdldCBzdWNjZWVkZWQoKTogYm9vbGVhbiB7XG4gICAgICAgIHJldHVybiB0aGlzLl9zdWNjZWVkZWQ7XG4gICAgfVxuXG4gICAgcHJpdmF0ZSBfc3RhcnRlZDogRGF0ZTtcbiAgICBwdWJsaWMgZ2V0IHN0YXJ0ZWQoKTogRGF0ZSB7XG4gICAgICAgIHJldHVybiB0aGlzLl9zdGFydGVkO1xuICAgIH1cblxuICAgIHByaXZhdGUgX2ZpbmlzaGVkOiBEYXRlO1xuICAgIHB1YmxpYyBnZXQgZmluaXNoZWQoKTogRGF0ZSB7XG4gICAgICAgIHJldHVybiB0aGlzLl9maW5pc2hlZDtcbiAgICB9XG5cbiAgICBjb25zdHJ1Y3RvcihtZXNzYWdlOiBzdHJpbmcsIHN1Y2NlZWRlZDogYm9vbGVhbiwgc3RhcnRlZDogRGF0ZSwgZmluaXNoZWQ6IERhdGUpIHtcbiAgICAgICAgdGhpcy5fbWVzc2FnZSA9IG1lc3NhZ2U7XG4gICAgICAgIHRoaXMuX3N1Y2NlZWRlZCA9IHN1Y2NlZWRlZDtcbiAgICAgICAgdGhpcy5fc3RhcnRlZCA9IHN0YXJ0ZWQ7XG4gICAgICAgIHRoaXMuX2ZpbmlzaGVkID0gZmluaXNoZWQ7XG4gICAgfVxufVxuIl19
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import { Injectable, Optional } from '@angular/core';
|
|
2
|
+
import { HttpResponse } from '@angular/common/http';
|
|
3
|
+
import { finalize, tap } from 'rxjs/operators';
|
|
4
|
+
import { ApiResult } from './api.result.service';
|
|
5
|
+
import * as i0 from "@angular/core";
|
|
6
|
+
import * as i1 from "./api.result.service";
|
|
7
|
+
// tslint:disable:variable-name
|
|
8
|
+
export class LoggingInterceptor {
|
|
9
|
+
set enabled(enabled) {
|
|
10
|
+
this._enabled = enabled;
|
|
11
|
+
if (this._enabled && this._outputToConsole) {
|
|
12
|
+
console.warn('API logging enabled but no provider found for ApiResultService. Results will be output to the console.');
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
constructor(apiResultService) {
|
|
16
|
+
this.apiResultService = apiResultService;
|
|
17
|
+
this._enabled = false;
|
|
18
|
+
this._outputToConsole = !this.apiResultService;
|
|
19
|
+
}
|
|
20
|
+
intercept(req, next) {
|
|
21
|
+
if (!this._enabled) {
|
|
22
|
+
return next.handle(req);
|
|
23
|
+
}
|
|
24
|
+
const started = new Date();
|
|
25
|
+
let succeeded;
|
|
26
|
+
return next.handle(req)
|
|
27
|
+
.pipe(tap(event => succeeded = event instanceof HttpResponse ? true : false, error => succeeded = false), finalize(() => {
|
|
28
|
+
if (this._outputToConsole) {
|
|
29
|
+
console.log(`${req.method} ${req.urlWithParams} completed in ${Date.now() - started.getTime()} ms. Success: ${succeeded}`);
|
|
30
|
+
}
|
|
31
|
+
else {
|
|
32
|
+
this.apiResultService.add(new ApiResult(`${req.method} ${req.urlWithParams}`, succeeded, started, new Date()));
|
|
33
|
+
}
|
|
34
|
+
}));
|
|
35
|
+
}
|
|
36
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.1.2", ngImport: i0, type: LoggingInterceptor, deps: [{ token: i1.ApiResultService, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
37
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.1.2", ngImport: i0, type: LoggingInterceptor }); }
|
|
38
|
+
}
|
|
39
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.1.2", ngImport: i0, type: LoggingInterceptor, decorators: [{
|
|
40
|
+
type: Injectable
|
|
41
|
+
}], ctorParameters: () => [{ type: i1.ApiResultService, decorators: [{
|
|
42
|
+
type: Optional
|
|
43
|
+
}] }] });
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nZ2luZy5pbnRlcmNlcHRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3ZjZC9zZGsvc3JjL2NsaWVudC9jbGllbnQvbG9nZ2luZy5pbnRlcmNlcHRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLFFBQVEsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUNyRCxPQUFPLEVBRVEsWUFBWSxFQUMxQixNQUFNLHNCQUFzQixDQUFDO0FBRzlCLE9BQU8sRUFBRSxRQUFRLEVBQUUsR0FBRyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDL0MsT0FBTyxFQUFvQixTQUFTLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQzs7O0FBRW5FLCtCQUErQjtBQUUvQixNQUFNLE9BQU8sa0JBQWtCO0lBRzdCLElBQUksT0FBTyxDQUFDLE9BQWdCO1FBQzFCLElBQUksQ0FBQyxRQUFRLEdBQUcsT0FBTyxDQUFDO1FBQ3hCLElBQUksSUFBSSxDQUFDLFFBQVEsSUFBSSxJQUFJLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQztZQUMzQyxPQUFPLENBQUMsSUFBSSxDQUFDLHlHQUF5RyxDQUFDLENBQUM7UUFDMUgsQ0FBQztJQUNILENBQUM7SUFFRCxZQUFnQyxnQkFBa0M7UUFBbEMscUJBQWdCLEdBQWhCLGdCQUFnQixDQUFrQjtRQVIxRCxhQUFRLEdBQUcsS0FBSyxDQUFDO1FBU3ZCLElBQUksQ0FBQyxnQkFBZ0IsR0FBRyxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQztJQUNqRCxDQUFDO0lBRUQsU0FBUyxDQUFDLEdBQXFCLEVBQUUsSUFBaUI7UUFDaEQsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztZQUNuQixPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDMUIsQ0FBQztRQUVELE1BQU0sT0FBTyxHQUFHLElBQUksSUFBSSxFQUFFLENBQUM7UUFDM0IsSUFBSSxTQUFrQixDQUFDO1FBRXZCLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUM7YUFDcEIsSUFBSSxDQUNILEdBQUcsQ0FDRCxLQUFLLENBQUMsRUFBRSxDQUFDLFNBQVMsR0FBRyxLQUFLLFlBQVksWUFBWSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFDakUsS0FBSyxDQUFDLEVBQUUsQ0FBQyxTQUFTLEdBQUcsS0FBSyxDQUMzQixFQUNELFFBQVEsQ0FBQyxHQUFHLEVBQUU7WUFDWixJQUFJLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDO2dCQUMxQixPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsR0FBRyxDQUFDLE1BQU0sSUFBSSxHQUFHLENBQUMsYUFBYSxpQkFBaUIsSUFBSSxDQUFDLEdBQUcsRUFBRSxHQUFHLE9BQU8sQ0FBQyxPQUFPLEVBQUUsa0JBQWtCLFNBQVMsRUFBRSxDQUFDLENBQUM7WUFDOUgsQ0FBQztpQkFBTSxDQUFDO2dCQUNOLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxHQUFHLENBQUMsSUFBSSxTQUFTLENBQUMsR0FBRyxHQUFHLENBQUMsTUFBTSxJQUFJLEdBQUcsQ0FBQyxhQUFhLEVBQUUsRUFBRSxTQUFTLEVBQUUsT0FBTyxFQUFFLElBQUksSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDO1lBQ2pILENBQUM7UUFDSCxDQUFDLENBQUMsQ0FDSCxDQUFDO0lBQ04sQ0FBQzs4R0FwQ1Usa0JBQWtCO2tIQUFsQixrQkFBa0I7OzJGQUFsQixrQkFBa0I7a0JBRDlCLFVBQVU7OzBCQVdJLFFBQVEiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3RhYmxlLCBPcHRpb25hbCB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHtcbiAgSHR0cEV2ZW50LCBIdHRwSW50ZXJjZXB0b3IsIEh0dHBIYW5kbGVyLFxuICBIdHRwUmVxdWVzdCwgSHR0cFJlc3BvbnNlXG59IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJztcblxuaW1wb3J0IHsgT2JzZXJ2YWJsZSB9IGZyb20gJ3J4anMnO1xuaW1wb3J0IHsgZmluYWxpemUsIHRhcCB9IGZyb20gJ3J4anMvb3BlcmF0b3JzJztcbmltcG9ydCB7IEFwaVJlc3VsdFNlcnZpY2UsIEFwaVJlc3VsdCB9IGZyb20gJy4vYXBpLnJlc3VsdC5zZXJ2aWNlJztcblxuLy8gdHNsaW50OmRpc2FibGU6dmFyaWFibGUtbmFtZVxuQEluamVjdGFibGUoKVxuZXhwb3J0IGNsYXNzIExvZ2dpbmdJbnRlcmNlcHRvciBpbXBsZW1lbnRzIEh0dHBJbnRlcmNlcHRvciB7XG4gIHByaXZhdGUgX291dHB1dFRvQ29uc29sZTogYm9vbGVhbjtcbiAgcHJpdmF0ZSBfZW5hYmxlZCA9IGZhbHNlO1xuICBzZXQgZW5hYmxlZChlbmFibGVkOiBib29sZWFuKSB7XG4gICAgdGhpcy5fZW5hYmxlZCA9IGVuYWJsZWQ7XG4gICAgaWYgKHRoaXMuX2VuYWJsZWQgJiYgdGhpcy5fb3V0cHV0VG9Db25zb2xlKSB7XG4gICAgICBjb25zb2xlLndhcm4oJ0FQSSBsb2dnaW5nIGVuYWJsZWQgYnV0IG5vIHByb3ZpZGVyIGZvdW5kIGZvciBBcGlSZXN1bHRTZXJ2aWNlLiAgUmVzdWx0cyB3aWxsIGJlIG91dHB1dCB0byB0aGUgY29uc29sZS4nKTtcbiAgICB9XG4gIH1cblxuICBjb25zdHJ1Y3RvcihAT3B0aW9uYWwoKSBwcml2YXRlIGFwaVJlc3VsdFNlcnZpY2U6IEFwaVJlc3VsdFNlcnZpY2UpIHtcbiAgICB0aGlzLl9vdXRwdXRUb0NvbnNvbGUgPSAhdGhpcy5hcGlSZXN1bHRTZXJ2aWNlO1xuICB9XG5cbiAgaW50ZXJjZXB0KHJlcTogSHR0cFJlcXVlc3Q8YW55PiwgbmV4dDogSHR0cEhhbmRsZXIpOiBPYnNlcnZhYmxlPEh0dHBFdmVudDxhbnk+PiB7XG4gICAgaWYgKCF0aGlzLl9lbmFibGVkKSB7XG4gICAgICByZXR1cm4gbmV4dC5oYW5kbGUocmVxKTtcbiAgICB9XG5cbiAgICBjb25zdCBzdGFydGVkID0gbmV3IERhdGUoKTtcbiAgICBsZXQgc3VjY2VlZGVkOiBib29sZWFuO1xuXG4gICAgcmV0dXJuIG5leHQuaGFuZGxlKHJlcSlcbiAgICAgIC5waXBlKFxuICAgICAgICB0YXAoXG4gICAgICAgICAgZXZlbnQgPT4gc3VjY2VlZGVkID0gZXZlbnQgaW5zdGFuY2VvZiBIdHRwUmVzcG9uc2UgPyB0cnVlIDogZmFsc2UsXG4gICAgICAgICAgZXJyb3IgPT4gc3VjY2VlZGVkID0gZmFsc2VcbiAgICAgICAgKSxcbiAgICAgICAgZmluYWxpemUoKCkgPT4ge1xuICAgICAgICAgIGlmICh0aGlzLl9vdXRwdXRUb0NvbnNvbGUpIHtcbiAgICAgICAgICAgIGNvbnNvbGUubG9nKGAke3JlcS5tZXRob2R9ICR7cmVxLnVybFdpdGhQYXJhbXN9IGNvbXBsZXRlZCBpbiAke0RhdGUubm93KCkgLSBzdGFydGVkLmdldFRpbWUoKX0gbXMuICBTdWNjZXNzOiAke3N1Y2NlZWRlZH1gKTtcbiAgICAgICAgICB9IGVsc2Uge1xuICAgICAgICAgICAgdGhpcy5hcGlSZXN1bHRTZXJ2aWNlLmFkZChuZXcgQXBpUmVzdWx0KGAke3JlcS5tZXRob2R9ICR7cmVxLnVybFdpdGhQYXJhbXN9YCwgc3VjY2VlZGVkLCBzdGFydGVkLCBuZXcgRGF0ZSgpKSk7XG4gICAgICAgICAgfVxuICAgICAgICB9KVxuICAgICAgKTtcbiAgfVxufVxuIl19
|
|
@@ -0,0 +1,100 @@
|
|
|
1
|
+
import { Injectable } from '@angular/core';
|
|
2
|
+
import { HttpResponse } from '@angular/common/http';
|
|
3
|
+
import { map } from 'rxjs/operators';
|
|
4
|
+
import { parseHeaderHateoasLinks } from '.';
|
|
5
|
+
import { HTTP_HEADERS } from './constants';
|
|
6
|
+
import * as i0 from "@angular/core";
|
|
7
|
+
// tslint:disable:variable-name
|
|
8
|
+
export class RequestHeadersInterceptor {
|
|
9
|
+
constructor() {
|
|
10
|
+
this._enabled = true;
|
|
11
|
+
this._version = '';
|
|
12
|
+
this._authenticationHeader = HTTP_HEADERS.Authorization;
|
|
13
|
+
}
|
|
14
|
+
set enabled(_enabled) {
|
|
15
|
+
this._enabled = _enabled;
|
|
16
|
+
}
|
|
17
|
+
set actAs(_actAs) {
|
|
18
|
+
this._actAs = _actAs;
|
|
19
|
+
}
|
|
20
|
+
set actAsOrgName(_actAsOrgName) {
|
|
21
|
+
this._actAsOrgName = _actAsOrgName;
|
|
22
|
+
}
|
|
23
|
+
get version() {
|
|
24
|
+
return this._version;
|
|
25
|
+
}
|
|
26
|
+
set version(_version) {
|
|
27
|
+
this._version = _version;
|
|
28
|
+
}
|
|
29
|
+
set authentication(_authentication) {
|
|
30
|
+
this._authentication = _authentication;
|
|
31
|
+
this._authenticationHeader = (this._authentication && this._authentication.length > 32) ?
|
|
32
|
+
HTTP_HEADERS.Authorization : HTTP_HEADERS.x_vcloud_authorization;
|
|
33
|
+
}
|
|
34
|
+
intercept(req, next) {
|
|
35
|
+
let headers = req.headers;
|
|
36
|
+
if (!headers.has('Accept')) {
|
|
37
|
+
headers = this.setAcceptHeader(headers);
|
|
38
|
+
}
|
|
39
|
+
if (!headers.has('Content-Type')) {
|
|
40
|
+
headers = this.setContentTypeHeader(headers, req.url);
|
|
41
|
+
}
|
|
42
|
+
if (this._authentication && !headers.has(HTTP_HEADERS.Authorization)) {
|
|
43
|
+
headers = headers.set(this._authenticationHeader, this._authentication);
|
|
44
|
+
}
|
|
45
|
+
/**
|
|
46
|
+
* Covers the case where the User set the ActAs token himself
|
|
47
|
+
*/
|
|
48
|
+
if (!headers.has('X-VMWARE-VCLOUD-TENANT-CONTEXT') && this._actAs) {
|
|
49
|
+
headers = headers.set('X-VMWARE-VCLOUD-TENANT-CONTEXT', this._actAs);
|
|
50
|
+
}
|
|
51
|
+
/**
|
|
52
|
+
* Covers the case where the User set the ActAs token himself
|
|
53
|
+
*/
|
|
54
|
+
if (!headers.has('X-VMWARE-VCLOUD-AUTH-CONTEXT') && this._actAsOrgName) {
|
|
55
|
+
headers = headers.set('X-VMWARE-VCLOUD-AUTH-CONTEXT', this._actAsOrgName);
|
|
56
|
+
}
|
|
57
|
+
const customReq = req.clone({
|
|
58
|
+
headers
|
|
59
|
+
});
|
|
60
|
+
return next.handle(customReq).pipe(map((res) => {
|
|
61
|
+
if (res instanceof HttpResponse) {
|
|
62
|
+
if (!res.body || !res.headers) {
|
|
63
|
+
return res;
|
|
64
|
+
}
|
|
65
|
+
if (res.headers.has(HTTP_HEADERS.link)) {
|
|
66
|
+
res.body.link = parseHeaderHateoasLinks(res.headers.get(HTTP_HEADERS.link));
|
|
67
|
+
}
|
|
68
|
+
if (res.headers.has(HTTP_HEADERS.Link)) {
|
|
69
|
+
res.body.link = parseHeaderHateoasLinks(res.headers.get(HTTP_HEADERS.Link));
|
|
70
|
+
}
|
|
71
|
+
if (res.headers.has(HTTP_HEADERS.etag)) {
|
|
72
|
+
res.body.etag = res.headers.get(HTTP_HEADERS.etag);
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
return res;
|
|
76
|
+
}));
|
|
77
|
+
}
|
|
78
|
+
setAcceptHeader(headers) {
|
|
79
|
+
const value = headers.get('_multisite');
|
|
80
|
+
headers = headers.delete('_multisite');
|
|
81
|
+
return headers.set('Accept', [
|
|
82
|
+
`application/*+json;version=${this._version}${value ? `;multisite=${value}` : ''}`,
|
|
83
|
+
`application/json;version=${this._version}${value ? `;multisite=${value}` : ''}`
|
|
84
|
+
]);
|
|
85
|
+
}
|
|
86
|
+
setContentTypeHeader(headers, url) {
|
|
87
|
+
if (url.indexOf('cloudapi') > -1) {
|
|
88
|
+
return headers.set('Content-Type', 'application/json');
|
|
89
|
+
}
|
|
90
|
+
else {
|
|
91
|
+
return headers.set('Content-Type', 'application/*+json');
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.1.2", ngImport: i0, type: RequestHeadersInterceptor, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
95
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.1.2", ngImport: i0, type: RequestHeadersInterceptor }); }
|
|
96
|
+
}
|
|
97
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.1.2", ngImport: i0, type: RequestHeadersInterceptor, decorators: [{
|
|
98
|
+
type: Injectable
|
|
99
|
+
}] });
|
|
100
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"request.headers.interceptor.js","sourceRoot":"","sources":["../../../../../../projects/vcd/sdk/src/client/client/request.headers.interceptor.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport { HttpHandler, HttpInterceptor, HttpRequest, HttpEvent, HttpHeaders, HttpResponse } from '@angular/common/http';\nimport { Observable } from 'rxjs';\nimport { map } from 'rxjs/operators';\nimport { parseHeaderHateoasLinks } from '.';\nimport { HTTP_HEADERS } from './constants';\n\n// tslint:disable:variable-name\n@Injectable()\nexport class RequestHeadersInterceptor implements HttpInterceptor {\n    private _enabled = true;\n    set enabled(_enabled: boolean) {\n        this._enabled = _enabled;\n    }\n\n    private _actAs: string;\n    set actAs(_actAs: string) {\n        this._actAs = _actAs;\n    }\n    \n    private _actAsOrgName: string;\n    set actAsOrgName(_actAsOrgName: string) {\n        this._actAsOrgName = _actAsOrgName;\n    }\n\n    private _version = '';\n    get version(): string {\n        return this._version;\n    }\n    set version(_version: string) {\n        this._version = _version;\n    }\n\n    private _authenticationHeader: string = HTTP_HEADERS.Authorization;\n    private _authentication: string;\n    set authentication(_authentication: string) {\n        this._authentication = _authentication;\n        this._authenticationHeader = (this._authentication && this._authentication.length > 32) ?\n            HTTP_HEADERS.Authorization : HTTP_HEADERS.x_vcloud_authorization;\n    }\n\n    intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {\n        let headers = req.headers;\n\n        if (!headers.has('Accept')) {\n            headers = this.setAcceptHeader(headers);\n        }\n\n        if (!headers.has('Content-Type')) {\n            headers = this.setContentTypeHeader(headers, req.url);\n        }\n\n        if (this._authentication && !headers.has(HTTP_HEADERS.Authorization)) {\n            headers = headers.set(this._authenticationHeader, this._authentication);\n        }\n\n        /**\n         * Covers the case where the User set the ActAs token himself\n         */\n        if (!headers.has('X-VMWARE-VCLOUD-TENANT-CONTEXT') && this._actAs) {\n            headers = headers.set('X-VMWARE-VCLOUD-TENANT-CONTEXT', this._actAs);\n        }\n\n        /**\n         * Covers the case where the User set the ActAs token himself\n         */\n        if (!headers.has('X-VMWARE-VCLOUD-AUTH-CONTEXT') && this._actAsOrgName) {\n            headers = headers.set('X-VMWARE-VCLOUD-AUTH-CONTEXT', this._actAsOrgName);\n        }\n\n        const customReq: HttpRequest<any> = req.clone({\n            headers\n        });\n\n        return next.handle(customReq).pipe(\n            map((res: HttpEvent<any>) => {\n                if (res instanceof HttpResponse) {\n                    if (!res.body || !res.headers) {\n                        return res;\n                    }\n\n                    if (res.headers.has(HTTP_HEADERS.link)) {\n                        res.body.link = parseHeaderHateoasLinks(res.headers.get(HTTP_HEADERS.link));\n                    }\n\n                    if (res.headers.has(HTTP_HEADERS.Link)) {\n                        res.body.link = parseHeaderHateoasLinks(res.headers.get(HTTP_HEADERS.Link));\n                    }\n\n                    if (res.headers.has(HTTP_HEADERS.etag)) {\n                        res.body.etag = res.headers.get(HTTP_HEADERS.etag);\n                    }\n                }\n                return res;\n            })\n        );\n    }\n\n    private setAcceptHeader(headers: HttpHeaders): HttpHeaders {\n        const value = headers.get('_multisite');\n        headers = headers.delete('_multisite');\n\n        return headers.set(\n            'Accept', [\n                `application/*+json;version=${this._version}${value ? `;multisite=${value}` : ''}`,\n                `application/json;version=${this._version}${value ? `;multisite=${value}` : ''}`\n            ]\n        );\n    }\n\n    private setContentTypeHeader(headers: HttpHeaders, url: string): HttpHeaders {\n        if (url.indexOf('cloudapi') > -1) {\n            return headers.set('Content-Type', 'application/json');\n        } else {\n            return headers.set('Content-Type', 'application/*+json');\n        }\n    }\n}\n"]}
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
import { Injectable } from '@angular/core';
|
|
2
|
+
import { HttpResponse } from '@angular/common/http';
|
|
3
|
+
import { map } from 'rxjs/operators';
|
|
4
|
+
import * as i0 from "@angular/core";
|
|
5
|
+
// tslint:disable:jsdoc-format
|
|
6
|
+
/**
|
|
7
|
+
* An interceptor on the response chain that normalizes differences in
|
|
8
|
+
* JSON payloads between vCloud Director version 9.1 and versions
|
|
9
|
+
* greater than 9.1.
|
|
10
|
+
*
|
|
11
|
+
* In 9.1 (API version 30.0) the server serializes JSON and nests the payload in a value field:
|
|
12
|
+
* ```
|
|
13
|
+
{
|
|
14
|
+
"name" : "{http://www.vmware.com/vcloud/versions}SupportedVersions",
|
|
15
|
+
"declaredType" : "com.vmware.vcloud.api.rest.schema.versioning.SupportedVersionsType",
|
|
16
|
+
"scope" : "javax.xml.bind.JAXBElement$GlobalScope",
|
|
17
|
+
"value" : {
|
|
18
|
+
"versionInfo" : [],
|
|
19
|
+
"any" : [],
|
|
20
|
+
"otherAttributes" : {}
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
```
|
|
24
|
+
*
|
|
25
|
+
* That same request in API versions 31.0 and above is represented as:
|
|
26
|
+
* ```
|
|
27
|
+
{
|
|
28
|
+
"versionInfo" : [],
|
|
29
|
+
"any" : [],
|
|
30
|
+
"otherAttributes" : {}
|
|
31
|
+
}
|
|
32
|
+
```
|
|
33
|
+
* This interceptor should process responses before any other interceptors that rely
|
|
34
|
+
* on consistent API information.
|
|
35
|
+
*/
|
|
36
|
+
export class ResponseNormalizationInterceptor {
|
|
37
|
+
static { this.QUERY_RESULT_TYPE = 'com.vmware.vcloud.api.rest.schema_v1_5.QueryResultRecordsType'; }
|
|
38
|
+
intercept(req, next) {
|
|
39
|
+
return next.handle(req).pipe(map(response => {
|
|
40
|
+
// While this condition seems awfully specific, the alternative option of examining the 'Content-Type'
|
|
41
|
+
// response header for 'version=30.0' proved to be an unreliable condition in at least one case;
|
|
42
|
+
// returning the same JSON payload as API versions >= 31.0.
|
|
43
|
+
if (response instanceof HttpResponse && response.body && response.body.value && response.body.declaredType && response.body.scope) {
|
|
44
|
+
const body = response.body.value;
|
|
45
|
+
if (response.body.declaredType === ResponseNormalizationInterceptor.QUERY_RESULT_TYPE) {
|
|
46
|
+
body.record = body.record.map(record => record.value);
|
|
47
|
+
}
|
|
48
|
+
return response.clone({ body });
|
|
49
|
+
}
|
|
50
|
+
return response;
|
|
51
|
+
}));
|
|
52
|
+
}
|
|
53
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.1.2", ngImport: i0, type: ResponseNormalizationInterceptor, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
54
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.1.2", ngImport: i0, type: ResponseNormalizationInterceptor }); }
|
|
55
|
+
}
|
|
56
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.1.2", ngImport: i0, type: ResponseNormalizationInterceptor, decorators: [{
|
|
57
|
+
type: Injectable
|
|
58
|
+
}] });
|
|
59
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVzcG9uc2Uubm9ybWFsaXphdGlvbi5pbnRlcmNlcHRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3ZjZC9zZGsvc3JjL2NsaWVudC9jbGllbnQvcmVzcG9uc2Uubm9ybWFsaXphdGlvbi5pbnRlcmNlcHRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQzNDLE9BQU8sRUFBd0QsWUFBWSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFHMUcsT0FBTyxFQUFFLEdBQUcsRUFBRSxNQUFNLGdCQUFnQixDQUFDOztBQUVyQyw4QkFBOEI7QUFDOUI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBNkJHO0FBRUgsTUFBTSxPQUFPLGdDQUFnQzthQUNuQixzQkFBaUIsR0FBRywrREFBK0QsQUFBbEUsQ0FBbUU7SUFFNUcsU0FBUyxDQUFDLEdBQXFCLEVBQUUsSUFBaUI7UUFDaEQsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FDMUIsR0FBRyxDQUFDLFFBQVEsQ0FBQyxFQUFFO1lBQ2Isc0dBQXNHO1lBQ3RHLGdHQUFnRztZQUNoRywyREFBMkQ7WUFDM0QsSUFBSSxRQUFRLFlBQVksWUFBWSxJQUFJLFFBQVEsQ0FBQyxJQUFJLElBQUksUUFBUSxDQUFDLElBQUksQ0FBQyxLQUFLLElBQUksUUFBUSxDQUFDLElBQUksQ0FBQyxZQUFZLElBQUksUUFBUSxDQUFDLElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQztnQkFDbEksTUFBTSxJQUFJLEdBQUcsUUFBUSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUM7Z0JBQ2pDLElBQUksUUFBUSxDQUFDLElBQUksQ0FBQyxZQUFZLEtBQUssZ0NBQWdDLENBQUMsaUJBQWlCLEVBQUUsQ0FBQztvQkFDdEYsSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQztnQkFDeEQsQ0FBQztnQkFFRCxPQUFPLFFBQVEsQ0FBQyxLQUFLLENBQUMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO1lBQ2xDLENBQUM7WUFFRCxPQUFPLFFBQVEsQ0FBQztRQUNsQixDQUFDLENBQUMsQ0FDSCxDQUFDO0lBQ0osQ0FBQzs4R0FyQlUsZ0NBQWdDO2tIQUFoQyxnQ0FBZ0M7OzJGQUFoQyxnQ0FBZ0M7a0JBRDVDLFVBQVUiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBIdHRwRXZlbnQsIEh0dHBJbnRlcmNlcHRvciwgSHR0cEhhbmRsZXIsIEh0dHBSZXF1ZXN0LCBIdHRwUmVzcG9uc2UgfSBmcm9tICdAYW5ndWxhci9jb21tb24vaHR0cCc7XG5cbmltcG9ydCB7IE9ic2VydmFibGUgfSBmcm9tICdyeGpzJztcbmltcG9ydCB7IG1hcCB9IGZyb20gJ3J4anMvb3BlcmF0b3JzJztcblxuLy8gdHNsaW50OmRpc2FibGU6anNkb2MtZm9ybWF0XG4vKipcbiAqIEFuIGludGVyY2VwdG9yIG9uIHRoZSByZXNwb25zZSBjaGFpbiB0aGF0IG5vcm1hbGl6ZXMgZGlmZmVyZW5jZXMgaW5cbiAqIEpTT04gcGF5bG9hZHMgYmV0d2VlbiB2Q2xvdWQgRGlyZWN0b3IgdmVyc2lvbiA5LjEgYW5kIHZlcnNpb25zXG4gKiBncmVhdGVyIHRoYW4gOS4xLlxuICpcbiAqIEluIDkuMSAoQVBJIHZlcnNpb24gMzAuMCkgdGhlIHNlcnZlciBzZXJpYWxpemVzIEpTT04gYW5kIG5lc3RzIHRoZSBwYXlsb2FkIGluIGEgdmFsdWUgZmllbGQ6XG4gKiBgYGBcbiAge1xuICAgIFwibmFtZVwiIDogXCJ7aHR0cDovL3d3dy52bXdhcmUuY29tL3ZjbG91ZC92ZXJzaW9uc31TdXBwb3J0ZWRWZXJzaW9uc1wiLFxuICAgIFwiZGVjbGFyZWRUeXBlXCIgOiBcImNvbS52bXdhcmUudmNsb3VkLmFwaS5yZXN0LnNjaGVtYS52ZXJzaW9uaW5nLlN1cHBvcnRlZFZlcnNpb25zVHlwZVwiLFxuICAgIFwic2NvcGVcIiA6IFwiamF2YXgueG1sLmJpbmQuSkFYQkVsZW1lbnQkR2xvYmFsU2NvcGVcIixcbiAgICBcInZhbHVlXCIgOiB7XG4gICAgICBcInZlcnNpb25JbmZvXCIgOiBbXSxcbiAgICAgIFwiYW55XCIgOiBbXSxcbiAgICAgIFwib3RoZXJBdHRyaWJ1dGVzXCIgOiB7fVxuICAgIH1cbiAgfVxuICBgYGBcbiAqXG4gKiBUaGF0IHNhbWUgcmVxdWVzdCBpbiBBUEkgdmVyc2lvbnMgMzEuMCBhbmQgYWJvdmUgaXMgcmVwcmVzZW50ZWQgYXM6XG4gKiBgYGBcbiAge1xuICAgIFwidmVyc2lvbkluZm9cIiA6IFtdLFxuICAgIFwiYW55XCIgOiBbXSxcbiAgICBcIm90aGVyQXR0cmlidXRlc1wiIDoge31cbiAgfVxuICBgYGBcbiAqIFRoaXMgaW50ZXJjZXB0b3Igc2hvdWxkIHByb2Nlc3MgcmVzcG9uc2VzIGJlZm9yZSBhbnkgb3RoZXIgaW50ZXJjZXB0b3JzIHRoYXQgcmVseVxuICogb24gY29uc2lzdGVudCBBUEkgaW5mb3JtYXRpb24uXG4gKi9cbkBJbmplY3RhYmxlKClcbmV4cG9ydCBjbGFzcyBSZXNwb25zZU5vcm1hbGl6YXRpb25JbnRlcmNlcHRvciBpbXBsZW1lbnRzIEh0dHBJbnRlcmNlcHRvciB7XG4gIHByaXZhdGUgc3RhdGljIHJlYWRvbmx5IFFVRVJZX1JFU1VMVF9UWVBFID0gJ2NvbS52bXdhcmUudmNsb3VkLmFwaS5yZXN0LnNjaGVtYV92MV81LlF1ZXJ5UmVzdWx0UmVjb3Jkc1R5cGUnO1xuXG4gIGludGVyY2VwdChyZXE6IEh0dHBSZXF1ZXN0PGFueT4sIG5leHQ6IEh0dHBIYW5kbGVyKTogT2JzZXJ2YWJsZTxIdHRwRXZlbnQ8YW55Pj4ge1xuICAgIHJldHVybiBuZXh0LmhhbmRsZShyZXEpLnBpcGUoXG4gICAgICBtYXAocmVzcG9uc2UgPT4ge1xuICAgICAgICAvLyBXaGlsZSB0aGlzIGNvbmRpdGlvbiBzZWVtcyBhd2Z1bGx5IHNwZWNpZmljLCB0aGUgYWx0ZXJuYXRpdmUgb3B0aW9uIG9mIGV4YW1pbmluZyB0aGUgJ0NvbnRlbnQtVHlwZSdcbiAgICAgICAgLy8gcmVzcG9uc2UgaGVhZGVyIGZvciAndmVyc2lvbj0zMC4wJyBwcm92ZWQgdG8gYmUgYW4gdW5yZWxpYWJsZSBjb25kaXRpb24gaW4gYXQgbGVhc3Qgb25lIGNhc2U7XG4gICAgICAgIC8vIHJldHVybmluZyB0aGUgc2FtZSBKU09OIHBheWxvYWQgYXMgQVBJIHZlcnNpb25zID49IDMxLjAuXG4gICAgICAgIGlmIChyZXNwb25zZSBpbnN0YW5jZW9mIEh0dHBSZXNwb25zZSAmJiByZXNwb25zZS5ib2R5ICYmIHJlc3BvbnNlLmJvZHkudmFsdWUgJiYgcmVzcG9uc2UuYm9keS5kZWNsYXJlZFR5cGUgJiYgcmVzcG9uc2UuYm9keS5zY29wZSkge1xuICAgICAgICAgIGNvbnN0IGJvZHkgPSByZXNwb25zZS5ib2R5LnZhbHVlO1xuICAgICAgICAgIGlmIChyZXNwb25zZS5ib2R5LmRlY2xhcmVkVHlwZSA9PT0gUmVzcG9uc2VOb3JtYWxpemF0aW9uSW50ZXJjZXB0b3IuUVVFUllfUkVTVUxUX1RZUEUpIHtcbiAgICAgICAgICAgIGJvZHkucmVjb3JkID0gYm9keS5yZWNvcmQubWFwKHJlY29yZCA9PiByZWNvcmQudmFsdWUpO1xuICAgICAgICAgIH1cblxuICAgICAgICAgIHJldHVybiByZXNwb25zZS5jbG9uZSh7IGJvZHkgfSk7XG4gICAgICAgIH1cblxuICAgICAgICByZXR1cm4gcmVzcG9uc2U7XG4gICAgICB9KVxuICAgICk7XG4gIH1cbn1cbiJdfQ==
|