jcc-express-mvc 1.6.2 → 1.6.4
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/lib/Application/Application.d.ts +1 -0
- package/lib/Application/Application.d.ts.map +1 -1
- package/lib/Application/Application.js +52 -58
- package/lib/Application/ApplicationBuilder.d.ts +1 -0
- package/lib/Application/ApplicationBuilder.d.ts.map +1 -1
- package/lib/Application/ApplicationBuilder.js +4 -0
- package/lib/Error/AppErrorHandler.d.ts.map +1 -1
- package/lib/Error/AppErrorHandler.js +1 -2
- package/lib/Error/DisplayErrorCode.d.ts.map +1 -1
- package/lib/Error/DisplayErrorCode.js +1 -2
- package/lib/Inertia/index.d.ts.map +1 -1
- package/lib/Inertia/index.js +5 -1
- package/lib/Interface/index.d.ts +1 -0
- package/lib/Interface/index.d.ts.map +1 -1
- package/lib/Middleware/index.d.ts +2 -1
- package/lib/Middleware/index.d.ts.map +1 -1
- package/lib/Middleware/index.js +14 -13
- package/lib/Passport/config.d.ts +4 -0
- package/lib/Passport/config.d.ts.map +1 -1
- package/lib/Passport/config.js +33 -6
- package/lib/Request/request.d.ts +2 -0
- package/lib/Request/request.d.ts.map +1 -1
- package/lib/Request/request.js +5 -0
- package/lib/Type/index.d.ts +18 -0
- package/lib/Type/index.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -8,6 +8,7 @@ export declare class Application extends ExpressApplication {
|
|
|
8
8
|
rootPath: string;
|
|
9
9
|
configRoutes: RouteConfig[];
|
|
10
10
|
private VERSION;
|
|
11
|
+
config: Record<string, any>;
|
|
11
12
|
constructor();
|
|
12
13
|
registerProviders(Provider: new (app: Application) => ServiceProvider): this;
|
|
13
14
|
boot(): this;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Application.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Application/Application.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAQnE,qBAAa,WAAY,SAAQ,kBAAkB;IACjD,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,SAAS,CAAyB;IACnC,QAAQ,EAAE,MAAM,CAAY;IAC5B,YAAY,EAAE,WAAW,EAAE,CAAM;IACxC,OAAO,CAAC,OAAO,CAAW;;
|
|
1
|
+
{"version":3,"file":"Application.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Application/Application.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAQnE,qBAAa,WAAY,SAAQ,kBAAkB;IACjD,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,SAAS,CAAyB;IACnC,QAAQ,EAAE,MAAM,CAAY;IAC5B,YAAY,EAAE,WAAW,EAAE,CAAM;IACxC,OAAO,CAAC,OAAO,CAAW;IACnB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;;IAUxC,iBAAiB,CAAC,QAAQ,EAAE,KAAK,GAAG,EAAE,WAAW,KAAK,eAAe,GAAG,IAAI;IAc5E,IAAI,IAAI,IAAI;IAUZ,OAAO,CAAC,YAAY;IAIb,OAAO;IAKR,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IAiB1B,MAAM,CAAC,aAAa;CAGrB"}
|
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault =
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
return mod && mod.__esModule ? mod : { default: mod };
|
|
6
|
-
};
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
7
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
8
6
|
exports.Application = void 0;
|
|
9
7
|
const app_root_path_1 = __importDefault(require("app-root-path"));
|
|
@@ -16,61 +14,57 @@ const dotenv_1 = __importDefault(require("dotenv"));
|
|
|
16
14
|
const Config_1 = require("../Config/Config");
|
|
17
15
|
const rootPath = app_root_path_1.default.path;
|
|
18
16
|
class Application extends ExpressApplication_1.ExpressApplication {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
RouteServiceProvider_1.RouteServiceProvider
|
|
31
|
-
);
|
|
32
|
-
}
|
|
33
|
-
// Register a service provider
|
|
34
|
-
registerProviders(Provider) {
|
|
35
|
-
const provider = new Provider(this);
|
|
36
|
-
provider.register();
|
|
37
|
-
this.providers.push(provider);
|
|
38
|
-
if (this.booted) {
|
|
39
|
-
this.bootProvider(provider);
|
|
17
|
+
constructor() {
|
|
18
|
+
super();
|
|
19
|
+
this.booted = false;
|
|
20
|
+
this.providers = [];
|
|
21
|
+
this.rootPath = rootPath;
|
|
22
|
+
this.configRoutes = [];
|
|
23
|
+
this.VERSION = "0.0.0";
|
|
24
|
+
this.config = {};
|
|
25
|
+
dotenv_1.default.config({ path: `${rootPath}/.env` });
|
|
26
|
+
this.instance("app", this);
|
|
27
|
+
this.singleton("RouteServiceProvider", RouteServiceProvider_1.RouteServiceProvider);
|
|
40
28
|
}
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
29
|
+
// Register a service provider
|
|
30
|
+
registerProviders(Provider) {
|
|
31
|
+
const provider = new Provider(this);
|
|
32
|
+
provider.register();
|
|
33
|
+
this.providers.push(provider);
|
|
34
|
+
if (this.booted) {
|
|
35
|
+
this.bootProvider(provider);
|
|
36
|
+
}
|
|
37
|
+
return this;
|
|
48
38
|
}
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
39
|
+
// Boot all registered service providers
|
|
40
|
+
boot() {
|
|
41
|
+
if (!this.booted) {
|
|
42
|
+
this.providers.forEach((provider) => this.bootProvider(provider));
|
|
43
|
+
this.booted = true;
|
|
44
|
+
}
|
|
45
|
+
return this;
|
|
46
|
+
}
|
|
47
|
+
// Boot a specific provider
|
|
48
|
+
bootProvider(provider) {
|
|
49
|
+
provider.boot();
|
|
50
|
+
}
|
|
51
|
+
version() {
|
|
52
|
+
return this.VERSION;
|
|
53
|
+
}
|
|
54
|
+
// Start the application
|
|
55
|
+
async run() {
|
|
56
|
+
if (!this.booted) {
|
|
57
|
+
this.boot();
|
|
58
|
+
}
|
|
59
|
+
const routeServiceProvider = this.resolve("RouteServiceProvider");
|
|
60
|
+
//
|
|
61
|
+
RouteBuilder_1.RouteBuilder.setServiceContainer(this);
|
|
62
|
+
await routeServiceProvider.loadRoutes(this.configRoutes);
|
|
63
|
+
const server = new Server_1.Server(this);
|
|
64
|
+
server.server(Number(Config_1.config.get("PORT", "5500")));
|
|
65
|
+
}
|
|
66
|
+
static configuration() {
|
|
67
|
+
return new ApplicationBuilder_1.ApplicationBuilder(new Application()).withConsole();
|
|
62
68
|
}
|
|
63
|
-
const routeServiceProvider = this.resolve("RouteServiceProvider");
|
|
64
|
-
//
|
|
65
|
-
RouteBuilder_1.RouteBuilder.setServiceContainer(this);
|
|
66
|
-
await routeServiceProvider.loadRoutes(this.configRoutes);
|
|
67
|
-
const server = new Server_1.Server(this);
|
|
68
|
-
server.server(Number(Config_1.config.get("PORT", "5500")));
|
|
69
|
-
}
|
|
70
|
-
static configuration() {
|
|
71
|
-
return new ApplicationBuilder_1.ApplicationBuilder(
|
|
72
|
-
new Application()
|
|
73
|
-
).withConsole();
|
|
74
|
-
}
|
|
75
69
|
}
|
|
76
70
|
exports.Application = Application;
|
|
@@ -5,6 +5,7 @@ export declare class ApplicationBuilder {
|
|
|
5
5
|
app: Application;
|
|
6
6
|
constructor(app: Application);
|
|
7
7
|
withKernel(Kernel: any): this;
|
|
8
|
+
withConfig(config: Record<string, any>): this;
|
|
8
9
|
withRouting(routeConfig: RouteConfig[]): this;
|
|
9
10
|
withProviders(providers: Array<new (app: Application) => ServiceProvider>): this;
|
|
10
11
|
private withEvents;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ApplicationBuilder.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Application/ApplicationBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAK3C,qBAAa,kBAAkB;IACtB,GAAG,EAAE,WAAW,CAAC;gBAEZ,GAAG,EAAE,WAAW;IAIrB,UAAU,CAAC,MAAM,EAAE,GAAG;IAKtB,WAAW,CAAC,WAAW,EAAE,WAAW,EAAE;IAOtC,aAAa,CAClB,SAAS,EAAE,KAAK,CAAC,KAAK,GAAG,EAAE,WAAW,KAAK,eAAe,CAAC;IAM7D,OAAO,CAAC,UAAU;IAKlB,OAAO,CAAC,gBAAgB;IAIjB,WAAW;IAKX,cAAc;IAWd,MAAM;CAGd"}
|
|
1
|
+
{"version":3,"file":"ApplicationBuilder.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Application/ApplicationBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAK3C,qBAAa,kBAAkB;IACtB,GAAG,EAAE,WAAW,CAAC;gBAEZ,GAAG,EAAE,WAAW;IAIrB,UAAU,CAAC,MAAM,EAAE,GAAG;IAKtB,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAKtC,WAAW,CAAC,WAAW,EAAE,WAAW,EAAE;IAOtC,aAAa,CAClB,SAAS,EAAE,KAAK,CAAC,KAAK,GAAG,EAAE,WAAW,KAAK,eAAe,CAAC;IAM7D,OAAO,CAAC,UAAU;IAKlB,OAAO,CAAC,gBAAgB;IAIjB,WAAW;IAKX,cAAc;IAWd,MAAM;CAGd"}
|
|
@@ -11,6 +11,10 @@ class ApplicationBuilder {
|
|
|
11
11
|
this.app.bind("HttpKernel", Kernel);
|
|
12
12
|
return this;
|
|
13
13
|
}
|
|
14
|
+
withConfig(config) {
|
|
15
|
+
this.app.config = { ...this.app.config, ...config };
|
|
16
|
+
return this;
|
|
17
|
+
}
|
|
14
18
|
withRouting(routeConfig) {
|
|
15
19
|
this.app.configRoutes = routeConfig.map((route) => {
|
|
16
20
|
return { ...route, name: `${this.app.rootPath}/${route.name}` };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppErrorHandler.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Error/AppErrorHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAKtC,qBAAa,eAAe;IAC1B,OAAO,CAAC,GAAG,CAAc;gBACb,GAAG,EAAE,WAAW;IAI5B;;;;OAIG;IACI,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAI5B,kBAAkB;IAMzB,OAAO,CAAC,gBAAgB;IAyBxB,OAAO,CAAC,GAAG,EAAE,GAAG;
|
|
1
|
+
{"version":3,"file":"AppErrorHandler.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Error/AppErrorHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAKtC,qBAAa,eAAe;IAC1B,OAAO,CAAC,GAAG,CAAc;gBACb,GAAG,EAAE,WAAW;IAI5B;;;;OAIG;IACI,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAI5B,kBAAkB;IAMzB,OAAO,CAAC,gBAAgB;IAyBxB,OAAO,CAAC,GAAG,EAAE,GAAG;CAyBjB"}
|
|
@@ -46,8 +46,7 @@ class AppErrorHandler {
|
|
|
46
46
|
let error = { ...err };
|
|
47
47
|
if (err.type === error_1.VALIDATION_ERROR) {
|
|
48
48
|
error.message = err.message;
|
|
49
|
-
if (req.
|
|
50
|
-
!req.headers["x-inertia"]) {
|
|
49
|
+
if (req.isApi()) {
|
|
51
50
|
return res.status(422).json({ errors: err.message });
|
|
52
51
|
}
|
|
53
52
|
return res.status(422).redirectBack();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DisplayErrorCode.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Error/DisplayErrorCode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AACvD,qBAAa,YAAa,SAAQ,gBAAgB;IAChD;;;;;;OAMG;IACH,MAAM,CAAC,IAAI,CACT,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,GAAG,EACZ,GAAG,EAAE,WAAW,EAChB,GAAG,EAAE,UAAU;
|
|
1
|
+
{"version":3,"file":"DisplayErrorCode.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Error/DisplayErrorCode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AACvD,qBAAa,YAAa,SAAQ,gBAAgB;IAChD;;;;;;OAMG;IACH,MAAM,CAAC,IAAI,CACT,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,GAAG,EACZ,GAAG,EAAE,WAAW,EAChB,GAAG,EAAE,UAAU;IAuCjB;;;;;;;OAOG;IACH,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG;CAGxD"}
|
|
@@ -21,8 +21,7 @@ class DisplayError extends ErrorHightLight_1.ErrorHighLighter {
|
|
|
21
21
|
const [actualPath, startLine, endLine] = pathParts[lastIndex].split(/\:/);
|
|
22
22
|
pathParts[lastIndex] = actualPath;
|
|
23
23
|
//if request is an API request, return JSON response
|
|
24
|
-
if (req.
|
|
25
|
-
!req.headers["x-inertia"]) {
|
|
24
|
+
if (req.isApi()) {
|
|
26
25
|
return res.status(500).json({
|
|
27
26
|
stack: pathParts.join("/").trim() + ` on line ${startLine}:${endLine}`,
|
|
28
27
|
error: ` ${message} `,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Inertia/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEhE,UAAU,cAAc;IACtB,QAAQ,EAAE,MAAM,CAAC;CAClB;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Inertia/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEhE,UAAU,cAAc;IACtB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAiED,eAAO,MAAM,OAAO,GAAI,SAAS,cAAc,WAzC9B,UAAU,OAAO,WAAW,QAAQ,OAAO,SA0CxB,CAAC"}
|
package/lib/Inertia/index.js
CHANGED
|
@@ -8,10 +8,14 @@ class InertiaMiddleware {
|
|
|
8
8
|
...(res.locals.error?.email ? res.locals.error : {}),
|
|
9
9
|
};
|
|
10
10
|
const auth = { ...req.user };
|
|
11
|
+
let getFlash = req.flash() || { type: "" };
|
|
12
|
+
const type = Object.keys(getFlash).length > 0 ? Object.keys(getFlash)[0] : "";
|
|
11
13
|
const flash = {
|
|
12
|
-
message:
|
|
14
|
+
message: type ? getFlash[type][0] : "",
|
|
13
15
|
status: res.statusCode,
|
|
16
|
+
type,
|
|
14
17
|
};
|
|
18
|
+
getFlash = {};
|
|
15
19
|
return { ...props, auth, flash, errors };
|
|
16
20
|
}
|
|
17
21
|
inertia(options) {
|
package/lib/Interface/index.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Interface/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE1E,MAAM,WAAW,YAAY;IAC3B,CAAC,GAAG,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,GAAG,cAAc,CAAC;CACzE;AAED,MAAM,WAAW,UAAW,SAAQ,OAAO;IACzC,IAAI,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAChC,cAAc,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3B,KAAK,IAAI;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAC;IACrC,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACjC,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,MAAM,CAAC;IACxD,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC;IAC5D,EAAE,EAAE,MAAM,CAAC;IACX;;;;KAIC;IACD,QAAQ,EAAE;QAAE,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,GAAG,CAAA;KAAE,CAAC;IAErD;;;KAGC;IACD,SAAS,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Interface/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,9 @@ import { Application } from "../Application/Application";
|
|
|
2
2
|
import { RequestHandler } from "express";
|
|
3
3
|
export declare class Middleware {
|
|
4
4
|
private express;
|
|
5
|
-
private
|
|
5
|
+
private expressApp;
|
|
6
6
|
private rootPath;
|
|
7
|
+
private app;
|
|
7
8
|
constructor(app: Application);
|
|
8
9
|
loadStaticFiles(): void;
|
|
9
10
|
use(globalMiddleares: RequestHandler[]): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Middleware/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAyB,EAEvB,cAAc,EACf,MAAM,SAAS,CAAC;AAUjB,qBAAa,UAAU;IACrB,OAAO,CAAC,OAAO,CAA0B;IACzC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Middleware/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAyB,EAEvB,cAAc,EACf,MAAM,SAAS,CAAC;AAUjB,qBAAa,UAAU;IACrB,OAAO,CAAC,OAAO,CAA0B;IACzC,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,GAAG,CAAc;gBAEb,GAAG,EAAE,WAAW;IAO5B,eAAe;IAMf,GAAG,CAAC,gBAAgB,EAAE,cAAc,EAAE;IAgBtC,OAAO,CAAC,uBAAuB;IASxB,kBAAkB,IAAI,cAAc;CAM5C"}
|
package/lib/Middleware/index.js
CHANGED
|
@@ -13,16 +13,17 @@ const config_1 = require("../Passport/config");
|
|
|
13
13
|
class Middleware {
|
|
14
14
|
//
|
|
15
15
|
constructor(app) {
|
|
16
|
+
this.app = app;
|
|
16
17
|
this.express = app.resolve("express", [], false);
|
|
17
|
-
this.
|
|
18
|
+
this.expressApp = app.resolve("expressApp", [], false);
|
|
18
19
|
this.rootPath = app.rootPath;
|
|
19
|
-
this.
|
|
20
|
+
this.expressApp.disable("x-powered-by");
|
|
20
21
|
}
|
|
21
22
|
loadStaticFiles() {
|
|
22
23
|
this.defaultTemplatingEngine();
|
|
23
|
-
this.
|
|
24
|
-
this.
|
|
25
|
-
this.
|
|
24
|
+
this.expressApp.use(this.express.static(`${this.rootPath}/public`));
|
|
25
|
+
this.expressApp.use(this.express.static(`${this.rootPath}/resources`));
|
|
26
|
+
this.expressApp.use((0, serve_favicon_1.default)(`${this.rootPath}/public/favicon.ico`));
|
|
26
27
|
}
|
|
27
28
|
use(globalMiddleares) {
|
|
28
29
|
//
|
|
@@ -30,24 +31,24 @@ class Middleware {
|
|
|
30
31
|
this.express.json(),
|
|
31
32
|
this.express.urlencoded({ extended: false }),
|
|
32
33
|
...globalMiddleares,
|
|
33
|
-
].forEach((middleware) => this.
|
|
34
|
+
].forEach((middleware) => this.expressApp.use(middleware));
|
|
34
35
|
this.passportMiddleware();
|
|
35
|
-
this.
|
|
36
|
+
this.expressApp.use(((req, res, next) => {
|
|
36
37
|
new Response_1.HttpResponse(req, res);
|
|
37
38
|
new request_1.HttpRequest(req, res);
|
|
38
39
|
next();
|
|
39
40
|
}));
|
|
40
41
|
}
|
|
41
42
|
defaultTemplatingEngine() {
|
|
42
|
-
this.
|
|
43
|
-
this.
|
|
44
|
-
this.
|
|
43
|
+
this.expressApp.engine("blade.html", Templating_engine_1.jsBladeEngine.render.bind(Templating_engine_1.jsBladeEngine));
|
|
44
|
+
this.expressApp.set("views", `${this.rootPath}/resources/views`);
|
|
45
|
+
this.expressApp.set("view engine", ".blade.html");
|
|
45
46
|
}
|
|
46
47
|
passportMiddleware() {
|
|
47
|
-
const passportAuth = new config_1.PassportAuth();
|
|
48
|
+
const passportAuth = new config_1.PassportAuth(this.app);
|
|
48
49
|
passportAuth.localPassport(passport_1.default);
|
|
49
|
-
this.
|
|
50
|
-
return this.
|
|
50
|
+
this.expressApp.use(passport_1.default.initialize());
|
|
51
|
+
return this.expressApp.use(passport_1.default.session());
|
|
51
52
|
}
|
|
52
53
|
}
|
|
53
54
|
exports.Middleware = Middleware;
|
package/lib/Passport/config.d.ts
CHANGED
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
import passportType from "passport";
|
|
2
|
+
import { Application } from "../Application/Application";
|
|
2
3
|
export declare class PassportAuth {
|
|
4
|
+
private config;
|
|
5
|
+
constructor(app: Application);
|
|
6
|
+
private getConfig;
|
|
3
7
|
/**
|
|
4
8
|
* Configures Passport.js to use a local authentication strategy.
|
|
5
9
|
* This strategy validates user credentials against the local database.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Passport/config.ts"],"names":[],"mappings":"AACA,OAAO,YAAY,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Passport/config.ts"],"names":[],"mappings":"AACA,OAAO,YAAY,MAAM,UAAU,CAAC;AASpC,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAGzD,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAa;gBACf,GAAG,EAAE,WAAW;IAI5B,OAAO,CAAC,SAAS;IAkBjB;;;;OAIG;IACI,aAAa,CAAC,QAAQ,EAAE,OAAO,YAAY;CAsEnD"}
|
package/lib/Passport/config.js
CHANGED
|
@@ -9,27 +9,51 @@ const LocalStrategy = passport_local_1.default.Strategy;
|
|
|
9
9
|
const util_1 = require("../util");
|
|
10
10
|
const AppError_1 = require("../Error/AppError");
|
|
11
11
|
const error_1 = require("../Error/Constants/error");
|
|
12
|
-
const { User } = (0, util_1.getModel)("User");
|
|
13
12
|
class PassportAuth {
|
|
13
|
+
constructor(app) {
|
|
14
|
+
this.config = app.config.auth || {};
|
|
15
|
+
}
|
|
16
|
+
getConfig() {
|
|
17
|
+
const configPasswordField = this.config.strategies?.local?.fields?.passwordField || "password";
|
|
18
|
+
const configUsernameField = this.config.strategies?.local?.fields?.usernameField || "email";
|
|
19
|
+
const model = this.config.providers?.users?.model || "User";
|
|
20
|
+
const driver = this.config.providers?.users?.driver || "jcc-eloquent";
|
|
21
|
+
return {
|
|
22
|
+
driver,
|
|
23
|
+
model,
|
|
24
|
+
configPasswordField,
|
|
25
|
+
configUsernameField,
|
|
26
|
+
};
|
|
27
|
+
}
|
|
14
28
|
/**
|
|
15
29
|
* Configures Passport.js to use a local authentication strategy.
|
|
16
30
|
* This strategy validates user credentials against the local database.
|
|
17
31
|
* @param {Object} passport - Passport.js instance.
|
|
18
32
|
*/
|
|
19
33
|
localPassport(passport) {
|
|
20
|
-
|
|
34
|
+
const { configPasswordField, configUsernameField, model, driver } = this.getConfig();
|
|
35
|
+
const { User } = (0, util_1.getModel)(model);
|
|
36
|
+
passport.use(new LocalStrategy({
|
|
37
|
+
usernameField: configUsernameField,
|
|
38
|
+
passwordField: configPasswordField,
|
|
39
|
+
}, async (email, password, done) => {
|
|
21
40
|
try {
|
|
22
41
|
if (!email || !password) {
|
|
23
42
|
return done(null, false, { message: "Invalid credentials" });
|
|
24
43
|
}
|
|
25
44
|
let user;
|
|
26
|
-
if (
|
|
45
|
+
if (driver === "mongodb") {
|
|
27
46
|
//
|
|
28
|
-
user = await User.findOne({ email }).select("+password");
|
|
47
|
+
user = await User.findOne({ configUsernameField: email }).select("+password");
|
|
48
|
+
}
|
|
49
|
+
else if (driver === "sequelize") {
|
|
50
|
+
user = await User.findOne({
|
|
51
|
+
where: { configUsernameField: email },
|
|
52
|
+
});
|
|
29
53
|
}
|
|
30
54
|
else {
|
|
31
55
|
User.hidden = User.hidden.filter((value) => value !== "password", 0);
|
|
32
|
-
user = await User.where(
|
|
56
|
+
user = await User.where(configUsernameField, email).first();
|
|
33
57
|
}
|
|
34
58
|
if (!user) {
|
|
35
59
|
return done(null, false, { message: "Invalid credentials" });
|
|
@@ -48,9 +72,12 @@ class PassportAuth {
|
|
|
48
72
|
passport.deserializeUser(async (id, done) => {
|
|
49
73
|
try {
|
|
50
74
|
let user;
|
|
51
|
-
if (
|
|
75
|
+
if (driver === "mongodb") {
|
|
52
76
|
user = await User.findById(id);
|
|
53
77
|
}
|
|
78
|
+
else if (driver === "sequelize") {
|
|
79
|
+
user = await User.findByPk(id);
|
|
80
|
+
}
|
|
54
81
|
else {
|
|
55
82
|
User.hidden = ["password", ...User.hidden];
|
|
56
83
|
user = await User.where("id", id).first();
|
package/lib/Request/request.d.ts
CHANGED
|
@@ -6,6 +6,7 @@ import { AppResponse, AppRequest } from "../Interface";
|
|
|
6
6
|
* @param {Object} response - The HTTP response object.
|
|
7
7
|
*/
|
|
8
8
|
export declare class HttpRequest {
|
|
9
|
+
private request;
|
|
9
10
|
constructor(request: AppRequest, response: AppResponse);
|
|
10
11
|
/**
|
|
11
12
|
* Sets up validation error handling and adds validation methods to the request object.
|
|
@@ -13,5 +14,6 @@ export declare class HttpRequest {
|
|
|
13
14
|
* @param {Object} response - The HTTP response object.
|
|
14
15
|
*/
|
|
15
16
|
private validationErrors;
|
|
17
|
+
private isApi;
|
|
16
18
|
}
|
|
17
19
|
//# sourceMappingURL=request.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Request/request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Request/request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAIvD;;;;;GAKG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,OAAO,CAAa;gBAChB,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW;IAMtD;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAkBxB,OAAO,CAAC,KAAK;CAGd"}
|
package/lib/Request/request.js
CHANGED
|
@@ -11,6 +11,8 @@ const error_1 = require("../Error/Constants/error");
|
|
|
11
11
|
*/
|
|
12
12
|
class HttpRequest {
|
|
13
13
|
constructor(request, response) {
|
|
14
|
+
this.request = request;
|
|
15
|
+
request.isApi = this.isApi.bind(this);
|
|
14
16
|
this.validationErrors(request, response);
|
|
15
17
|
}
|
|
16
18
|
/**
|
|
@@ -31,5 +33,8 @@ class HttpRequest {
|
|
|
31
33
|
request.validate = async (validationData) => (0, Validation_1.validateRequest)(error_1.VALIDATION_ERROR, request, validationData);
|
|
32
34
|
return;
|
|
33
35
|
}
|
|
36
|
+
isApi() {
|
|
37
|
+
return this.request.path.startsWith("/api");
|
|
38
|
+
}
|
|
34
39
|
}
|
|
35
40
|
exports.HttpRequest = HttpRequest;
|
package/lib/Type/index.d.ts
CHANGED
|
@@ -42,4 +42,22 @@ export type HttpRoute = Array<{
|
|
|
42
42
|
Controller?: BaseController;
|
|
43
43
|
}>;
|
|
44
44
|
export type SocketType = Socket<DefaultEventsMap, DefaultEventsMap, DefaultEventsMap, any>;
|
|
45
|
+
export type AuthStrategy = {
|
|
46
|
+
fields: {
|
|
47
|
+
usernameField: string;
|
|
48
|
+
passwordField: string;
|
|
49
|
+
};
|
|
50
|
+
};
|
|
51
|
+
export type AuthProvider = {
|
|
52
|
+
driver: string;
|
|
53
|
+
model: string;
|
|
54
|
+
};
|
|
55
|
+
export type AuthConfig = {
|
|
56
|
+
default: string;
|
|
57
|
+
strategies: Record<string, AuthStrategy>;
|
|
58
|
+
providers: Record<string, AuthProvider>;
|
|
59
|
+
};
|
|
60
|
+
export type AppConfig = {
|
|
61
|
+
auth: AuthConfig;
|
|
62
|
+
};
|
|
45
63
|
//# sourceMappingURL=index.d.ts.map
|
package/lib/Type/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Type/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAIrD,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,kBAAkB,CAAC,CAAC,IAAI,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;AAE9D,MAAM,MAAM,UAAU,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1C,MAAM,MAAM,gBAAgB,GAAG;IAC7B,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAChB,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,QAAQ,CAAC;AAElE,MAAM,MAAM,cAAc,GAAG,KAAK,GAAG,MAAM,GAAG,OAAO,GAAG,KAAK,GAAG,QAAQ,CAAC;AAEzE,MAAM,MAAM,YAAY,GAAG,eAAe,GAAG,CAAC,cAAc,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC;AAG/E,MAAM,MAAM,UAAU,GAAG,eAAe,EAAE,GAAG,eAAe,CAAC;AAE7D,MAAM,MAAM,UAAU,GAAG,KAAK,CAAC;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,cAAc,CAAC;IACvB,OAAO,EAAE,YAAY,CAAC;IACtB,WAAW,EAAE,cAAc,GAAG,cAAc,EAAE,CAAC;IAC/C,UAAU,CAAC,EAAE,cAAc,CAAC;CAC7B,CAAC,CAAC;AAEH,MAAM,MAAM,SAAS,GAAG,KAAK,CAAC;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,cAAc,CAAC;IACvB,QAAQ,EAAE,cAAc,CAAC;IACzB,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,CAAC,EAAE,cAAc,CAAC;CAC7B,CAAC,CAAC;AAQH,MAAM,MAAM,UAAU,GAAG,MAAM,CAC7B,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,GAAG,CACJ,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Type/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAIrD,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,kBAAkB,CAAC,CAAC,IAAI,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;AAE9D,MAAM,MAAM,UAAU,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1C,MAAM,MAAM,gBAAgB,GAAG;IAC7B,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAChB,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,QAAQ,CAAC;AAElE,MAAM,MAAM,cAAc,GAAG,KAAK,GAAG,MAAM,GAAG,OAAO,GAAG,KAAK,GAAG,QAAQ,CAAC;AAEzE,MAAM,MAAM,YAAY,GAAG,eAAe,GAAG,CAAC,cAAc,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC;AAG/E,MAAM,MAAM,UAAU,GAAG,eAAe,EAAE,GAAG,eAAe,CAAC;AAE7D,MAAM,MAAM,UAAU,GAAG,KAAK,CAAC;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,cAAc,CAAC;IACvB,OAAO,EAAE,YAAY,CAAC;IACtB,WAAW,EAAE,cAAc,GAAG,cAAc,EAAE,CAAC;IAC/C,UAAU,CAAC,EAAE,cAAc,CAAC;CAC7B,CAAC,CAAC;AAEH,MAAM,MAAM,SAAS,GAAG,KAAK,CAAC;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,cAAc,CAAC;IACvB,QAAQ,EAAE,cAAc,CAAC;IACzB,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,CAAC,EAAE,cAAc,CAAC;CAC7B,CAAC,CAAC;AAQH,MAAM,MAAM,UAAU,GAAG,MAAM,CAC7B,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,GAAG,CACJ,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE;QACN,aAAa,EAAE,MAAM,CAAC;QACtB,aAAa,EAAE,MAAM,CAAC;KACvB,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACzC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;CACzC,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,IAAI,EAAE,UAAU,CAAC;CAClB,CAAC"}
|