eservices-back-core 1.2.58 → 1.2.60
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/middleware/test-middleware.d.ts.map +1 -1
- package/dist/middleware/test-middleware.js +2 -1
- package/dist/middleware/test-middleware.js.map +1 -1
- package/dist/middleware/user-middleware.d.ts.map +1 -1
- package/dist/middleware/user-middleware.js +6 -2
- package/dist/middleware/user-middleware.js.map +1 -1
- package/dist/utils/get-current-context-from-request.d.ts +3 -0
- package/dist/utils/get-current-context-from-request.d.ts.map +1 -0
- package/dist/utils/get-current-context-from-request.js +13 -0
- package/dist/utils/get-current-context-from-request.js.map +1 -0
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/test-middleware.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"test-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/test-middleware.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;8BAKrB,OAAO,OAAO,QAAQ;AAA3C,wBAkBC"}
|
|
@@ -5,12 +5,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const jwt_decode_1 = __importDefault(require("jwt-decode"));
|
|
7
7
|
const store_1 = require("../store");
|
|
8
|
+
const get_current_context_from_request_1 = __importDefault(require("../utils/get-current-context-from-request"));
|
|
8
9
|
exports.default = (req, res, next) => {
|
|
9
10
|
try {
|
|
10
11
|
const state = store_1.store.getState();
|
|
11
12
|
const accessToken = req.__token = state.token;
|
|
12
13
|
const payload = (0, jwt_decode_1.default)(accessToken);
|
|
13
|
-
req.session.currentContextId =
|
|
14
|
+
req.session.currentContextId = (0, get_current_context_from_request_1.default)(req);
|
|
14
15
|
// @ts-ignore
|
|
15
16
|
req.oidc = {
|
|
16
17
|
user: payload
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-middleware.js","sourceRoot":"","sources":["../../src/middleware/test-middleware.ts"],"names":[],"mappings":";;;;;AAKA,4DAAmC;AACnC,oCAA+B;
|
|
1
|
+
{"version":3,"file":"test-middleware.js","sourceRoot":"","sources":["../../src/middleware/test-middleware.ts"],"names":[],"mappings":";;;;;AAKA,4DAAmC;AACnC,oCAA+B;AAC/B,iHAAqF;AAErF,kBAAe,CAAC,GAAY,EAAE,GAAa,EAAE,IAAI,EAAE,EAAE;IACpD,IAAI;QACH,MAAM,KAAK,GAAG,aAAK,CAAC,QAAQ,EAAE,CAAC;QAE/B,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC;QAC9C,MAAM,OAAO,GAAG,IAAA,oBAAS,EAAC,WAAW,CAAC,CAAC;QACvC,GAAG,CAAC,OAAO,CAAC,gBAAgB,GAAG,IAAA,0CAA4B,EAAC,GAAG,CAAC,CAAC;QACjE,aAAa;QACb,GAAG,CAAC,IAAI,GAAG;YACV,IAAI,EAAE,OAAO;SACb,CAAA;QACD,GAAG,CAAC,OAAO,CAAC,WAAW,GAAI,WAAW,CAAC;QACvC,GAAG,CAAC,OAAO,CAAC,MAAM,GAAS,OAAO,CAAC,0BAA0B,CAAC,CAAC;QAC/D,GAAG,CAAC,OAAO,CAAC,QAAQ,GAAO,OAAO,CAAC,4BAA4B,CAAC,CAAC;QACjE,IAAI,EAAE,CAAC;KACP;IAAC,OAAO,CAAC,EAAE;QACX,IAAI,CAAC,CAAC,CAAC,CAAC;KACR;AACF,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/user-middleware.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"user-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/user-middleware.ts"],"names":[],"mappings":";AAGA,wBA2BC"}
|
|
@@ -8,13 +8,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
15
|
const winston_1 = require("winston");
|
|
16
|
+
const get_current_context_from_request_1 = __importDefault(require("../utils/get-current-context-from-request"));
|
|
13
17
|
exports.default = (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
|
|
14
18
|
try {
|
|
15
19
|
const tokenLogger = winston_1.loggers.get("tokens");
|
|
16
20
|
const accessToken = req.oidc.accessToken;
|
|
17
|
-
req.currentContextId = req
|
|
21
|
+
req.currentContextId = (0, get_current_context_from_request_1.default)(req);
|
|
18
22
|
req.__token = `${accessToken.token_type} ${accessToken.access_token}`;
|
|
19
23
|
req.userInfo = yield req.oidc.fetchUserInfo();
|
|
20
24
|
req.session.user = req.userInfo;
|
|
@@ -22,7 +26,7 @@ exports.default = (req, res, next) => __awaiter(void 0, void 0, void 0, function
|
|
|
22
26
|
req.session.accessToken = req.__token;
|
|
23
27
|
req.session.userId = req.userInfo["AppRegister.Claim.UserId"];
|
|
24
28
|
req.session.personId = req.userInfo["AppRegister.Claim.PersonId"];
|
|
25
|
-
req.session.currentContextId = req
|
|
29
|
+
req.session.currentContextId = (0, get_current_context_from_request_1.default)(req);
|
|
26
30
|
tokenLogger.info(req.__token, {
|
|
27
31
|
user: req.session.user
|
|
28
32
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-middleware.js","sourceRoot":"","sources":["../../src/middleware/user-middleware.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"user-middleware.js","sourceRoot":"","sources":["../../src/middleware/user-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,qCAAgC;AAChC,iHAAqF;AAErF,kBAAe,CAAO,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;IAEvC,IAAI;QACH,MAAM,WAAW,GAAG,iBAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC1C,MAAM,WAAW,GAAG,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC;QAEzC,GAAG,CAAC,gBAAgB,GAAG,IAAA,0CAA4B,EAAC,GAAG,CAAC,CAAA;QACxD,GAAG,CAAC,OAAO,GAAG,GAAG,WAAW,CAAC,UAAU,IAAI,WAAW,CAAC,YAAY,EAAE,CAAC;QACtE,GAAG,CAAC,QAAQ,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;QAE9C,GAAG,CAAC,OAAO,CAAC,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC;QAChC,aAAa;QACb,GAAG,CAAC,OAAO,CAAC,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC;QACtC,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,GAAG,CAAC,QAAQ,CAAC,0BAA0B,CAAC,CAAC;QAC9D,GAAG,CAAC,OAAO,CAAC,QAAQ,GAAE,GAAG,CAAC,QAAQ,CAAC,4BAA4B,CAAC,CAAC;QACjE,GAAG,CAAC,OAAO,CAAC,gBAAgB,GAAG,IAAA,0CAA4B,EAAC,GAAG,CAAC,CAAC;QAEjE,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;YAC7B,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,IAAI;SACtB,CAAC,CAAC;QAEH,IAAI,EAAE,CAAC;KACP;IAAC,OAAO,CAAC,EAAE;QAEX,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;QAC1B,IAAI,CAAC,CAAC,CAAC,CAAC;KACR;AACF,CAAC,CAAA,CAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"get-current-context-from-request.d.ts","sourceRoot":"","sources":["../../src/utils/get-current-context-from-request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AAEhC,MAAM,CAAC,OAAO,UAAU,4BAA4B,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAUrF"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
function getCurrentContextFromRequest(req) {
|
|
4
|
+
const headerContextId = req.headers['context-id'];
|
|
5
|
+
if (typeof headerContextId !== "string")
|
|
6
|
+
return undefined;
|
|
7
|
+
const parsedContextId = Number.parseInt(headerContextId, 10);
|
|
8
|
+
if (Number.isInteger(parsedContextId))
|
|
9
|
+
return parsedContextId;
|
|
10
|
+
return undefined;
|
|
11
|
+
}
|
|
12
|
+
exports.default = getCurrentContextFromRequest;
|
|
13
|
+
//# sourceMappingURL=get-current-context-from-request.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"get-current-context-from-request.js","sourceRoot":"","sources":["../../src/utils/get-current-context-from-request.ts"],"names":[],"mappings":";;AAEA,SAAwB,4BAA4B,CAAC,GAAY;IAChE,MAAM,eAAe,GAAG,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAElD,IAAI,OAAO,eAAe,KAAK,QAAQ;QAAE,OAAO,SAAS,CAAC;IAE1D,MAAM,eAAe,GAAG,MAAM,CAAC,QAAQ,CAAC,eAAe,EAAE,EAAE,CAAC,CAAA;IAE5D,IAAI,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC;QAAE,OAAO,eAAe,CAAC;IAE9D,OAAO,SAAS,CAAC;AAClB,CAAC;AAVD,+CAUC"}
|