eservices-back-core 1.0.84 → 1.0.87
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 +33 -8
- package/dist/Server.js.map +1 -1
- package/dist/router/index.js +2 -4
- package/dist/router/index.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;
|
|
1
|
+
{"version":3,"file":"Server.d.ts","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":"AAAA,OAAgB,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AAGzC,OAAO,EAAC,YAAY,EAAC,MAAM,wBAAwB,CAAC;AAOpD,UAAU,aAAa;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IACvB,QAAQ,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAG,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,YAAY,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,IAAI,CAAC,EAAE;QACN,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,EAAE;YACT,KAAK,EAAE,MAAM,CAAC;YACd,IAAI,EAAE,MAAM,CAAC;YACb,4BAA4B,EAAE,MAAM,CAAA;SACpC,CAAA;KACD,CAAC;CAEF;AAKD,MAAM,CAAC,OAAO,OAAO,MAAM;IAC1B,GAAG,EAAE,OAAO,CAAC;IACb,OAAO,EAAE,aAAa,CAAC;IACvB,iBAAiB,EAAE;QAClB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KACxB,CAAM;IAEP,MAAM,CAAC,SAAS,IAAI,MAAM;gBAGd,OAAO,EAAE,aAAa;IAkDlC;;OAEG;IACH,oBAAoB,CAAC,KAAK,EAAE,MAAM;CAmBlC"}
|
package/dist/Server.js
CHANGED
|
@@ -1,28 +1,52 @@
|
|
|
1
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
|
+
};
|
|
2
11
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
13
|
};
|
|
5
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
15
|
const express_1 = __importDefault(require("express"));
|
|
7
|
-
const http_1 = __importDefault(require("http"));
|
|
8
16
|
const use_logger_1 = __importDefault(require("./logger/use-logger"));
|
|
9
|
-
const router_1 = __importDefault(require("./router"));
|
|
10
17
|
const log4js_1 = __importDefault(require("log4js"));
|
|
11
18
|
const update_using_context_1 = __importDefault(require("./scripts/update-using-context"));
|
|
19
|
+
const cors_1 = __importDefault(require("cors"));
|
|
20
|
+
const path_1 = __importDefault(require("path"));
|
|
21
|
+
const express_openid_connect_1 = require("express-openid-connect");
|
|
12
22
|
let serverLink = null;
|
|
13
23
|
class Server {
|
|
14
24
|
constructor(options) {
|
|
15
25
|
this.usingContextStore = {};
|
|
16
26
|
serverLink = this;
|
|
17
|
-
this.app = (0, express_1.default)();
|
|
18
|
-
const server = http_1.default.createServer(this.app);
|
|
27
|
+
const app = this.app = (0, express_1.default)();
|
|
19
28
|
this.options = options;
|
|
20
29
|
this.options.typeName = this.options.type === 'front' ? 'SCP' : 'BAP';
|
|
21
30
|
(0, use_logger_1.default)(this);
|
|
22
|
-
(0,
|
|
31
|
+
app.use((0, cors_1.default)());
|
|
32
|
+
app.use((0, express_openid_connect_1.auth)(options.oidc));
|
|
33
|
+
app.get("/test-page", (req, res) => {
|
|
34
|
+
const user = req.oidc.user;
|
|
35
|
+
const userId = Number(user['AppRegister.Claim.PersonId']);
|
|
36
|
+
res.send(`hello <b>${req.oidc.user.name}</b>, ${req.oidc.user.sub}, ${userId}`);
|
|
37
|
+
});
|
|
38
|
+
app.get("/main*", (req, res) => __awaiter(this, void 0, void 0, function* () {
|
|
39
|
+
res.sendFile(path_1.default.join(options.frontendDir, `${options.type}-main.html`));
|
|
40
|
+
}));
|
|
41
|
+
app.use((err, req, res, next) => {
|
|
42
|
+
console.log(err);
|
|
43
|
+
res.status(500).json({
|
|
44
|
+
success: false,
|
|
45
|
+
});
|
|
46
|
+
});
|
|
23
47
|
(0, update_using_context_1.default)(this);
|
|
24
48
|
const logger = log4js_1.default.getLogger();
|
|
25
|
-
|
|
49
|
+
app.listen(options.port, () => {
|
|
26
50
|
logger.debug(`----------VERSION 1.0.74-----------`);
|
|
27
51
|
logger.debug(`Server run on ${options.port} port`);
|
|
28
52
|
logger.debug(`Type is ${options.type}(${options.typeName})`);
|
|
@@ -31,10 +55,10 @@ class Server {
|
|
|
31
55
|
logger.debug(`Api URL is ${options.apiUrl}`);
|
|
32
56
|
logger.debug(`-----------------------------------`);
|
|
33
57
|
});
|
|
34
|
-
|
|
58
|
+
app.on('error', err => {
|
|
35
59
|
logger.error(err);
|
|
36
60
|
});
|
|
37
|
-
|
|
61
|
+
app.on('close', e => {
|
|
38
62
|
logger.debug('Server stopped');
|
|
39
63
|
});
|
|
40
64
|
}
|
|
@@ -49,6 +73,7 @@ class Server {
|
|
|
49
73
|
if (!refer)
|
|
50
74
|
return DEFAULT_CONTEXT;
|
|
51
75
|
const url = new URL(refer);
|
|
76
|
+
// tslint:disable-next-line:no-shadowed-variable
|
|
52
77
|
let path = url.pathname;
|
|
53
78
|
const typeBack = '/back-main';
|
|
54
79
|
if (path.startsWith(typeBack))
|
package/dist/Server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Server.js","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Server.js","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":"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"}
|
package/dist/router/index.js
CHANGED
|
@@ -12,16 +12,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
const body_parser_1 = __importDefault(require("body-parser"));
|
|
16
|
-
const express_1 = __importDefault(require("express"));
|
|
17
15
|
const path_1 = __importDefault(require("path"));
|
|
18
16
|
const auth_middleware_1 = __importDefault(require("../middleware/auth-middleware"));
|
|
19
17
|
const cors_1 = __importDefault(require("cors"));
|
|
20
18
|
function useRouter(server) {
|
|
21
19
|
const app = server.app;
|
|
22
|
-
app.use(
|
|
20
|
+
// app.use(bodyParser.json())
|
|
23
21
|
app.use((0, cors_1.default)());
|
|
24
|
-
app.use(
|
|
22
|
+
// app.use(express.static(server.options.frontendDir));
|
|
25
23
|
app.use((0, auth_middleware_1.default)(server));
|
|
26
24
|
// app.use(userMiddleware);
|
|
27
25
|
// app.use("/close-api", closeRouter(server));
|
package/dist/router/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAEA,gDAA0B;AAK1B,oFAA4D;AAS5D,gDAAuB;AAGvB,SAAwB,SAAS,CAAC,MAAc;IAE/C,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;IACvB,6BAA6B;IAC7B,GAAG,CAAC,GAAG,CAAC,IAAA,cAAI,GAAE,CAAC,CAAC;IAChB,uDAAuD;IACvD,GAAG,CAAC,GAAG,CAAC,IAAA,yBAAc,EAAC,MAAM,CAAC,CAAC,CAAC;IAChC,2BAA2B;IAI3B,8CAA8C;IAE9C,GAAG,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QAClC,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;QAC3B,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC,CAAC;QAC1D,GAAG,CAAC,IAAI,CAAC,YAAY,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,SAAS,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,MAAM,EAAE,CAAC,CAAC;IACjF,CAAC,CAAC,CAAA;IAEF,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAC,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QAEnC,MAAM,QAAQ,GAAG,cAAI,CAAC,IAAI,CACzB,MAAM,CAAC,OAAO,CAAC,WAAW,EAC1B,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,YAAY,CAClC,CAAA;QACD,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACxB,CAAC,CAAA,CAAC,CAAA;IACF,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QAC/B,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACjB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,iBACnB,OAAO,EAAE,KAAK,IACX,GAAG,EACL,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO;IACP;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MA8DE;AACH,CAAC;AAnGD,4BAmGC"}
|