prostgles-server 4.2.589 → 4.2.591
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 +3 -5
- package/dist/Auth/AuthHandler.d.ts.map +1 -1
- package/dist/Auth/AuthHandler.js +16 -15
- package/dist/Auth/AuthHandler.js.map +1 -1
- package/dist/Auth/AuthTypes.d.ts +5 -1
- package/dist/Auth/AuthTypes.d.ts.map +1 -1
- package/dist/Auth/AuthTypes.js.map +1 -1
- package/dist/Auth/endpoints/setCatchAllRequestHandler.d.ts +2 -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/setLogoutRequestHandler.d.ts +2 -1
- package/dist/Auth/endpoints/setLogoutRequestHandler.d.ts.map +1 -1
- package/dist/Auth/endpoints/setLogoutRequestHandler.js +2 -2
- package/dist/Auth/endpoints/setLogoutRequestHandler.js.map +1 -1
- package/dist/Auth/endpoints/setMagicLinkOrOTPRequestHandler.js +1 -1
- package/dist/Auth/endpoints/setRegisterRequestHandler.js +1 -1
- package/dist/Auth/endpoints/setRegisterRequestHandler.js.map +1 -1
- package/dist/Auth/getClientAuth.js +1 -1
- package/dist/Auth/getClientAuth.js.map +1 -1
- package/dist/Auth/login.d.ts.map +1 -1
- package/dist/Auth/login.js +8 -4
- package/dist/Auth/login.js.map +1 -1
- package/dist/Auth/setupAuthRoutes.d.ts +2 -1
- package/dist/Auth/setupAuthRoutes.d.ts.map +1 -1
- package/dist/Auth/setupAuthRoutes.js +5 -5
- package/dist/Auth/setupAuthRoutes.js.map +1 -1
- package/dist/Auth/utils/handleGetUser.d.ts.map +1 -1
- package/dist/Auth/utils/handleGetUser.js +9 -10
- package/dist/Auth/utils/handleGetUser.js.map +1 -1
- package/dist/Auth/utils/{setCookieAndGoToReturnURLIFSet.d.ts → setCookieAndGoToReturnURLIfSet.d.ts} +2 -2
- package/dist/Auth/utils/{setCookieAndGoToReturnURLIFSet.d.ts.map → setCookieAndGoToReturnURLIfSet.d.ts.map} +1 -1
- package/dist/Auth/utils/{setCookieAndGoToReturnURLIFSet.js → setCookieAndGoToReturnURLIfSet.js} +8 -5
- package/dist/Auth/utils/setCookieAndGoToReturnURLIfSet.js.map +1 -0
- package/dist/DBSchemaBuilder/DBSchemaBuilder.spec.js +3 -0
- package/dist/DBSchemaBuilder/DBSchemaBuilder.spec.js.map +1 -1
- package/dist/DBSchemaBuilder/getServerFunctionReturnTypes.fixture.js +2 -0
- package/dist/DBSchemaBuilder/getServerFunctionReturnTypes.fixture.js.map +1 -1
- package/dist/ProstglesTypes.d.ts +1 -1
- package/dist/ProstglesTypes.d.ts.map +1 -1
- package/dist/PublishParser/PublishParser.d.ts.map +1 -1
- package/dist/PublishParser/PublishParser.js +6 -5
- package/dist/PublishParser/PublishParser.js.map +1 -1
- package/dist/PublishParser/defineServerFunction.d.ts +8 -4
- package/dist/PublishParser/defineServerFunction.d.ts.map +1 -1
- package/dist/PublishParser/defineServerFunction.js.map +1 -1
- package/lib/Auth/AuthHandler.ts +16 -17
- package/lib/Auth/AuthTypes.ts +9 -0
- package/lib/Auth/endpoints/setCatchAllRequestHandler.ts +5 -5
- package/lib/Auth/endpoints/setLogoutRequestHandler.ts +3 -2
- package/lib/Auth/endpoints/setMagicLinkOrOTPRequestHandler.ts +1 -1
- package/lib/Auth/endpoints/setRegisterRequestHandler.ts +2 -2
- package/lib/Auth/getClientAuth.ts +1 -1
- package/lib/Auth/login.ts +10 -4
- package/lib/Auth/setupAuthRoutes.ts +6 -5
- package/lib/Auth/utils/handleGetUser.ts +11 -10
- package/lib/Auth/utils/{setCookieAndGoToReturnURLIFSet.ts → setCookieAndGoToReturnURLIfSet.ts} +6 -3
- package/lib/DBSchemaBuilder/DBSchemaBuilder.spec.ts +3 -0
- package/lib/DBSchemaBuilder/getServerFunctionReturnTypes.fixture.ts +3 -1
- package/lib/ProstglesTypes.ts +1 -1
- package/lib/PublishParser/PublishParser.ts +12 -5
- package/lib/PublishParser/defineServerFunction.ts +15 -4
- package/package.json +1 -1
- package/dist/Auth/utils/setCookieAndGoToReturnURLIFSet.js.map +0 -1
package/dist/Auth/utils/{setCookieAndGoToReturnURLIFSet.js → setCookieAndGoToReturnURLIfSet.js}
RENAMED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.validateSessionAndSetCookie = validateSessionAndSetCookie;
|
|
4
|
-
exports.
|
|
4
|
+
exports.setCookieAndGoToReturnURLIfSet = setCookieAndGoToReturnURLIfSet;
|
|
5
5
|
const AuthHandler_1 = require("../AuthHandler");
|
|
6
6
|
const login_1 = require("../login");
|
|
7
7
|
const getSafeReturnUrlFromQuery_1 = require("./getSafeReturnUrlFromQuery");
|
|
@@ -16,9 +16,12 @@ function validateSessionAndSetCookie(cookie, requestHandler) {
|
|
|
16
16
|
code: sessionErrorCode,
|
|
17
17
|
});
|
|
18
18
|
}
|
|
19
|
-
return this.
|
|
19
|
+
return this.setCookieAndGoToReturnURLIfSet(cookie, requestHandler);
|
|
20
20
|
}
|
|
21
|
-
function
|
|
21
|
+
function setCookieAndGoToReturnURLIfSet(cookie, requestHandler) {
|
|
22
|
+
if (!this.config) {
|
|
23
|
+
throw new Error("AuthHandler config is not set");
|
|
24
|
+
}
|
|
22
25
|
const { sid, expires } = cookie;
|
|
23
26
|
const { res, req } = requestHandler;
|
|
24
27
|
if (!sid) {
|
|
@@ -42,7 +45,7 @@ function setCookieAndGoToReturnURLIFSet(cookie, requestHandler) {
|
|
|
42
45
|
//signed: true
|
|
43
46
|
secure: true,
|
|
44
47
|
sameSite: "strict",
|
|
45
|
-
...(this.
|
|
48
|
+
...(this.config.loginSignupConfig?.cookieOptions ?? {}),
|
|
46
49
|
};
|
|
47
50
|
const cookieData = sid;
|
|
48
51
|
res.cookie(this.sidKeyName, cookieData, cookieOpts);
|
|
@@ -56,4 +59,4 @@ function setCookieAndGoToReturnURLIFSet(cookie, requestHandler) {
|
|
|
56
59
|
}
|
|
57
60
|
return res.redirect("/");
|
|
58
61
|
}
|
|
59
|
-
//# sourceMappingURL=
|
|
62
|
+
//# sourceMappingURL=setCookieAndGoToReturnURLIfSet.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"setCookieAndGoToReturnURLIfSet.js","sourceRoot":"","sources":["../../../lib/Auth/utils/setCookieAndGoToReturnURLIfSet.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,6 +39,9 @@ void (0, node_test_1.describe)("DBSchemaBuilder type tests", async () => {
|
|
|
39
39
|
db.dwadaw?.find;
|
|
40
40
|
return {};
|
|
41
41
|
},
|
|
42
|
+
findUser: (userFilter) => {
|
|
43
|
+
return { id: "123", name: "John Doe", type: "dwa" };
|
|
44
|
+
},
|
|
42
45
|
};
|
|
43
46
|
/** Test the created schema */
|
|
44
47
|
const c = {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DBSchemaBuilder.spec.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/DBSchemaBuilder.spec.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"DBSchemaBuilder.spec.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/DBSchemaBuilder.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getServerFunctionReturnTypes.fixture.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getServerFunctionReturnTypes.fixture.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAA+C;AAa/C,KAAK,IAAA,WAAS,EAAgB;IAC5B,YAAY,EAAE,EAAE;IAChB,OAAO,EAAE,GAAG,EAAE,GAAE,CAAC;IACjB,SAAS,EAAE;QACT,MAAM,EAAE;YACN,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC9B,SAAS,EAAE;gBACT,eAAe,EAAE,IAAA,kBAAc,EAAC;oBAC9B,GAAG,EAAE,GAAoB,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;iBAC9C,CAAC;gBACF,YAAY,EAAE,IAAA,kBAAc,EAAC;oBAC3B,GAAG,EAAE,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE;wBACtB,KAAK,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"getServerFunctionReturnTypes.fixture.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getServerFunctionReturnTypes.fixture.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAA+C;AAa/C,KAAK,IAAA,WAAS,EAAgB;IAC5B,YAAY,EAAE,EAAE;IAChB,OAAO,EAAE,GAAG,EAAE,GAAE,CAAC;IACjB,SAAS,EAAE;QACT,MAAM,EAAE;YACN,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC9B,SAAS,EAAE;gBACT,eAAe,EAAE,IAAA,kBAAc,EAAC;oBAC9B,GAAG,EAAE,GAAoB,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;iBAC9C,CAAC;gBACF,YAAY,EAAE,IAAA,kBAAc,EAAC;oBAC3B,GAAG,EAAE,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE;wBACtB,KAAK,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;wBACvB,+EAA+E;wBAC/E,KAAK,GAAG,CAAC,YAAY,CAAC;wBACtB,OAAO,EAAE,CAAC;oBACZ,CAAC;iBACF,CAAC;aACH;SACF;KACF;CACF,CAAC,CAAC"}
|
package/dist/ProstglesTypes.d.ts
CHANGED
|
@@ -154,7 +154,7 @@ export type ProstglesInitOptions<S = void, SUser extends SessionUser = SessionUs
|
|
|
154
154
|
/**
|
|
155
155
|
* Server-side functions that can be invoked by the client
|
|
156
156
|
*/
|
|
157
|
-
functions?: ServerFunctionDefinitions<S>;
|
|
157
|
+
functions?: ServerFunctionDefinitions<S, SUser>;
|
|
158
158
|
/**
|
|
159
159
|
* If true then will test all table methods on each socket connect.
|
|
160
160
|
* Not recommended for production
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProstglesTypes.d.ts","sourceRoot":"","sources":["../lib/ProstglesTypes.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ProstglesTypes.d.ts","sourceRoot":"","sources":["../lib/ProstglesTypes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PublishParser.d.ts","sourceRoot":"","sources":["../../lib/PublishParser/PublishParser.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE9E,OAAO,KAAK,EAAE,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACnE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAG9D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAIvE,OAAO,KAAK,EACV,QAAQ,EACR,eAAe,EACf,eAAe,EACf,aAAa,EACd,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,aAAa,EACnB,MAAM,wBAAwB,CAAC;AAEhC,qBAAa,aAAa;IACxB,OAAO,EAAE,oBAAoB,CAAC,SAAS,CAAC,CAAC;IACzC,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,GAAG,EAAE,eAAe,CAAC;IACrB,EAAE,EAAE,EAAE,CAAC;IACP,SAAS,EAAE,SAAS,CAAC;gBAET,SAAS,EAAE,SAAS;IAc1B,gBAAgB,CACpB,SAAS,EAAE,iBAAiB,EAC5B,UAAU,EAAE,iBAAiB,GAAG,SAAS,GACxC,OAAO,CAAC,aAAa,CAAC;IAmBnB,mBAAmB,CAAC,SAAS,EAAE,iBAAiB,EAAE,QAAQ,EAAE,iBAAiB,GAAG,SAAS;
|
|
1
|
+
{"version":3,"file":"PublishParser.d.ts","sourceRoot":"","sources":["../../lib/PublishParser/PublishParser.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE9E,OAAO,KAAK,EAAE,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACnE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAG9D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAIvE,OAAO,KAAK,EACV,QAAQ,EACR,eAAe,EACf,eAAe,EACf,aAAa,EACd,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,aAAa,EACnB,MAAM,wBAAwB,CAAC;AAEhC,qBAAa,aAAa;IACxB,OAAO,EAAE,oBAAoB,CAAC,SAAS,CAAC,CAAC;IACzC,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,GAAG,EAAE,eAAe,CAAC;IACrB,EAAE,EAAE,EAAE,CAAC;IACP,SAAS,EAAE,SAAS,CAAC;gBAET,SAAS,EAAE,SAAS;IAc1B,gBAAgB,CACpB,SAAS,EAAE,iBAAiB,EAC5B,UAAU,EAAE,iBAAiB,GAAG,SAAS,GACxC,OAAO,CAAC,aAAa,CAAC;IAmBnB,mBAAmB,CAAC,SAAS,EAAE,iBAAiB,EAAE,QAAQ,EAAE,iBAAiB,GAAG,SAAS;IA+D/F;;OAEG;IACG,gBAAgB,CACpB,SAAS,EAAE,iBAAiB,EAC5B,UAAU,EAAE,iBAAiB,GAAG,SAAS,GACxC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAe/B,2BAA2B,CAC/B,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,eAAe,EAClD,KAAK,EAAE,eAAe,GAAG,SAAS,GACjC,OAAO,CAAC,eAAe,CAAC;IAWrB,kBAAkB,CACtB,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,IAAI,CAAC,eAAe,EAAE,WAAW,GAAG,WAAW,CAAC,EAC1E,UAAU,EAAE,iBAAiB,GAAG,SAAS,EACzC,KAAK,EAAE,eAAe,GAAG,SAAS,GACjC,OAAO,CAAC,eAAe,CAAC;IAmC3B,mBAAmB,CACjB,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,eAAe,EACvC,SAAS,EAAE,eAAe,EAC1B,KAAK,EAAE,eAAe,GAAG,SAAS;IAoD9B,aAAa,CACjB,IAAI,EAAE,QAAQ,EACd,UAAU,EAAE,iBAAiB,GAAG,SAAS,EACzC,KAAK,EAAE,eAAe,GAAG,SAAS,GACjC,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IA+BvC,6BAA6B,0LAA4C;IAGzE,oBAAoB;;;;;OAAmC;CACxD;AAED,cAAc,wBAAwB,CAAC"}
|
|
@@ -63,19 +63,20 @@ class PublishParser {
|
|
|
63
63
|
if (!functionGroups || !publishParams.user) {
|
|
64
64
|
return;
|
|
65
65
|
}
|
|
66
|
+
const { findUser } = this.prostgles.opts.auth ?? {};
|
|
67
|
+
if (!findUser) {
|
|
68
|
+
throw new Error("findUser function is missing in auth config. It is required for functions to work.");
|
|
69
|
+
}
|
|
66
70
|
const user = publishParams.user;
|
|
67
|
-
const users = publishParams.dbo.users;
|
|
68
|
-
if (!users?.findOne)
|
|
69
|
-
return;
|
|
70
71
|
const userId = user.id;
|
|
71
72
|
if (!userId || typeof userId !== "string") {
|
|
72
73
|
throw "User ID is missing or invalid";
|
|
73
74
|
}
|
|
74
75
|
const allowedFunctionsMap = new Map();
|
|
75
76
|
for (const group of Object.values(functionGroups)) {
|
|
76
|
-
const matchingUser = await
|
|
77
|
+
const matchingUser = await findUser({
|
|
77
78
|
$and: [group.userFilter, { id: userId }],
|
|
78
|
-
});
|
|
79
|
+
}, publishParams.dbo);
|
|
79
80
|
if (!matchingUser)
|
|
80
81
|
continue;
|
|
81
82
|
for (const [name, method] of Object.entries(group.functions)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PublishParser.js","sourceRoot":"","sources":["../../lib/PublishParser/PublishParser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qDAAwF;AACxF,qDAA8D;AAK9D,yEAAsE;AACtE,qEAAkE;AAElE,2DAAwD;AACxD,iEAA8D;AAC9D,mFAAgF;AAOhF,iEAIgC;AAEhC,MAAa,aAAa;IACxB,OAAO,CAAkC;IACzC,aAAa,CAAO;IACpB,GAAG,CAAkB;IACrB,EAAE,CAAK;IACP,SAAS,CAAY;IAErB,YAAY,SAAoB;QAC9B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC;QAEtC,6DAA6D;QAC7D,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC;QAClD,MAAM,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,SAAS,CAAC;QAC9B,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;YAChB,MAAM,uCAAuC,CAAC;QAChD,CAAC;QACD,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACf,CAAC;IAED,KAAK,CAAC,gBAAgB,CACpB,SAA4B,EAC5B,UAAyC;QAEzC,MAAM,WAAW,GACf,UAAU,IAAI,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC,CAAC;QACvF,IAAI,WAAW,KAAK,sBAAsB,EAAE,CAAC;YAC3C,MAAM,sBAAsB,CAAC;QAC/B,CAAC;QACD,OAAO;YACL,GAAG,WAAW;YACd,GAAG,EAAE,IAAI,CAAC,GAAoB;YAC9B,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG;YAClC,SAAS;YACT,UAAU,EAAE,IAAA,qCAAuB,EAAC,SAAS,CAAC;YAC9C,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM;YACxC,mBAAmB,EAAE,CAAC,KAAkC,EAAE,EAAE,CAC1D,IAAA,qCAAiB,EAAC,IAAI,CAAC,SAAS,EAAE,SAAS,EAAE,KAAK,CAAC;SACtD,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,SAA4B,EAAE,QAAuC;QAC7F,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QACvE,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC;QACrD,IAAI,CAAC,cAAc,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;YAC3C,OAAO;QACT,CAAC;QACD,MAAM,
|
|
1
|
+
{"version":3,"file":"PublishParser.js","sourceRoot":"","sources":["../../lib/PublishParser/PublishParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,10 @@ export type ServerFunctionDefinition = {
|
|
|
20
20
|
unrestrictedDbAccess?: true;
|
|
21
21
|
run: (...args: any[]) => MaybePromise<unknown>;
|
|
22
22
|
};
|
|
23
|
+
declare const serverFunctionContext: unique symbol;
|
|
24
|
+
type ServerFunctionContextMarker<S, SUser extends SessionUser> = {
|
|
25
|
+
[serverFunctionContext]?: [S, SUser];
|
|
26
|
+
};
|
|
23
27
|
type DefineFunctionArgs<TInput extends Record<string, JSONB.FieldType> | undefined, Context, Return> = {
|
|
24
28
|
input?: TInput;
|
|
25
29
|
description?: string;
|
|
@@ -27,19 +31,19 @@ type DefineFunctionArgs<TInput extends Record<string, JSONB.FieldType> | undefin
|
|
|
27
31
|
};
|
|
28
32
|
export declare function defineFunction<TInput extends Record<string, JSONB.FieldType> | undefined = undefined, S = void, SUser extends SessionUser = SessionUser, Return = unknown>(args: DefineFunctionArgs<TInput, UnrestrictedFunctionContext<S, SUser>, Return> & {
|
|
29
33
|
unrestrictedDbAccess: true;
|
|
30
|
-
}): typeof args
|
|
34
|
+
}): typeof args & ServerFunctionContextMarker<S, SUser>;
|
|
31
35
|
export declare function defineFunction<TInput extends Record<string, JSONB.FieldType> | undefined = undefined, S = void, SUser extends SessionUser = SessionUser, Return = unknown>(args: DefineFunctionArgs<TInput, RestrictedFunctionContext<S, SUser>, Return> & {
|
|
32
36
|
unrestrictedDbAccess?: undefined;
|
|
33
|
-
}): typeof args
|
|
37
|
+
}): typeof args & ServerFunctionContextMarker<S, SUser>;
|
|
34
38
|
type UsersTableRow<S> = S extends DBSchema ? S extends {
|
|
35
39
|
users: {
|
|
36
40
|
columns: infer UserRow extends AnyObject;
|
|
37
41
|
};
|
|
38
42
|
} ? UserRow : AnyObject : AnyObject;
|
|
39
43
|
type ValidDbSchema<S> = S extends DBSchema ? S : void;
|
|
40
|
-
export type ServerFunctionDefinitions<S = void> = Record<string, {
|
|
44
|
+
export type ServerFunctionDefinitions<S = void, SUser extends SessionUser = SessionUser> = Record<string, {
|
|
41
45
|
userFilter: FullFilter<UsersTableRow<S>, ValidDbSchema<S>>;
|
|
42
|
-
functions: Record<string, ServerFunctionDefinition
|
|
46
|
+
functions: Record<string, ServerFunctionDefinition & ServerFunctionContextMarker<S, SUser>>;
|
|
43
47
|
}>;
|
|
44
48
|
export {};
|
|
45
49
|
//# sourceMappingURL=defineServerFunction.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defineServerFunction.d.ts","sourceRoot":"","sources":["../../lib/PublishParser/defineServerFunction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EACT,QAAQ,EACR,UAAU,EACV,KAAK,EACL,wBAAwB,EACxB,YAAY,EACZ,UAAU,EACX,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAE5D,KAAK,mBAAmB,CAAC,CAAC,EAAE,KAAK,SAAS,WAAW,IAAI,IAAI,CAC3D,aAAa,CAAC,CAAC,EAAE,KAAK,CAAC,EACvB,QAAQ,GAAG,WAAW,GAAG,YAAY,CACtC,GAAG;IACF,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;IACtB,IAAI,EAAE,CAAC,SAAS,QAAQ,GACtB,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,SAAS,SAAS,GACrC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,CAAC,GAC/B,KAAK,CAAC,MAAM,CAAC,GACf,KAAK,CAAC,MAAM,CAAC,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,yBAAyB,CACnC,CAAC,GAAG,IAAI,EACR,KAAK,SAAS,WAAW,GAAG,WAAW,IACrC,mBAAmB,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;AAElC,MAAM,MAAM,2BAA2B,CACrC,CAAC,GAAG,IAAI,EACR,KAAK,SAAS,WAAW,GAAG,WAAW,IACrC,mBAAmB,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG;IAClC,EAAE,EAAE,EAAE,CAAC;IACP,GAAG,EAAE,UAAU,CAAC;IAChB,mBAAmB,EAAE,aAAa,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,qBAAqB,CAAC,CAAC;CACrE,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,yBAAyB,GAAG,2BAA2B,CAAC;AAE5F,MAAM,MAAM,wBAAwB,GAAG;IACrC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IACxC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,oBAAoB,CAAC,EAAE,IAAI,CAAC;IAC5B,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,YAAY,CAAC,OAAO,CAAC,CAAC;CAChD,CAAC;AAEF,KAAK,kBAAkB,CACrB,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,SAAS,EAC1D,OAAO,EACP,MAAM,IACJ;IACF,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,EAAE,CAAC,IAAI,EAAE,wBAAwB,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,OAAO,KAAK,YAAY,CAAC,MAAM,CAAC,CAAC;CACzF,CAAC;AAEF,wBAAgB,cAAc,CAC5B,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,SAAS,GAAG,SAAS,EACtE,CAAC,GAAG,IAAI,EACR,KAAK,SAAS,WAAW,GAAG,WAAW,EACvC,MAAM,GAAG,OAAO,EAEhB,IAAI,EAAE,kBAAkB,CAAC,MAAM,EAAE,2BAA2B,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,MAAM,CAAC,GAAG;IAChF,oBAAoB,EAAE,IAAI,CAAC;CAC5B,GACA,OAAO,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"defineServerFunction.d.ts","sourceRoot":"","sources":["../../lib/PublishParser/defineServerFunction.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defineServerFunction.js","sourceRoot":"","sources":["../../lib/PublishParser/defineServerFunction.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"defineServerFunction.js","sourceRoot":"","sources":["../../lib/PublishParser/defineServerFunction.ts"],"names":[],"mappings":";;AAqFA,wCAEC;AAFD,SAAgB,cAAc,CAAC,IAAa;IAC1C,OAAO,IAAI,CAAC;AACd,CAAC"}
|
package/lib/Auth/AuthHandler.ts
CHANGED
|
@@ -13,9 +13,9 @@ import { handleGetUserThrottled, type GetUserOrRedirected } from "./utils/handle
|
|
|
13
13
|
import { matchesRoute } from "./utils/matchesRoute";
|
|
14
14
|
import { removeExpressRoute, removeExpressRoutesTest } from "./utils/removeExpressRoute";
|
|
15
15
|
import {
|
|
16
|
-
|
|
16
|
+
setCookieAndGoToReturnURLIfSet,
|
|
17
17
|
validateSessionAndSetCookie,
|
|
18
|
-
} from "./utils/
|
|
18
|
+
} from "./utils/setCookieAndGoToReturnURLIfSet";
|
|
19
19
|
|
|
20
20
|
export { getClientRequestIPsInfo, removeExpressRoute, removeExpressRoutesTest };
|
|
21
21
|
export const HTTP_FAIL_CODES = {
|
|
@@ -63,9 +63,7 @@ export const GET_ALL_AUTH_ROUTES = (conf: AuthConfig["loginSignupConfig"]) => {
|
|
|
63
63
|
|
|
64
64
|
export class AuthHandler {
|
|
65
65
|
protected readonly prostgles: Prostgles;
|
|
66
|
-
protected readonly
|
|
67
|
-
getUser?: undefined | AuthConfig["getUser"];
|
|
68
|
-
};
|
|
66
|
+
protected readonly config: AuthConfig | undefined;
|
|
69
67
|
|
|
70
68
|
get dbHandles() {
|
|
71
69
|
const { dbo, db } = this.prostgles;
|
|
@@ -78,18 +76,19 @@ export class AuthHandler {
|
|
|
78
76
|
// TODO: tidy
|
|
79
77
|
constructor(prostgles: Prostgles) {
|
|
80
78
|
this.prostgles = prostgles;
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
79
|
+
const config = prostgles.opts.auth;
|
|
80
|
+
this.config = config;
|
|
81
|
+
if (config) {
|
|
82
|
+
this.init(config);
|
|
84
83
|
}
|
|
85
84
|
}
|
|
86
85
|
|
|
87
86
|
get sidKeyName() {
|
|
88
|
-
return this.
|
|
87
|
+
return this.config?.sidKeyName ?? SID_KEY_NAME;
|
|
89
88
|
}
|
|
90
89
|
|
|
91
90
|
get authRoutes() {
|
|
92
|
-
return GET_ALL_AUTH_ROUTES(this.
|
|
91
|
+
return GET_ALL_AUTH_ROUTES(this.config?.loginSignupConfig);
|
|
93
92
|
}
|
|
94
93
|
|
|
95
94
|
init = setupAuthRoutes.bind(this);
|
|
@@ -106,9 +105,9 @@ export class AuthHandler {
|
|
|
106
105
|
logout: logoutRoute,
|
|
107
106
|
magicLinks: magicLinksRoute,
|
|
108
107
|
loginWithProvider,
|
|
109
|
-
} = GET_ALL_AUTH_ROUTES(this.
|
|
108
|
+
} = GET_ALL_AUTH_ROUTES(this.config?.loginSignupConfig);
|
|
110
109
|
const pubRoutes = [
|
|
111
|
-
...(this.
|
|
110
|
+
...(this.config?.loginSignupConfig?.publicRoutes || []),
|
|
112
111
|
login,
|
|
113
112
|
logoutRoute,
|
|
114
113
|
magicLinksRoute,
|
|
@@ -120,7 +119,7 @@ export class AuthHandler {
|
|
|
120
119
|
});
|
|
121
120
|
};
|
|
122
121
|
|
|
123
|
-
|
|
122
|
+
setCookieAndGoToReturnURLIfSet = setCookieAndGoToReturnURLIfSet.bind(this);
|
|
124
123
|
validateSessionAndSetCookie = validateSessionAndSetCookie.bind(this);
|
|
125
124
|
handleGetUser = handleGetUserThrottled.bind(this);
|
|
126
125
|
|
|
@@ -141,7 +140,7 @@ export class AuthHandler {
|
|
|
141
140
|
};
|
|
142
141
|
|
|
143
142
|
destroy = () => {
|
|
144
|
-
const app = this.
|
|
143
|
+
const app = this.config?.loginSignupConfig?.app;
|
|
145
144
|
const {
|
|
146
145
|
login,
|
|
147
146
|
logout,
|
|
@@ -149,7 +148,7 @@ export class AuthHandler {
|
|
|
149
148
|
loginWithProvider,
|
|
150
149
|
emailRegistration,
|
|
151
150
|
magicLinks,
|
|
152
|
-
} = GET_ALL_AUTH_ROUTES(this.
|
|
151
|
+
} = GET_ALL_AUTH_ROUTES(this.config?.loginSignupConfig);
|
|
153
152
|
|
|
154
153
|
removeExpressRoute(app, [
|
|
155
154
|
login,
|
|
@@ -232,8 +231,8 @@ export class AuthHandler {
|
|
|
232
231
|
): boolean => {
|
|
233
232
|
const hasExpired = Boolean(session && session.expires <= Date.now());
|
|
234
233
|
if (
|
|
235
|
-
this.
|
|
236
|
-
!this.
|
|
234
|
+
this.config?.loginSignupConfig?.publicRoutes &&
|
|
235
|
+
!this.config.loginSignupConfig.disableSocketAuthGuard
|
|
237
236
|
) {
|
|
238
237
|
const error = "Session has expired";
|
|
239
238
|
if (hasExpired) {
|
package/lib/Auth/AuthTypes.ts
CHANGED
|
@@ -18,6 +18,7 @@ import type {
|
|
|
18
18
|
AuthResponse,
|
|
19
19
|
ClientSchema,
|
|
20
20
|
FieldFilter,
|
|
21
|
+
FullFilter,
|
|
21
22
|
IdentityProvider,
|
|
22
23
|
LocalLoginMode,
|
|
23
24
|
UserLike,
|
|
@@ -323,6 +324,14 @@ export type AuthConfig<S = void, SUser extends SessionUser = SessionUser> = {
|
|
|
323
324
|
reqInfo: AuthClientRequest,
|
|
324
325
|
) => Awaitable<AuthResultOrError<SUser>>;
|
|
325
326
|
|
|
327
|
+
/**
|
|
328
|
+
* Used in functions
|
|
329
|
+
*/
|
|
330
|
+
findUser: (
|
|
331
|
+
userFilter: FullFilter<void, void>,
|
|
332
|
+
dbo: DBOFullyTyped<S>,
|
|
333
|
+
) => Awaitable<SUser["user"] | undefined>;
|
|
334
|
+
|
|
326
335
|
/**
|
|
327
336
|
* Will setup auth routes
|
|
328
337
|
* /login
|
|
@@ -3,22 +3,22 @@ import type { RequestHandler } from "express";
|
|
|
3
3
|
import { isDefined } from "prostgles-types";
|
|
4
4
|
import type { AuthHandler } from "../AuthHandler";
|
|
5
5
|
import { EXPRESS_CATCH_ALL_ROUTE, HTTP_FAIL_CODES } from "../AuthHandler";
|
|
6
|
-
import type { AuthClientRequest } from "../AuthTypes";
|
|
6
|
+
import type { AuthClientRequest, AuthConfig } from "../AuthTypes";
|
|
7
7
|
import { getSafeReturnUrlFromQuery } from "../utils/getSafeReturnUrlFromQuery";
|
|
8
8
|
import { matchesRoute } from "../utils/matchesRoute";
|
|
9
9
|
|
|
10
|
-
export function setCatchAllRequestHandler(this: AuthHandler, app: e.Express) {
|
|
10
|
+
export function setCatchAllRequestHandler(this: AuthHandler, app: e.Express, config: AuthConfig) {
|
|
11
11
|
const requestHandlerCatchAll: RequestHandler = async (req, res, next) => {
|
|
12
|
-
const { onGetRequestOK } =
|
|
12
|
+
const { onGetRequestOK } = config.loginSignupConfig ?? {};
|
|
13
13
|
const {
|
|
14
14
|
restApi,
|
|
15
15
|
opts: { fileTable },
|
|
16
|
-
authHandler,
|
|
17
16
|
} = this.prostgles;
|
|
17
|
+
/** TODO: tidy - this shouldn't be handled here */
|
|
18
18
|
const pathsHandledByProstgles = [
|
|
19
19
|
restApi?.path,
|
|
20
20
|
fileTable && (fileTable.fileServePath ?? `/${fileTable.tableName}`),
|
|
21
|
-
|
|
21
|
+
config.loginSignupConfig?.loginWithOAuth && this.authRoutes.loginWithProvider,
|
|
22
22
|
].filter(isDefined);
|
|
23
23
|
if (pathsHandledByProstgles.some((path) => matchesRoute(path, req.path))) {
|
|
24
24
|
next();
|
|
@@ -2,15 +2,16 @@ import type e from "express";
|
|
|
2
2
|
import type { Request, Response } from "express";
|
|
3
3
|
import type { AuthHandler } from "../AuthHandler";
|
|
4
4
|
import { throttledReject } from "../utils/throttledReject";
|
|
5
|
+
import type { AuthConfig } from "../AuthTypes";
|
|
5
6
|
|
|
6
|
-
export function setLogoutRequestHandler(this: AuthHandler, app: e.Express) {
|
|
7
|
+
export function setLogoutRequestHandler(this: AuthHandler, app: e.Express, config: AuthConfig) {
|
|
7
8
|
const logoutRequestHandler = async (req: Request, res: Response) => {
|
|
8
9
|
const sid = this.validateSid(req.cookies?.[this.sidKeyName]);
|
|
9
10
|
if (sid) {
|
|
10
11
|
try {
|
|
11
12
|
await throttledReject(async () => {
|
|
12
13
|
const { db, dbo } = this.dbHandles;
|
|
13
|
-
return
|
|
14
|
+
return config.loginSignupConfig?.logout(req.cookies?.[this.sidKeyName], dbo, db);
|
|
14
15
|
});
|
|
15
16
|
} catch (err) {
|
|
16
17
|
console.error(err);
|
|
@@ -36,7 +36,7 @@ export function setMagicLinkOrOTPRequestHandler(
|
|
|
36
36
|
if (data.returnToken) {
|
|
37
37
|
return res.json({ success: true, token: response.session.sid });
|
|
38
38
|
}
|
|
39
|
-
this.
|
|
39
|
+
this.setCookieAndGoToReturnURLIfSet(response.session, { req, res });
|
|
40
40
|
}
|
|
41
41
|
} catch (_e) {
|
|
42
42
|
res
|
|
@@ -17,7 +17,7 @@ type RegisterResponseHandler = Response<ReturnType>;
|
|
|
17
17
|
export function setRegisterRequestHandler(
|
|
18
18
|
this: AuthHandler,
|
|
19
19
|
{ onRegister, minPasswordLength = 8, requirePassword }: SignupWithEmail,
|
|
20
|
-
app: e.Express
|
|
20
|
+
app: e.Express,
|
|
21
21
|
) {
|
|
22
22
|
const registerRequestHandler = async (req: Request, res: RegisterResponseHandler) => {
|
|
23
23
|
const [error, data] = parseLoginData(req.body);
|
|
@@ -53,7 +53,7 @@ export function setRegisterRequestHandler(
|
|
|
53
53
|
password,
|
|
54
54
|
getConfirmationUrl: ({ code, websiteUrl }) =>
|
|
55
55
|
getMagicLinkUrl({
|
|
56
|
-
loginSignupConfig: this.
|
|
56
|
+
loginSignupConfig: this.config?.loginSignupConfig,
|
|
57
57
|
websiteUrl,
|
|
58
58
|
data: { type: "otp", code, email: username, returnToken: false },
|
|
59
59
|
}),
|
package/lib/Auth/login.ts
CHANGED
|
@@ -11,11 +11,17 @@ export async function login(
|
|
|
11
11
|
res: LoginResponseHandler,
|
|
12
12
|
loginParams: LoginParams,
|
|
13
13
|
) {
|
|
14
|
+
const config = this.config;
|
|
15
|
+
if (!config) {
|
|
16
|
+
throw new Error(
|
|
17
|
+
"AuthHandler config is missing. Make sure to initialize AuthHandler with Prostgles instance that has auth config.",
|
|
18
|
+
);
|
|
19
|
+
}
|
|
14
20
|
const start = Date.now();
|
|
15
|
-
const { responseThrottle = 500 } =
|
|
21
|
+
const { responseThrottle = 500 } = config;
|
|
16
22
|
|
|
17
23
|
const errCodeOrSession = await throttledAuthCall(async () => {
|
|
18
|
-
const { login } =
|
|
24
|
+
const { login } = config.loginSignupConfig ?? {};
|
|
19
25
|
if (!login) {
|
|
20
26
|
console.error("Auth login config missing");
|
|
21
27
|
return "server-error";
|
|
@@ -29,7 +35,7 @@ export async function login(
|
|
|
29
35
|
getClientRequestIPsInfo({ httpReq: req }),
|
|
30
36
|
(data, websiteUrl) =>
|
|
31
37
|
getMagicLinkUrl({
|
|
32
|
-
loginSignupConfig:
|
|
38
|
+
loginSignupConfig: config.loginSignupConfig,
|
|
33
39
|
websiteUrl,
|
|
34
40
|
data,
|
|
35
41
|
}),
|
|
@@ -76,7 +82,7 @@ export async function login(
|
|
|
76
82
|
}
|
|
77
83
|
return res.json(loginResponse.response);
|
|
78
84
|
}
|
|
79
|
-
this.
|
|
85
|
+
this.setCookieAndGoToReturnURLIfSet(loginResponse.session, { req, res });
|
|
80
86
|
}
|
|
81
87
|
|
|
82
88
|
export const getBasicSessionErrorCode = (session: Pick<BasicSession, "expires" | "sid">) => {
|
|
@@ -9,9 +9,10 @@ import { setOAuthRequestHandlers } from "./endpoints/setOAuthRequestHandlers";
|
|
|
9
9
|
import { setRegisterRequestHandler } from "./endpoints/setRegisterRequestHandler";
|
|
10
10
|
import { upsertNamedExpressMiddleware } from "./utils/upsertNamedExpressMiddleware";
|
|
11
11
|
import { setupUserContextMiddleware } from "./middleware/userContextMiddleware";
|
|
12
|
+
import type { AuthConfig } from "./AuthTypes";
|
|
12
13
|
|
|
13
|
-
export function setupAuthRoutes(this: AuthHandler) {
|
|
14
|
-
const { loginSignupConfig, onUseOrSocketConnected } =
|
|
14
|
+
export function setupAuthRoutes(this: AuthHandler, config: AuthConfig) {
|
|
15
|
+
const { loginSignupConfig, onUseOrSocketConnected } = config;
|
|
15
16
|
|
|
16
17
|
if (this.sidKeyName === "sid") {
|
|
17
18
|
throw "sidKeyName cannot be 'sid' due to collision with socket.io";
|
|
@@ -62,7 +63,7 @@ export function setupAuthRoutes(this: AuthHandler) {
|
|
|
62
63
|
}
|
|
63
64
|
next();
|
|
64
65
|
};
|
|
65
|
-
upsertNamedExpressMiddleware(app, prostglesUseMiddleware, "
|
|
66
|
+
upsertNamedExpressMiddleware(app, prostglesUseMiddleware, "prostglesOnUseOrSocketConnected");
|
|
66
67
|
}
|
|
67
68
|
|
|
68
69
|
if (onMagicLinkOrOTP) {
|
|
@@ -72,7 +73,7 @@ export function setupAuthRoutes(this: AuthHandler) {
|
|
|
72
73
|
setLoginRequestHandler.bind(this)(app);
|
|
73
74
|
|
|
74
75
|
/* Redirect if not logged in and requesting non public content */
|
|
75
|
-
setCatchAllRequestHandler.bind(this)(app);
|
|
76
|
+
setCatchAllRequestHandler.bind(this)(app, config);
|
|
76
77
|
|
|
77
|
-
setLogoutRequestHandler.bind(this)(app);
|
|
78
|
+
setLogoutRequestHandler.bind(this)(app, config);
|
|
78
79
|
}
|
|
@@ -16,13 +16,19 @@ export async function handleGetUserThrottled(
|
|
|
16
16
|
this: AuthHandler,
|
|
17
17
|
clientReq: AuthClientRequest,
|
|
18
18
|
): Promise<GetUserOrRedirected> {
|
|
19
|
-
const
|
|
19
|
+
const config = this.config;
|
|
20
|
+
if (!config) {
|
|
21
|
+
return {
|
|
22
|
+
sid: undefined,
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
const getSessionForCaching = config.cacheSession?.getSession;
|
|
20
26
|
|
|
21
27
|
/** Get cached session if available */
|
|
22
28
|
const __prglCache =
|
|
23
|
-
!
|
|
24
|
-
|
|
25
|
-
|
|
29
|
+
!config.cacheSession ? undefined : (
|
|
30
|
+
(clientReq.httpReq ?? clientReq.socket).__prglCache?.get(this.prostgles.appId)
|
|
31
|
+
);
|
|
26
32
|
if (clientReq.socket && __prglCache) {
|
|
27
33
|
const { userData, session } = __prglCache;
|
|
28
34
|
const isValid = this.isNonExpiredSocketSession(clientReq.socket, session);
|
|
@@ -38,13 +44,8 @@ export async function handleGetUserThrottled(
|
|
|
38
44
|
}
|
|
39
45
|
|
|
40
46
|
const result = await throttledAuthCall(async () => {
|
|
41
|
-
if (!this.opts.getUser) {
|
|
42
|
-
return {
|
|
43
|
-
sid: undefined,
|
|
44
|
-
};
|
|
45
|
-
}
|
|
46
47
|
const { db, dbo } = this.dbHandles;
|
|
47
|
-
const clientInfoOrErr = await
|
|
48
|
+
const clientInfoOrErr = await config.getUser(
|
|
48
49
|
this.getValidatedSid(clientReq),
|
|
49
50
|
dbo,
|
|
50
51
|
db,
|
package/lib/Auth/utils/{setCookieAndGoToReturnURLIFSet.ts → setCookieAndGoToReturnURLIfSet.ts}
RENAMED
|
@@ -19,14 +19,17 @@ export function validateSessionAndSetCookie(
|
|
|
19
19
|
code: sessionErrorCode,
|
|
20
20
|
});
|
|
21
21
|
}
|
|
22
|
-
return this.
|
|
22
|
+
return this.setCookieAndGoToReturnURLIfSet(cookie, requestHandler);
|
|
23
23
|
}
|
|
24
24
|
|
|
25
|
-
export function
|
|
25
|
+
export function setCookieAndGoToReturnURLIfSet(
|
|
26
26
|
this: AuthHandler,
|
|
27
27
|
cookie: { sid: string; expires: number },
|
|
28
28
|
requestHandler: { req: ExpressReq; res: LoginResponseHandler },
|
|
29
29
|
) {
|
|
30
|
+
if (!this.config) {
|
|
31
|
+
throw new Error("AuthHandler config is not set");
|
|
32
|
+
}
|
|
30
33
|
const { sid, expires } = cookie;
|
|
31
34
|
const { res, req } = requestHandler;
|
|
32
35
|
if (!sid) {
|
|
@@ -54,7 +57,7 @@ export function setCookieAndGoToReturnURLIFSet(
|
|
|
54
57
|
//signed: true
|
|
55
58
|
secure: true,
|
|
56
59
|
sameSite: "strict",
|
|
57
|
-
...(this.
|
|
60
|
+
...(this.config.loginSignupConfig?.cookieOptions ?? {}),
|
|
58
61
|
} as const;
|
|
59
62
|
const cookieData = sid;
|
|
60
63
|
|
|
@@ -23,7 +23,9 @@ void prostgles<FixtureSchema>({
|
|
|
23
23
|
}),
|
|
24
24
|
scalarResult: defineFunction({
|
|
25
25
|
run: (_args, { dbo }) => {
|
|
26
|
-
void dbo.orders
|
|
26
|
+
void dbo.orders.find();
|
|
27
|
+
// @ts-expect-error The surrounding prostgles schema must reach defineFunction.
|
|
28
|
+
void dbo.missingTable;
|
|
27
29
|
return 42;
|
|
28
30
|
},
|
|
29
31
|
}),
|