eservices-back-core 1.2.41 → 1.2.42
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/refresh-middleware.d.ts +4 -0
- package/dist/middleware/refresh-middleware.d.ts.map +1 -0
- package/dist/middleware/refresh-middleware.js +34 -0
- package/dist/middleware/refresh-middleware.js.map +1 -0
- package/dist/middleware/user-middleware.d.ts.map +1 -1
- package/dist/middleware/user-middleware.js +1 -9
- package/dist/middleware/user-middleware.js.map +1 -1
- package/dist/router/index.d.ts.map +1 -1
- package/dist/router/index.js +2 -0
- package/dist/router/index.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"refresh-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/refresh-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAC,MAAM,SAAS,CAAC;oCAKpC,OAAO,OAAO,QAAQ,QAAQ,YAAY;AAH9D,wBAsBC"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.default = () => {
|
|
13
|
+
const store = new Map();
|
|
14
|
+
return (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
|
|
15
|
+
const userId = req.session.userId;
|
|
16
|
+
// On this moment we don't save information about User. It can happen only after clean auth moment.
|
|
17
|
+
if (!userId)
|
|
18
|
+
return next();
|
|
19
|
+
// Updating access token
|
|
20
|
+
const accessToken = req.oidc.accessToken;
|
|
21
|
+
if (accessToken.isExpired()) {
|
|
22
|
+
if (store.has(userId))
|
|
23
|
+
yield store.get(userId);
|
|
24
|
+
else {
|
|
25
|
+
const promiseRefresh = accessToken.refresh();
|
|
26
|
+
store.set(userId, promiseRefresh);
|
|
27
|
+
yield promiseRefresh;
|
|
28
|
+
store.delete(userId);
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
next();
|
|
32
|
+
});
|
|
33
|
+
};
|
|
34
|
+
//# sourceMappingURL=refresh-middleware.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"refresh-middleware.js","sourceRoot":"","sources":["../../src/middleware/refresh-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;AAEA,kBAAe,GAAG,EAAE;IACnB,MAAM,KAAK,GAAG,IAAI,GAAG,EAAwB,CAAC;IAE9C,OAAO,CAAO,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QAChE,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAA;QAEjC,mGAAmG;QACnG,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,EAAE,CAAC;QAE3B,wBAAwB;QACxB,MAAM,WAAW,GAAG,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC;QACzC,IAAI,WAAW,CAAC,SAAS,EAAE,EAAE;YAC5B,IAAI,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC;gBAAE,MAAM,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;iBAC1C;gBACJ,MAAM,cAAc,GAAG,WAAW,CAAC,OAAO,EAAE,CAAA;gBAC5C,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;gBAClC,MAAM,cAAc,CAAC;gBACrB,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;aACrB;SACD;QACD,IAAI,EAAE,CAAA;IACP,CAAC,CAAA,CAAA;AACF,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/user-middleware.ts"],"names":[],"mappings":";AAEA,
|
|
1
|
+
{"version":3,"file":"user-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/user-middleware.ts"],"names":[],"mappings":";AAEA,wBA2BC"}
|
|
@@ -13,15 +13,7 @@ const winston_1 = require("winston");
|
|
|
13
13
|
exports.default = (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
|
|
14
14
|
try {
|
|
15
15
|
const tokenLogger = winston_1.loggers.get("tokens");
|
|
16
|
-
const
|
|
17
|
-
let accessToken = req.oidc.accessToken;
|
|
18
|
-
if (accessToken.isExpired()) {
|
|
19
|
-
accessToken = yield accessToken.refresh()
|
|
20
|
-
.catch(err => {
|
|
21
|
-
errorLogger.error(err);
|
|
22
|
-
throw err;
|
|
23
|
-
});
|
|
24
|
-
}
|
|
16
|
+
const accessToken = req.oidc.accessToken;
|
|
25
17
|
req.__token = `${accessToken.token_type} ${accessToken.access_token}`;
|
|
26
18
|
req.userInfo = yield req.oidc.fetchUserInfo();
|
|
27
19
|
req.session.user = req.userInfo;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-middleware.js","sourceRoot":"","sources":["../../src/middleware/user-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,qCAAgC;AAEhC,kBAAe,CAAO,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;IAEvC,IAAI;
|
|
1
|
+
{"version":3,"file":"user-middleware.js","sourceRoot":"","sources":["../../src/middleware/user-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,qCAAgC;AAEhC,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,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;QAI9C,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;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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":"AAuBA,MAAM,CAAC,OAAO,UAAU,SAAS,SAmEhC"}
|
package/dist/router/index.js
CHANGED
|
@@ -27,6 +27,7 @@ const cookie_parser_1 = __importDefault(require("cookie-parser"));
|
|
|
27
27
|
const Server_1 = __importDefault(require("../Server"));
|
|
28
28
|
const api_error_1 = __importDefault(require("../errors/api-error"));
|
|
29
29
|
const open_api_router_1 = __importDefault(require("./open/open-api-router"));
|
|
30
|
+
const refresh_middleware_1 = __importDefault(require("../middleware/refresh-middleware"));
|
|
30
31
|
function useRouter() {
|
|
31
32
|
const server = Server_1.default.getServer();
|
|
32
33
|
const app = server.app;
|
|
@@ -52,6 +53,7 @@ function useRouter() {
|
|
|
52
53
|
app.use("/open-api", open_api_router_1.default);
|
|
53
54
|
// Protect level
|
|
54
55
|
app.use((0, auth_middleware_1.default)());
|
|
56
|
+
app.use((0, refresh_middleware_1.default)());
|
|
55
57
|
app.use(user_middleware_1.default);
|
|
56
58
|
app.use("/close-api", (0, close_1.default)());
|
|
57
59
|
app.get("/main*", (req, res) => __awaiter(this, void 0, void 0, function* () {
|
package/dist/router/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,8DAAsC;AACtC,sDAA+B;AAC/B,gDAA0B;AAE1B,oDAAkC;AAClC,kFAAwD;AAExD,oFAA4D;AAC5D,wFAA+D;AAC/D,oFAA2D;AAC3D,sFAA6D;AAC7D,0FAAiE;AACjE,gDAAwB;AACxB,kEAAyC;AAGzC,uDAA+B;AAE/B,oEAA2C;AAC3C,6EAAmD;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":"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"}
|