prostgles-server 4.2.341 → 4.2.343
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/AuthHandler.d.ts +1 -1
- package/dist/Auth/AuthHandler.js +1 -1
- package/dist/Auth/AuthHandler.js.map +1 -1
- package/dist/Auth/getClientAuth.js +3 -3
- package/dist/Auth/getClientAuth.js.map +1 -1
- package/dist/Auth/setupAuthRoutes.js +3 -3
- package/dist/Auth/setupAuthRoutes.js.map +1 -1
- package/dist/Auth/utils/removeExpressRoute.d.ts +3 -2
- package/dist/Auth/utils/removeExpressRoute.d.ts.map +1 -1
- package/dist/Auth/utils/removeExpressRoute.js +34 -15
- package/dist/Auth/utils/removeExpressRoute.js.map +1 -1
- package/dist/Auth/utils/upsertNamedExpressMiddleware.d.ts.map +1 -1
- package/dist/Auth/utils/upsertNamedExpressMiddleware.js.map +1 -1
- package/dist/ProstglesTypes.d.ts +2 -1
- package/dist/ProstglesTypes.d.ts.map +1 -1
- package/dist/ProstglesTypes.js.map +1 -1
- package/dist/RestApi.d.ts +22 -19
- package/dist/RestApi.d.ts.map +1 -1
- package/dist/RestApi.js +5 -6
- package/dist/RestApi.js.map +1 -1
- package/lib/Auth/AuthHandler.ts +1 -1
- package/lib/Auth/getClientAuth.ts +3 -3
- package/lib/Auth/setupAuthRoutes.ts +3 -3
- package/lib/Auth/utils/removeExpressRoute.ts +40 -19
- package/lib/Auth/utils/upsertNamedExpressMiddleware.ts +2 -1
- package/lib/ProstglesTypes.ts +2 -1
- package/lib/RestApi.ts +29 -26
- package/package.json +1 -2
|
@@ -26,7 +26,7 @@ export declare const AUTH_ROUTES_AND_PARAMS: {
|
|
|
26
26
|
readonly logout: "/logout";
|
|
27
27
|
readonly magicLinks: "/magic-link";
|
|
28
28
|
readonly magicLinkWithId: "/magic-link/:id";
|
|
29
|
-
readonly catchAll: "*";
|
|
29
|
+
readonly catchAll: "*splat";
|
|
30
30
|
};
|
|
31
31
|
export declare class AuthHandler {
|
|
32
32
|
protected readonly prostgles: Prostgles;
|
package/dist/Auth/AuthHandler.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthHandler.js","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":";;;AAAA,qDAAsD;AAItD,mDAAgD;AAChD,mCAAgC;AAChC,uDAAoD;AACpD,6EAA0E;AASjE,wGATA,iDAAuB,OASA;AARhC,+EAA4E;AAC5E,yDAAyF;AACzF,mEAAyF;AAMvD,mGANzB,uCAAkB,OAMyB;AAAE,wGANzB,4CAAuB,OAMyB;AAL7E,2FAGgD;AAGnC,QAAA,eAAe,GAAG;IAC7B,YAAY,EAAE,GAAG;IACjB,SAAS,EAAE,GAAG;IACd,WAAW,EAAE,GAAG;IAChB,qBAAqB,EAAE,GAAG;IAC1B,QAAQ,EAAE,GAAG;IACb,iBAAiB,EAAE,GAAG;CACd,CAAC;AAEE,QAAA,kBAAkB,GAAG;IAChC,EAAE,EAAE,GAAG;IACP,OAAO,EAAE,GAAG;CACJ,CAAC;AAEE,QAAA,sBAAsB,GAAG;IACpC,KAAK,EAAE,QAAQ;IACf,iBAAiB,EAAE,QAAQ;IAC3B,iBAAiB,EAAE,WAAW;IAC9B,kBAAkB,EAAE,WAAW;IAC/B,UAAU,EAAE,YAAY;IACxB,MAAM,EAAE,SAAS;IACjB,UAAU,EAAE,aAAa;IACzB,eAAe,EAAE,iBAAiB;IAClC,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"AuthHandler.js","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ const prostgles_types_1 = require("prostgles-types");
|
|
|
5
5
|
const AuthHandler_1 = require("./AuthHandler");
|
|
6
6
|
async function getClientAuth(clientReq) {
|
|
7
7
|
let pathGuard = false;
|
|
8
|
-
const { loginWithOAuth, signupWithEmail
|
|
8
|
+
const { loginWithOAuth, signupWithEmail, localLoginMode, login, publicRoutes, disableSocketAuthGuard, } = this.opts.loginSignupConfig ?? {};
|
|
9
9
|
if (publicRoutes && !disableSocketAuthGuard) {
|
|
10
10
|
pathGuard = true;
|
|
11
11
|
/**
|
|
@@ -55,8 +55,8 @@ async function getClientAuth(clientReq) {
|
|
|
55
55
|
const auth = {
|
|
56
56
|
//@ts-ignore
|
|
57
57
|
providers: getOAuthProviders(loginWithOAuth),
|
|
58
|
-
signupWithEmailAndPassword:
|
|
59
|
-
minPasswordLength:
|
|
58
|
+
signupWithEmailAndPassword: signupWithEmail && {
|
|
59
|
+
minPasswordLength: signupWithEmail.minPasswordLength ?? 8,
|
|
60
60
|
url: AuthHandler_1.AUTH_ROUTES_AND_PARAMS.emailRegistration,
|
|
61
61
|
},
|
|
62
62
|
preferredLogin: userData.preferredLogin,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getClientAuth.js","sourceRoot":"","sources":["../../lib/Auth/getClientAuth.ts"],"names":[],"mappings":";;;AAAA,qDAQyB;AAOzB,+CAAoE;AAE7D,KAAK,UAAU,aAAa,CAEjC,SAA4B;IAE5B,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,MAAM,EACJ,cAAc,EACd,eAAe,
|
|
1
|
+
{"version":3,"file":"getClientAuth.js","sourceRoot":"","sources":["../../lib/Auth/getClientAuth.ts"],"names":[],"mappings":";;;AAAA,qDAQyB;AAOzB,+CAAoE;AAE7D,KAAK,UAAU,aAAa,CAEjC,SAA4B;IAE5B,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,MAAM,EACJ,cAAc,EACd,eAAe,EACf,cAAc,EACd,KAAK,EACL,YAAY,EACZ,sBAAsB,GACvB,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,IAAI,EAAE,CAAC;IAEtC,IAAI,YAAY,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC5C,SAAS,GAAG,IAAI,CAAC;QAEjB;;WAEG;QACH,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;YACrB,MAAM,kBAAkB,GAAG,KAAK,EAAE,SAA4B,EAAuB,EAAE;gBACrF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;gBAClE,IAAI,IAAA,0BAAQ,EAAC,UAAU,CAAC,IAAI,UAAU,CAAC,GAAG,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC;oBAC9D,OAAO,UAAU,CAAC;gBACpB,CAAC;YACH,CAAC,CAAC;YACF,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;YAC7B,MAAM,CAAC,kBAAkB,CAAC,0BAAQ,CAAC,SAAS,CAAC,CAAC;YAC9C,MAAM,CAAC,EAAE,CACP,0BAAQ,CAAC,SAAS,EAClB,KAAK,EACH,MAAyB,EACzB,KAAK,CAAC,IAAS,EAAE,IAAgC,EAAE,EAAE;gBACnD,YAAY;YACd,CAAC,EACD,EAAE;gBACF,IAAI,CAAC;oBACH,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GACxB,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAuB,CAAC,CAAC,CAAC,MAAM,CAAC;oBAClF,IAAI,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;wBAC7C,OAAO,CAAC,IAAI,CAAC,mDAAmD,EAAE,QAAQ,CAAC,CAAC;oBAC9E,CAAC;oBAED,qBAAqB;oBACrB,MAAM,mBAAmB,GAAG,CAAC,SAAS,CAAC,CAAC;oBACxC,IACE,CAAC,mBAAmB,CAAC,QAAQ,CAAC,MAAM,CAAC;wBACrC,QAAQ;wBACR,OAAO,QAAQ,KAAK,QAAQ;wBAC5B,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC;wBAC1B,CAAC,CAAC,MAAM,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EACvC,CAAC;wBACD,EAAE,CAAC,IAAI,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;oBACnC,CAAC;yBAAM,CAAC;wBACN,EAAE,CAAC,IAAI,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,CAAC;oBACpC,CAAC;gBACH,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,OAAO,CAAC,KAAK,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAC;oBACtC,EAAE,CAAC,GAAG,CAAC,CAAC;gBACV,CAAC;YACH,CAAC,CACF,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;IAChE,IAAI,QAAQ,KAAK,sBAAsB,EAAE,CAAC;QACxC,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,MAAM,IAAI,GAAqB;QAC7B,YAAY;QACZ,SAAS,EAAE,iBAAiB,CAAC,cAAc,CAAC;QAC5C,0BAA0B,EAAE,eAAe,IAAI;YAC7C,iBAAiB,EAAE,eAAe,CAAC,iBAAiB,IAAI,CAAC;YACzD,GAAG,EAAE,oCAAsB,CAAC,iBAAiB;SAC9C;QACD,cAAc,EAAE,QAAQ,CAAC,cAAc;QACvC,IAAI,EAAE,QAAQ,CAAC,UAAU;QACzB,SAAS,EAAE,cAAc,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC;QACnE,SAAS;KACV,CAAC;IACF,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;AAC5B,CAAC;AAnFD,sCAmFC;AAED,MAAM,iBAAiB,GAAG,CACxB,cAAqD,EACV,EAAE;IAC7C,IAAI,CAAC,cAAc;QAAE,OAAO,SAAS,CAAC;IACtC,MAAM,EAAE,cAAc,EAAE,GAAG,cAAc,CAAC;IAC1C,IAAI,IAAA,yBAAO,EAAC,cAAc,CAAC;QAAE,OAAO,SAAS,CAAC;IAE9C,MAAM,MAAM,GAAkC,EAAE,CAAC;IACjD,IAAA,kCAAgB,EAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,EAAE,MAAM,CAAC,EAAE,EAAE;QAClE,IAAI,MAAM,EAAE,QAAQ,EAAE,CAAC;YACrB,MAAM,CAAC,YAAY,CAAC,GAAG;gBACrB,GAAG,EAAE,GAAG,oCAAsB,CAAC,iBAAiB,IAAI,YAAY,EAAE;gBAClE,GAAG,CAAC,YAAY,KAAK,aAAa,IAAI;oBACpC,WAAW,EAAE,cAAc,CAAC,WAAW,EAAE,WAAW;oBACpD,eAAe,EAAE,cAAc,CAAC,WAAW,EAAE,eAAe;iBAC7D,CAAC;aACH,CAAC;QACJ,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}
|
|
@@ -17,12 +17,12 @@ function setupAuthRoutes() {
|
|
|
17
17
|
if (!loginSignupConfig) {
|
|
18
18
|
return;
|
|
19
19
|
}
|
|
20
|
-
const { app, publicRoutes = [], onMagicLinkOrOTP, loginWithOAuth, signupWithEmail
|
|
20
|
+
const { app, publicRoutes = [], onMagicLinkOrOTP, loginWithOAuth, signupWithEmail, } = loginSignupConfig;
|
|
21
21
|
if (publicRoutes.find((r) => typeof r !== "string" || !r)) {
|
|
22
22
|
throw "Invalid or empty string provided within publicRoutes ";
|
|
23
23
|
}
|
|
24
|
-
if (
|
|
25
|
-
(0, setRegisterRequestHandler_1.setRegisterRequestHandler)(
|
|
24
|
+
if (signupWithEmail) {
|
|
25
|
+
(0, setRegisterRequestHandler_1.setRegisterRequestHandler)(signupWithEmail, app);
|
|
26
26
|
}
|
|
27
27
|
if (loginWithOAuth) {
|
|
28
28
|
setOAuthRequestHandlers_1.setOAuthRequestHandlers.bind(this)(app, loginWithOAuth);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupAuthRoutes.js","sourceRoot":"","sources":["../../lib/Auth/setupAuthRoutes.ts"],"names":[],"mappings":";;;AACA,+CAAqE;AACrE,qFAAkF;AAClF,+EAA4E;AAC5E,iFAA8E;AAC9E,iGAA8F;AAC9F,iFAA8E;AAC9E,qFAAkF;AAClF,uFAAoF;AAEpF,SAAgB,eAAe;IAC7B,MAAM,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;IAEhE,IAAI,IAAI,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;QAC9B,MAAM,4DAA4D,CAAC;IACrE,CAAC;IAED,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvB,OAAO;IACT,CAAC;IACD,MAAM,EACJ,GAAG,EACH,YAAY,GAAG,EAAE,EACjB,gBAAgB,EAChB,cAAc,EACd,eAAe,
|
|
1
|
+
{"version":3,"file":"setupAuthRoutes.js","sourceRoot":"","sources":["../../lib/Auth/setupAuthRoutes.ts"],"names":[],"mappings":";;;AACA,+CAAqE;AACrE,qFAAkF;AAClF,+EAA4E;AAC5E,iFAA8E;AAC9E,iGAA8F;AAC9F,iFAA8E;AAC9E,qFAAkF;AAClF,uFAAoF;AAEpF,SAAgB,eAAe;IAC7B,MAAM,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;IAEhE,IAAI,IAAI,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;QAC9B,MAAM,4DAA4D,CAAC;IACrE,CAAC;IAED,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvB,OAAO;IACT,CAAC;IACD,MAAM,EACJ,GAAG,EACH,YAAY,GAAG,EAAE,EACjB,gBAAgB,EAChB,cAAc,EACd,eAAe,GAChB,GAAG,iBAAiB,CAAC;IACtB,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1D,MAAM,uDAAuD,CAAC;IAChE,CAAC;IAED,IAAI,eAAe,EAAE,CAAC;QACpB,IAAA,qDAAyB,EAAC,eAAe,EAAE,GAAG,CAAC,CAAC;IAClD,CAAC;IAED,IAAI,cAAc,EAAE,CAAC;QACnB,iDAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;IAC1D,CAAC;IAED,IAAI,sBAAsB,EAAE,CAAC;QAC3B,MAAM,sBAAsB,GAAmB,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACtE,MAAM,OAAO,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;YACtC,MAAM,kBAAkB,GAAG,MAAM,sBAAsB,CACrD,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAC3B,IAAA,qCAAuB,EAAC,OAAO,CAAC,EAChC,OAAO,CACR,CAAC;YAEF,IAAI,kBAAkB,IAAI,OAAO,IAAI,kBAAkB,EAAE,CAAC;gBACxD,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,kBAAkB,CAAC;gBAC/C,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;gBACrC,OAAO;YACT,CAAC;YAED,IAAI,kBAAkB,IAAI,SAAS,IAAI,kBAAkB,EAAE,CAAC;gBAC1D,MAAM,EAAE,OAAO,EAAE,GAAG,kBAAkB,CAAC;gBACvC,OAAO,IAAI,CAAC,2BAA2B,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;YACjE,CAAC;YACD,IAAI,EAAE,CAAC;QACT,CAAC,CAAC;QACF,IAAA,2DAA4B,EAAC,GAAG,EAAE,sBAAsB,EAAE,iCAAiC,CAAC,CAAC;IAC/F,CAAC;IAED,IAAI,gBAAgB,EAAE,CAAC;QACrB,iEAA+B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;IACpE,CAAC;IAED,+CAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IAEvC,iEAAiE;IACjE,qDAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IAE1C,iDAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;AAC1C,CAAC;AA/DD,0CA+DC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { ExpressApp } from "../../RestApi";
|
|
2
|
-
|
|
3
|
-
export declare const
|
|
2
|
+
import { Express } from "express";
|
|
3
|
+
export declare const removeExpressRoute: (app: ExpressApp | Express | undefined, _routePaths: (string | undefined)[], method?: "get" | "post" | "put" | "delete") => void;
|
|
4
|
+
export declare const removeExpressRoutesTest: (app: ExpressApp | Express) => Promise<void>;
|
|
4
5
|
//# sourceMappingURL=removeExpressRoute.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"removeExpressRoute.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/removeExpressRoute.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"removeExpressRoute.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/removeExpressRoute.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEhD,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAwBlC,eAAO,MAAM,kBAAkB,QACxB,UAAU,GAAG,OAAO,GAAG,SAAS,eACxB,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,WAC1B,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,SAe3C,CAAC;AAGF,eAAO,MAAM,uBAAuB,QAAe,UAAU,GAAG,OAAO,kBA2BtE,CAAC"}
|
|
@@ -3,18 +3,39 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.removeExpressRoutesTest = exports.removeExpressRoute = void 0;
|
|
4
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
5
|
const AuthHandler_1 = require("../AuthHandler");
|
|
6
|
+
const getRouter = (app) => {
|
|
7
|
+
const router = (app._router || app.router);
|
|
8
|
+
if (typeof router === "string") {
|
|
9
|
+
throw new Error("app.router is a string");
|
|
10
|
+
}
|
|
11
|
+
const stack = router?.stack;
|
|
12
|
+
if (!stack) {
|
|
13
|
+
throw new Error("app._router or app.router is missing");
|
|
14
|
+
}
|
|
15
|
+
return {
|
|
16
|
+
getStack: () => {
|
|
17
|
+
const { stack } = router;
|
|
18
|
+
if (!stack) {
|
|
19
|
+
throw new Error("app._router.stack or app.router.stack is missing");
|
|
20
|
+
}
|
|
21
|
+
return stack;
|
|
22
|
+
},
|
|
23
|
+
router,
|
|
24
|
+
};
|
|
25
|
+
};
|
|
6
26
|
const removeExpressRoute = (app, _routePaths, method) => {
|
|
7
|
-
|
|
27
|
+
if (!app)
|
|
28
|
+
return;
|
|
8
29
|
const routePaths = _routePaths.filter(prostgles_types_1.isDefined);
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
30
|
+
const { router, getStack } = getRouter(app);
|
|
31
|
+
const newRoutes = getStack().filter((route) => {
|
|
32
|
+
const path = route.route?.path;
|
|
33
|
+
const matchesForRemoval = path &&
|
|
34
|
+
routePaths.some((routePath) => (0, AuthHandler_1.matchesRoute)(routePath, path)) &&
|
|
35
|
+
(!method || route.route?.methods?.[method]);
|
|
36
|
+
return !matchesForRemoval;
|
|
37
|
+
});
|
|
38
|
+
router.stack = newRoutes;
|
|
18
39
|
};
|
|
19
40
|
exports.removeExpressRoute = removeExpressRoute;
|
|
20
41
|
let testedApp;
|
|
@@ -24,12 +45,10 @@ const removeExpressRoutesTest = async (app) => {
|
|
|
24
45
|
app.get("/removeExpressRoute", (req, res) => {
|
|
25
46
|
res.json({ v: 1 });
|
|
26
47
|
});
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
}
|
|
30
|
-
const currentRoutes = app._router.stack.slice(0);
|
|
48
|
+
const { getStack } = getRouter(app);
|
|
49
|
+
const currentRoutes = getStack().slice(0);
|
|
31
50
|
(0, exports.removeExpressRoute)(app, ["/removeExpressRoute"]);
|
|
32
|
-
if (
|
|
51
|
+
if (getStack().length !== currentRoutes.length - 1) {
|
|
33
52
|
throw "removeExpressRoutesTest failed app._router.stack length is not correct";
|
|
34
53
|
}
|
|
35
54
|
/** Full test */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"removeExpressRoute.js","sourceRoot":"","sources":["../../../lib/Auth/utils/removeExpressRoute.ts"],"names":[],"mappings":";;;AAAA,qDAA4C;AAE5C,gDAA8C;
|
|
1
|
+
{"version":3,"file":"removeExpressRoute.js","sourceRoot":"","sources":["../../../lib/Auth/utils/removeExpressRoute.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upsertNamedExpressMiddleware.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/upsertNamedExpressMiddleware.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"upsertNamedExpressMiddleware.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/upsertNamedExpressMiddleware.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAIzC,eAAO,MAAM,4BAA4B,QAClC,SAAS,WACL,cAAc,QACjB,MAAM,SAMb,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upsertNamedExpressMiddleware.js","sourceRoot":"","sources":["../../../lib/Auth/utils/upsertNamedExpressMiddleware.ts"],"names":[],"mappings":";;;AAEA,+DAAyE;
|
|
1
|
+
{"version":3,"file":"upsertNamedExpressMiddleware.js","sourceRoot":"","sources":["../../../lib/Auth/utils/upsertNamedExpressMiddleware.ts"],"names":[],"mappings":";;;AAEA,+DAAyE;AAGlE,MAAM,4BAA4B,GAAG,CAC1C,GAAc,EACd,OAAuB,EACvB,IAAY,EACZ,EAAE;IACF,MAAM,QAAQ,GAAG,IAAI,CAAC;IACtB,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC5D,IAAA,sCAAwB,EAAC,GAAiB,EAAE,IAAI,CAAC,CAAC;IAClD,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACnB,CAAC,CAAC;AATW,QAAA,4BAA4B,gCASvC"}
|
package/dist/ProstglesTypes.d.ts
CHANGED
|
@@ -8,6 +8,7 @@ import { ExpressApp, RestApiConfig } from "./RestApi";
|
|
|
8
8
|
import { OnSchemaChangeCallback } from "./SchemaWatch/SchemaWatch";
|
|
9
9
|
import { ColConstraint } from "./TableConfig/getConstraintDefinitionQueries";
|
|
10
10
|
import { TableConfig } from "./TableConfig/TableConfig";
|
|
11
|
+
import { Express } from "express";
|
|
11
12
|
import { PRGLIOSocket } from "./DboBuilder/DboBuilder";
|
|
12
13
|
import pgPromise from "pg-promise";
|
|
13
14
|
import pg from "pg-promise/typescript/pg-subset";
|
|
@@ -57,7 +58,7 @@ export type FileTableConfig = {
|
|
|
57
58
|
/**
|
|
58
59
|
* Express server instance
|
|
59
60
|
*/
|
|
60
|
-
expressApp: ExpressApp;
|
|
61
|
+
expressApp: ExpressApp | Express;
|
|
61
62
|
/**
|
|
62
63
|
* Specifying referencedTables with referenceColumns allows restricting the
|
|
63
64
|
* allowed file types that can be inserted and referenced in the specified tables.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProstglesTypes.d.ts","sourceRoot":"","sources":["../lib/ProstglesTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC9E,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACnF,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AACtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,8CAA8C,CAAC;AAC7E,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"ProstglesTypes.d.ts","sourceRoot":"","sources":["../lib/ProstglesTypes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProstglesTypes.js","sourceRoot":"","sources":["../lib/ProstglesTypes.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"ProstglesTypes.js","sourceRoot":"","sources":["../lib/ProstglesTypes.ts"],"names":[],"mappings":";;;AAmGa,QAAA,UAAU,GAAG,CAAC,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,CAAU,CAAC"}
|
package/dist/RestApi.d.ts
CHANGED
|
@@ -2,25 +2,27 @@ import { Express } from "express";
|
|
|
2
2
|
import { ExpressReq, ExpressRes } from "./Auth/AuthTypes";
|
|
3
3
|
import { Prostgles } from "./Prostgles";
|
|
4
4
|
import { VoidFunction } from "./SchemaWatch/SchemaWatch";
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
delete?: boolean;
|
|
19
|
-
};
|
|
5
|
+
type ExpressInternalRouter = {
|
|
6
|
+
stack?: {
|
|
7
|
+
name: string;
|
|
8
|
+
handle: VoidFunction;
|
|
9
|
+
path: undefined;
|
|
10
|
+
keys?: any[];
|
|
11
|
+
route?: {
|
|
12
|
+
path?: string;
|
|
13
|
+
methods?: {
|
|
14
|
+
get?: boolean;
|
|
15
|
+
post?: boolean;
|
|
16
|
+
put?: boolean;
|
|
17
|
+
delete?: boolean;
|
|
20
18
|
};
|
|
21
|
-
}
|
|
22
|
-
};
|
|
23
|
-
}
|
|
19
|
+
};
|
|
20
|
+
}[];
|
|
21
|
+
};
|
|
22
|
+
export type ExpressApp = {
|
|
23
|
+
_router?: ExpressInternalRouter;
|
|
24
|
+
router?: ExpressInternalRouter;
|
|
25
|
+
} & Omit<Express, "_router" | "router">;
|
|
24
26
|
export type RestApiConfig = {
|
|
25
27
|
/**
|
|
26
28
|
* Express server instance
|
|
@@ -39,7 +41,7 @@ export declare class RestApi {
|
|
|
39
41
|
methods: string;
|
|
40
42
|
schema: string;
|
|
41
43
|
};
|
|
42
|
-
expressApp:
|
|
44
|
+
expressApp: ExpressApp;
|
|
43
45
|
path: string;
|
|
44
46
|
constructor({ expressApp, path, prostgles }: RestApiConfig & {
|
|
45
47
|
prostgles: Prostgles;
|
|
@@ -50,4 +52,5 @@ export declare class RestApi {
|
|
|
50
52
|
onPostSql: (req: ExpressReq, res: ExpressRes) => Promise<void>;
|
|
51
53
|
onPostTableCommand: (req: ExpressReq, res: ExpressRes) => Promise<void>;
|
|
52
54
|
}
|
|
55
|
+
export {};
|
|
53
56
|
//# sourceMappingURL=RestApi.d.ts.map
|
package/dist/RestApi.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RestApi.d.ts","sourceRoot":"","sources":["../lib/RestApi.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"RestApi.d.ts","sourceRoot":"","sources":["../lib/RestApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAGzD,KAAK,qBAAqB,GAAG;IAC3B,KAAK,CAAC,EAAE;QACN,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,YAAY,CAAC;QACrB,IAAI,EAAE,SAAS,CAAC;QAChB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,KAAK,CAAC,EAAE;YACN,IAAI,CAAC,EAAE,MAAM,CAAC;YACd,OAAO,CAAC,EAAE;gBACR,GAAG,CAAC,EAAE,OAAO,CAAC;gBACd,IAAI,CAAC,EAAE,OAAO,CAAC;gBACf,GAAG,CAAC,EAAE,OAAO,CAAC;gBACd,MAAM,CAAC,EAAE,OAAO,CAAC;aAClB,CAAC;SACH,CAAC;KACH,EAAE,CAAC;CACL,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,OAAO,CAAC,EAAE,qBAAqB,CAAC;IAChC,MAAM,CAAC,EAAE,qBAAqB,CAAC;CAChC,GAAG,IAAI,CAAC,OAAO,EAAE,SAAS,GAAG,QAAQ,CAAC,CAAC;AAExC,MAAM,MAAM,aAAa,GAAG;IAC1B;;OAEG;IACH,UAAU,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,qBAAa,OAAO;IAClB,SAAS,EAAE,SAAS,CAAC;IACrB,MAAM,EAAE;QACN,EAAE,EAAE,MAAM,CAAC;QACX,GAAG,EAAE,MAAM,CAAC;QACZ,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,UAAU,EAAE,UAAU,CAAC;IACvB,IAAI,SAAU;gBACF,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,aAAa,GAAG;QAAE,SAAS,EAAE,SAAS,CAAA;KAAE;IAqBrF,OAAO,aAKL;IACF,YAAY,QAAe,UAAU,OAAO,UAAU,mBAuBpD;IACF,YAAY,QAAe,UAAU,OAAO,UAAU,mBAWpD;IACF,SAAS,QAAe,UAAU,OAAO,UAAU,mBAsBjD;IAEF,kBAAkB,QAAe,UAAU,OAAO,UAAU,mBAqC1D;CACH"}
|
package/dist/RestApi.js
CHANGED
|
@@ -1,12 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.RestApi = void 0;
|
|
4
|
-
const bodyParser = require("body-parser");
|
|
5
4
|
const AuthHandler_1 = require("./Auth/AuthHandler");
|
|
6
5
|
const DboBuilder_1 = require("./DboBuilder/DboBuilder");
|
|
7
6
|
const runClientRequest_1 = require("./runClientRequest");
|
|
8
7
|
const prostgles_types_1 = require("prostgles-types");
|
|
9
|
-
const jsonParser = bodyParser.json();
|
|
10
8
|
class RestApi {
|
|
11
9
|
prostgles;
|
|
12
10
|
routes;
|
|
@@ -25,10 +23,11 @@ class RestApi {
|
|
|
25
23
|
schema: `${path}/schema`,
|
|
26
24
|
};
|
|
27
25
|
this.expressApp = expressApp;
|
|
28
|
-
|
|
29
|
-
expressApp.post(this.routes.
|
|
30
|
-
expressApp.post(this.routes.
|
|
31
|
-
expressApp.post(this.routes.
|
|
26
|
+
/** Must check if json parser is loaded */
|
|
27
|
+
expressApp.post(this.routes.db, this.onPostTableCommand);
|
|
28
|
+
expressApp.post(this.routes.sql, this.onPostSql);
|
|
29
|
+
expressApp.post(this.routes.methods, this.onPostMethod);
|
|
30
|
+
expressApp.post(this.routes.schema, this.onPostSchema);
|
|
32
31
|
}
|
|
33
32
|
destroy = () => {
|
|
34
33
|
this.expressApp.removeListener(this.routes.db, this.onPostTableCommand);
|
package/dist/RestApi.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RestApi.js","sourceRoot":"","sources":["../lib/RestApi.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"RestApi.js","sourceRoot":"","sources":["../lib/RestApi.ts"],"names":[],"mappings":"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"}
|
package/lib/Auth/AuthHandler.ts
CHANGED
|
@@ -22,7 +22,7 @@ export async function getClientAuth(
|
|
|
22
22
|
let pathGuard = false;
|
|
23
23
|
const {
|
|
24
24
|
loginWithOAuth,
|
|
25
|
-
signupWithEmail
|
|
25
|
+
signupWithEmail,
|
|
26
26
|
localLoginMode,
|
|
27
27
|
login,
|
|
28
28
|
publicRoutes,
|
|
@@ -88,8 +88,8 @@ export async function getClientAuth(
|
|
|
88
88
|
const auth: AuthSocketSchema = {
|
|
89
89
|
//@ts-ignore
|
|
90
90
|
providers: getOAuthProviders(loginWithOAuth),
|
|
91
|
-
signupWithEmailAndPassword:
|
|
92
|
-
minPasswordLength:
|
|
91
|
+
signupWithEmailAndPassword: signupWithEmail && {
|
|
92
|
+
minPasswordLength: signupWithEmail.minPasswordLength ?? 8,
|
|
93
93
|
url: AUTH_ROUTES_AND_PARAMS.emailRegistration,
|
|
94
94
|
},
|
|
95
95
|
preferredLogin: userData.preferredLogin,
|
|
@@ -23,14 +23,14 @@ export function setupAuthRoutes(this: AuthHandler) {
|
|
|
23
23
|
publicRoutes = [],
|
|
24
24
|
onMagicLinkOrOTP,
|
|
25
25
|
loginWithOAuth,
|
|
26
|
-
signupWithEmail
|
|
26
|
+
signupWithEmail,
|
|
27
27
|
} = loginSignupConfig;
|
|
28
28
|
if (publicRoutes.find((r) => typeof r !== "string" || !r)) {
|
|
29
29
|
throw "Invalid or empty string provided within publicRoutes ";
|
|
30
30
|
}
|
|
31
31
|
|
|
32
|
-
if (
|
|
33
|
-
setRegisterRequestHandler(
|
|
32
|
+
if (signupWithEmail) {
|
|
33
|
+
setRegisterRequestHandler(signupWithEmail, app);
|
|
34
34
|
}
|
|
35
35
|
|
|
36
36
|
if (loginWithOAuth) {
|
|
@@ -1,39 +1,60 @@
|
|
|
1
1
|
import { isDefined } from "prostgles-types";
|
|
2
2
|
import type { ExpressApp } from "../../RestApi";
|
|
3
3
|
import { matchesRoute } from "../AuthHandler";
|
|
4
|
+
import { Express } from "express";
|
|
5
|
+
|
|
6
|
+
const getRouter = (app: ExpressApp | Express) => {
|
|
7
|
+
const router = (app._router || app.router) as ExpressApp["_router"] | undefined;
|
|
8
|
+
if (typeof router === "string") {
|
|
9
|
+
throw new Error("app.router is a string");
|
|
10
|
+
}
|
|
11
|
+
const stack = router?.stack;
|
|
12
|
+
|
|
13
|
+
if (!stack) {
|
|
14
|
+
throw new Error("app._router or app.router is missing");
|
|
15
|
+
}
|
|
16
|
+
return {
|
|
17
|
+
getStack: () => {
|
|
18
|
+
const { stack } = router;
|
|
19
|
+
if (!stack) {
|
|
20
|
+
throw new Error("app._router.stack or app.router.stack is missing");
|
|
21
|
+
}
|
|
22
|
+
return stack;
|
|
23
|
+
},
|
|
24
|
+
router,
|
|
25
|
+
};
|
|
26
|
+
};
|
|
4
27
|
|
|
5
28
|
export const removeExpressRoute = (
|
|
6
|
-
app: ExpressApp | undefined,
|
|
29
|
+
app: ExpressApp | Express | undefined,
|
|
7
30
|
_routePaths: (string | undefined)[],
|
|
8
31
|
method?: "get" | "post" | "put" | "delete"
|
|
9
32
|
) => {
|
|
10
|
-
|
|
33
|
+
if (!app) return;
|
|
11
34
|
const routePaths = _routePaths.filter(isDefined);
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
35
|
+
const { router, getStack } = getRouter(app);
|
|
36
|
+
const newRoutes = getStack().filter((route) => {
|
|
37
|
+
const path = route.route?.path;
|
|
38
|
+
const matchesForRemoval =
|
|
39
|
+
path &&
|
|
40
|
+
routePaths.some((routePath) => matchesRoute(routePath, path)) &&
|
|
41
|
+
(!method || route.route?.methods?.[method]);
|
|
19
42
|
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
43
|
+
return !matchesForRemoval;
|
|
44
|
+
});
|
|
45
|
+
router.stack = newRoutes;
|
|
23
46
|
};
|
|
24
47
|
|
|
25
|
-
let testedApp: ExpressApp | undefined;
|
|
26
|
-
export const removeExpressRoutesTest = async (app: ExpressApp) => {
|
|
48
|
+
let testedApp: ExpressApp | Express | undefined;
|
|
49
|
+
export const removeExpressRoutesTest = async (app: ExpressApp | Express) => {
|
|
27
50
|
if (testedApp) return;
|
|
28
51
|
app.get("/removeExpressRoute", (req, res) => {
|
|
29
52
|
res.json({ v: 1 });
|
|
30
53
|
});
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
}
|
|
34
|
-
const currentRoutes = app._router.stack.slice(0);
|
|
54
|
+
const { getStack } = getRouter(app);
|
|
55
|
+
const currentRoutes = getStack().slice(0);
|
|
35
56
|
removeExpressRoute(app, ["/removeExpressRoute"]);
|
|
36
|
-
if (
|
|
57
|
+
if (getStack().length !== currentRoutes.length - 1) {
|
|
37
58
|
throw "removeExpressRoutesTest failed app._router.stack length is not correct";
|
|
38
59
|
}
|
|
39
60
|
/** Full test */
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type e from "express";
|
|
2
2
|
import { RequestHandler } from "express";
|
|
3
3
|
import { removeExpressRouteByName } from "../../FileManager/FileManager";
|
|
4
|
+
import type { ExpressApp } from "../../RestApi";
|
|
4
5
|
|
|
5
6
|
export const upsertNamedExpressMiddleware = (
|
|
6
7
|
app: e.Express,
|
|
@@ -9,6 +10,6 @@ export const upsertNamedExpressMiddleware = (
|
|
|
9
10
|
) => {
|
|
10
11
|
const funcName = name;
|
|
11
12
|
Object.defineProperty(handler, "name", { value: funcName });
|
|
12
|
-
removeExpressRouteByName(app, name);
|
|
13
|
+
removeExpressRouteByName(app as ExpressApp, name);
|
|
13
14
|
app.use(handler);
|
|
14
15
|
};
|
package/lib/ProstglesTypes.ts
CHANGED
|
@@ -8,6 +8,7 @@ import { ExpressApp, RestApiConfig } from "./RestApi";
|
|
|
8
8
|
import { OnSchemaChangeCallback } from "./SchemaWatch/SchemaWatch";
|
|
9
9
|
import { ColConstraint } from "./TableConfig/getConstraintDefinitionQueries";
|
|
10
10
|
import { TableConfig } from "./TableConfig/TableConfig";
|
|
11
|
+
import { Express } from "express";
|
|
11
12
|
|
|
12
13
|
import { PRGLIOSocket } from "./DboBuilder/DboBuilder";
|
|
13
14
|
|
|
@@ -69,7 +70,7 @@ export type FileTableConfig = {
|
|
|
69
70
|
/**
|
|
70
71
|
* Express server instance
|
|
71
72
|
*/
|
|
72
|
-
expressApp: ExpressApp;
|
|
73
|
+
expressApp: ExpressApp | Express;
|
|
73
74
|
|
|
74
75
|
/**
|
|
75
76
|
* Specifying referencedTables with referenceColumns allows restricting the
|
package/lib/RestApi.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import * as bodyParser from "body-parser";
|
|
2
1
|
import { Express } from "express";
|
|
3
2
|
import { HTTP_FAIL_CODES, removeExpressRoute } from "./Auth/AuthHandler";
|
|
4
3
|
import { ExpressReq, ExpressRes } from "./Auth/AuthTypes";
|
|
@@ -7,27 +6,29 @@ import { Prostgles } from "./Prostgles";
|
|
|
7
6
|
import { runClientMethod, runClientRequest, runClientSqlRequest } from "./runClientRequest";
|
|
8
7
|
import { VoidFunction } from "./SchemaWatch/SchemaWatch";
|
|
9
8
|
import { isDefined } from "prostgles-types";
|
|
10
|
-
const jsonParser = bodyParser.json();
|
|
11
9
|
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
delete?: boolean;
|
|
26
|
-
};
|
|
10
|
+
type ExpressInternalRouter = {
|
|
11
|
+
stack?: {
|
|
12
|
+
name: string;
|
|
13
|
+
handle: VoidFunction;
|
|
14
|
+
path: undefined;
|
|
15
|
+
keys?: any[];
|
|
16
|
+
route?: {
|
|
17
|
+
path?: string;
|
|
18
|
+
methods?: {
|
|
19
|
+
get?: boolean;
|
|
20
|
+
post?: boolean;
|
|
21
|
+
put?: boolean;
|
|
22
|
+
delete?: boolean;
|
|
27
23
|
};
|
|
28
|
-
}
|
|
29
|
-
};
|
|
30
|
-
}
|
|
24
|
+
};
|
|
25
|
+
}[];
|
|
26
|
+
};
|
|
27
|
+
|
|
28
|
+
export type ExpressApp = {
|
|
29
|
+
_router?: ExpressInternalRouter;
|
|
30
|
+
router?: ExpressInternalRouter;
|
|
31
|
+
} & Omit<Express, "_router" | "router">;
|
|
31
32
|
|
|
32
33
|
export type RestApiConfig = {
|
|
33
34
|
/**
|
|
@@ -49,7 +50,7 @@ export class RestApi {
|
|
|
49
50
|
methods: string;
|
|
50
51
|
schema: string;
|
|
51
52
|
};
|
|
52
|
-
expressApp:
|
|
53
|
+
expressApp: ExpressApp;
|
|
53
54
|
path = "/api";
|
|
54
55
|
constructor({ expressApp, path, prostgles }: RestApiConfig & { prostgles: Prostgles }) {
|
|
55
56
|
if (isDefined(path) && !path.trim()) {
|
|
@@ -63,11 +64,13 @@ export class RestApi {
|
|
|
63
64
|
methods: `${path}/methods/:method`,
|
|
64
65
|
schema: `${path}/schema`,
|
|
65
66
|
};
|
|
66
|
-
this.expressApp = expressApp;
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
expressApp.post(this.routes.
|
|
70
|
-
expressApp.post(this.routes.
|
|
67
|
+
this.expressApp = expressApp as ExpressApp;
|
|
68
|
+
/** Must check if json parser is loaded */
|
|
69
|
+
|
|
70
|
+
expressApp.post(this.routes.db, this.onPostTableCommand);
|
|
71
|
+
expressApp.post(this.routes.sql, this.onPostSql);
|
|
72
|
+
expressApp.post(this.routes.methods, this.onPostMethod);
|
|
73
|
+
expressApp.post(this.routes.schema, this.onPostSchema);
|
|
71
74
|
}
|
|
72
75
|
|
|
73
76
|
destroy = () => {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "prostgles-server",
|
|
3
|
-
"version": "4.2.
|
|
3
|
+
"version": "4.2.343",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -43,7 +43,6 @@
|
|
|
43
43
|
"@types/passport-github2": "^1.2.9",
|
|
44
44
|
"@types/passport-google-oauth20": "^2.0.16",
|
|
45
45
|
"@types/passport-microsoft": "^1.0.3",
|
|
46
|
-
"body-parser": "^1.20.3",
|
|
47
46
|
"check-disk-space": "^3.4.0",
|
|
48
47
|
"file-type": "^18.5.0",
|
|
49
48
|
"nodemailer": "^7.0.11",
|