@smartbit4all/ng-client 1.1.27 → 1.1.28
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2020/lib/session/smart-header-maintainer.interceptor.mjs +14 -11
- package/fesm2015/smartbit4all-ng-client.mjs +12 -9
- package/fesm2015/smartbit4all-ng-client.mjs.map +1 -1
- package/fesm2020/smartbit4all-ng-client.mjs +12 -9
- package/fesm2020/smartbit4all-ng-client.mjs.map +1 -1
- package/lib/session/smart-header-maintainer.interceptor.d.ts +3 -3
- package/package.json +1 -1
- package/smartbit4all-ng-client-1.1.28.tgz +0 -0
- package/smartbit4all-ng-client-1.1.27.tgz +0 -0
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Injectable } from
|
|
1
|
+
import { Injectable } from '@angular/core';
|
|
2
2
|
import * as i0 from "@angular/core";
|
|
3
3
|
import * as i1 from "./smart-session.service";
|
|
4
4
|
export class SmartHeaderMaintainerInterceptor {
|
|
@@ -6,21 +6,24 @@ export class SmartHeaderMaintainerInterceptor {
|
|
|
6
6
|
this.session = session;
|
|
7
7
|
}
|
|
8
8
|
intercept(request, next) {
|
|
9
|
-
|
|
9
|
+
// new request data
|
|
10
|
+
let url = request.urlWithParams.replace('http://localhost', this.session.getBasePath());
|
|
10
11
|
let headers = {};
|
|
12
|
+
// copy current headers
|
|
13
|
+
request.headers.keys().map((key) => {
|
|
14
|
+
let value = request.headers.getAll(key);
|
|
15
|
+
if (value) {
|
|
16
|
+
headers[key] = value;
|
|
17
|
+
}
|
|
18
|
+
});
|
|
19
|
+
// add own headers
|
|
20
|
+
const hasHeaders = this.session.headerParams && this.session.headerParams.length;
|
|
11
21
|
if (hasHeaders) {
|
|
12
22
|
this.session.headerParams.map((headerParam) => {
|
|
13
23
|
headers[headerParam.headerName] = headerParam.value;
|
|
14
24
|
});
|
|
15
25
|
}
|
|
16
|
-
|
|
17
|
-
// TODO fix me
|
|
18
|
-
if (request.urlWithParams.includes("/kerb/sso")) {
|
|
19
|
-
request = request.clone({
|
|
20
|
-
url: url,
|
|
21
|
-
});
|
|
22
|
-
return next.handle(request);
|
|
23
|
-
}
|
|
26
|
+
// create new request (necessary to rewrite url)
|
|
24
27
|
request = request.clone({
|
|
25
28
|
url: url,
|
|
26
29
|
setHeaders: headers,
|
|
@@ -33,4 +36,4 @@ SmartHeaderMaintainerInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersio
|
|
|
33
36
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: SmartHeaderMaintainerInterceptor, decorators: [{
|
|
34
37
|
type: Injectable
|
|
35
38
|
}], ctorParameters: function () { return [{ type: i1.SmartSessionService }]; } });
|
|
36
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
39
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnQtaGVhZGVyLW1haW50YWluZXIuaW50ZXJjZXB0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9zbWFydC1uZy1jbGllbnQvc3JjL2xpYi9zZXNzaW9uL3NtYXJ0LWhlYWRlci1tYWludGFpbmVyLmludGVyY2VwdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7OztBQU0zQyxNQUFNLE9BQU8sZ0NBQWdDO0lBQzNDLFlBQW9CLE9BQTRCO1FBQTVCLFlBQU8sR0FBUCxPQUFPLENBQXFCO0lBQUcsQ0FBQztJQUVwRCxTQUFTLENBQUMsT0FBeUIsRUFBRSxJQUFpQjtRQUNwRCxtQkFBbUI7UUFDbkIsSUFBSSxHQUFHLEdBQUcsT0FBTyxDQUFDLGFBQWEsQ0FBQyxPQUFPLENBQUMsa0JBQWtCLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxXQUFXLEVBQUUsQ0FBQyxDQUFDO1FBQ3hGLElBQUksT0FBTyxHQUEwQyxFQUFFLENBQUM7UUFFeEQsdUJBQXVCO1FBQ3ZCLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUFFLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUU7WUFDakMsSUFBSSxLQUFLLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDeEMsSUFBSSxLQUFLLEVBQUU7Z0JBQ1QsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLEtBQUssQ0FBQzthQUN0QjtRQUNILENBQUMsQ0FBQyxDQUFDO1FBRUgsa0JBQWtCO1FBQ2xCLE1BQU0sVUFBVSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsWUFBWSxJQUFJLElBQUksQ0FBQyxPQUFPLENBQUMsWUFBWSxDQUFDLE1BQU0sQ0FBQztRQUNqRixJQUFJLFVBQVUsRUFBRTtZQUNkLElBQUksQ0FBQyxPQUFPLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxDQUFDLFdBQVcsRUFBRSxFQUFFO2dCQUM1QyxPQUFPLENBQUMsV0FBVyxDQUFDLFVBQVUsQ0FBQyxHQUFHLFdBQVcsQ0FBQyxLQUFLLENBQUM7WUFDdEQsQ0FBQyxDQUFDLENBQUM7U0FDSjtRQUVELGdEQUFnRDtRQUNoRCxPQUFPLEdBQUcsT0FBTyxDQUFDLEtBQUssQ0FBQztZQUN0QixHQUFHLEVBQUUsR0FBRztZQUNSLFVBQVUsRUFBRSxPQUFPO1NBQ3BCLENBQUMsQ0FBQztRQUVILE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUM5QixDQUFDOzs4SEEvQlUsZ0NBQWdDO2tJQUFoQyxnQ0FBZ0M7NEZBQWhDLGdDQUFnQztrQkFENUMsVUFBVSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcclxuaW1wb3J0IHsgSHR0cFJlcXVlc3QsIEh0dHBIYW5kbGVyLCBIdHRwRXZlbnQsIEh0dHBJbnRlcmNlcHRvciB9IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJztcclxuaW1wb3J0IHsgT2JzZXJ2YWJsZSB9IGZyb20gJ3J4anMnO1xyXG5pbXBvcnQgeyBTbWFydFNlc3Npb25TZXJ2aWNlIH0gZnJvbSAnLi9zbWFydC1zZXNzaW9uLnNlcnZpY2UnO1xyXG5cclxuQEluamVjdGFibGUoKVxyXG5leHBvcnQgY2xhc3MgU21hcnRIZWFkZXJNYWludGFpbmVySW50ZXJjZXB0b3IgaW1wbGVtZW50cyBIdHRwSW50ZXJjZXB0b3Ige1xyXG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgc2Vzc2lvbjogU21hcnRTZXNzaW9uU2VydmljZSkge31cclxuXHJcbiAgaW50ZXJjZXB0KHJlcXVlc3Q6IEh0dHBSZXF1ZXN0PGFueT4sIG5leHQ6IEh0dHBIYW5kbGVyKTogT2JzZXJ2YWJsZTxIdHRwRXZlbnQ8YW55Pj4ge1xyXG4gICAgLy8gbmV3IHJlcXVlc3QgZGF0YVxyXG4gICAgbGV0IHVybCA9IHJlcXVlc3QudXJsV2l0aFBhcmFtcy5yZXBsYWNlKCdodHRwOi8vbG9jYWxob3N0JywgdGhpcy5zZXNzaW9uLmdldEJhc2VQYXRoKCkpO1xyXG4gICAgbGV0IGhlYWRlcnM6IHsgW25hbWU6IHN0cmluZ106IHN0cmluZyB8IHN0cmluZ1tdIH0gPSB7fTtcclxuXHJcbiAgICAvLyBjb3B5IGN1cnJlbnQgaGVhZGVyc1xyXG4gICAgcmVxdWVzdC5oZWFkZXJzLmtleXMoKS5tYXAoKGtleSkgPT4ge1xyXG4gICAgICBsZXQgdmFsdWUgPSByZXF1ZXN0LmhlYWRlcnMuZ2V0QWxsKGtleSk7XHJcbiAgICAgIGlmICh2YWx1ZSkge1xyXG4gICAgICAgIGhlYWRlcnNba2V5XSA9IHZhbHVlO1xyXG4gICAgICB9XHJcbiAgICB9KTtcclxuXHJcbiAgICAvLyBhZGQgb3duIGhlYWRlcnNcclxuICAgIGNvbnN0IGhhc0hlYWRlcnMgPSB0aGlzLnNlc3Npb24uaGVhZGVyUGFyYW1zICYmIHRoaXMuc2Vzc2lvbi5oZWFkZXJQYXJhbXMubGVuZ3RoO1xyXG4gICAgaWYgKGhhc0hlYWRlcnMpIHtcclxuICAgICAgdGhpcy5zZXNzaW9uLmhlYWRlclBhcmFtcy5tYXAoKGhlYWRlclBhcmFtKSA9PiB7XHJcbiAgICAgICAgaGVhZGVyc1toZWFkZXJQYXJhbS5oZWFkZXJOYW1lXSA9IGhlYWRlclBhcmFtLnZhbHVlO1xyXG4gICAgICB9KTtcclxuICAgIH1cclxuXHJcbiAgICAvLyBjcmVhdGUgbmV3IHJlcXVlc3QgKG5lY2Vzc2FyeSB0byByZXdyaXRlIHVybClcclxuICAgIHJlcXVlc3QgPSByZXF1ZXN0LmNsb25lKHtcclxuICAgICAgdXJsOiB1cmwsXHJcbiAgICAgIHNldEhlYWRlcnM6IGhlYWRlcnMsXHJcbiAgICB9KTtcclxuXHJcbiAgICByZXR1cm4gbmV4dC5oYW5kbGUocmVxdWVzdCk7XHJcbiAgfVxyXG59XHJcbiJdfQ==
|
|
@@ -3083,21 +3083,24 @@ class SmartHeaderMaintainerInterceptor {
|
|
|
3083
3083
|
this.session = session;
|
|
3084
3084
|
}
|
|
3085
3085
|
intercept(request, next) {
|
|
3086
|
-
|
|
3086
|
+
// new request data
|
|
3087
|
+
let url = request.urlWithParams.replace('http://localhost', this.session.getBasePath());
|
|
3087
3088
|
let headers = {};
|
|
3089
|
+
// copy current headers
|
|
3090
|
+
request.headers.keys().map((key) => {
|
|
3091
|
+
let value = request.headers.getAll(key);
|
|
3092
|
+
if (value) {
|
|
3093
|
+
headers[key] = value;
|
|
3094
|
+
}
|
|
3095
|
+
});
|
|
3096
|
+
// add own headers
|
|
3097
|
+
const hasHeaders = this.session.headerParams && this.session.headerParams.length;
|
|
3088
3098
|
if (hasHeaders) {
|
|
3089
3099
|
this.session.headerParams.map((headerParam) => {
|
|
3090
3100
|
headers[headerParam.headerName] = headerParam.value;
|
|
3091
3101
|
});
|
|
3092
3102
|
}
|
|
3093
|
-
|
|
3094
|
-
// TODO fix me
|
|
3095
|
-
if (request.urlWithParams.includes("/kerb/sso")) {
|
|
3096
|
-
request = request.clone({
|
|
3097
|
-
url: url,
|
|
3098
|
-
});
|
|
3099
|
-
return next.handle(request);
|
|
3100
|
-
}
|
|
3103
|
+
// create new request (necessary to rewrite url)
|
|
3101
3104
|
request = request.clone({
|
|
3102
3105
|
url: url,
|
|
3103
3106
|
setHeaders: headers,
|