@eclipse-che/che-e2e 7.48.1 → 7.49.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/dist/utils/requestHandlers/CheApiRequestHandler.js +2 -0
- package/dist/utils/requestHandlers/CheApiRequestHandler.js.map +1 -1
- package/dist/utils/requestHandlers/headers/CheMultiuserAuthorizationHeaderHandler.js +16 -3
- package/dist/utils/requestHandlers/headers/CheMultiuserAuthorizationHeaderHandler.js.map +1 -1
- package/package.json +1 -1
- package/utils/requestHandlers/CheApiRequestHandler.ts +2 -0
- package/utils/requestHandlers/headers/CheMultiuserAuthorizationHeaderHandler.ts +6 -3
|
@@ -51,6 +51,7 @@ let CheApiRequestHandler = class CheApiRequestHandler {
|
|
|
51
51
|
return request;
|
|
52
52
|
}
|
|
53
53
|
request_censored.headers.Authorization = 'CENSORED';
|
|
54
|
+
request_censored.headers.Cookie = 'CENSORED';
|
|
54
55
|
Logger_1.Logger.info(`RequestHandler request:\n` + request_censored);
|
|
55
56
|
}
|
|
56
57
|
catch (err) {
|
|
@@ -85,6 +86,7 @@ let CheApiRequestHandler = class CheApiRequestHandler {
|
|
|
85
86
|
return response;
|
|
86
87
|
}
|
|
87
88
|
response_censored.config.headers.Authorization = 'CENSORED';
|
|
89
|
+
response_censored.config.headers.Cookie = 'CENSORED';
|
|
88
90
|
if (response_censored.data.access_token != null) {
|
|
89
91
|
response_censored.data.access_token = 'CENSORED';
|
|
90
92
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CheApiRequestHandler.js","sourceRoot":"","sources":["../../../utils/requestHandlers/CheApiRequestHandler.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;;;;AAExE,kDAAiE;AACjE,uDAAoD;AACpD,2DAA8C;AAC9C,yCAA+C;AAE/C,sCAAmC;AAGnC,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;
|
|
1
|
+
{"version":3,"file":"CheApiRequestHandler.js","sourceRoot":"","sources":["../../../utils/requestHandlers/CheApiRequestHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,17 +5,30 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
5
5
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
6
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
7
|
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
|
+
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
|
+
};
|
|
8
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
15
|
exports.CheMultiuserAuthorizationHeaderHandler = void 0;
|
|
10
16
|
const inversify_1 = require("inversify");
|
|
17
|
+
const DriverHelper_1 = require("../../DriverHelper");
|
|
18
|
+
const inversify_types_1 = require("../../../inversify.types");
|
|
11
19
|
let CheMultiuserAuthorizationHeaderHandler = class CheMultiuserAuthorizationHeaderHandler {
|
|
20
|
+
constructor(driverHelper) {
|
|
21
|
+
this.driverHelper = driverHelper;
|
|
22
|
+
}
|
|
12
23
|
async get() {
|
|
13
|
-
|
|
14
|
-
return { headers: { 'cookie':
|
|
24
|
+
let token = await this.driverHelper.getDriver().manage().getCookie('_oauth_proxy');
|
|
25
|
+
return { headers: { 'cookie': `_oauth_proxy=${token.value}` } };
|
|
15
26
|
}
|
|
16
27
|
};
|
|
17
28
|
CheMultiuserAuthorizationHeaderHandler = __decorate([
|
|
18
|
-
inversify_1.injectable()
|
|
29
|
+
inversify_1.injectable(),
|
|
30
|
+
__param(0, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
|
|
31
|
+
__metadata("design:paramtypes", [DriverHelper_1.DriverHelper])
|
|
19
32
|
], CheMultiuserAuthorizationHeaderHandler);
|
|
20
33
|
exports.CheMultiuserAuthorizationHeaderHandler = CheMultiuserAuthorizationHeaderHandler;
|
|
21
34
|
//# sourceMappingURL=CheMultiuserAuthorizationHeaderHandler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CheMultiuserAuthorizationHeaderHandler.js","sourceRoot":"","sources":["../../../../utils/requestHandlers/headers/CheMultiuserAuthorizationHeaderHandler.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"CheMultiuserAuthorizationHeaderHandler.js","sourceRoot":"","sources":["../../../../utils/requestHandlers/headers/CheMultiuserAuthorizationHeaderHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAWA,yCAA+C;AAC/C,qDAAkD;AAClD,8DAAmD;AAGnD,IAAa,sCAAsC,GAAnD,MAAa,sCAAsC;IAC/C,YAA2D,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IAAI,CAAC;IAE1F,KAAK,CAAC,GAAG;QACL,IAAI,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QACnF,OAAO,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,gBAAgB,KAAK,CAAC,KAAK,EAAE,EAAE,EAAE,CAAC;IACpE,CAAC;CACJ,CAAA;AAPY,sCAAsC;IADlD,sBAAU,EAAE;IAEI,WAAA,kBAAM,CAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCAAgC,2BAAY;GAD5E,sCAAsC,CAOlD;AAPY,wFAAsC"}
|
package/package.json
CHANGED
|
@@ -35,6 +35,7 @@ export class CheApiRequestHandler {
|
|
|
35
35
|
return request;
|
|
36
36
|
}
|
|
37
37
|
request_censored.headers.Authorization = 'CENSORED';
|
|
38
|
+
request_censored.headers.Cookie = 'CENSORED';
|
|
38
39
|
Logger.info(`RequestHandler request:\n` + request_censored);
|
|
39
40
|
} catch (err) {
|
|
40
41
|
Logger.error(`RequestHandler request: Failed to deep clone AxiosRequestConfig:` + err);
|
|
@@ -69,6 +70,7 @@ export class CheApiRequestHandler {
|
|
|
69
70
|
return response;
|
|
70
71
|
}
|
|
71
72
|
response_censored.config.headers.Authorization = 'CENSORED';
|
|
73
|
+
response_censored.config.headers.Cookie = 'CENSORED';
|
|
72
74
|
if (response_censored.data.access_token != null) {
|
|
73
75
|
response_censored.data.access_token = 'CENSORED';
|
|
74
76
|
}
|
|
@@ -9,13 +9,16 @@
|
|
|
9
9
|
**********************************************************************/
|
|
10
10
|
import { AxiosRequestConfig } from 'axios';
|
|
11
11
|
import { IAuthorizationHeaderHandler } from './IAuthorizationHeaderHandler';
|
|
12
|
-
import { injectable } from 'inversify';
|
|
12
|
+
import { inject, injectable } from 'inversify';
|
|
13
|
+
import { DriverHelper } from '../../DriverHelper';
|
|
14
|
+
import { CLASSES } from '../../../inversify.types';
|
|
13
15
|
|
|
14
16
|
@injectable()
|
|
15
17
|
export class CheMultiuserAuthorizationHeaderHandler implements IAuthorizationHeaderHandler {
|
|
18
|
+
constructor(@inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper) { }
|
|
16
19
|
|
|
17
20
|
async get(): Promise<AxiosRequestConfig> {
|
|
18
|
-
|
|
19
|
-
return { headers: { 'cookie':
|
|
21
|
+
let token = await this.driverHelper.getDriver().manage().getCookie('_oauth_proxy');
|
|
22
|
+
return { headers: { 'cookie': `_oauth_proxy=${token.value}` } };
|
|
20
23
|
}
|
|
21
24
|
}
|