prostgles-server 4.2.590 → 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/PublishParser/PublishParser.d.ts.map +1 -1
- package/dist/PublishParser/PublishParser.js +6 -5
- package/dist/PublishParser/PublishParser.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/PublishParser/PublishParser.ts +12 -5
- package/package.json +1 -1
- package/dist/Auth/utils/setCookieAndGoToReturnURLIFSet.js.map +0 -1
|
@@ -32,9 +32,7 @@ export declare const GET_AUTH_ROUTE: (conf: AuthConfig["loginSignupConfig"], rou
|
|
|
32
32
|
export declare const GET_ALL_AUTH_ROUTES: (conf: AuthConfig["loginSignupConfig"]) => { [K in keyof typeof AUTH_ROUTES]: string; };
|
|
33
33
|
export declare class AuthHandler {
|
|
34
34
|
protected readonly prostgles: Prostgles;
|
|
35
|
-
protected readonly
|
|
36
|
-
getUser?: undefined | AuthConfig["getUser"];
|
|
37
|
-
};
|
|
35
|
+
protected readonly config: AuthConfig | undefined;
|
|
38
36
|
get dbHandles(): {
|
|
39
37
|
dbo: DBOFullyTyped;
|
|
40
38
|
db: import("../Prostgles").DB;
|
|
@@ -49,10 +47,10 @@ export declare class AuthHandler {
|
|
|
49
47
|
readonly magicLinks: string;
|
|
50
48
|
readonly magicLinkWithId: string;
|
|
51
49
|
};
|
|
52
|
-
init: () => void;
|
|
50
|
+
init: (config: AuthConfig) => void;
|
|
53
51
|
validateSid: (sid: string | undefined) => string | undefined;
|
|
54
52
|
isUserRoute: (pathname: string) => boolean;
|
|
55
|
-
|
|
53
|
+
setCookieAndGoToReturnURLIfSet: (cookie: {
|
|
56
54
|
sid: string;
|
|
57
55
|
expires: number;
|
|
58
56
|
}, requestHandler: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthHandler.d.ts","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,iBAAiB,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAI/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAE1E,OAAO,EAA0B,KAAK,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAEzF,OAAO,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAMzF,OAAO,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,CAAC;AAChF,eAAO,MAAM,eAAe;;;;;;;CAOlB,CAAC;AAEX,eAAO,MAAM,kBAAkB;;;CAGrB,CAAC;AAGX,eAAO,MAAM,uBAAuB,WAAW,CAAC;AAChD,eAAO,MAAM,0BAA0B,cAAc,CAAC;AACtD,eAAO,MAAM,WAAW;;;;;;;CAOd,CAAC;AACX,eAAO,MAAM,cAAc,GACzB,MAAM,UAAU,CAAC,mBAAmB,CAAC,EACrC,OAAO,MAAM,OAAO,WAAW,WAIhC,CAAC;AACF,eAAO,MAAM,mBAAmB,GAAI,MAAM,UAAU,CAAC,mBAAmB,CAAC,KAMlE,GACF,CAAC,IAAI,MAAM,OAAO,WAAW,GAAG,MAAM,GAE1C,CAAC;AAEF,qBAAa,WAAW;IACtB,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IACxC,SAAS,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"AuthHandler.d.ts","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,iBAAiB,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAI/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAE1E,OAAO,EAA0B,KAAK,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAEzF,OAAO,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAMzF,OAAO,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,CAAC;AAChF,eAAO,MAAM,eAAe;;;;;;;CAOlB,CAAC;AAEX,eAAO,MAAM,kBAAkB;;;CAGrB,CAAC;AAGX,eAAO,MAAM,uBAAuB,WAAW,CAAC;AAChD,eAAO,MAAM,0BAA0B,cAAc,CAAC;AACtD,eAAO,MAAM,WAAW;;;;;;;CAOd,CAAC;AACX,eAAO,MAAM,cAAc,GACzB,MAAM,UAAU,CAAC,mBAAmB,CAAC,EACrC,OAAO,MAAM,OAAO,WAAW,WAIhC,CAAC;AACF,eAAO,MAAM,mBAAmB,GAAI,MAAM,UAAU,CAAC,mBAAmB,CAAC,KAMlE,GACF,CAAC,IAAI,MAAM,OAAO,WAAW,GAAG,MAAM,GAE1C,CAAC;AAEF,qBAAa,WAAW;IACtB,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IACxC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU,GAAG,SAAS,CAAC;IAElD,IAAI,SAAS;aAKU,aAAa;;MACnC;gBAGW,SAAS,EAAE,SAAS;IAShC,IAAI,UAAU,WAEb;IAED,IAAI,UAAU;;;;;;;MAEb;IAED,IAAI,+BAA8B;IAElC,WAAW,GAAI,KAAK,MAAM,GAAG,SAAS,wBAIpC;IAEF,WAAW,GAAI,UAAU,MAAM,aAkB7B;IAEF,8BAA8B;;;;;;eAA6C;IAC3E,2BAA2B;;;;;;mFAA0C;IACrE,aAAa,iEAAqC;IAElD;;;;OAIG;IACH,cAAc,GAAU,WAAW,iBAAiB,KAAG,OAAO,CAAC,mBAAmB,CAAC,CASjF;IAEF,OAAO,aAoBL;IAEF,KAAK,4PAAoB;IAEzB;;;;;;OAMG;IACH,eAAe,CAAC,cAAc,EAAE,iBAAiB,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS;IAyClF;;OAEG;IACH,aAAa,GAAI,WAAW,iBAAiB,GAAG,SAAS,KAAG,MAAM,GAAG,SAAS,CAO5E;IAEF,wBAAwB,iEAAuC;IAE/D,yBAAyB,GACvB,QAAQ,YAAY,EACpB,SAAS,YAAY,GAAG,SAAS,KAChC,OAAO,CAiBR;IAEF,aAAa;;;gCAA4B;CAC1C"}
|
package/dist/Auth/AuthHandler.js
CHANGED
|
@@ -13,7 +13,7 @@ const matchesRoute_1 = require("./utils/matchesRoute");
|
|
|
13
13
|
const removeExpressRoute_1 = require("./utils/removeExpressRoute");
|
|
14
14
|
Object.defineProperty(exports, "removeExpressRoute", { enumerable: true, get: function () { return removeExpressRoute_1.removeExpressRoute; } });
|
|
15
15
|
Object.defineProperty(exports, "removeExpressRoutesTest", { enumerable: true, get: function () { return removeExpressRoute_1.removeExpressRoutesTest; } });
|
|
16
|
-
const
|
|
16
|
+
const setCookieAndGoToReturnURLIfSet_1 = require("./utils/setCookieAndGoToReturnURLIfSet");
|
|
17
17
|
exports.HTTP_FAIL_CODES = {
|
|
18
18
|
UNAUTHORIZED: 401,
|
|
19
19
|
NOT_FOUND: 404,
|
|
@@ -51,7 +51,7 @@ const GET_ALL_AUTH_ROUTES = (conf) => {
|
|
|
51
51
|
exports.GET_ALL_AUTH_ROUTES = GET_ALL_AUTH_ROUTES;
|
|
52
52
|
class AuthHandler {
|
|
53
53
|
prostgles;
|
|
54
|
-
|
|
54
|
+
config;
|
|
55
55
|
get dbHandles() {
|
|
56
56
|
const { dbo, db } = this.prostgles;
|
|
57
57
|
if (!db || !dbo) {
|
|
@@ -62,16 +62,17 @@ class AuthHandler {
|
|
|
62
62
|
// TODO: tidy
|
|
63
63
|
constructor(prostgles) {
|
|
64
64
|
this.prostgles = prostgles;
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
65
|
+
const config = prostgles.opts.auth;
|
|
66
|
+
this.config = config;
|
|
67
|
+
if (config) {
|
|
68
|
+
this.init(config);
|
|
68
69
|
}
|
|
69
70
|
}
|
|
70
71
|
get sidKeyName() {
|
|
71
|
-
return this.
|
|
72
|
+
return this.config?.sidKeyName ?? SID_KEY_NAME;
|
|
72
73
|
}
|
|
73
74
|
get authRoutes() {
|
|
74
|
-
return (0, exports.GET_ALL_AUTH_ROUTES)(this.
|
|
75
|
+
return (0, exports.GET_ALL_AUTH_ROUTES)(this.config?.loginSignupConfig);
|
|
75
76
|
}
|
|
76
77
|
init = setupAuthRoutes_1.setupAuthRoutes.bind(this);
|
|
77
78
|
validateSid = (sid) => {
|
|
@@ -82,9 +83,9 @@ class AuthHandler {
|
|
|
82
83
|
return sid;
|
|
83
84
|
};
|
|
84
85
|
isUserRoute = (pathname) => {
|
|
85
|
-
const { login, logout: logoutRoute, magicLinks: magicLinksRoute, loginWithProvider, } = (0, exports.GET_ALL_AUTH_ROUTES)(this.
|
|
86
|
+
const { login, logout: logoutRoute, magicLinks: magicLinksRoute, loginWithProvider, } = (0, exports.GET_ALL_AUTH_ROUTES)(this.config?.loginSignupConfig);
|
|
86
87
|
const pubRoutes = [
|
|
87
|
-
...(this.
|
|
88
|
+
...(this.config?.loginSignupConfig?.publicRoutes || []),
|
|
88
89
|
login,
|
|
89
90
|
logoutRoute,
|
|
90
91
|
magicLinksRoute,
|
|
@@ -94,8 +95,8 @@ class AuthHandler {
|
|
|
94
95
|
return (0, matchesRoute_1.matchesRoute)(publicRoute, pathname);
|
|
95
96
|
});
|
|
96
97
|
};
|
|
97
|
-
|
|
98
|
-
validateSessionAndSetCookie =
|
|
98
|
+
setCookieAndGoToReturnURLIfSet = setCookieAndGoToReturnURLIfSet_1.setCookieAndGoToReturnURLIfSet.bind(this);
|
|
99
|
+
validateSessionAndSetCookie = setCookieAndGoToReturnURLIfSet_1.validateSessionAndSetCookie.bind(this);
|
|
99
100
|
handleGetUser = handleGetUser_1.handleGetUserThrottled.bind(this);
|
|
100
101
|
/**
|
|
101
102
|
* Used by:
|
|
@@ -114,8 +115,8 @@ class AuthHandler {
|
|
|
114
115
|
}
|
|
115
116
|
};
|
|
116
117
|
destroy = () => {
|
|
117
|
-
const app = this.
|
|
118
|
-
const { login, logout, magicLinkWithId: magicLinksIdParam, loginWithProvider, emailRegistration, magicLinks, } = (0, exports.GET_ALL_AUTH_ROUTES)(this.
|
|
118
|
+
const app = this.config?.loginSignupConfig?.app;
|
|
119
|
+
const { login, logout, magicLinkWithId: magicLinksIdParam, loginWithProvider, emailRegistration, magicLinks, } = (0, exports.GET_ALL_AUTH_ROUTES)(this.config?.loginSignupConfig);
|
|
119
120
|
(0, removeExpressRoute_1.removeExpressRoute)(app, [
|
|
120
121
|
login,
|
|
121
122
|
logout,
|
|
@@ -183,8 +184,8 @@ class AuthHandler {
|
|
|
183
184
|
getSidAndUserFromRequest = getSidAndUserFromRequest_1.getSidAndUserFromRequest.bind(this);
|
|
184
185
|
isNonExpiredSocketSession = (socket, session) => {
|
|
185
186
|
const hasExpired = Boolean(session && session.expires <= Date.now());
|
|
186
|
-
if (this.
|
|
187
|
-
!this.
|
|
187
|
+
if (this.config?.loginSignupConfig?.publicRoutes &&
|
|
188
|
+
!this.config.loginSignupConfig.disableSocketAuthGuard) {
|
|
188
189
|
const error = "Session has expired";
|
|
189
190
|
if (hasExpired) {
|
|
190
191
|
if (session?.onExpiration === "redirect")
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthHandler.js","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":";;;AACA,qDAAmE;AAKnE,mDAAgD;AAChD,mCAAgC;AAChC,uDAAoD;AACpD,6EAA0E;AAUjE,wGAVA,iDAAuB,OAUA;AAThC,+EAA4E;AAC5E,yDAAyF;AACzF,uDAAoD;AACpD,mEAAyF;AAMvD,mGANzB,uCAAkB,OAMyB;AAAE,wGANzB,4CAAuB,OAMyB;AAL7E,2FAGgD;AAGnC,QAAA,eAAe,GAAG;IAC7B,YAAY,EAAE,GAAG;IACjB,SAAS,EAAE,GAAG;IACd,WAAW,EAAE,GAAG;IAChB,qBAAqB,EAAE,GAAG;IAC1B,QAAQ,EAAE,GAAG;IACb,iBAAiB,EAAE,GAAG;CACd,CAAC;AAEE,QAAA,kBAAkB,GAAG;IAChC,EAAE,EAAE,GAAG;IACP,OAAO,EAAE,GAAG;CACJ,CAAC;AAEX,MAAM,YAAY,GAAG,YAAqB,CAAC;AAC9B,QAAA,uBAAuB,GAAG,QAAQ,CAAC,CAAC,sBAAsB;AAC1D,QAAA,0BAA0B,GAAG,WAAW,CAAC;AACzC,QAAA,WAAW,GAAG;IACzB,KAAK,EAAE,QAAQ;IACf,iBAAiB,EAAE,QAAQ;IAC3B,iBAAiB,EAAE,WAAW;IAC9B,MAAM,EAAE,SAAS;IACjB,UAAU,EAAE,aAAa;IACzB,eAAe,EAAE,iBAAiB;CAC1B,CAAC;AACJ,MAAM,cAAc,GAAG,CAC5B,IAAqC,EACrC,KAA+B,EAC/B,EAAE;IACF,MAAM,QAAQ,GAAG,IAAI,EAAE,kBAAkB,IAAI,EAAE,CAAC;IAChD,OAAO,GAAG,QAAQ,GAAG,mBAAW,CAAC,KAAK,CAAC,EAAE,CAAC;AAC5C,CAAC,CAAC;AANW,QAAA,cAAc,kBAMzB;AACK,MAAM,mBAAmB,GAAG,CAAC,IAAqC,EAAE,EAAE;IAC3E,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,mBAAW,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;QACzC,GAAG;QACH,IAAA,sBAAc,EAAC,IAAI,EAAE,GAA+B,CAAC;KACtD,CAAC,CAGH,CAAC;AACJ,CAAC,CAAC;AATW,QAAA,mBAAmB,uBAS9B;AAEF,MAAa,WAAW;IACH,SAAS,CAAY;IACrB,
|
|
1
|
+
{"version":3,"file":"AuthHandler.js","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":"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"}
|
package/dist/Auth/AuthTypes.d.ts
CHANGED
|
@@ -6,7 +6,7 @@ import type { Profile as GitHubProfile, StrategyOptions as GitHubStrategy } from
|
|
|
6
6
|
import type { Profile as GoogleProfile, StrategyOptions as GoogleStrategy } from "passport-google-oauth20";
|
|
7
7
|
import type { MicrosoftStrategyOptions } from "passport-microsoft";
|
|
8
8
|
import type OAuth2Strategy from "passport-oauth2";
|
|
9
|
-
import type { AnyObject, AuthRequest, AuthResponse, ClientSchema, FieldFilter, IdentityProvider, LocalLoginMode, UserLike } from "prostgles-types";
|
|
9
|
+
import type { AnyObject, AuthRequest, AuthResponse, ClientSchema, FieldFilter, FullFilter, IdentityProvider, LocalLoginMode, UserLike } from "prostgles-types";
|
|
10
10
|
import type { DBOFullyTyped } from "../DBSchemaBuilder/DBSchemaBuilder";
|
|
11
11
|
import type { PRGLIOSocket } from "../DboBuilder/DboBuilderTypes";
|
|
12
12
|
import { type CachedSession } from "../DboBuilder/DboBuilderTypes";
|
|
@@ -258,6 +258,10 @@ export type AuthConfig<S = void, SUser extends SessionUser = SessionUser> = {
|
|
|
258
258
|
* - websocket auth guard - when session expires tells the client to reload to be redirected to login
|
|
259
259
|
*/
|
|
260
260
|
getUser: (sid: string | undefined, dbo: DBOFullyTyped<S>, db: DB, client: LoginClientInfo, reqInfo: AuthClientRequest) => Awaitable<AuthResultOrError<SUser>>;
|
|
261
|
+
/**
|
|
262
|
+
* Used in functions
|
|
263
|
+
*/
|
|
264
|
+
findUser: (userFilter: FullFilter<void, void>, dbo: DBOFullyTyped<S>) => Awaitable<SUser["user"] | undefined>;
|
|
261
265
|
/**
|
|
262
266
|
* Will setup auth routes
|
|
263
267
|
* /login
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthTypes.d.ts","sourceRoot":"","sources":["../../lib/Auth/AuthTypes.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"AuthTypes.d.ts","sourceRoot":"","sources":["../../lib/Auth/AuthTypes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthTypes.js","sourceRoot":"","sources":["../../lib/Auth/AuthTypes.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"AuthTypes.js","sourceRoot":"","sources":["../../lib/Auth/AuthTypes.ts"],"names":[],"mappings":";;;AA6BA,+CAA+C;AAuVxC,MAAM,eAAe,GAAG,CAAC,EAC9B,UAAU,EACV,IAAI,EACJ,iBAAiB,GAKlB,EAAE,EAAE;IACH,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;QAC/B,OAAO,GAAG,IAAA,4BAAc,EAAC,iBAAiB,EAAE,iBAAiB,CAAC,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;IAC9E,CAAC;IACD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IAC7B,MAAM,eAAe,GAAG,IAAI,GAAG,CAC7B,GAAG,UAAU,GAAG,IAAA,4BAAc,EAAC,iBAAiB,EAAE,YAAY,CAAC,EAAE,CAClE,CAAC;IACF,eAAe,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACjD,eAAe,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC/C,OAAO,eAAe,CAAC,QAAQ,EAAE,CAAC;AACpC,CAAC,CAAC;AAnBW,QAAA,eAAe,mBAmB1B"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type e from "express";
|
|
2
2
|
import type { AuthHandler } from "../AuthHandler";
|
|
3
|
-
|
|
3
|
+
import type { AuthConfig } from "../AuthTypes";
|
|
4
|
+
export declare function setCatchAllRequestHandler(this: AuthHandler, app: e.Express, config: AuthConfig): void;
|
|
4
5
|
//# sourceMappingURL=setCatchAllRequestHandler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setCatchAllRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setCatchAllRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAG7B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"setCatchAllRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setCatchAllRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAG7B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD,OAAO,KAAK,EAAqB,UAAU,EAAE,MAAM,cAAc,CAAC;AAIlE,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,QA0F9F"}
|
|
@@ -5,14 +5,15 @@ const prostgles_types_1 = require("prostgles-types");
|
|
|
5
5
|
const AuthHandler_1 = require("../AuthHandler");
|
|
6
6
|
const getSafeReturnUrlFromQuery_1 = require("../utils/getSafeReturnUrlFromQuery");
|
|
7
7
|
const matchesRoute_1 = require("../utils/matchesRoute");
|
|
8
|
-
function setCatchAllRequestHandler(app) {
|
|
8
|
+
function setCatchAllRequestHandler(app, config) {
|
|
9
9
|
const requestHandlerCatchAll = async (req, res, next) => {
|
|
10
|
-
const { onGetRequestOK } =
|
|
11
|
-
const { restApi, opts: { fileTable },
|
|
10
|
+
const { onGetRequestOK } = config.loginSignupConfig ?? {};
|
|
11
|
+
const { restApi, opts: { fileTable }, } = this.prostgles;
|
|
12
|
+
/** TODO: tidy - this shouldn't be handled here */
|
|
12
13
|
const pathsHandledByProstgles = [
|
|
13
14
|
restApi?.path,
|
|
14
15
|
fileTable && (fileTable.fileServePath ?? `/${fileTable.tableName}`),
|
|
15
|
-
|
|
16
|
+
config.loginSignupConfig?.loginWithOAuth && this.authRoutes.loginWithProvider,
|
|
16
17
|
].filter(prostgles_types_1.isDefined);
|
|
17
18
|
if (pathsHandledByProstgles.some((path) => (0, matchesRoute_1.matchesRoute)(path, req.path))) {
|
|
18
19
|
next();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setCatchAllRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setCatchAllRequestHandler.ts"],"names":[],"mappings":";;AASA,8DA0FC;AAjGD,qDAA4C;AAE5C,gDAA0E;AAE1E,kFAA+E;AAC/E,wDAAqD;AAErD,SAAgB,yBAAyB,CAAoB,GAAc;
|
|
1
|
+
{"version":3,"file":"setCatchAllRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setCatchAllRequestHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type e from "express";
|
|
2
2
|
import type { AuthHandler } from "../AuthHandler";
|
|
3
|
-
|
|
3
|
+
import type { AuthConfig } from "../AuthTypes";
|
|
4
|
+
export declare function setLogoutRequestHandler(this: AuthHandler, app: e.Express, config: AuthConfig): void;
|
|
4
5
|
//# sourceMappingURL=setLogoutRequestHandler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setLogoutRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setLogoutRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAE7B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"setLogoutRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setLogoutRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAE7B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/C,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,QAgB5F"}
|
|
@@ -2,14 +2,14 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.setLogoutRequestHandler = setLogoutRequestHandler;
|
|
4
4
|
const throttledReject_1 = require("../utils/throttledReject");
|
|
5
|
-
function setLogoutRequestHandler(app) {
|
|
5
|
+
function setLogoutRequestHandler(app, config) {
|
|
6
6
|
const logoutRequestHandler = async (req, res) => {
|
|
7
7
|
const sid = this.validateSid(req.cookies?.[this.sidKeyName]);
|
|
8
8
|
if (sid) {
|
|
9
9
|
try {
|
|
10
10
|
await (0, throttledReject_1.throttledReject)(async () => {
|
|
11
11
|
const { db, dbo } = this.dbHandles;
|
|
12
|
-
return
|
|
12
|
+
return config.loginSignupConfig?.logout(req.cookies?.[this.sidKeyName], dbo, db);
|
|
13
13
|
});
|
|
14
14
|
}
|
|
15
15
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setLogoutRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setLogoutRequestHandler.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"setLogoutRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setLogoutRequestHandler.ts"],"names":[],"mappings":";;AAMA,0DAgBC;AAnBD,8DAA2D;AAG3D,SAAgB,uBAAuB,CAAoB,GAAc,EAAE,MAAkB;IAC3F,MAAM,oBAAoB,GAAG,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;QACjE,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;QAC7D,IAAI,GAAG,EAAE,CAAC;YACR,IAAI,CAAC;gBACH,MAAM,IAAA,iCAAe,EAAC,KAAK,IAAI,EAAE;oBAC/B,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC;oBACnC,OAAO,MAAM,CAAC,iBAAiB,EAAE,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;gBACnF,CAAC,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACrB,CAAC;QACH,CAAC;QACD,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACpB,CAAC,CAAC;IACF,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;AACzD,CAAC"}
|
|
@@ -19,7 +19,7 @@ function setMagicLinkOrOTPRequestHandler(onMagicLink, app) {
|
|
|
19
19
|
if (data.returnToken) {
|
|
20
20
|
return res.json({ success: true, token: response.session.sid });
|
|
21
21
|
}
|
|
22
|
-
this.
|
|
22
|
+
this.setCookieAndGoToReturnURLIfSet(response.session, { req, res });
|
|
23
23
|
}
|
|
24
24
|
}
|
|
25
25
|
catch (_e) {
|
|
@@ -41,7 +41,7 @@ function setRegisterRequestHandler({ onRegister, minPasswordLength = 8, requireP
|
|
|
41
41
|
email: username,
|
|
42
42
|
password,
|
|
43
43
|
getConfirmationUrl: ({ code, websiteUrl }) => (0, AuthTypes_1.getMagicLinkUrl)({
|
|
44
|
-
loginSignupConfig: this.
|
|
44
|
+
loginSignupConfig: this.config?.loginSignupConfig,
|
|
45
45
|
websiteUrl,
|
|
46
46
|
data: { type: "otp", code, email: username, returnToken: false },
|
|
47
47
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setRegisterRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setRegisterRequestHandler.ts"],"names":[],"mappings":";;AAgBA,8DA0DC;AAvED,gDAAmE;AACnE,4CAAqE;AACrE,8EAA2E;AAC3E,qEAA0D;AAU1D,SAAgB,yBAAyB,CAEvC,EAAE,UAAU,EAAE,iBAAiB,GAAG,CAAC,EAAE,eAAe,EAAmB,EACvE,GAAc;IAEd,MAAM,sBAAsB,GAAG,KAAK,EAAE,GAAY,EAAE,GAA4B,EAAE,EAAE;QAClF,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,IAAA,uCAAc,EAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC/C,IAAI,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC;YACnB,OAAO,GAAG;iBACP,MAAM,CAAC,6BAAe,CAAC,WAAW,CAAC;iBACnC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,sBAAsB,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QAC5E,CAAC;QACD,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC;QACzC,MAAM,YAAY,GAAG,CAAC,QAAoB,EAAE,EAAE;YAC5C,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;gBACrB,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACrB,CAAC;iBAAM,CAAC;gBACN,GAAG,CAAC,MAAM,CAAC,6BAAe,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACzD,CAAC;QACH,CAAC,CAAC;QACF,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,YAAY,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC,CAAC;QACpE,CAAC;QACD,IAAI,CAAC,QAAQ,IAAI,eAAe,EAAE,CAAC;YACjC,OAAO,YAAY,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC,CAAC;QACpE,CAAC;aAAM,IAAI,QAAQ,CAAC,MAAM,GAAG,iBAAiB,EAAE,CAAC;YAC/C,OAAO,YAAY,CAAC;gBAClB,OAAO,EAAE,KAAK;gBACd,IAAI,EAAE,eAAe;gBACrB,OAAO,EAAE,6BAA6B,iBAAiB,kBAAkB;aAC1E,CAAC,CAAC;QACL,CAAC;QACD,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,IAAA,iDAAuB,EAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;YAC7D,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC;gBAC9B,KAAK,EAAE,QAAQ;gBACf,QAAQ;gBACR,kBAAkB,EAAE,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,CAC3C,IAAA,2BAAe,EAAC;oBACd,iBAAiB,EAAE,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"setRegisterRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setRegisterRequestHandler.ts"],"names":[],"mappings":";;AAgBA,8DA0DC;AAvED,gDAAmE;AACnE,4CAAqE;AACrE,8EAA2E;AAC3E,qEAA0D;AAU1D,SAAgB,yBAAyB,CAEvC,EAAE,UAAU,EAAE,iBAAiB,GAAG,CAAC,EAAE,eAAe,EAAmB,EACvE,GAAc;IAEd,MAAM,sBAAsB,GAAG,KAAK,EAAE,GAAY,EAAE,GAA4B,EAAE,EAAE;QAClF,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,IAAA,uCAAc,EAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC/C,IAAI,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC;YACnB,OAAO,GAAG;iBACP,MAAM,CAAC,6BAAe,CAAC,WAAW,CAAC;iBACnC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,sBAAsB,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QAC5E,CAAC;QACD,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC;QACzC,MAAM,YAAY,GAAG,CAAC,QAAoB,EAAE,EAAE;YAC5C,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;gBACrB,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACrB,CAAC;iBAAM,CAAC;gBACN,GAAG,CAAC,MAAM,CAAC,6BAAe,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACzD,CAAC;QACH,CAAC,CAAC;QACF,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,YAAY,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC,CAAC;QACpE,CAAC;QACD,IAAI,CAAC,QAAQ,IAAI,eAAe,EAAE,CAAC;YACjC,OAAO,YAAY,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC,CAAC;QACpE,CAAC;aAAM,IAAI,QAAQ,CAAC,MAAM,GAAG,iBAAiB,EAAE,CAAC;YAC/C,OAAO,YAAY,CAAC;gBAClB,OAAO,EAAE,KAAK;gBACd,IAAI,EAAE,eAAe;gBACrB,OAAO,EAAE,6BAA6B,iBAAiB,kBAAkB;aAC1E,CAAC,CAAC;QACL,CAAC;QACD,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,IAAA,iDAAuB,EAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;YAC7D,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC;gBAC9B,KAAK,EAAE,QAAQ;gBACf,QAAQ;gBACR,kBAAkB,EAAE,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,CAC3C,IAAA,2BAAe,EAAC;oBACd,iBAAiB,EAAE,IAAI,CAAC,MAAM,EAAE,iBAAiB;oBACjD,UAAU;oBACV,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,KAAK,EAAE;iBACjE,CAAC;gBACJ,UAAU;gBACV,GAAG;aACJ,CAAC,CAAC;YACH,OAAO,YAAY,CAAC,MAAM,CAAC,CAAC;QAC9B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,KAAK,CAAC,CAAC;YAC7C,OAAO,YAAY,CAAC;gBAClB,OAAO,EAAE,KAAK;gBACd,IAAI,EAAE,cAAc;gBACpB,OAAO,EAAE,sBAAsB;aAChC,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;IAEF,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,iBAAiB,EAAE,sBAAsB,CAAC,CAAC;AACtE,CAAC"}
|
|
@@ -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, localLoginMode, login, publicRoutes, disableSocketAuthGuard, } = this.
|
|
8
|
+
const { loginWithOAuth, signupWithEmail, localLoginMode, login, publicRoutes, disableSocketAuthGuard, } = this.config?.loginSignupConfig ?? {};
|
|
9
9
|
if (publicRoutes && !disableSocketAuthGuard) {
|
|
10
10
|
pathGuard = true;
|
|
11
11
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getClientAuth.js","sourceRoot":"","sources":["../../lib/Auth/getClientAuth.ts"],"names":[],"mappings":";;AAUA,sCAwFC;AA7FD,qDAAgF;AAChF,+CAA8D;AAIvD,KAAK,UAAU,aAAa,CAEjC,SAA4B;IAE5B,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,MAAM,EACJ,cAAc,EACd,eAAe,EACf,cAAc,EACd,KAAK,EACL,YAAY,EACZ,sBAAsB,GACvB,GAAG,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"getClientAuth.js","sourceRoot":"","sources":["../../lib/Auth/getClientAuth.ts"],"names":[],"mappings":"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"}
|
package/dist/Auth/login.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../lib/Auth/login.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAmB,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAG/E,wBAAsB,KAAK,CACzB,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,UAAU,EACf,GAAG,EAAE,oBAAoB,EACzB,WAAW,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../lib/Auth/login.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAmB,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAG/E,wBAAsB,KAAK,CACzB,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,UAAU,EACf,GAAG,EAAE,oBAAoB,EACzB,WAAW,EAAE,WAAW,6CA0EzB;AAED,eAAO,MAAM,wBAAwB,GAAI,SAAS,IAAI,CAAC,YAAY,EAAE,SAAS,GAAG,KAAK,CAAC,+BAkBtF,CAAC"}
|
package/dist/Auth/login.js
CHANGED
|
@@ -6,17 +6,21 @@ const AuthHandler_1 = require("./AuthHandler");
|
|
|
6
6
|
const AuthTypes_1 = require("./AuthTypes");
|
|
7
7
|
const throttledReject_1 = require("./utils/throttledReject");
|
|
8
8
|
async function login(req, res, loginParams) {
|
|
9
|
+
const config = this.config;
|
|
10
|
+
if (!config) {
|
|
11
|
+
throw new Error("AuthHandler config is missing. Make sure to initialize AuthHandler with Prostgles instance that has auth config.");
|
|
12
|
+
}
|
|
9
13
|
const start = Date.now();
|
|
10
|
-
const { responseThrottle = 500 } =
|
|
14
|
+
const { responseThrottle = 500 } = config;
|
|
11
15
|
const errCodeOrSession = await (0, throttledReject_1.throttledAuthCall)(async () => {
|
|
12
|
-
const { login } =
|
|
16
|
+
const { login } = config.loginSignupConfig ?? {};
|
|
13
17
|
if (!login) {
|
|
14
18
|
console.error("Auth login config missing");
|
|
15
19
|
return "server-error";
|
|
16
20
|
}
|
|
17
21
|
const { db, dbo } = this.dbHandles;
|
|
18
22
|
const result = await login(loginParams, dbo, db, (0, AuthHandler_1.getClientRequestIPsInfo)({ httpReq: req }), (data, websiteUrl) => (0, AuthTypes_1.getMagicLinkUrl)({
|
|
19
|
-
loginSignupConfig:
|
|
23
|
+
loginSignupConfig: config.loginSignupConfig,
|
|
20
24
|
websiteUrl,
|
|
21
25
|
data,
|
|
22
26
|
}));
|
|
@@ -54,7 +58,7 @@ async function login(req, res, loginParams) {
|
|
|
54
58
|
}
|
|
55
59
|
return res.json(loginResponse.response);
|
|
56
60
|
}
|
|
57
|
-
this.
|
|
61
|
+
this.setCookieAndGoToReturnURLIfSet(loginResponse.session, { req, res });
|
|
58
62
|
}
|
|
59
63
|
const getBasicSessionErrorCode = (session) => {
|
|
60
64
|
const { sid, expires } = session;
|
package/dist/Auth/login.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../lib/Auth/login.ts"],"names":[],"mappings":";;;AAOA,
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../lib/Auth/login.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import type { AuthHandler } from "./AuthHandler";
|
|
2
|
-
|
|
2
|
+
import type { AuthConfig } from "./AuthTypes";
|
|
3
|
+
export declare function setupAuthRoutes(this: AuthHandler, config: AuthConfig): void;
|
|
3
4
|
//# sourceMappingURL=setupAuthRoutes.d.ts.map
|
|
@@ -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;AAUjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,wBAAgB,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,UAAU,QAiEpE"}
|
|
@@ -10,8 +10,8 @@ const setOAuthRequestHandlers_1 = require("./endpoints/setOAuthRequestHandlers")
|
|
|
10
10
|
const setRegisterRequestHandler_1 = require("./endpoints/setRegisterRequestHandler");
|
|
11
11
|
const upsertNamedExpressMiddleware_1 = require("./utils/upsertNamedExpressMiddleware");
|
|
12
12
|
const userContextMiddleware_1 = require("./middleware/userContextMiddleware");
|
|
13
|
-
function setupAuthRoutes() {
|
|
14
|
-
const { loginSignupConfig, onUseOrSocketConnected } =
|
|
13
|
+
function setupAuthRoutes(config) {
|
|
14
|
+
const { loginSignupConfig, onUseOrSocketConnected } = config;
|
|
15
15
|
if (this.sidKeyName === "sid") {
|
|
16
16
|
throw "sidKeyName cannot be 'sid' due to collision with socket.io";
|
|
17
17
|
}
|
|
@@ -44,14 +44,14 @@ function setupAuthRoutes() {
|
|
|
44
44
|
}
|
|
45
45
|
next();
|
|
46
46
|
};
|
|
47
|
-
(0, upsertNamedExpressMiddleware_1.upsertNamedExpressMiddleware)(app, prostglesUseMiddleware, "
|
|
47
|
+
(0, upsertNamedExpressMiddleware_1.upsertNamedExpressMiddleware)(app, prostglesUseMiddleware, "prostglesOnUseOrSocketConnected");
|
|
48
48
|
}
|
|
49
49
|
if (onMagicLinkOrOTP) {
|
|
50
50
|
setMagicLinkOrOTPRequestHandler_1.setMagicLinkOrOTPRequestHandler.bind(this)(onMagicLinkOrOTP, app);
|
|
51
51
|
}
|
|
52
52
|
setLoginRequestHandler_1.setLoginRequestHandler.bind(this)(app);
|
|
53
53
|
/* Redirect if not logged in and requesting non public content */
|
|
54
|
-
setCatchAllRequestHandler_1.setCatchAllRequestHandler.bind(this)(app);
|
|
55
|
-
setLogoutRequestHandler_1.setLogoutRequestHandler.bind(this)(app);
|
|
54
|
+
setCatchAllRequestHandler_1.setCatchAllRequestHandler.bind(this)(app, config);
|
|
55
|
+
setLogoutRequestHandler_1.setLogoutRequestHandler.bind(this)(app, config);
|
|
56
56
|
}
|
|
57
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":";;AAaA,0CAiEC;AA5ED,+CAAwD;AACxD,qFAAkF;AAClF,+EAA4E;AAC5E,iFAA8E;AAC9E,iGAA8F;AAC9F,iFAA8E;AAC9E,qFAAkF;AAClF,uFAAoF;AACpF,8EAAgF;AAGhF,SAAgB,eAAe,CAAoB,MAAkB;IACnE,MAAM,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,GAAG,MAAM,CAAC;IAE7D,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,kDAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IAE3C,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,EAAE,MAAM,CAAC,CAAC;IAElD,iDAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AAClD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleGetUser.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/handleGetUser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEpD,OAAO,EAA2B,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAI5F,MAAM,MAAM,mBAAmB,GAAG,iBAAiB,GAAG,sBAAsB,CAAC;AAE7E;;;;GAIG;AACH,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,WAAW,EACjB,SAAS,EAAE,iBAAiB,GAC3B,OAAO,CAAC,mBAAmB,CAAC,
|
|
1
|
+
{"version":3,"file":"handleGetUser.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/handleGetUser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEpD,OAAO,EAA2B,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAI5F,MAAM,MAAM,mBAAmB,GAAG,iBAAiB,GAAG,sBAAsB,CAAC;AAE7E;;;;GAIG;AACH,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,WAAW,EACjB,SAAS,EAAE,iBAAiB,GAC3B,OAAO,CAAC,mBAAmB,CAAC,CAqF9B;AAED,eAAO,MAAM,WAAW,GACtB,aAAa,iBAAiB,KAC7B,WAAW,IAAI,YAAY,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,YAAY,CAAC,WAEjE,CAAC"}
|
|
@@ -11,11 +11,15 @@ const throttledReject_1 = require("./throttledReject");
|
|
|
11
11
|
* Used in Publish Parser and AuthHandler
|
|
12
12
|
*/
|
|
13
13
|
async function handleGetUserThrottled(clientReq) {
|
|
14
|
-
const
|
|
14
|
+
const config = this.config;
|
|
15
|
+
if (!config) {
|
|
16
|
+
return {
|
|
17
|
+
sid: undefined,
|
|
18
|
+
};
|
|
19
|
+
}
|
|
20
|
+
const getSessionForCaching = config.cacheSession?.getSession;
|
|
15
21
|
/** Get cached session if available */
|
|
16
|
-
const __prglCache = !
|
|
17
|
-
undefined
|
|
18
|
-
: (clientReq.httpReq ?? clientReq.socket).__prglCache?.get(this.prostgles.appId);
|
|
22
|
+
const __prglCache = !config.cacheSession ? undefined : ((clientReq.httpReq ?? clientReq.socket).__prglCache?.get(this.prostgles.appId));
|
|
19
23
|
if (clientReq.socket && __prglCache) {
|
|
20
24
|
const { userData, session } = __prglCache;
|
|
21
25
|
const isValid = this.isNonExpiredSocketSession(clientReq.socket, session);
|
|
@@ -31,13 +35,8 @@ async function handleGetUserThrottled(clientReq) {
|
|
|
31
35
|
};
|
|
32
36
|
}
|
|
33
37
|
const result = await (0, throttledReject_1.throttledAuthCall)(async () => {
|
|
34
|
-
if (!this.opts.getUser) {
|
|
35
|
-
return {
|
|
36
|
-
sid: undefined,
|
|
37
|
-
};
|
|
38
|
-
}
|
|
39
38
|
const { db, dbo } = this.dbHandles;
|
|
40
|
-
const clientInfoOrErr = await
|
|
39
|
+
const clientInfoOrErr = await config.getUser(this.getValidatedSid(clientReq), dbo, db, (0, AuthHandler_1.getClientRequestIPsInfo)(clientReq), clientReq);
|
|
41
40
|
if ((0, exports.isAuthError)(clientInfoOrErr)) {
|
|
42
41
|
return {
|
|
43
42
|
error: (0, prostgles_types_1.isObject)(clientInfoOrErr) ? clientInfoOrErr : { success: false, code: clientInfoOrErr },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleGetUser.js","sourceRoot":"","sources":["../../../lib/Auth/utils/handleGetUser.ts"],"names":[],"mappings":";;;AAcA,
|
|
1
|
+
{"version":3,"file":"handleGetUser.js","sourceRoot":"","sources":["../../../lib/Auth/utils/handleGetUser.ts"],"names":[],"mappings":"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"}
|
package/dist/Auth/utils/{setCookieAndGoToReturnURLIFSet.d.ts → setCookieAndGoToReturnURLIfSet.d.ts}
RENAMED
|
@@ -8,11 +8,11 @@ export declare function validateSessionAndSetCookie(this: AuthHandler, cookie: {
|
|
|
8
8
|
req: ExpressReq;
|
|
9
9
|
res: LoginResponseHandler;
|
|
10
10
|
}): void | LoginResponseHandler;
|
|
11
|
-
export declare function
|
|
11
|
+
export declare function setCookieAndGoToReturnURLIfSet(this: AuthHandler, cookie: {
|
|
12
12
|
sid: string;
|
|
13
13
|
expires: number;
|
|
14
14
|
}, requestHandler: {
|
|
15
15
|
req: ExpressReq;
|
|
16
16
|
res: LoginResponseHandler;
|
|
17
17
|
}): void;
|
|
18
|
-
//# sourceMappingURL=
|
|
18
|
+
//# sourceMappingURL=setCookieAndGoToReturnURLIfSet.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"
|
|
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,+BAW/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,QA8C/D"}
|
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":";;AAQA,kEAcC;AAED,wEAiDC;AAzED,gDAA+F;AAG/F,oCAAoD;AACpD,2EAAwE;AACxE,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,OAAO,GAAG,CAAC,MAAM,CAAC,6BAAe,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC;YACnD,OAAO,EAAE,KAAK;YACd,IAAI,EAAE,gBAAgB;SACvB,CAAC,CAAC;IACL,CAAC;IACD,OAAO,IAAI,CAAC,8BAA8B,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;AACrE,CAAC;AAED,SAAgB,8BAA8B,CAE5C,MAAwC,EACxC,cAA8D;IAE9D,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IACnD,CAAC;IACD,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,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;IACjC,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,QAAQ;QAClB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,aAAa,IAAI,EAAE,CAAC;KAC/C,CAAC;IACX,MAAM,UAAU,GAAG,GAAG,CAAC;IAEvB,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IACpD,MAAM,aAAa,GAAG,IAAA,qDAAyB,EAAC,GAAG,CAAC,CAAC;IACrD,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"}
|
|
@@ -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":"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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"}
|
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
|
|
|
@@ -71,9 +71,13 @@ export class PublishParser {
|
|
|
71
71
|
if (!functionGroups || !publishParams.user) {
|
|
72
72
|
return;
|
|
73
73
|
}
|
|
74
|
+
const { findUser } = this.prostgles.opts.auth ?? {};
|
|
75
|
+
if (!findUser) {
|
|
76
|
+
throw new Error(
|
|
77
|
+
"findUser function is missing in auth config. It is required for functions to work.",
|
|
78
|
+
);
|
|
79
|
+
}
|
|
74
80
|
const user = publishParams.user;
|
|
75
|
-
const users = publishParams.dbo.users;
|
|
76
|
-
if (!users?.findOne) return;
|
|
77
81
|
const userId = user.id;
|
|
78
82
|
if (!userId || typeof userId !== "string") {
|
|
79
83
|
throw "User ID is missing or invalid";
|
|
@@ -81,9 +85,12 @@ export class PublishParser {
|
|
|
81
85
|
const allowedFunctionsMap = new Map<string, ServerFunctionDefinition>();
|
|
82
86
|
|
|
83
87
|
for (const group of Object.values(functionGroups)) {
|
|
84
|
-
const matchingUser = await
|
|
85
|
-
|
|
86
|
-
|
|
88
|
+
const matchingUser = await findUser(
|
|
89
|
+
{
|
|
90
|
+
$and: [group.userFilter, { id: userId }],
|
|
91
|
+
},
|
|
92
|
+
publishParams.dbo,
|
|
93
|
+
);
|
|
87
94
|
if (!matchingUser) continue;
|
|
88
95
|
|
|
89
96
|
for (const [name, method] of Object.entries(group.functions)) {
|
package/package.json
CHANGED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"setCookieAndGoToReturnURLIFSet.js","sourceRoot":"","sources":["../../../lib/Auth/utils/setCookieAndGoToReturnURLIFSet.ts"],"names":[],"mappings":";;AAQA,kEAcC;AAED,wEA8CC;AAtED,gDAA+F;AAG/F,oCAAoD;AACpD,2EAAwE;AACxE,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,OAAO,GAAG,CAAC,MAAM,CAAC,6BAAe,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC;YACnD,OAAO,EAAE,KAAK;YACd,IAAI,EAAE,gBAAgB;SACvB,CAAC,CAAC;IACL,CAAC;IACD,OAAO,IAAI,CAAC,8BAA8B,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;AACrE,CAAC;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,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;IACjC,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,QAAQ;QAClB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,aAAa,IAAI,EAAE,CAAC;KAC7C,CAAC;IACX,MAAM,UAAU,GAAG,GAAG,CAAC;IAEvB,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IACpD,MAAM,aAAa,GAAG,IAAA,qDAAyB,EAAC,GAAG,CAAC,CAAC;IACrD,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"}
|