eservices-back-core 1.5.7 → 1.5.8
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/auth/use-auth.d.ts.map +1 -1
- package/dist/auth/use-auth.js +17 -12
- package/dist/auth/use-auth.js.map +1 -1
- package/dist/middleware/error-middleware.d.ts.map +1 -1
- package/dist/middleware/error-middleware.js +4 -0
- package/dist/middleware/error-middleware.js.map +1 -1
- package/dist/router/index.d.ts.map +1 -1
- package/dist/router/index.js +10 -1
- package/dist/router/index.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-auth.d.ts","sourceRoot":"","sources":["../../src/auth/use-auth.ts"],"names":[],"mappings":"AAEA,OAAgB,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AAIzC,OAAO,EAAC,gBAAgB,EAAE,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAOlE,QAAA,MAAM,WAAW,SAAS,CAAC;AAK3B,OAAO,CAAC,MAAM,CAAA;IACb,UAAU,OAAO,CAAC;QACjB,UAAU,OAAO;YAChB,OAAO,EAAE;gBACR,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAA;aACxC,CAAA;SACD;KACD;CACD;AAID;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,OAAO,EAAE,YAAY;;+
|
|
1
|
+
{"version":3,"file":"use-auth.d.ts","sourceRoot":"","sources":["../../src/auth/use-auth.ts"],"names":[],"mappings":"AAEA,OAAgB,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AAIzC,OAAO,EAAC,gBAAgB,EAAE,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAOlE,QAAA,MAAM,WAAW,SAAS,CAAC;AAK3B,OAAO,CAAC,MAAM,CAAA;IACb,UAAU,OAAO,CAAC;QACjB,UAAU,OAAO;YAChB,OAAO,EAAE;gBACR,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAA;aACxC,CAAA;SACD;KACD;CACD;AAID;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,OAAO,EAAE,YAAY;;+BAiIZ,OAAO;wBA4BpB,OAAO;EASlC;AAqCD;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAM/F;AAuBD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,UAIlD;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,UAGxD"}
|
package/dist/auth/use-auth.js
CHANGED
|
@@ -139,7 +139,7 @@ function useAuth(options) {
|
|
|
139
139
|
}
|
|
140
140
|
catch (e) {
|
|
141
141
|
use_logger_1.Logger.error(e);
|
|
142
|
-
|
|
142
|
+
next(auth_error_1.default.UserIsNotAuthorize());
|
|
143
143
|
}
|
|
144
144
|
}));
|
|
145
145
|
return router;
|
|
@@ -148,17 +148,22 @@ function useAuth(options) {
|
|
|
148
148
|
return __awaiter(this, void 0, void 0, function* () {
|
|
149
149
|
debug("Process of socket auth was started.");
|
|
150
150
|
return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
151
|
+
try {
|
|
152
|
+
const authState = getAuthStateFormRequest(req);
|
|
153
|
+
if (!authState)
|
|
154
|
+
return reject("Authorization Session not Found.");
|
|
155
|
+
if (isActiveAuthorizedState(authState))
|
|
156
|
+
return void resolve();
|
|
157
|
+
debug("Данные access авторизации устарели или не указаны.");
|
|
158
|
+
if (!isRefreshTokenProvided(authState))
|
|
159
|
+
return reject("Данные refresh авторизации не существуют либо полностью устарели. Необходимо произвести авторизацию заново.");
|
|
160
|
+
const newTokenSet = yield refreshTokenSetByRefreshToken(req.session[SESSION_KEY].refreshToken);
|
|
161
|
+
updateSessionByTokenSet(req, newTokenSet);
|
|
162
|
+
resolve();
|
|
163
|
+
}
|
|
164
|
+
catch (e) {
|
|
165
|
+
reject(e);
|
|
166
|
+
}
|
|
162
167
|
}));
|
|
163
168
|
});
|
|
164
169
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-auth.js","sourceRoot":"","sources":["../../src/auth/use-auth.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,iDAA6E;AAC7E,kDAAgC;AAChC,sDAAyC;AACzC,6BAAyB;AACzB,qDAA4C;AAC5C,uDAA+B;AAE/B,sEAA6C;AAC7C,kEAAwC;AACxC,iFAAwD;AAExD,MAAM,SAAS,GAAG,qBAAqB,CAAC;AACxC,6DAA6D;AAC7D,MAAM,WAAW,GAAG,MAAM,CAAC;AAC3B,MAAM,eAAe,GAAG,KAAM,CAAC;AAE/B,MAAM,KAAK,GAAG,IAAA,eAAW,EAAC,SAAS,CAAC,CAAC;AAcrC;;;GAGG;AACH,SAAwB,OAAO,CAAC,OAAqB;IAEpD,gDAAgD;IAChD,sBAAM,CAAC,sBAAsB,CAAC;QAC7B,OAAO,EAAE,eAAe;KACxB,CAAC,CAAC;IAEH,MAAM,EAAC,aAAa,EAAC,OAAO,EAAC,GAAG,OAAO,CAAC;IACxC,IAAI,MAAe,CAAC;IACpB,IAAI,SAA0B,CAAC;IAE/B,oGAAoG;IACpG,MAAM,WAAW,GAAG,OAAO,GAAG,WAAW,CAAC;IAC1C;;OAEG;IAEH,IAAA,0BAAe,EAAC,GAAS,EAAE;QAC1B,mBAAM,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAA;QAC1C,SAAS,GAAG,MAAM,sBAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QACjD,mBAAM,CAAC,IAAI,CAAC,+BAA+B,EAAE,aAAa,CAAC,CAAA;QAC3D,MAAM,GAAG,IAAI,SAAS,CAAC,MAAM,CAAC;YAC7B,SAAS,EAAE,OAAO,CAAC,QAAQ;YAC3B,aAAa,EAAE,OAAO,CAAC,YAAY;YACnC,cAAc,EAAE,CAAC,MAAM,CAAC;YACxB,aAAa,EAAE,CAAC,WAAW,CAAC;SAC5B,CAAC,CAAC;QACH,mBAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;IAE/C,CAAC,CAAA,EAAE;QACF,QAAQ;YACP,mBAAM,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC;QAC9C,CAAC;KACD,CAAC,CAAA;IAEF;;OAEG;IACH,SAAS,6BAA6B,CAAC,YAAoB;QAC1D,OAAO,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC;aAClC,IAAI,CAAC,QAAQ,CAAC,EAAE;YAChB,KAAK,CAAC,8BAA8B,CAAC,CAAC;YACtC,OAAO,QAAQ,CAAC;QACjB,CAAC,CAAC,CAAA;IACH,CAAC;IAED,SAAS,iBAAiB;QACzB,MAAM,MAAM,GAAG,iBAAO,CAAC,MAAM,EAAE,CAAC;QAEhC,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,CAAO,GAAY,EAAE,GAAG,EAAE,EAAE;YACnD,IAAI,CAAC;gBACJ,MAAM,MAAM,GAAG,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;gBAC1C,MAAM,EAAC,YAAY,EAAC,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAC;gBAEpD,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE;oBAC3D,KAAK,EAAE,MAAM,CAAC,KAAK;oBACnB,aAAa,EAAE,YAAY;iBAC3B,CAAC,CAAC;gBACH,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAuB,CAAC;gBAEnE,uBAAuB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;gBACvC,iBAAiB,CAAC,GAAG,EAAE,QAAQ,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;gBACpD,KAAK,CAAC,mDAAmD,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;gBAEnF,GAAG,CAAC,QAAQ,CAAC,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,UAAU,KAAI,OAAO,CAAC,CAAA;YACjD,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACZ,KAAK,CAAC,yCAAyC,EAAE,CAAC,CAAC,CAAC;gBACpD,OAAO,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YAC9B,CAAC;QACF,CAAC,CAAA,CAAC,CAAA;QACF,MAAM,CAAC,GAAG,CAAC,IAAA,sBAAU,GAAE,CAAC,MAAM,EAAE,CAAC,GAAY,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YAC3D,IAAI,CAAC;gBACJ,yBAAyB,CAAC,GAAG,CAAC,CAAC;gBAC/B,yDAAyD;gBACzD,GAAG,CAAC,QAAQ,CAAC,IAAA,sBAAU,GAAE,CAAC,KAAK,CAAC,CAAC;YAClC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACZ,KAAK,CAAC,iCAAiC,EAAE,CAAC,CAAC,CAAC;gBAC5C,IAAI,CAAC,CAAC,CAAC,CAAC;YACT,CAAC;QACF,CAAC,CAAC,CAAA;QACF,MAAM,CAAC,GAAG,CAAC,CAAO,GAAY,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YAC5C,IAAI,CAAC;gBACJ,KAAK,CAAC,yCAAyC,EAAE,IAAA,WAAK,EAAC,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC;gBAE1E,MAAM,SAAS,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAC;gBAE/C,IAAI,uBAAuB,CAAC,SAAS,CAAC,EAAE,CAAC;oBACxC,KAAK,CAAC,gCAAgC,CAAC,CAAA;oBACvC,OAAO,IAAI,EAAE,CAAC;gBACf,CAAC;gBACD,IAAI,sBAAsB,CAAC,SAAS,CAAC,EAAE,CAAC;oBACvC,KAAK,CAAC,gCAAgC,CAAC,CAAA;oBACvC,MAAM,WAAW,GAAG,MAAM,6BAA6B,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;oBAEhF,uBAAuB,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;oBAC1C,KAAK,CAAC,6BAA6B,CAAC,CAAA;oBACpC,OAAO,IAAI,EAAE,CAAC;gBACf,CAAC;gBAED,KAAK,CAAC,4CAA4C,CAAC,CAAC;gBAEpD,MAAM,YAAY,GAAG,0BAAU,CAAC,YAAY,EAAE,CAAC;gBAC/C,iBAAiB,CAAC,GAAG,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;gBACrD,kGAAkG;gBAClG,oEAAoE;gBACpE,MAAM,aAAa,GAAG,0BAAU,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;gBAE7D,MAAM,KAAK,GAAsB;oBAChC,UAAU,EAAE,OAAO,GAAG,IAAA,WAAK,EAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI;iBACzC,CAAC;gBAEF,KAAK,CAAC,+CAA+C,EAAE,KAAK,CAAC,CAAC;gBAC9D,IAAI,CAAC,MAAM;oBAAE,MAAM,oBAAS,CAAC,4BAA4B,EAAE,CAAC;gBAE5D,MAAM,GAAG,GAAG,MAAM,CAAC,gBAAgB,CAAC;oBACnC,KAAK,EAAE,qCAAqC;oBAC5C,cAAc,EAAE,aAAa;oBAC7B,qBAAqB,EAAE,MAAM;oBAC7B,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;iBAC5B,CAAC,CAAC;gBACH,OAAO,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;YACzB,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACZ,mBAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"use-auth.js","sourceRoot":"","sources":["../../src/auth/use-auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/error-middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"error-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/error-middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;wCAWV,OAAO,OAAO,QAAQ;AAAtD,wBA2BE"}
|
|
@@ -18,7 +18,11 @@ const auth_middleware_1 = require("./auth-middleware");
|
|
|
18
18
|
const use_logger_1 = require("../logger/use-logger");
|
|
19
19
|
const auth_error_1 = __importDefault(require("../errors/auth-error"));
|
|
20
20
|
const get_auth_url_1 = __importDefault(require("../auth/get-auth-url"));
|
|
21
|
+
const debug_1 = __importDefault(require("debug"));
|
|
22
|
+
const utils_1 = require("../utils");
|
|
23
|
+
const debug = (0, debug_1.default)((0, utils_1.getCoreDebugMark)("error-handler"));
|
|
21
24
|
exports.default = (err, req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
|
|
25
|
+
debug(err);
|
|
22
26
|
use_logger_1.Logger.error('Error level %o', err);
|
|
23
27
|
// Error bind with Authorization
|
|
24
28
|
if (err instanceof auth_error_1.default || (req.method === "GET" && !req.infoUserId)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error-middleware.js","sourceRoot":"","sources":["../../src/middleware/error-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,oEAA2C;AAE3C,oFAA0D;AAC1D,uDAA6C;AAC7C,qDAA4C;AAC5C,sEAA6C;AAC7C,wEAA8C;
|
|
1
|
+
{"version":3,"file":"error-middleware.js","sourceRoot":"","sources":["../../src/middleware/error-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,oEAA2C;AAE3C,oFAA0D;AAC1D,uDAA6C;AAC7C,qDAA4C;AAC5C,sEAA6C;AAC7C,wEAA8C;AAC9C,kDAA+B;AAC/B,oCAA0C;AAE1C,MAAM,KAAK,GAAG,IAAA,eAAW,EAAC,IAAA,wBAAgB,EAAC,eAAe,CAAC,CAAC,CAAC;AAE7D,kBAAe,CAAO,GAAG,EAAE,GAAY,EAAE,GAAa,EAAE,IAAI,EAAE,EAAE;IAE/D,KAAK,CAAC,GAAG,CAAC,CAAC;IAEX,mBAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;IAEpC,gCAAgC;IAChC,IACC,GAAG,YAAY,oBAAS,IAAI,CAAC,GAAG,CAAC,MAAM,KAAK,KAAK,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,EACpE,CAAC;QACF,IAAA,4BAAU,GAAE,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAC/B,OAAO,GAAG,CAAC,QAAQ,CAAC,IAAA,sBAAU,GAAE,CAAC,KAAK,CAAC,CAAC;IACzC,CAAC;IAGD,IAAI,OAAO,GAAG,KAAK,QAAQ;QAC1B,OAAO,KAAK,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,4BAAgB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IAE9D,IAAI,GAAG,YAAY,mBAAQ;QAC1B,OAAO,KAAK,GAAG;aACd,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;aAClB,IAAI,CAAC,IAAA,4BAAgB,EAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAElD,IAAI,GAAG,YAAY,KAAK;QACvB,OAAO,KAAK,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,4BAAgB,EAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;IAEtE,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,EAAC,QAAQ,EAAE,IAAA,sBAAU,GAAE,CAAC,KAAK,EAAC,CAAC,CAAC;AACpD,CAAC,CAAA,CAAC"}
|
|
@@ -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":"AA2BA,MAAM,CAAC,OAAO,UAAU,SAAS,SAmGhC"}
|
package/dist/router/index.js
CHANGED
|
@@ -28,6 +28,8 @@ const session_middleware_1 = require("../middleware/session-middleware");
|
|
|
28
28
|
const get_auth_url_1 = __importDefault(require("../auth/get-auth-url"));
|
|
29
29
|
const criterion_1 = __importDefault(require("../model/criterion"));
|
|
30
30
|
const get_criterion_preset_1 = require("../utils/get-criterion-preset");
|
|
31
|
+
const fs_1 = __importDefault(require("fs"));
|
|
32
|
+
const use_logger_1 = require("../logger/use-logger");
|
|
31
33
|
function useRouter() {
|
|
32
34
|
const server = Server_1.default.getServer();
|
|
33
35
|
const app = server.app;
|
|
@@ -45,7 +47,14 @@ function useRouter() {
|
|
|
45
47
|
}
|
|
46
48
|
app.get((0, get_auth_url_1.default)().login + '*', (req, res) => __awaiter(this, void 0, void 0, function* () {
|
|
47
49
|
const filePath = path_1.default.join(server.params.frontendDir, `${server.type}-auth.html`);
|
|
48
|
-
|
|
50
|
+
fs_1.default.promises.access(filePath, fs_1.default.constants.F_OK)
|
|
51
|
+
.then(() => {
|
|
52
|
+
res.sendFile(filePath);
|
|
53
|
+
})
|
|
54
|
+
.catch(e => {
|
|
55
|
+
use_logger_1.Logger.error(e);
|
|
56
|
+
res.send("Page isn't available right now.");
|
|
57
|
+
});
|
|
49
58
|
}));
|
|
50
59
|
// test
|
|
51
60
|
app.use("/test-api", (0, test_close_router_1.default)());
|
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,sDAA8B;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":"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"}
|