eservices-back-core 1.2.15 → 1.2.16
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/Server.d.ts.map +1 -1
- package/dist/Server.js +4 -0
- package/dist/Server.js.map +1 -1
- package/dist/app.js +2 -1
- package/dist/app.js.map +1 -1
- package/dist/middleware/user-middleware.d.ts.map +1 -1
- package/dist/middleware/user-middleware.js +6 -1
- package/dist/middleware/user-middleware.js.map +1 -1
- package/package.json +1 -1
package/dist/Server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Server.d.ts","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":";AAAA,OAAgB,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AACzC,OAAa,EAAC,MAAM,IAAI,UAAU,EAAC,MAAM,MAAM,CAAC;AAKhD,OAAO,EAAC,MAAM,IAAI,YAAY,EAAC,MAAM,WAAW,CAAC;AAEjD,OAAO,EAAC,YAAY,EAAE,UAAU,EAAC,MAAM,SAAS,CAAC;AAEjD,OAAO,EAAC,YAAY,EAAC,MAAM,wBAAwB,CAAC;AAKpD,MAAM,CAAC,OAAO,OAAO,MAAM;IAC1B;;OAEG;IACH,GAAG,EAAE,OAAO,CAAC;IAEb;;OAEG;IACH,UAAU,EAAE,UAAU,CAAA;IAEtB;;OAEG;IACH,IAAI,EAAE,UAAU,CAAC;IACjB;;OAEG;IACH,IAAI,QAAQ,IAAI,KAAK,GAAG,KAAK,CAE5B;IAED;;OAEG;IACH,UAAU,EAAE,MAAM,CAAA;IAElB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAA;IAEnB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAA;IAEjB;;OAEG;IACH,MAAM,EAAE,YAAY,CAAA;IAEpB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAA;IACd;;OAEG;IACH,IAAI,EAAE,YAAY,CAAA;IAElB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAA;IAEZ,MAAM,CAAC,SAAS,IAAI,MAAM;gBAGd,MAAM,EAAE,YAAY;
|
|
1
|
+
{"version":3,"file":"Server.d.ts","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":";AAAA,OAAgB,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AACzC,OAAa,EAAC,MAAM,IAAI,UAAU,EAAC,MAAM,MAAM,CAAC;AAKhD,OAAO,EAAC,MAAM,IAAI,YAAY,EAAC,MAAM,WAAW,CAAC;AAEjD,OAAO,EAAC,YAAY,EAAE,UAAU,EAAC,MAAM,SAAS,CAAC;AAEjD,OAAO,EAAC,YAAY,EAAC,MAAM,wBAAwB,CAAC;AAKpD,MAAM,CAAC,OAAO,OAAO,MAAM;IAC1B;;OAEG;IACH,GAAG,EAAE,OAAO,CAAC;IAEb;;OAEG;IACH,UAAU,EAAE,UAAU,CAAA;IAEtB;;OAEG;IACH,IAAI,EAAE,UAAU,CAAC;IACjB;;OAEG;IACH,IAAI,QAAQ,IAAI,KAAK,GAAG,KAAK,CAE5B;IAED;;OAEG;IACH,UAAU,EAAE,MAAM,CAAA;IAElB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAA;IAEnB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAA;IAEjB;;OAEG;IACH,MAAM,EAAE,YAAY,CAAA;IAEpB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAA;IACd;;OAEG;IACH,IAAI,EAAE,YAAY,CAAA;IAElB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAA;IAEZ,MAAM,CAAC,SAAS,IAAI,MAAM;gBAGd,MAAM,EAAE,YAAY;IA2BhC,GAAG;CAcH;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,YAAY,UAYhD"}
|
package/dist/Server.js
CHANGED
|
@@ -16,6 +16,7 @@ const use_config_1 = __importDefault(require("./utils/use-config"));
|
|
|
16
16
|
let serverLink = null;
|
|
17
17
|
class Server {
|
|
18
18
|
constructor(params) {
|
|
19
|
+
var _a, _b, _c, _d;
|
|
19
20
|
serverLink = this;
|
|
20
21
|
this.app = (0, express_1.default)();
|
|
21
22
|
this.httpServer = http_1.default.createServer(this.app);
|
|
@@ -32,6 +33,9 @@ class Server {
|
|
|
32
33
|
credentials: true
|
|
33
34
|
}
|
|
34
35
|
});
|
|
36
|
+
if (!((_d = (_c = (_b = (_a = params.oidc) === null || _a === void 0 ? void 0 : _a.authorizationParams) === null || _b === void 0 ? void 0 : _b.scope) === null || _c === void 0 ? void 0 : _c.includes) === null || _d === void 0 ? void 0 : _d.call(_c, 'offline_access'))) {
|
|
37
|
+
console.warn('[server-warning] scope offline_access is not provided in authorizationParams.');
|
|
38
|
+
}
|
|
35
39
|
}
|
|
36
40
|
/**
|
|
37
41
|
* @description Параметр идентифицирующий тип web-сервера. Используется для работы с AppServer.
|
package/dist/Server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Server.js","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":";;;;;;AAAA,sDAAyC;AACzC,gDAAgD;AAChD,qEAA+C;AAC/C,sDAAoC;AACpC,qEAA4C;AAC5C,qCAAgC;AAChC,yCAAiD;AACjD,gDAAwB;AAExB,oEAA2C;AAI3C,IAAI,UAAU,GAAG,IAAI,CAAC;AAEtB,MAAqB,MAAM;IA2D1B,YAAY,MAAoB
|
|
1
|
+
{"version":3,"file":"Server.js","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":"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"}
|
package/dist/app.js
CHANGED
|
@@ -29,7 +29,8 @@ console.log(`For retoken http://localhost:${process.env.PORT}/test-api/re-token`
|
|
|
29
29
|
login: false,
|
|
30
30
|
},
|
|
31
31
|
authorizationParams: {
|
|
32
|
-
response_type: "code",
|
|
32
|
+
response_type: "code",
|
|
33
|
+
scope: "openid offline_access profile"
|
|
33
34
|
},
|
|
34
35
|
},
|
|
35
36
|
});
|
package/dist/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":";;;;;AAAA,qCAAsC;AAEtC,gDAAwB;AAExB,
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":";;;;;AAAA,qCAAsC;AAEtC,gDAAwB;AAExB,mCAA8C;AAE9C,IAAA,eAAY,EAAC;IACZ,IAAI,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,CAAC;CACxC,CAAC,CAAC;AAEH,OAAO,CAAC,GAAG,CAAC,gCAAgC,OAAO,CAAC,GAAG,CAAC,IAAI,oBAAoB,CAAC,CAAA;AAEjF,IAAA,qBAAY,EAAC;IACZ,OAAO,EAAE,oBAAoB,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE;IAC/C,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;IAC9B,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,IAAwB;IAC1C,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO;IAC3B,UAAU,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC;IACtC,WAAW,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,UAAU,CAAC;IACtD,IAAI,EAAE;QACL,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU;QACrC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ;QAC7B,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;QACpC,MAAM,EACL,qEAAqE;QACtE,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW;QACrC,SAAS,EAAE,IAAI;QACf,WAAW,EAAE,IAAI;QACjB,MAAM,EAAE;YACP,KAAK,EAAE,KAAK;SACZ;QACD,mBAAmB,EAAE;YACpB,aAAa,EAAE,MAAM;YACrB,KAAK,EAAE,+BAA+B;SACtC;KACD;CACD,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,wBAsCC"}
|
|
@@ -13,9 +13,14 @@ 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 errorLogger = winston_1.loggers.get('error');
|
|
16
17
|
let accessToken = req.oidc.accessToken;
|
|
17
18
|
if (accessToken.isExpired()) {
|
|
18
|
-
accessToken = yield accessToken.refresh()
|
|
19
|
+
accessToken = yield accessToken.refresh()
|
|
20
|
+
.catch(err => {
|
|
21
|
+
errorLogger.error(err);
|
|
22
|
+
throw err;
|
|
23
|
+
});
|
|
19
24
|
}
|
|
20
25
|
req.__token = `${accessToken.token_type} ${accessToken.access_token}`;
|
|
21
26
|
req.userInfo = yield req.oidc.fetchUserInfo();
|
|
@@ -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;QAEH,MAAM,WAAW,GAAG,iBAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;
|
|
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;QAEH,MAAM,WAAW,GAAG,iBAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC1C,MAAM,WAAW,GAAG,iBAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QAExC,IAAI,WAAW,GAAG,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC;QAEvC,IAAI,WAAW,CAAC,SAAS,EAAE,EAAE;YAC5B,WAAW,GAAG,MAAM,WAAW,CAAC,OAAO,EAAE;iBACxC,KAAK,CAAC,GAAG,CAAC,EAAE;gBACZ,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACvB,MAAM,GAAG,CAAC;YACX,CAAC,CAAC,CAAC;SACH;QAED,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"}
|