prostgles-server 4.2.435 → 4.2.436
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/README.md +2 -3
- package/dist/Auth/endpoints/setMagicLinkOrOTPRequestHandler.d.ts.map +1 -1
- package/dist/Auth/endpoints/setMagicLinkOrOTPRequestHandler.js.map +1 -1
- package/dist/Auth/middleware/userContextMiddleware.d.ts +8 -0
- package/dist/Auth/middleware/userContextMiddleware.d.ts.map +1 -0
- package/dist/Auth/middleware/userContextMiddleware.js +14 -0
- package/dist/Auth/middleware/userContextMiddleware.js.map +1 -0
- package/dist/Auth/setupAuthRoutes.d.ts.map +1 -1
- package/dist/Auth/setupAuthRoutes.js +2 -0
- package/dist/Auth/setupAuthRoutes.js.map +1 -1
- package/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/lib/Auth/endpoints/setMagicLinkOrOTPRequestHandler.ts +3 -9
- package/lib/Auth/middleware/userContextMiddleware.ts +20 -0
- package/lib/Auth/setupAuthRoutes.ts +4 -1
- package/lib/index.ts +3 -2
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -28,7 +28,6 @@ $ npm install prostgles-server
|
|
|
28
28
|
|
|
29
29
|
```typescript
|
|
30
30
|
import prostgles from "prostgles-server";
|
|
31
|
-
import prostgles from "prostgles-server";
|
|
32
31
|
|
|
33
32
|
prostgles({
|
|
34
33
|
dbConnection: {
|
|
@@ -73,13 +72,13 @@ prostgles({
|
|
|
73
72
|
},
|
|
74
73
|
io,
|
|
75
74
|
publish: "*", // Unrestricted INSERT/SELECT/UPDATE/DELETE access to the tables in the database
|
|
76
|
-
onReady: async (dbo) => {},
|
|
75
|
+
onReady: async ({ dbo }) => {},
|
|
77
76
|
});
|
|
78
77
|
```
|
|
79
78
|
|
|
80
79
|
react.tsx
|
|
81
80
|
|
|
82
|
-
```
|
|
81
|
+
```jsx
|
|
83
82
|
const App = () => {
|
|
84
83
|
const { isLoading, dbo } = useProstglesClient();
|
|
85
84
|
if (isLoading) return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setMagicLinkOrOTPRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setMagicLinkOrOTPRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"setMagicLinkOrOTPRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setMagicLinkOrOTPRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAG7B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD,OAAO,KAAK,EAAc,iBAAiB,EAAsB,WAAW,EAAE,MAAM,cAAc,CAAC;AAUnG,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,WAAW,EACjB,WAAW,EAAE,QAAQ,CAAC,iBAAiB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,kBAAkB,CAAC,EAC/E,GAAG,EAAE,CAAC,CAAC,OAAO,QAmDf"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setMagicLinkOrOTPRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setMagicLinkOrOTPRequestHandler.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"setMagicLinkOrOTPRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setMagicLinkOrOTPRequestHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type e from "express";
|
|
2
|
+
import type { AuthHandler } from "../AuthHandler";
|
|
3
|
+
import type { GetUserOrRedirected } from "../utils/handleGetUser";
|
|
4
|
+
export declare function setupUserContextMiddleware(this: AuthHandler, app: e.Express): void;
|
|
5
|
+
export interface RequestWithUser extends e.Request {
|
|
6
|
+
getUser(): Promise<GetUserOrRedirected>;
|
|
7
|
+
}
|
|
8
|
+
//# sourceMappingURL=userContextMiddleware.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"userContextMiddleware.d.ts","sourceRoot":"","sources":["../../../lib/Auth/middleware/userContextMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAE7B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAElE,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO,QAS3E;AAED,MAAM,WAAW,eAAgB,SAAQ,CAAC,CAAC,OAAO;IAChD,OAAO,IAAI,OAAO,CAAC,mBAAmB,CAAC,CAAC;CACzC"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.setupUserContextMiddleware = setupUserContextMiddleware;
|
|
4
|
+
const upsertNamedExpressMiddleware_1 = require("../utils/upsertNamedExpressMiddleware");
|
|
5
|
+
function setupUserContextMiddleware(app) {
|
|
6
|
+
const userContextMiddleware = (req, _res, next) => {
|
|
7
|
+
req.getUser = () => {
|
|
8
|
+
return this.getUserOrError({ httpReq: req, res: _res });
|
|
9
|
+
};
|
|
10
|
+
next();
|
|
11
|
+
};
|
|
12
|
+
(0, upsertNamedExpressMiddleware_1.upsertNamedExpressMiddleware)(app, userContextMiddleware, "prostglesUserContextMiddleware");
|
|
13
|
+
}
|
|
14
|
+
//# sourceMappingURL=userContextMiddleware.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"userContextMiddleware.js","sourceRoot":"","sources":["../../../lib/Auth/middleware/userContextMiddleware.ts"],"names":[],"mappings":";;AAMA,gEASC;AAZD,wFAAqF;AAGrF,SAAgB,0BAA0B,CAAoB,GAAc;IAC1E,MAAM,qBAAqB,GAAmB,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAQ,EAAE;QACrE,GAAuB,CAAC,OAAO,GAAG,GAAG,EAAE;YACtC,OAAO,IAAI,CAAC,cAAc,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1D,CAAC,CAAC;QAEF,IAAI,EAAE,CAAC;IACT,CAAC,CAAC;IACF,IAAA,2DAA4B,EAAC,GAAG,EAAE,qBAAqB,EAAE,gCAAgC,CAAC,CAAC;AAC7F,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupAuthRoutes.d.ts","sourceRoot":"","sources":["../../lib/Auth/setupAuthRoutes.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"setupAuthRoutes.d.ts","sourceRoot":"","sources":["../../lib/Auth/setupAuthRoutes.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAWjD,wBAAgB,eAAe,CAAC,IAAI,EAAE,WAAW,QAiEhD"}
|
|
@@ -9,6 +9,7 @@ const setMagicLinkOrOTPRequestHandler_1 = require("./endpoints/setMagicLinkOrOTP
|
|
|
9
9
|
const setOAuthRequestHandlers_1 = require("./endpoints/setOAuthRequestHandlers");
|
|
10
10
|
const setRegisterRequestHandler_1 = require("./endpoints/setRegisterRequestHandler");
|
|
11
11
|
const upsertNamedExpressMiddleware_1 = require("./utils/upsertNamedExpressMiddleware");
|
|
12
|
+
const userContextMiddleware_1 = require("./middleware/userContextMiddleware");
|
|
12
13
|
function setupAuthRoutes() {
|
|
13
14
|
const { loginSignupConfig, onUseOrSocketConnected } = this.opts;
|
|
14
15
|
if (this.sidKeyName === "sid") {
|
|
@@ -50,6 +51,7 @@ function setupAuthRoutes() {
|
|
|
50
51
|
setLoginRequestHandler_1.setLoginRequestHandler.bind(this)(app);
|
|
51
52
|
/* Redirect if not logged in and requesting non public content */
|
|
52
53
|
setCatchAllRequestHandler_1.setCatchAllRequestHandler.bind(this)(app);
|
|
54
|
+
userContextMiddleware_1.setupUserContextMiddleware.bind(this)(app);
|
|
53
55
|
setLogoutRequestHandler_1.setLogoutRequestHandler.bind(this)(app);
|
|
54
56
|
}
|
|
55
57
|
//# sourceMappingURL=setupAuthRoutes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupAuthRoutes.js","sourceRoot":"","sources":["../../lib/Auth/setupAuthRoutes.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"setupAuthRoutes.js","sourceRoot":"","sources":["../../lib/Auth/setupAuthRoutes.ts"],"names":[],"mappings":";;AAYA,0CAiEC;AA3ED,+CAAwD;AACxD,qFAAkF;AAClF,+EAA4E;AAC5E,iFAA8E;AAC9E,iGAA8F;AAC9F,iFAA8E;AAC9E,qFAAkF;AAClF,uFAAoF;AACpF,8EAAgF;AAEhF,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,kDAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IAE3C,iDAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;AAC1C,CAAC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -9,5 +9,7 @@ export type { DBOFullyTyped } from "./DBSchemaBuilder/DBSchemaBuilder";
|
|
|
9
9
|
export type { DBHandlerServer } from "./Prostgles";
|
|
10
10
|
export type { CloudClient, LocalConfig } from "./FileManager/FileManager";
|
|
11
11
|
export type * from "./TableConfig/TableConfig";
|
|
12
|
+
export * from "./Auth/utils/upsertNamedExpressMiddleware";
|
|
13
|
+
export type { RequestWithUser } from "./Auth/middleware/userContextMiddleware";
|
|
12
14
|
export default prostgles;
|
|
13
15
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAwB,MAAM,iBAAiB,CAAC;AAExE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAE7D,iBAAS,SAAS,CAAC,CAAC,GAAG,IAAI,EAAE,KAAK,SAAS,WAAW,GAAG,WAAW,EAClE,MAAM,EAAE,oBAAoB,CAAC,CAAC,EAAE,KAAK,CAAC,GAKrB,OAAO,CAAC,UAAU,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAC/C;AACD,cAAc,sCAAsC,CAAC;AACrD,cAAc,kBAAkB,CAAC;AACjC,YAAY,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAC1E,YAAY,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AACvE,YAAY,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAC1E,mBAAmB,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAwB,MAAM,iBAAiB,CAAC;AAExE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAE7D,iBAAS,SAAS,CAAC,CAAC,GAAG,IAAI,EAAE,KAAK,SAAS,WAAW,GAAG,WAAW,EAClE,MAAM,EAAE,oBAAoB,CAAC,CAAC,EAAE,KAAK,CAAC,GAKrB,OAAO,CAAC,UAAU,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAC/C;AACD,cAAc,sCAAsC,CAAC;AACrD,cAAc,kBAAkB,CAAC;AACjC,YAAY,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAC1E,YAAY,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AACvE,YAAY,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAC1E,mBAAmB,2BAA2B,CAAC;AAC/C,cAAc,2CAA2C,CAAC;AAC1D,YAAY,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC/E,eAAe,SAAS,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -23,5 +23,6 @@ function prostgles(params) {
|
|
|
23
23
|
}
|
|
24
24
|
__exportStar(require("./PublishParser/defineServerFunction"), exports);
|
|
25
25
|
__exportStar(require("./Auth/AuthTypes"), exports);
|
|
26
|
+
__exportStar(require("./Auth/utils/upsertNamedExpressMiddleware"), exports);
|
|
26
27
|
exports.default = prostgles;
|
|
27
28
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAEA,2CAAwC;AAGxC,SAAS,SAAS,CAChB,MAAsC;IAEtC,MAAM,IAAI,GAAG,IAAI,qBAAS,CAAC,MAA8B,CAAC,CAAC;IAC3D,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAA+B,EAAE;QACvD,IAAI,EAAE,MAAM;KACb,CAA6C,CAAC;AACjD,CAAC;AACD,uEAAqD;AACrD,mDAAiC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAEA,2CAAwC;AAGxC,SAAS,SAAS,CAChB,MAAsC;IAEtC,MAAM,IAAI,GAAG,IAAI,qBAAS,CAAC,MAA8B,CAAC,CAAC;IAC3D,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAA+B,EAAE;QACvD,IAAI,EAAE,MAAM;KACb,CAA6C,CAAC;AACjD,CAAC;AACD,uEAAqD;AACrD,mDAAiC;AAMjC,4EAA0D;AAE1D,kBAAe,SAAS,CAAC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import type e from "express";
|
|
2
2
|
import { type Response } from "express";
|
|
3
3
|
import type { AuthResponse } from "prostgles-types";
|
|
4
|
-
import type { DBOFullyTyped } from "../../DBSchemaBuilder/DBSchemaBuilder";
|
|
5
4
|
import type { AuthHandler } from "../AuthHandler";
|
|
6
5
|
import { getClientRequestIPsInfo, HTTP_FAIL_CODES, HTTP_SUCCESS_CODES } from "../AuthHandler";
|
|
7
6
|
import type { ExpressReq, LoginSignupConfig, MagicLinkOrOTPData, SessionUser } from "../AuthTypes";
|
|
@@ -17,22 +16,17 @@ type MagicLinkResponseHandler = Response<
|
|
|
17
16
|
export function setMagicLinkOrOTPRequestHandler(
|
|
18
17
|
this: AuthHandler,
|
|
19
18
|
onMagicLink: Required<LoginSignupConfig<void, SessionUser>>["onMagicLinkOrOTP"],
|
|
20
|
-
app: e.Express
|
|
19
|
+
app: e.Express,
|
|
21
20
|
) {
|
|
22
21
|
const handler = async (
|
|
23
22
|
req: ExpressReq,
|
|
24
23
|
res: MagicLinkResponseHandler,
|
|
25
|
-
data: MagicLinkOrOTPData
|
|
24
|
+
data: MagicLinkOrOTPData,
|
|
26
25
|
) => {
|
|
27
26
|
try {
|
|
28
27
|
const response = await throttledAuthCall(async () => {
|
|
29
28
|
const { db, dbo } = this.dbHandles;
|
|
30
|
-
return onMagicLink(
|
|
31
|
-
data,
|
|
32
|
-
dbo,
|
|
33
|
-
db,
|
|
34
|
-
getClientRequestIPsInfo({ httpReq: req })
|
|
35
|
-
);
|
|
29
|
+
return onMagicLink(data, dbo, db, getClientRequestIPsInfo({ httpReq: req }));
|
|
36
30
|
});
|
|
37
31
|
if (!response.session) {
|
|
38
32
|
res
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import type e from "express";
|
|
2
|
+
import type { RequestHandler } from "express";
|
|
3
|
+
import type { AuthHandler } from "../AuthHandler";
|
|
4
|
+
import { upsertNamedExpressMiddleware } from "../utils/upsertNamedExpressMiddleware";
|
|
5
|
+
import type { GetUserOrRedirected } from "../utils/handleGetUser";
|
|
6
|
+
|
|
7
|
+
export function setupUserContextMiddleware(this: AuthHandler, app: e.Express) {
|
|
8
|
+
const userContextMiddleware: RequestHandler = (req, _res, next): void => {
|
|
9
|
+
(req as RequestWithUser).getUser = () => {
|
|
10
|
+
return this.getUserOrError({ httpReq: req, res: _res });
|
|
11
|
+
};
|
|
12
|
+
|
|
13
|
+
next();
|
|
14
|
+
};
|
|
15
|
+
upsertNamedExpressMiddleware(app, userContextMiddleware, "prostglesUserContextMiddleware");
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
export interface RequestWithUser extends e.Request {
|
|
19
|
+
getUser(): Promise<GetUserOrRedirected>;
|
|
20
|
+
}
|
|
@@ -8,6 +8,7 @@ import { setMagicLinkOrOTPRequestHandler } from "./endpoints/setMagicLinkOrOTPRe
|
|
|
8
8
|
import { setOAuthRequestHandlers } from "./endpoints/setOAuthRequestHandlers";
|
|
9
9
|
import { setRegisterRequestHandler } from "./endpoints/setRegisterRequestHandler";
|
|
10
10
|
import { upsertNamedExpressMiddleware } from "./utils/upsertNamedExpressMiddleware";
|
|
11
|
+
import { setupUserContextMiddleware } from "./middleware/userContextMiddleware";
|
|
11
12
|
|
|
12
13
|
export function setupAuthRoutes(this: AuthHandler) {
|
|
13
14
|
const { loginSignupConfig, onUseOrSocketConnected } = this.opts;
|
|
@@ -44,7 +45,7 @@ export function setupAuthRoutes(this: AuthHandler) {
|
|
|
44
45
|
const errorInfoOrSession = await onUseOrSocketConnected(
|
|
45
46
|
this.getSIDNoError(reqInfo),
|
|
46
47
|
getClientRequestIPsInfo(reqInfo),
|
|
47
|
-
reqInfo
|
|
48
|
+
reqInfo,
|
|
48
49
|
);
|
|
49
50
|
|
|
50
51
|
if (errorInfoOrSession && "error" in errorInfoOrSession) {
|
|
@@ -71,5 +72,7 @@ export function setupAuthRoutes(this: AuthHandler) {
|
|
|
71
72
|
/* Redirect if not logged in and requesting non public content */
|
|
72
73
|
setCatchAllRequestHandler.bind(this)(app);
|
|
73
74
|
|
|
75
|
+
setupUserContextMiddleware.bind(this)(app);
|
|
76
|
+
|
|
74
77
|
setLogoutRequestHandler.bind(this)(app);
|
|
75
78
|
}
|
package/lib/index.ts
CHANGED
|
@@ -4,7 +4,7 @@ import { Prostgles } from "./Prostgles";
|
|
|
4
4
|
import type { ProstglesInitOptions } from "./ProstglesTypes";
|
|
5
5
|
|
|
6
6
|
function prostgles<S = void, SUser extends SessionUser = SessionUser>(
|
|
7
|
-
params: ProstglesInitOptions<S, SUser
|
|
7
|
+
params: ProstglesInitOptions<S, SUser>,
|
|
8
8
|
) {
|
|
9
9
|
const prgl = new Prostgles(params as ProstglesInitOptions);
|
|
10
10
|
return prgl.init(params.onReady as OnReadyCallbackBasic, {
|
|
@@ -18,5 +18,6 @@ export type { DBOFullyTyped } from "./DBSchemaBuilder/DBSchemaBuilder";
|
|
|
18
18
|
export type { DBHandlerServer } from "./Prostgles";
|
|
19
19
|
export type { CloudClient, LocalConfig } from "./FileManager/FileManager";
|
|
20
20
|
export type * from "./TableConfig/TableConfig";
|
|
21
|
-
|
|
21
|
+
export * from "./Auth/utils/upsertNamedExpressMiddleware";
|
|
22
|
+
export type { RequestWithUser } from "./Auth/middleware/userContextMiddleware";
|
|
22
23
|
export default prostgles;
|