prostgles-server 4.2.342 → 4.2.344
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/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/DBSchemaBuilder.d.ts.map +1 -1
- package/dist/DBSchemaBuilder.js +15 -4
- package/dist/DBSchemaBuilder.js.map +1 -1
- package/dist/RestApi.d.ts.map +1 -1
- package/dist/RestApi.js +5 -6
- package/dist/RestApi.js.map +1 -1
- package/lib/Auth/getClientAuth.ts +3 -3
- package/lib/Auth/setupAuthRoutes.ts +3 -3
- package/lib/DBSchemaBuilder.ts +17 -5
- package/lib/RestApi.ts +6 -6
- package/package.json +1 -2
|
@@ -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":"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"}
|
|
@@ -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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DBSchemaBuilder.d.ts","sourceRoot":"","sources":["../lib/DBSchemaBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,WAAW,EACX,QAAQ,
|
|
1
|
+
{"version":3,"file":"DBSchemaBuilder.d.ts","sourceRoot":"","sources":["../lib/DBSchemaBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,WAAW,EACX,QAAQ,EAKR,UAAU,EACV,YAAY,EACZ,WAAW,EACZ,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,UAAU,EAAmC,MAAM,yBAAyB,CAAC;AACtF,OAAO,EACL,mBAAmB,EAEnB,gBAAgB,EAChB,eAAe,EACf,KAAK,aAAa,EACnB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAsC,EAAE,EAAE,MAAM,8BAA8B,CAAC;AAEtF,eAAO,MAAM,WAAW,eAAgB,UAAU,KAAG,MA8FpD,CAAC;AAEF,MAAM,MAAM,iBAAiB,CAC3B,CAAC,SAAS,SAAS,GAAG,SAAS,EAC/B,MAAM,SAAS,QAAQ,GAAG,IAAI,GAAG,IAAI,IACnC,WAAW,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG;IAAE,OAAO,EAAE,IAAI,CAAA;CAAE,CAAC;AAC/C,MAAM,MAAM,kBAAkB,CAC5B,CAAC,SAAS,SAAS,GAAG,SAAS,EAC/B,MAAM,SAAS,QAAQ,GAAG,IAAI,GAAG,IAAI,IACnC,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG;IAAE,OAAO,EAAE,KAAK,CAAA;CAAE,CAAC;AAEjD,MAAM,MAAM,yBAAyB,CAAC,MAAM,GAAG,IAAI,IACjD,MAAM,SAAS,QAAQ,GACrB;KACG,QAAQ,IAAI,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,SAAS,IAAI,GAClE,iBAAiB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,GACtD,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC1D,GACD,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC;AAEhD,MAAM,MAAM,oBAAoB,CAC9B,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC,EAChD,gBAAgB,GAAG,IAAI,IACrB;IACF,GAAG,EAAE,UAAU,CAAC;CACjB,GAAG,OAAO,CAAC,WAAW,CAAC,GACtB,CAAC,gBAAgB,SAAS,IAAI,GAAG;IAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAA;CAAE,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;AAE3E,MAAM,MAAM,aAAa,CACvB,MAAM,GAAG,IAAI,EACb,gBAAgB,GAAG,IAAI,IACrB,yBAAyB,CAAC,MAAM,CAAC,GACnC,oBAAoB,CAAC,yBAAyB,CAAC,MAAM,CAAC,EAAE,gBAAgB,CAAC,CAAC;AAE5E,MAAM,MAAM,iBAAiB,CAAC,MAAM,GAAG,IAAI,IACzC,MAAM,SAAS,QAAQ,GACrB;KACG,QAAQ,IAAI,MAAM,OAAO,CAAC,MAAM,CAAC,GAC9B,mBAAmB,GACnB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,SAAS,IAAI,GACvC,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,GACpD,gBAAgB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,CAAC;CAC7D,GACD,aAAa,CAAC"}
|
package/dist/DBSchemaBuilder.js
CHANGED
|
@@ -42,11 +42,22 @@ const getDBSchema = (dboBuilder) => {
|
|
|
42
42
|
if (!colConf.enum)
|
|
43
43
|
throw "colConf.enum missing";
|
|
44
44
|
addEnumTypes(colConf.enum, !!colConf.nullable);
|
|
45
|
+
/** When referencing a isLookupTable table we add the isLookupTable.values as enums */
|
|
45
46
|
}
|
|
46
|
-
else if ("references" in colConf && colConf.references) {
|
|
47
|
-
const
|
|
48
|
-
|
|
49
|
-
|
|
47
|
+
else if (("references" in colConf && colConf.references) || c.references?.length) {
|
|
48
|
+
const { tableConfigurator } = dboBuilder.prostgles;
|
|
49
|
+
const lookupTableConfig = colConf.references ?
|
|
50
|
+
tableConfigurator?.config[colConf.references.tableName]
|
|
51
|
+
: c.references
|
|
52
|
+
?.map((ref) => {
|
|
53
|
+
const refTableConfig = tableConfigurator?.config[ref.ftable];
|
|
54
|
+
if (refTableConfig && "isLookupTable" in refTableConfig) {
|
|
55
|
+
return refTableConfig;
|
|
56
|
+
}
|
|
57
|
+
})
|
|
58
|
+
.find(prostgles_types_1.isDefined);
|
|
59
|
+
if (lookupTableConfig && "isLookupTable" in lookupTableConfig) {
|
|
60
|
+
const enumValus = Object.keys(lookupTableConfig.isLookupTable.values);
|
|
50
61
|
addEnumTypes(enumValus, !!colConf.nullable);
|
|
51
62
|
}
|
|
52
63
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DBSchemaBuilder.js","sourceRoot":"","sources":["../lib/DBSchemaBuilder.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"DBSchemaBuilder.js","sourceRoot":"","sources":["../lib/DBSchemaBuilder.ts"],"names":[],"mappings":"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"}
|
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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"}
|
|
@@ -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) {
|
package/lib/DBSchemaBuilder.ts
CHANGED
|
@@ -3,6 +3,7 @@ import {
|
|
|
3
3
|
DbJoinMaker,
|
|
4
4
|
DBSchema,
|
|
5
5
|
getJSONBSchemaTSTypes,
|
|
6
|
+
isDefined,
|
|
6
7
|
isObject,
|
|
7
8
|
JSONB,
|
|
8
9
|
SQLHandler,
|
|
@@ -68,11 +69,22 @@ export const getDBSchema = (dboBuilder: DboBuilder): string => {
|
|
|
68
69
|
if ("enum" in colConf) {
|
|
69
70
|
if (!colConf.enum) throw "colConf.enum missing";
|
|
70
71
|
addEnumTypes(colConf.enum, !!colConf.nullable);
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
72
|
+
/** When referencing a isLookupTable table we add the isLookupTable.values as enums */
|
|
73
|
+
} else if (("references" in colConf && colConf.references) || c.references?.length) {
|
|
74
|
+
const { tableConfigurator } = dboBuilder.prostgles;
|
|
75
|
+
const lookupTableConfig =
|
|
76
|
+
colConf.references ?
|
|
77
|
+
tableConfigurator?.config[colConf.references.tableName]
|
|
78
|
+
: c.references
|
|
79
|
+
?.map((ref) => {
|
|
80
|
+
const refTableConfig = tableConfigurator?.config[ref.ftable];
|
|
81
|
+
if (refTableConfig && "isLookupTable" in refTableConfig) {
|
|
82
|
+
return refTableConfig;
|
|
83
|
+
}
|
|
84
|
+
})
|
|
85
|
+
.find(isDefined);
|
|
86
|
+
if (lookupTableConfig && "isLookupTable" in lookupTableConfig) {
|
|
87
|
+
const enumValus = Object.keys(lookupTableConfig.isLookupTable.values);
|
|
76
88
|
addEnumTypes(enumValus, !!colConf.nullable);
|
|
77
89
|
}
|
|
78
90
|
}
|
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,7 +6,6 @@ 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
10
|
type ExpressInternalRouter = {
|
|
13
11
|
stack?: {
|
|
@@ -67,10 +65,12 @@ export class RestApi {
|
|
|
67
65
|
schema: `${path}/schema`,
|
|
68
66
|
};
|
|
69
67
|
this.expressApp = expressApp as ExpressApp;
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
expressApp.post(this.routes.
|
|
73
|
-
expressApp.post(this.routes.
|
|
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);
|
|
74
74
|
}
|
|
75
75
|
|
|
76
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.344",
|
|
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",
|