eservices-back-core 1.0.91 → 1.0.94

package/dist/Server.d.ts

@@ -12,10 +12,6 @@ interface ServerOptions {
     staticFolderDir?: string;
     usingContextFile?: string;
 }
-export default class Server {
-    app: Express;
-    options: ServerOptions;
-    constructor(options: ServerOptions);
-}
+export declare function initServer(app: Express, options: ServerOptions): void;
 export {};
 //# sourceMappingURL=Server.d.ts.map

package/dist/Server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Server.d.ts","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":"AAAA,OAAgB,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AACzC,OAAO,EAAC,YAAY,EAAO,MAAM,wBAAwB,CAAC;AAK1D,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;CAC1B;AAID,MAAM,CAAC,OAAO,OAAO,MAAM;IAC1B,GAAG,EAAE,OAAO,CAAC;IACb,OAAO,EAAE,aAAa,CAAC;gBAEX,OAAO,EAAE,aAAa;CA2BlC"}
+{"version":3,"file":"Server.d.ts","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AAChC,OAAO,EAAC,YAAY,EAAO,MAAM,wBAAwB,CAAC;AAG1D,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;CAC1B;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,QAiB9D"}

package/dist/Server.js

@@ -1,45 +1,25 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const express_1 = __importDefault(require("express"));
+exports.initServer = void 0;
 const express_openid_connect_1 = require("express-openid-connect");
 const cors_1 = __importDefault(require("cors"));
-const path_1 = __importDefault(require("path"));
-let serverLink = null;
-class Server {
-    constructor(options) {
-        serverLink = this;
-        const app = this.app = (0, express_1.default)();
-        this.options = options;
-        this.options.typeName = this.options.type === 'front' ? 'SCP' : 'BAP';
-        app.use((0, cors_1.default)());
-        app.use((0, express_openid_connect_1.auth)(options.oidc));
-        app.get("/test-page", (req, res) => {
-            const user = req.oidc.user;
-            const userId = Number(user['AppRegister.Claim.PersonId']);
-            res.send(`hello <b>${req.oidc.user.name}</b>, ${req.oidc.user.sub}, ${userId}`);
-        });
-        app.get("/main*", (req, res) => __awaiter(this, void 0, void 0, function* () {
-            res.sendFile(path_1.default.join(options.frontendDir, `${options.type}-main.html`));
-        }));
-        app.use((err, req, res, next) => {
-            console.log(err);
-            res.status(500).json({
-                success: false,
-            });
+function initServer(app, options) {
+    app.use((0, cors_1.default)());
+    app.use((0, express_openid_connect_1.auth)(options.oidc));
+    app.get("/test-page", (req, res) => {
+        const user = req.oidc.user;
+        const userId = Number(user['AppRegister.Claim.PersonId']);
+        res.send(`hello <b>${req.oidc.user.name}</b>, ${req.oidc.user.sub}, ${userId}`);
+    });
+    app.use((err, req, res, next) => {
+        console.log(err);
+        res.status(500).json({
+            success: false,
         });
-    }
+    });
 }
-exports.default = Server;
+exports.initServer = initServer;
 //# sourceMappingURL=Server.js.map

package/dist/Server.js.map

@@ -1 +1 @@
-{"version":3,"file":"Server.js","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,sDAAyC;AACzC,mEAA0D;AAE1D,gDAAuB;AACvB,gDAAwB;AAexB,IAAI,UAAU,GAAG,IAAI,CAAC;AAEtB,MAAqB,MAAM;IAI1B,YAAY,OAAsB;QACjC,UAAU,GAAG,IAAI,CAAC;QAClB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,GAAG,IAAA,iBAAO,GAAE,CAAC;QACjC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,KAAK,OAAO,CAAA,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;QAErE,GAAG,CAAC,GAAG,CAAC,IAAA,cAAI,GAAE,CAAC,CAAC;QAChB,GAAG,CAAC,GAAG,CAAC,IAAA,6BAAI,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5B,GAAG,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAClC,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;YAC3B,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC,CAAC;YAC1D,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;QACjF,CAAC,CAAC,CAAA;QAEF,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAC,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;YACnC,GAAG,CAAC,QAAQ,CAAC,cAAI,CAAC,IAAI,CAAE,OAAO,CAAC,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,YAAY,CAAE,CAAC,CAAC;QAC7E,CAAC,CAAA,CAAC,CAAA;QACF,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YAC/B,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACjB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACpB,OAAO,EAAE,KAAK;aACd,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IAEJ,CAAC;CAGD;AA/BD,yBA+BC"}
+{"version":3,"file":"Server.js","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":";;;;;;AACA,mEAA0D;AAC1D,gDAAuB;AAevB,SAAgB,UAAU,CAAC,GAAY,EAAE,OAAsB;IAC9D,GAAG,CAAC,GAAG,CAAC,IAAA,cAAI,GAAE,CAAC,CAAC;IAChB,GAAG,CAAC,GAAG,CAAC,IAAA,6BAAI,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IAC5B,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;IAGF,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,CAAC;YACpB,OAAO,EAAE,KAAK;SACd,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AAEJ,CAAC;AAjBD,gCAiBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eservices-back-core",
-  "version": "1.0.91",
+  "version": "1.0.94",
   "description": "",
   "main": "dist/Server.js",
   "scripts": {

package/src/Server.ts

@@ -1,8 +1,6 @@
-import express, {Express}	from "express";
+import {Express}	from "express";
 import {ConfigParams, auth} from "express-openid-connect";
-
 import cors from 'cors'
-import path from "path";
 
 interface ServerOptions{
 	port: number,
@@ -17,37 +15,21 @@ interface ServerOptions{
 	usingContextFile?: string,
 }
 
-let serverLink = null;
-
-export default class Server{
-	app: Express;
-	options: ServerOptions;
-
-	constructor(options: ServerOptions) {
-		serverLink = this;
-		const app = this.app = express();
-		this.options = options;
-		this.options.typeName = this.options.type === 'front'? 'SCP' : 'BAP';
-
-		app.use(cors());
-		app.use(auth(options.oidc));
-		app.get("/test-page", (req, res) => {
-			const user = req.oidc.user;
-			const userId = Number(user['AppRegister.Claim.PersonId']);
-			res.send(`hello <b>${req.oidc.user.name}</b>, ${req.oidc.user.sub}, ${userId}`);
-		})
-		
-		app.get("/main*",async (req, res) => {
-			res.sendFile(path.join( options.frontendDir, `${options.type}-main.html` ));
-		})
-		app.use((err, req, res, next) => {
-			console.log(err);
-			res.status(500).json({
-				success: false,
-			});
+export function initServer(app: Express, options: ServerOptions) {
+	app.use(cors());
+	app.use(auth(options.oidc));
+	app.get("/test-page", (req, res) => {
+		const user = req.oidc.user;
+		const userId = Number(user['AppRegister.Claim.PersonId']);
+		res.send(`hello <b>${req.oidc.user.name}</b>, ${req.oidc.user.sub}, ${userId}`);
+	})
+	
+	
+	app.use((err, req, res, next) => {
+		console.log(err);
+		res.status(500).json({
+			success: false,
 		});
-
-	}
-
-
+	});
+	
 }

package/tsconfig.json

@@ -19,5 +19,5 @@
     "./src/**/*",
     "app.ts"
   ],
-
+  "exclude": ["app.ts"]
 }

package/src/app.ts

@@ -1,27 +0,0 @@
-import Server from "./Server";
-import path from "path";
-
-new Server({
-	baseUrl: process.env.BASE_URL,
-	port: Number(process.env.PORT),
-	type: process.env.TYPE as 'front' | 'back',// process.env.TYPE,
-	apiUrl: 'https://sandbox.eservices.dev:15015',
-	projectDir: path.join(__dirname, '..'),
-	frontendDir: path.join(__dirname, '../..', 'frontend'),
-	staticFolderDir: path.join(__dirname, '..', 'static'),
-	usingContextFile: path.join(__dirname, '..', 'using-context.json'),
-
-	oidc: {
-		issuerBaseURL	: process.env.OIDC_ISSUE,
-		baseURL			: process.env.BASE_URL,
-		clientID		: process.env.OIDC_CLIENT_ID,
-		secret			: 'aaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbcccccccccccccccccccccccce',
-		clientSecret	: process.env.OIDC_SECRET,
-		idpLogout		: true,
-		authorizationParams: {
-			response_type: 'code', // This requires you to provide a client secret
-			audience: 'https://api.example.com/products',
-			scope: 'openid profile email',
-		},
-	}
-})

package/src/middleware/cors-middleware.js

@@ -1,13 +0,0 @@
-module.exports =  function corsMiddleware(req, res, next) {
-	const origin = req.headers.origin;
-	
-	res.header("Access-Control-Allow-Origin", origin);
-	
-	res.header("Access-Control-Allow-Headers", "Auth_old-Token,Authorization, Origin, X-Requested-With, content-type, Content-Type, Content-Type, content-type, Content_Type, Accept");
-	res.header('Access-Control-Allow-Methods', 'GET, POST, OPTIONS, PUT, PATCH, DELETE');
-	
-	if (req.method === "OPTIONS") {
-		return res.status(200).end();
-	}
-	next();
-}

package/src/middleware/user-middleware.js

@@ -1,17 +0,0 @@
-
-module.exports = async (req, res, next) => {
-
-	try {
-		let accessToken = req.oidc.accessToken;
-		
-		if (accessToken.isExpired()) {
-			accessToken = await accessToken.refresh();
-		}
-		req.__token = `${accessToken.token_type} ${accessToken.access_token}`;
-		req.userInfo = await req.oidc.fetchUserInfo();
-
-		next();
-	} catch (e) {
-		next(e);
-	}
-}