prostgles-server 4.2.368 → 4.2.370
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 +20 -4
- package/dist/Auth/AuthHandler.d.ts.map +1 -1
- package/dist/Auth/AuthHandler.js +24 -9
- package/dist/Auth/AuthHandler.js.map +1 -1
- package/dist/Auth/AuthTypes.d.ts +6 -1
- package/dist/Auth/AuthTypes.d.ts.map +1 -1
- package/dist/Auth/AuthTypes.js +3 -3
- package/dist/Auth/AuthTypes.js.map +1 -1
- package/dist/Auth/endpoints/setCatchAllRequestHandler.d.ts.map +1 -1
- package/dist/Auth/endpoints/setCatchAllRequestHandler.js +5 -4
- package/dist/Auth/endpoints/setCatchAllRequestHandler.js.map +1 -1
- package/dist/Auth/endpoints/setLoginRequestHandler.d.ts +1 -1
- package/dist/Auth/endpoints/setLoginRequestHandler.d.ts.map +1 -1
- package/dist/Auth/endpoints/setLoginRequestHandler.js +1 -1
- package/dist/Auth/endpoints/setLoginRequestHandler.js.map +1 -1
- package/dist/Auth/endpoints/setLogoutRequestHandler.d.ts.map +1 -1
- package/dist/Auth/endpoints/setLogoutRequestHandler.js +1 -2
- package/dist/Auth/endpoints/setLogoutRequestHandler.js.map +1 -1
- package/dist/Auth/endpoints/setMagicLinkOrOTPRequestHandler.d.ts.map +1 -1
- package/dist/Auth/endpoints/setMagicLinkOrOTPRequestHandler.js +4 -4
- package/dist/Auth/endpoints/setMagicLinkOrOTPRequestHandler.js.map +1 -1
- package/dist/Auth/endpoints/setOAuthRequestHandlers.js +2 -2
- package/dist/Auth/endpoints/setOAuthRequestHandlers.js.map +1 -1
- package/dist/Auth/endpoints/setRegisterRequestHandler.d.ts +2 -3
- package/dist/Auth/endpoints/setRegisterRequestHandler.d.ts.map +1 -1
- package/dist/Auth/endpoints/setRegisterRequestHandler.js +8 -4
- package/dist/Auth/endpoints/setRegisterRequestHandler.js.map +1 -1
- package/dist/Auth/getClientAuth.d.ts +1 -1
- package/dist/Auth/getClientAuth.d.ts.map +1 -1
- package/dist/Auth/getClientAuth.js +4 -6
- package/dist/Auth/getClientAuth.js.map +1 -1
- package/dist/Auth/setupAuthRoutes.d.ts.map +1 -1
- package/dist/Auth/setupAuthRoutes.js +1 -1
- package/dist/Auth/setupAuthRoutes.js.map +1 -1
- package/dist/Auth/utils/getReturnUrl.d.ts.map +1 -1
- package/dist/Auth/utils/getReturnUrl.js +3 -4
- package/dist/Auth/utils/getReturnUrl.js.map +1 -1
- package/dist/Auth/utils/setCookieAndGoToReturnURLIFSet.d.ts.map +1 -1
- package/dist/Auth/utils/setCookieAndGoToReturnURLIFSet.js +2 -3
- package/dist/Auth/utils/setCookieAndGoToReturnURLIFSet.js.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getSelectQuery.d.ts.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getSelectQuery.js +1 -0
- package/dist/DboBuilder/QueryBuilder/getSelectQuery.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts +1 -1
- package/dist/Filtering.d.ts +2 -2
- package/dist/PublishParser/publishTypesAndUtils.d.ts.map +1 -1
- package/dist/PublishParser/publishTypesAndUtils.js.map +1 -1
- package/dist/WebsocketAPI/getClientHandlers.d.ts +3 -3
- package/dist/WebsocketAPI/getClientHandlers.d.ts.map +1 -1
- package/dist/WebsocketAPI/getClientHandlers.js.map +1 -1
- package/dist/runClientRequest.d.ts.map +1 -1
- package/dist/runClientRequest.js +2 -1
- package/dist/runClientRequest.js.map +1 -1
- package/lib/Auth/AuthHandler.ts +29 -9
- package/lib/Auth/AuthTypes.ts +17 -5
- package/lib/Auth/endpoints/setCatchAllRequestHandler.ts +6 -7
- package/lib/Auth/endpoints/setLoginRequestHandler.ts +5 -5
- package/lib/Auth/endpoints/setLogoutRequestHandler.ts +2 -3
- package/lib/Auth/endpoints/setMagicLinkOrOTPRequestHandler.ts +7 -13
- package/lib/Auth/endpoints/setOAuthRequestHandlers.ts +3 -3
- package/lib/Auth/endpoints/setRegisterRequestHandler.ts +12 -7
- package/lib/Auth/getClientAuth.ts +9 -19
- package/lib/Auth/setupAuthRoutes.ts +2 -2
- package/lib/Auth/utils/getReturnUrl.ts +4 -5
- package/lib/Auth/utils/setCookieAndGoToReturnURLIFSet.ts +3 -11
- package/lib/DboBuilder/QueryBuilder/getSelectQuery.ts +1 -0
- package/lib/PublishParser/publishTypesAndUtils.ts +12 -7
- package/lib/WebsocketAPI/getClientHandlers.ts +5 -5
- package/lib/runClientRequest.ts +10 -2
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getClientAuth.js","sourceRoot":"","sources":["../../lib/Auth/getClientAuth.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"getClientAuth.js","sourceRoot":"","sources":["../../lib/Auth/getClientAuth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupAuthRoutes.d.ts","sourceRoot":"","sources":["../../lib/Auth/setupAuthRoutes.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"setupAuthRoutes.d.ts","sourceRoot":"","sources":["../../lib/Auth/setupAuthRoutes.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAUjD,wBAAgB,eAAe,CAAC,IAAI,EAAE,WAAW,QA+DhD"}
|
|
@@ -22,7 +22,7 @@ function setupAuthRoutes() {
|
|
|
22
22
|
throw "Invalid or empty string provided within publicRoutes ";
|
|
23
23
|
}
|
|
24
24
|
if (signupWithEmail) {
|
|
25
|
-
|
|
25
|
+
setRegisterRequestHandler_1.setRegisterRequestHandler.bind(this)(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":";;;AAEA,+CAAwD;AACxD,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,
|
|
1
|
+
{"version":3,"file":"setupAuthRoutes.js","sourceRoot":"","sources":["../../lib/Auth/setupAuthRoutes.ts"],"names":[],"mappings":";;;AAEA,+CAAwD;AACxD,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,qDAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;IAC7D,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":"getReturnUrl.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/getReturnUrl.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG/C,eAAO,MAAM,YAAY,QAAS,UAAU,
|
|
1
|
+
{"version":3,"file":"getReturnUrl.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/getReturnUrl.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG/C,eAAO,MAAM,YAAY,QAAS,UAAU,8BAO3C,CAAC"}
|
|
@@ -4,10 +4,9 @@ exports.getReturnUrl = void 0;
|
|
|
4
4
|
const AuthHandler_1 = require("../AuthHandler");
|
|
5
5
|
const getSafeReturnURL_1 = require("./getSafeReturnURL");
|
|
6
6
|
const getReturnUrl = (req) => {
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
return (0, getSafeReturnURL_1.getSafeReturnURL)(returnURL, returnUrlParamName);
|
|
7
|
+
if (req.query[AuthHandler_1.AUTH_RETURN_URL_PARAM_NAME]) {
|
|
8
|
+
const returnURL = decodeURIComponent(req.query[AuthHandler_1.AUTH_RETURN_URL_PARAM_NAME]);
|
|
9
|
+
return (0, getSafeReturnURL_1.getSafeReturnURL)(returnURL, AuthHandler_1.AUTH_RETURN_URL_PARAM_NAME);
|
|
11
10
|
}
|
|
12
11
|
return null;
|
|
13
12
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getReturnUrl.js","sourceRoot":"","sources":["../../../lib/Auth/utils/getReturnUrl.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"getReturnUrl.js","sourceRoot":"","sources":["../../../lib/Auth/utils/getReturnUrl.ts"],"names":[],"mappings":";;;AAAA,gDAA4D;AAE5D,yDAAsD;AAE/C,MAAM,YAAY,GAAG,CAAC,GAAe,EAAE,EAAE;IAC9C,IAAI,GAAG,CAAC,KAAK,CAAC,wCAA0B,CAAC,EAAE,CAAC;QAC1C,MAAM,SAAS,GAAG,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,wCAA0B,CAAW,CAAC,CAAC;QAEtF,OAAO,IAAA,mCAAgB,EAAC,SAAS,EAAE,wCAA0B,CAAC,CAAC;IACjE,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAPW,QAAA,YAAY,gBAOvB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setCookieAndGoToReturnURLIFSet.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/setCookieAndGoToReturnURLIFSet.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"setCookieAndGoToReturnURLIFSet.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/setCookieAndGoToReturnURLIFSet.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+C,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC/F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAMhF,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,EACxC,cAAc,EAAE;IAAE,GAAG,EAAE,UAAU,CAAC;IAAC,GAAG,EAAE,oBAAoB,CAAA;CAAE,QAY/D;AAED,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,EACxC,cAAc,EAAE;IAAE,GAAG,EAAE,UAAU,CAAC;IAAC,GAAG,EAAE,oBAAoB,CAAA;CAAE,QA0C/D"}
|
|
@@ -51,9 +51,8 @@ function setCookieAndGoToReturnURLIFSet(cookie, requestHandler) {
|
|
|
51
51
|
if (safeReturnUrl) {
|
|
52
52
|
return res.redirect(safeReturnUrl);
|
|
53
53
|
}
|
|
54
|
-
const safeOriginalUrl = (0, getSafeReturnURL_1.getSafeReturnURL)(req.originalUrl, AuthHandler_1.
|
|
55
|
-
if (safeOriginalUrl &&
|
|
56
|
-
![AuthHandler_1.AUTH_ROUTES_AND_PARAMS.magicLinks].some((authRoute) => (0, matchesRoute_1.matchesRoute)(authRoute, safeOriginalUrl))) {
|
|
54
|
+
const safeOriginalUrl = (0, getSafeReturnURL_1.getSafeReturnURL)(req.originalUrl, AuthHandler_1.AUTH_RETURN_URL_PARAM_NAME);
|
|
55
|
+
if (safeOriginalUrl && !(0, matchesRoute_1.matchesRoute)(this.authRoutes.magicLinks, safeOriginalUrl)) {
|
|
57
56
|
return res.redirect(safeOriginalUrl);
|
|
58
57
|
}
|
|
59
58
|
return res.redirect("/");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setCookieAndGoToReturnURLIFSet.js","sourceRoot":"","sources":["../../../lib/Auth/utils/setCookieAndGoToReturnURLIFSet.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"setCookieAndGoToReturnURLIFSet.js","sourceRoot":"","sources":["../../../lib/Auth/utils/setCookieAndGoToReturnURLIFSet.ts"],"names":[],"mappings":";;;AAAA,gDAA+F;AAG/F,oCAAoD;AACpD,iDAA8C;AAC9C,yDAAsD;AACtD,iDAA8C;AAE9C,SAAgB,2BAA2B,CAEzC,MAAwC,EACxC,cAA8D;IAE9D,MAAM,gBAAgB,GAAG,IAAA,gCAAwB,EAAC,MAAM,CAAC,CAAC;IAC1D,IAAI,gBAAgB,EAAE,CAAC;QACrB,MAAM,EAAE,GAAG,EAAE,GAAG,cAAc,CAAC;QAC/B,GAAG,CAAC,MAAM,CAAC,6BAAe,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC;YAC5C,OAAO,EAAE,KAAK;YACd,IAAI,EAAE,gBAAgB;SACvB,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IACD,OAAO,IAAI,CAAC,8BAA8B,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;AACrE,CAAC;AAfD,kEAeC;AAED,SAAgB,8BAA8B,CAE5C,MAAwC,EACxC,cAA8D;IAE9D,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAChC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,cAAc,CAAC;IACpC,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,QAAQ,CAAC;IACjB,CAAC;IAED,MAAM,YAAY,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,YAAY;IAE/C,IAAI,cAAc,GAA4B;QAC5C,MAAM,EAAE,YAAY;KACrB,CAAC;IAEF,IAAI,OAAO,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;QACtE,cAAc,GAAG,EAAE,OAAO,EAAE,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QAChD,MAAM,IAAI,GAAG,CAAC,CAAC,cAAc,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;QACvE,IAAI,IAAI,IAAI,GAAG,EAAE,CAAC;YAChB,OAAO,CAAC,IAAI,CAAC,8DAA8D,IAAI,MAAM,CAAC,CAAC;QACzF,CAAC;IACH,CAAC;IAED,MAAM,UAAU,GAAG;QACjB,GAAG,cAAc;QACjB,+CAA+C;QAC/C,QAAQ,EAAE,IAAI;QACd,cAAc;QACd,MAAM,EAAE,IAAI;QACZ,QAAQ,EAAE,QAAiB;QAC3B,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,aAAa,IAAI,EAAE,CAAC;KACtD,CAAC;IACF,MAAM,UAAU,GAAG,GAAG,CAAC;IACvB,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IACpD,MAAM,aAAa,GAAG,IAAA,2BAAY,EAAC,GAAG,CAAC,CAAC;IACxC,IAAI,aAAa,EAAE,CAAC;QAClB,OAAO,GAAG,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;IACrC,CAAC;IACD,MAAM,eAAe,GAAG,IAAA,mCAAgB,EAAC,GAAG,CAAC,WAAW,EAAE,wCAA0B,CAAC,CAAC;IACtF,IAAI,eAAe,IAAI,CAAC,IAAA,2BAAY,EAAC,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,eAAe,CAAC,EAAE,CAAC;QAClF,OAAO,GAAG,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IACvC,CAAC;IACD,OAAO,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;AAC3B,CAAC;AA7CD,wEA6CC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSelectQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getSelectQuery.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAG9D;;GAEG;AACH,eAAO,MAAM,qBAAqB,gCAAgC,CAAC;AACnE,eAAO,MAAM,gBAAgB,+BAA+B,CAAC;AAE7D;;;KAGK;AACL,wBAAgB,cAAc,CAC5B,WAAW,EAAE,WAAW,EACxB,CAAC,EAAE,QAAQ,EACX,KAAK,oBAAI,EACT,mBAAmB,EAAE,OAAO,GAC3B,MAAM,
|
|
1
|
+
{"version":3,"file":"getSelectQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getSelectQuery.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAG9D;;GAEG;AACH,eAAO,MAAM,qBAAqB,gCAAgC,CAAC;AACnE,eAAO,MAAM,gBAAgB,+BAA+B,CAAC;AAE7D;;;KAGK;AACL,wBAAgB,cAAc,CAC5B,WAAW,EAAE,WAAW,EACxB,CAAC,EAAE,QAAQ,EACX,KAAK,oBAAI,EACT,mBAAmB,EAAE,OAAO,GAC3B,MAAM,CA0ER;AAID,KAAK,eAAe,GAAG;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AACF,eAAO,MAAM,WAAW,WACd,CAAC,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC,EAAE,gDAC0B,eAAe,KAC7E,MAAM,EAUR,CAAC;AASF,eAAO,MAAM,mBAAmB,MAAO,QAAQ,WAA6B,CAAC;AAE7E,eAAO,MAAM,cAAc,MAAO,QAAQ,wBAAwB,OAAO,aAuBxE,CAAC"}
|
|
@@ -51,6 +51,7 @@ function getSelectQuery(viewHandler, q, depth = 0, selectParamsGroupBy) {
|
|
|
51
51
|
` SELECT *, ${pkey ? (0, prostgles_types_1.asName)(pkey.name) : "ROW_NUMBER() OVER()"} as ${exports.ROOT_TABLE_ROW_NUM_ID}`,
|
|
52
52
|
` FROM ${q.table}`,
|
|
53
53
|
`)`,
|
|
54
|
+
joinCtes.length ? "," : "",
|
|
54
55
|
...joinCtes,
|
|
55
56
|
];
|
|
56
57
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSelectQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getSelectQuery.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"getSelectQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getSelectQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -52,7 +52,7 @@ export declare class ViewHandler {
|
|
|
52
52
|
filter: import("prostgles-types").FullFilter<AnyObject, void>;
|
|
53
53
|
fields: FieldFilter<AnyObject>;
|
|
54
54
|
}[] | undefined;
|
|
55
|
-
rule: "
|
|
55
|
+
rule: "update" | "insert" | "delete" | "select";
|
|
56
56
|
}) => Promise<boolean>;
|
|
57
57
|
checkFilter(filter: any): void;
|
|
58
58
|
getInfo: (lang?: string | undefined, param2?: any, param3?: any, tableRules?: ParsedTableRule | undefined, localParams?: LocalParams | undefined) => Promise<import("prostgles-types").TableInfo>;
|
package/dist/Filtering.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { FullFilter } from "prostgles-types";
|
|
2
2
|
import { type SelectItemValidated } from "./DboBuilder/QueryBuilder/QueryBuilder";
|
|
3
|
-
export declare const FILTER_OPERANDS: readonly ["$ilike", "$like", "$nilike", "$nlike", ...("
|
|
4
|
-
export declare const FILTER_OPERAND_TO_SQL_OPERAND: Record<"=" | "$eq" | "<>" | ">" | "<" | ">=" | "<=" | "$ne" | "$gt" | "$gte" | "$lt" | "$lte" | "$isDistinctFrom" | "$isNotDistinctFrom" | "$in" | "$nin" | "$
|
|
3
|
+
export declare const FILTER_OPERANDS: readonly ["$ilike", "$like", "$nilike", "$nlike", ...("?" | "@@" | "@>" | "<@" | "?|" | "?&" | "||" | "-" | "#-" | "@?")[], "=", "$eq", "<>", ">", "<", ">=", "<=", "$eq", "$ne", "$gt", "$gte", "$lt", "$lte", "$isDistinctFrom", "$isNotDistinctFrom", "$between", "$notBetween", "$in", "$nin"];
|
|
4
|
+
export declare const FILTER_OPERAND_TO_SQL_OPERAND: Record<"?" | "=" | "$eq" | "<>" | ">" | "<" | ">=" | "<=" | "$ne" | "$gt" | "$gte" | "$lt" | "$lte" | "$isDistinctFrom" | "$isNotDistinctFrom" | "$in" | "$nin" | "$ilike" | "$like" | "$nilike" | "$nlike" | "@@" | "@>" | "<@" | "$between" | "$notBetween" | "?|" | "?&" | "||" | "-" | "#-" | "@?", string>;
|
|
5
5
|
/**
|
|
6
6
|
* Parse a single filter
|
|
7
7
|
* Ensure only single key objects reach this point
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publishTypesAndUtils.d.ts","sourceRoot":"","sources":["../../lib/PublishParser/publishTypesAndUtils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"publishTypesAndUtils.d.ts","sourceRoot":"","sources":["../../lib/PublishParser/publishTypesAndUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publishTypesAndUtils.js","sourceRoot":"","sources":["../../lib/PublishParser/publishTypesAndUtils.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"publishTypesAndUtils.js","sourceRoot":"","sources":["../../lib/PublishParser/publishTypesAndUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,9 +3,9 @@ import type { AuthClientRequest } from "../Auth/AuthTypes";
|
|
|
3
3
|
import type { DBOFullyTyped } from "../DBSchemaBuilder/DBSchemaBuilder";
|
|
4
4
|
import type { Prostgles } from "../Prostgles";
|
|
5
5
|
import type { PermissionScope } from "../PublishParser/publishTypesAndUtils";
|
|
6
|
-
export
|
|
6
|
+
export type ClientHandlers<S = void> = {
|
|
7
7
|
clientDb: DBOFullyTyped<S, false>;
|
|
8
8
|
clientMethods: Record<string, Method>;
|
|
9
|
-
}
|
|
10
|
-
export
|
|
9
|
+
};
|
|
10
|
+
export declare const getClientHandlers: <S = void>(prostgles: Prostgles, clientReq: AuthClientRequest, scope: PermissionScope | undefined) => Promise<ClientHandlers>;
|
|
11
11
|
//# sourceMappingURL=getClientHandlers.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getClientHandlers.d.ts","sourceRoot":"","sources":["../../lib/WebsocketAPI/getClientHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,MAAM,EAKZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAG9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAE7E,
|
|
1
|
+
{"version":3,"file":"getClientHandlers.d.ts","sourceRoot":"","sources":["../../lib/WebsocketAPI/getClientHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,MAAM,EAKZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAG9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAE7E,MAAM,MAAM,cAAc,CAAC,CAAC,GAAG,IAAI,IAAI;IACrC,QAAQ,EAAE,aAAa,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IAClC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACvC,CAAC;AACF,eAAO,MAAM,iBAAiB,wBACjB,SAAS,aACT,iBAAiB,SACrB,eAAe,GAAG,SAAS,KACjC,QAAQ,cAAc,CA4DxB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getClientHandlers.js","sourceRoot":"","sources":["../../lib/WebsocketAPI/getClientHandlers.ts"],"names":[],"mappings":";;;AAAA,qDAQyB;AAIzB,0DAA6F;AAC7F,uDAAoD;
|
|
1
|
+
{"version":3,"file":"getClientHandlers.js","sourceRoot":"","sources":["../../lib/WebsocketAPI/getClientHandlers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runClientRequest.d.ts","sourceRoot":"","sources":["../lib/runClientRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAA0B,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAIL,KAAK,SAAS,EACf,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAK1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"runClientRequest.d.ts","sourceRoot":"","sources":["../lib/runClientRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAA0B,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAIL,KAAK,SAAS,EACf,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAK1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAM7C,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,sCAAsC,CAAC;AA0B5E,KAAK,IAAI,GAAG;IACV,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAUF,eAAO,MAAM,gBAAgB,SACrB,SAAS,oBACG,IAAI,aACX,iBAAiB,SACrB,eAAe,GAAG,SAAS,mCA0FnC,CAAC;AAEF,eAAO,MAAM,sBAAsB,SAC3B,SAAS,aACJ,iBAAiB;;;;;;;;EAoB7B,CAAC;AAEF,eAAO,MAAM,mBAAmB,SACxB,SAAS,mBACE,UAAU,aAChB,iBAAiB,iBAsB7B,CAAC;AAEF,KAAK,UAAU,GAAG;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;CAChB,CAAC;AACF,eAAO,MAAM,eAAe,SACpB,SAAS,mBACE,UAAU,aAChB,iBAAiB,iBA+B7B,CAAC"}
|
package/dist/runClientRequest.js
CHANGED
|
@@ -100,7 +100,8 @@ const clientCanRunSqlRequest = async function (clientReq) {
|
|
|
100
100
|
throw "authHandler missing";
|
|
101
101
|
}
|
|
102
102
|
const publishParams = await this.publishParser?.getPublishParams(clientReq, undefined);
|
|
103
|
-
const allowedToRunSQL = publishParams &&
|
|
103
|
+
const allowedToRunSQL = publishParams &&
|
|
104
|
+
(await this.opts.publishRawSQL?.(publishParams));
|
|
104
105
|
return allowedToRunSQL === true || allowedToRunSQL === "*";
|
|
105
106
|
};
|
|
106
107
|
const allowed = await canRunSQL();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runClientRequest.js","sourceRoot":"","sources":["../lib/runClientRequest.ts"],"names":[],"mappings":";;;AACA,qDAKyB;AAIzB,gFAA6E;AAC7E,gDAAgD;
|
|
1
|
+
{"version":3,"file":"runClientRequest.js","sourceRoot":"","sources":["../lib/runClientRequest.ts"],"names":[],"mappings":"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"}
|
package/lib/Auth/AuthHandler.ts
CHANGED
|
@@ -31,17 +31,34 @@ export const HTTP_SUCCESS_CODES = {
|
|
|
31
31
|
CREATED: 201,
|
|
32
32
|
} as const;
|
|
33
33
|
|
|
34
|
-
|
|
34
|
+
const SID_KEY_NAME = "session_id" as const;
|
|
35
|
+
export const EXPRESS_CATCH_ALL_ROUTE = "*splat"; //v5 "*splat" //v4 "*"
|
|
36
|
+
export const AUTH_RETURN_URL_PARAM_NAME = "returnURL";
|
|
37
|
+
const AUTH_ROUTES = {
|
|
35
38
|
login: "/login",
|
|
36
39
|
loginWithProvider: "/oauth",
|
|
37
40
|
emailRegistration: "/register",
|
|
38
|
-
returnUrlParamName: "returnURL",
|
|
39
|
-
sidKeyName: "session_id",
|
|
40
41
|
logout: "/logout",
|
|
41
42
|
magicLinks: "/magic-link",
|
|
42
43
|
magicLinkWithId: "/magic-link/:id",
|
|
43
|
-
catchAll: "*splat", //v5 "*splat" //v4 "*"
|
|
44
44
|
} as const;
|
|
45
|
+
export const GET_AUTH_ROUTE = (
|
|
46
|
+
conf: AuthConfig["loginSignupConfig"],
|
|
47
|
+
route: keyof typeof AUTH_ROUTES
|
|
48
|
+
) => {
|
|
49
|
+
const basePath = conf?.authRoutesBasePath || "";
|
|
50
|
+
return `${basePath}/auth${AUTH_ROUTES[route]}`;
|
|
51
|
+
};
|
|
52
|
+
export const GET_ALL_AUTH_ROUTES = (conf: AuthConfig["loginSignupConfig"]) => {
|
|
53
|
+
return Object.fromEntries(
|
|
54
|
+
Object.entries(AUTH_ROUTES).map(([key]) => [
|
|
55
|
+
key,
|
|
56
|
+
GET_AUTH_ROUTE(conf, key as keyof typeof AUTH_ROUTES),
|
|
57
|
+
])
|
|
58
|
+
) as {
|
|
59
|
+
[K in keyof typeof AUTH_ROUTES]: string;
|
|
60
|
+
};
|
|
61
|
+
};
|
|
45
62
|
|
|
46
63
|
export class AuthHandler {
|
|
47
64
|
protected readonly prostgles: Prostgles;
|
|
@@ -59,7 +76,11 @@ export class AuthHandler {
|
|
|
59
76
|
}
|
|
60
77
|
|
|
61
78
|
get sidKeyName() {
|
|
62
|
-
return this.opts.sidKeyName ??
|
|
79
|
+
return this.opts.sidKeyName ?? SID_KEY_NAME;
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
get authRoutes() {
|
|
83
|
+
return GET_ALL_AUTH_ROUTES(this.opts.loginSignupConfig);
|
|
63
84
|
}
|
|
64
85
|
|
|
65
86
|
validateSid = (sid: string | undefined) => {
|
|
@@ -74,7 +95,7 @@ export class AuthHandler {
|
|
|
74
95
|
logout: logoutRoute,
|
|
75
96
|
magicLinks: magicLinksRoute,
|
|
76
97
|
loginWithProvider,
|
|
77
|
-
} =
|
|
98
|
+
} = GET_ALL_AUTH_ROUTES(this.opts.loginSignupConfig);
|
|
78
99
|
const pubRoutes = [
|
|
79
100
|
...(this.opts.loginSignupConfig?.publicRoutes || []),
|
|
80
101
|
login,
|
|
@@ -116,17 +137,16 @@ export class AuthHandler {
|
|
|
116
137
|
login,
|
|
117
138
|
logout,
|
|
118
139
|
magicLinkWithId: magicLinksIdParam,
|
|
119
|
-
catchAll,
|
|
120
140
|
loginWithProvider,
|
|
121
141
|
emailRegistration,
|
|
122
142
|
magicLinks,
|
|
123
|
-
} =
|
|
143
|
+
} = GET_ALL_AUTH_ROUTES(this.opts.loginSignupConfig);
|
|
124
144
|
|
|
125
145
|
removeExpressRoute(app, [
|
|
126
146
|
login,
|
|
127
147
|
logout,
|
|
128
148
|
magicLinksIdParam,
|
|
129
|
-
|
|
149
|
+
EXPRESS_CATCH_ALL_ROUTE,
|
|
130
150
|
loginWithProvider,
|
|
131
151
|
emailRegistration,
|
|
132
152
|
magicLinks,
|
package/lib/Auth/AuthTypes.ts
CHANGED
|
@@ -23,10 +23,10 @@ import type {
|
|
|
23
23
|
UserLike,
|
|
24
24
|
} from "prostgles-types";
|
|
25
25
|
import type { DBOFullyTyped } from "../DBSchemaBuilder/DBSchemaBuilder";
|
|
26
|
-
import type { PRGLIOSocket} from "../DboBuilder/DboBuilderTypes";
|
|
26
|
+
import type { PRGLIOSocket } from "../DboBuilder/DboBuilderTypes";
|
|
27
27
|
import { type CachedSession } from "../DboBuilder/DboBuilderTypes";
|
|
28
28
|
import type { DB } from "../Prostgles";
|
|
29
|
-
import {
|
|
29
|
+
import { GET_AUTH_ROUTE } from "./AuthHandler";
|
|
30
30
|
|
|
31
31
|
type Awaitable<T> = T | Promise<T>;
|
|
32
32
|
|
|
@@ -363,12 +363,22 @@ export type MagicLinkOrOTPData =
|
|
|
363
363
|
| { type: "magic-link"; id: string; returnToken: boolean }
|
|
364
364
|
| { type: "otp"; code: string; email: string; returnToken: boolean };
|
|
365
365
|
|
|
366
|
-
export const getMagicLinkUrl = (
|
|
366
|
+
export const getMagicLinkUrl = ({
|
|
367
|
+
websiteUrl,
|
|
368
|
+
data,
|
|
369
|
+
loginSignupConfig,
|
|
370
|
+
}: {
|
|
371
|
+
websiteUrl: string;
|
|
372
|
+
data: MagicLinkOrOTPData;
|
|
373
|
+
loginSignupConfig: AuthConfig["loginSignupConfig"];
|
|
374
|
+
}) => {
|
|
367
375
|
if (data.type === "magic-link") {
|
|
368
|
-
return `${
|
|
376
|
+
return `${GET_AUTH_ROUTE(loginSignupConfig, "magicLinkWithId")}/${data.id}`;
|
|
369
377
|
}
|
|
370
378
|
const { code, email } = data;
|
|
371
|
-
const confirmationUrl = new URL(
|
|
379
|
+
const confirmationUrl = new URL(
|
|
380
|
+
`${websiteUrl}${GET_AUTH_ROUTE(loginSignupConfig, "magicLinks")}`
|
|
381
|
+
);
|
|
372
382
|
confirmationUrl.searchParams.set("email", email);
|
|
373
383
|
confirmationUrl.searchParams.set("code", code);
|
|
374
384
|
return confirmationUrl.toString();
|
|
@@ -385,6 +395,8 @@ export type LoginSignupConfig<S, SUser extends SessionUser> = {
|
|
|
385
395
|
*/
|
|
386
396
|
app: Express;
|
|
387
397
|
|
|
398
|
+
authRoutesBasePath?: string;
|
|
399
|
+
|
|
388
400
|
/**
|
|
389
401
|
* Options used in setting the cookie after a successful login
|
|
390
402
|
*/
|
|
@@ -3,7 +3,7 @@ import type { RequestHandler } from "express";
|
|
|
3
3
|
import { isDefined } from "prostgles-types";
|
|
4
4
|
import type { DBOFullyTyped } from "../../DBSchemaBuilder/DBSchemaBuilder";
|
|
5
5
|
import type { AuthHandler } from "../AuthHandler";
|
|
6
|
-
import {
|
|
6
|
+
import { EXPRESS_CATCH_ALL_ROUTE, HTTP_FAIL_CODES } from "../AuthHandler";
|
|
7
7
|
import type { AuthClientRequest } from "../AuthTypes";
|
|
8
8
|
import { getReturnUrl } from "../utils/getReturnUrl";
|
|
9
9
|
import { matchesRoute } from "../utils/matchesRoute";
|
|
@@ -15,7 +15,7 @@ export function setCatchAllRequestHandler(this: AuthHandler, app: e.Express) {
|
|
|
15
15
|
const pathsHandledByProstgles = [
|
|
16
16
|
restApi?.path,
|
|
17
17
|
fileManager?.path,
|
|
18
|
-
authHandler &&
|
|
18
|
+
authHandler && this.authRoutes.loginWithProvider,
|
|
19
19
|
].filter(isDefined);
|
|
20
20
|
if (pathsHandledByProstgles.some((path) => matchesRoute(path, req.path))) {
|
|
21
21
|
next();
|
|
@@ -41,13 +41,12 @@ export function setCatchAllRequestHandler(this: AuthHandler, app: e.Express) {
|
|
|
41
41
|
/**
|
|
42
42
|
* Requesting a User route (must be logged in)
|
|
43
43
|
*/
|
|
44
|
+
const loginRoute = this.authRoutes.login;
|
|
44
45
|
if (this.isUserRoute(req.path)) {
|
|
45
46
|
/* Check auth. Redirect to login if unauthorized */
|
|
46
47
|
const isLoggedIn = await isLoggedInUser();
|
|
47
48
|
if (!isLoggedIn) {
|
|
48
|
-
res.redirect(
|
|
49
|
-
`${AUTH_ROUTES_AND_PARAMS.login}?returnURL=${encodeURIComponent(req.originalUrl)}`
|
|
50
|
-
);
|
|
49
|
+
res.redirect(`${loginRoute}?returnURL=${encodeURIComponent(req.originalUrl)}`);
|
|
51
50
|
return;
|
|
52
51
|
}
|
|
53
52
|
|
|
@@ -63,7 +62,7 @@ export function setCatchAllRequestHandler(this: AuthHandler, app: e.Express) {
|
|
|
63
62
|
* 1) If logged in and not anonymous then redirect to main page
|
|
64
63
|
* 2) If logged in and anonymous then allow visiting /login (it will be caught earlier by new-session-redirect)
|
|
65
64
|
* */
|
|
66
|
-
} else if (matchesRoute(
|
|
65
|
+
} else if (matchesRoute(loginRoute, req.path)) {
|
|
67
66
|
const { user, isAnonymous, error } = await getUser();
|
|
68
67
|
if (error) {
|
|
69
68
|
res.status(HTTP_FAIL_CODES.BAD_REQUEST).json(error);
|
|
@@ -95,5 +94,5 @@ export function setCatchAllRequestHandler(this: AuthHandler, app: e.Express) {
|
|
|
95
94
|
}
|
|
96
95
|
};
|
|
97
96
|
|
|
98
|
-
app.get(
|
|
97
|
+
app.get(EXPRESS_CATCH_ALL_ROUTE, requestHandlerCatchAll);
|
|
99
98
|
}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import type { Response } from "express";
|
|
2
1
|
import type e from "express";
|
|
3
|
-
import type {
|
|
2
|
+
import type { Response } from "express";
|
|
3
|
+
import type { AuthRequest, AuthResponse } from "prostgles-types";
|
|
4
4
|
import { isDefined, isObject } from "prostgles-types";
|
|
5
|
-
import type { AuthHandler} from "../AuthHandler";
|
|
6
|
-
import {
|
|
5
|
+
import type { AuthHandler } from "../AuthHandler";
|
|
6
|
+
import { HTTP_FAIL_CODES } from "../AuthHandler";
|
|
7
7
|
import type { LoginParams } from "../AuthTypes";
|
|
8
8
|
|
|
9
9
|
export type LoginResponse =
|
|
@@ -16,7 +16,7 @@ export type LoginResponse =
|
|
|
16
16
|
export type LoginResponseHandler = Response<LoginResponse>;
|
|
17
17
|
|
|
18
18
|
export function setLoginRequestHandler(this: AuthHandler, app: e.Express) {
|
|
19
|
-
app.post(
|
|
19
|
+
app.post(this.authRoutes.login, async (req, res: LoginResponseHandler) => {
|
|
20
20
|
const [error, loginData] = parseLoginData(req.body);
|
|
21
21
|
if (error || !loginData) {
|
|
22
22
|
return res
|
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
import type { Request, Response } from "express";
|
|
2
1
|
import type e from "express";
|
|
2
|
+
import type { Request, Response } from "express";
|
|
3
3
|
import type { DBOFullyTyped } from "../../DBSchemaBuilder/DBSchemaBuilder";
|
|
4
4
|
import type { AuthHandler } from "../AuthHandler";
|
|
5
|
-
import { AUTH_ROUTES_AND_PARAMS } from "../AuthHandler";
|
|
6
5
|
import { throttledReject } from "../utils/throttledReject";
|
|
7
6
|
|
|
8
7
|
export function setLogoutRequestHandler(this: AuthHandler, app: e.Express) {
|
|
@@ -23,5 +22,5 @@ export function setLogoutRequestHandler(this: AuthHandler, app: e.Express) {
|
|
|
23
22
|
}
|
|
24
23
|
res.redirect("/");
|
|
25
24
|
};
|
|
26
|
-
app.post(
|
|
25
|
+
app.post(this.authRoutes.logout, logoutRequestHandler);
|
|
27
26
|
}
|
|
@@ -1,18 +1,12 @@
|
|
|
1
1
|
import type e from "express";
|
|
2
2
|
import { type Response } from "express";
|
|
3
|
+
import type { AuthResponse } from "prostgles-types";
|
|
3
4
|
import type { DBOFullyTyped } from "../../DBSchemaBuilder/DBSchemaBuilder";
|
|
4
|
-
import type {
|
|
5
|
-
|
|
6
|
-
import {
|
|
7
|
-
AUTH_ROUTES_AND_PARAMS,
|
|
8
|
-
getClientRequestIPsInfo,
|
|
9
|
-
HTTP_FAIL_CODES,
|
|
10
|
-
HTTP_SUCCESS_CODES,
|
|
11
|
-
} from "../AuthHandler";
|
|
5
|
+
import type { AuthHandler } from "../AuthHandler";
|
|
6
|
+
import { getClientRequestIPsInfo, HTTP_FAIL_CODES, HTTP_SUCCESS_CODES } from "../AuthHandler";
|
|
12
7
|
import type { ExpressReq, LoginSignupConfig, MagicLinkOrOTPData, SessionUser } from "../AuthTypes";
|
|
13
8
|
import { throttledAuthCall } from "../utils/throttledReject";
|
|
14
9
|
import type { LoginResponse } from "./setLoginRequestHandler";
|
|
15
|
-
import type { AuthResponse } from "prostgles-types";
|
|
16
10
|
|
|
17
11
|
type MagicLinkResponseHandler = Response<
|
|
18
12
|
| LoginResponse
|
|
@@ -56,24 +50,24 @@ export function setMagicLinkOrOTPRequestHandler(
|
|
|
56
50
|
}
|
|
57
51
|
};
|
|
58
52
|
|
|
59
|
-
app.get(
|
|
53
|
+
app.get(this.authRoutes.magicLinkWithId, (req, res: MagicLinkResponseHandler) => {
|
|
60
54
|
const { id } = req.params;
|
|
61
55
|
|
|
62
56
|
if (typeof id !== "string" || !id) {
|
|
63
|
-
res
|
|
57
|
+
return res
|
|
64
58
|
.status(HTTP_FAIL_CODES.BAD_REQUEST)
|
|
65
59
|
.json({ success: false, code: "invalid-magic-link", message: "Invalid magic link" });
|
|
66
60
|
}
|
|
67
61
|
return handler(req, res, { type: "magic-link", id, returnToken: false });
|
|
68
62
|
});
|
|
69
63
|
|
|
70
|
-
app.get(
|
|
64
|
+
app.get(this.authRoutes.magicLinks, (req, res: MagicLinkResponseHandler) => {
|
|
71
65
|
const data = parseMagicLinkOrOTPData(res, req.query);
|
|
72
66
|
if (!data) return;
|
|
73
67
|
return handler(req, res, data);
|
|
74
68
|
});
|
|
75
69
|
|
|
76
|
-
app.post(
|
|
70
|
+
app.post(this.authRoutes.magicLinks, (req, res: MagicLinkResponseHandler) => {
|
|
77
71
|
const data = parseMagicLinkOrOTPData(res, req.body);
|
|
78
72
|
if (!data) return;
|
|
79
73
|
return handler(req, res, data);
|