prostgles-server 4.2.688 → 4.2.690
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 +2 -0
- package/dist/Auth/AuthHandler.d.ts.map +1 -1
- package/dist/Auth/AuthHandler.js +17 -4
- package/dist/Auth/AuthHandler.js.map +1 -1
- package/dist/Auth/AuthTypes.d.ts +10 -8
- package/dist/Auth/AuthTypes.d.ts.map +1 -1
- package/dist/Auth/AuthTypes.js.map +1 -1
- package/dist/Auth/endpoints/setOAuthRequestHandlers.js +1 -1
- package/dist/Auth/endpoints/setOAuthRequestHandlers.js.map +1 -1
- package/dist/Auth/endpoints/setRegisterRequestHandler.d.ts +1 -1
- package/dist/Auth/endpoints/setRegisterRequestHandler.d.ts.map +1 -1
- package/dist/Auth/endpoints/setRegisterRequestHandler.js +20 -6
- package/dist/Auth/endpoints/setRegisterRequestHandler.js.map +1 -1
- package/dist/Auth/getClientAuth.d.ts +1 -1
- package/dist/Auth/getClientAuth.d.ts.map +1 -1
- package/dist/Auth/getClientAuth.js +18 -8
- package/dist/Auth/getClientAuth.js.map +1 -1
- package/dist/Auth/setupAuthRoutes.d.ts.map +1 -1
- package/dist/Auth/setupAuthRoutes.js +5 -0
- package/dist/Auth/setupAuthRoutes.js.map +1 -1
- package/dist/Auth/utils/upsertNamedExpressMiddleware.d.ts +2 -2
- package/dist/Auth/utils/upsertNamedExpressMiddleware.d.ts.map +1 -1
- package/dist/Auth/utils/upsertNamedExpressMiddleware.js +2 -2
- package/dist/Auth/utils/upsertNamedExpressMiddleware.js.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getJoinQuery.d.ts.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getJoinQuery.js +11 -3
- package/dist/DboBuilder/QueryBuilder/getJoinQuery.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/getRawInfo.js +1 -1
- package/dist/DboBuilder/ViewHandler/getRawInfo.js.map +1 -1
- package/dist/Jobs/JobManager.d.ts +2 -0
- package/dist/Jobs/JobManager.d.ts.map +1 -1
- package/dist/Jobs/JobManager.js +11 -0
- package/dist/Jobs/JobManager.js.map +1 -1
- package/dist/Jobs/JobTypes.d.ts +35 -18
- package/dist/Jobs/JobTypes.d.ts.map +1 -1
- package/dist/Jobs/JobTypes.js.map +1 -1
- package/dist/Jobs/enqueueJob.d.ts +1 -0
- package/dist/Jobs/enqueueJob.d.ts.map +1 -1
- package/dist/Jobs/enqueueJob.js.map +1 -1
- package/dist/Jobs/enqueueSchedules.d.ts.map +1 -1
- package/dist/Jobs/enqueueSchedules.js +15 -6
- package/dist/Jobs/enqueueSchedules.js.map +1 -1
- package/dist/Jobs/getJobRetention.d.ts +10 -0
- package/dist/Jobs/getJobRetention.d.ts.map +1 -0
- package/dist/Jobs/getJobRetention.js +65 -0
- package/dist/Jobs/getJobRetention.js.map +1 -0
- package/dist/Jobs/jobTableConfig.d.ts +9 -0
- package/dist/Jobs/jobTableConfig.d.ts.map +1 -1
- package/dist/Jobs/jobTableConfig.js +9 -0
- package/dist/Jobs/jobTableConfig.js.map +1 -1
- package/dist/Jobs/pruneJobs.d.ts +4 -0
- package/dist/Jobs/pruneJobs.d.ts.map +1 -0
- package/dist/Jobs/pruneJobs.js +49 -0
- package/dist/Jobs/pruneJobs.js.map +1 -0
- package/dist/Jobs/runJob.d.ts.map +1 -1
- package/dist/Jobs/runJob.js +7 -3
- package/dist/Jobs/runJob.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/package.json +2 -2
|
@@ -20,6 +20,7 @@ export declare const HTTP_SUCCESS_CODES: {
|
|
|
20
20
|
};
|
|
21
21
|
export declare const EXPRESS_CATCH_ALL_ROUTE = "*splat";
|
|
22
22
|
export declare const AUTH_RETURN_URL_PARAM_NAME = "returnURL";
|
|
23
|
+
export declare const AUTH_CACHE_CONTROL_MIDDLEWARE_NAME = "prostglesAuthCacheControl";
|
|
23
24
|
export declare const AUTH_ROUTES: {
|
|
24
25
|
readonly login: "/login";
|
|
25
26
|
readonly loginWithProvider: "/oauth";
|
|
@@ -29,6 +30,7 @@ export declare const AUTH_ROUTES: {
|
|
|
29
30
|
readonly magicLinkWithId: "/magic-link/:id";
|
|
30
31
|
};
|
|
31
32
|
export declare const getAuthRoute: (conf: AuthConfig["loginSignupConfig"], route: keyof typeof AUTH_ROUTES) => string;
|
|
33
|
+
export declare const getAuthRoutesBasePath: (conf: AuthConfig["loginSignupConfig"]) => string;
|
|
32
34
|
export declare const getAllAuthRoutes: (conf: AuthConfig["loginSignupConfig"]) => Record<"login" | "loginWithProvider" | "emailRegistration" | "logout" | "magicLinks" | "magicLinkWithId", string>;
|
|
33
35
|
export declare class AuthHandler {
|
|
34
36
|
protected readonly prostgles: Prostgles;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthHandler.d.ts","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAKjE,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;
|
|
1
|
+
{"version":3,"file":"AuthHandler.d.ts","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAKjE,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;AAOzF,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,kCAAkC,8BAA8B,CAAC;AAC9E,eAAO,MAAM,WAAW;;;;;;;CAOd,CAAC;AACX,eAAO,MAAM,YAAY,GACvB,MAAM,UAAU,CAAC,mBAAmB,CAAC,EACrC,OAAO,MAAM,OAAO,WAAW,WAGhC,CAAC;AACF,eAAO,MAAM,qBAAqB,GAAI,MAAM,UAAU,CAAC,mBAAmB,CAAC,WAQ1E,CAAC;AACF,eAAO,MAAM,gBAAgB,GAAI,MAAM,UAAU,CAAC,mBAAmB,CAAC,sHAErE,CAAC;AAEF,qBAAa,WAAW;IACtB,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IACxC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU,GAAG,SAAS,CAAC;IAClD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA4B;IAE3D,IAAI,SAAS;aAKU,eAAe;;MACrC;gBAGW,SAAS,EAAE,SAAS;IAShC,IAAI,UAAU,WAEb;IAED,IAAI,UAAU,sHAEb;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,GAAI,WAAW,iBAAiB,KAAG,OAAO,CAAC,mBAAmB,CAAC,CAiB1E;IAEF,kBAAkB,GAAI,QAAQ,0BAA0B,UAAwC;IAEhG;;;;OAIG;IACH,cAAc,GAAU,WAAW,iBAAiB,KAAG,OAAO,CAAC,mBAAmB,CAAC,CASjF;IAEF,OAAO,aAwBL;IAEF,KAAK,4PAAoB;IAEzB;;;;;;OAMG;IACH,eAAe,CAAC,cAAc,EAAE,iBAAiB,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS;IA0ClF;;OAEG;IACH,aAAa,GAAI,WAAW,iBAAiB,GAAG,SAAS,KAAG,MAAM,GAAG,SAAS,CAO5E;IAEF,wBAAwB,iEAAuC;IAE/D,aAAa;;;gCAA4B;CAC1C"}
|
package/dist/Auth/AuthHandler.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.AuthHandler = exports.getAllAuthRoutes = exports.getAuthRoute = exports.AUTH_ROUTES = exports.AUTH_RETURN_URL_PARAM_NAME = exports.EXPRESS_CATCH_ALL_ROUTE = exports.HTTP_SUCCESS_CODES = exports.HTTP_FAIL_CODES = exports.removeExpressRoutesTest = exports.removeExpressRoute = exports.getClientRequestIPsInfo = void 0;
|
|
3
|
+
exports.AuthHandler = exports.getAllAuthRoutes = exports.getAuthRoutesBasePath = exports.getAuthRoute = exports.AUTH_ROUTES = exports.AUTH_CACHE_CONTROL_MIDDLEWARE_NAME = exports.AUTH_RETURN_URL_PARAM_NAME = exports.EXPRESS_CATCH_ALL_ROUTE = exports.HTTP_SUCCESS_CODES = exports.HTTP_FAIL_CODES = exports.removeExpressRoutesTest = exports.removeExpressRoute = exports.getClientRequestIPsInfo = void 0;
|
|
4
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
5
|
const getClientAuth_1 = require("./getClientAuth");
|
|
6
6
|
const login_1 = require("./login");
|
|
@@ -14,6 +14,7 @@ const matchesRoute_1 = require("./utils/matchesRoute");
|
|
|
14
14
|
const removeExpressRoute_1 = require("./utils/removeExpressRoute");
|
|
15
15
|
Object.defineProperty(exports, "removeExpressRoute", { enumerable: true, get: function () { return removeExpressRoute_1.removeExpressRoute; } });
|
|
16
16
|
Object.defineProperty(exports, "removeExpressRoutesTest", { enumerable: true, get: function () { return removeExpressRoute_1.removeExpressRoutesTest; } });
|
|
17
|
+
const upsertNamedExpressMiddleware_1 = require("./utils/upsertNamedExpressMiddleware");
|
|
17
18
|
const setCookieAndGoToReturnURLIfSet_1 = require("./utils/setCookieAndGoToReturnURLIfSet");
|
|
18
19
|
exports.HTTP_FAIL_CODES = {
|
|
19
20
|
UNAUTHORIZED: 401,
|
|
@@ -30,6 +31,7 @@ exports.HTTP_SUCCESS_CODES = {
|
|
|
30
31
|
const SID_KEY_NAME = "session_id";
|
|
31
32
|
exports.EXPRESS_CATCH_ALL_ROUTE = "*splat"; //v5 "*splat" //v4 "*"
|
|
32
33
|
exports.AUTH_RETURN_URL_PARAM_NAME = "returnURL";
|
|
34
|
+
exports.AUTH_CACHE_CONTROL_MIDDLEWARE_NAME = "prostglesAuthCacheControl";
|
|
33
35
|
exports.AUTH_ROUTES = {
|
|
34
36
|
login: "/login",
|
|
35
37
|
loginWithProvider: "/oauth",
|
|
@@ -39,10 +41,17 @@ exports.AUTH_ROUTES = {
|
|
|
39
41
|
magicLinkWithId: "/magic-link/:id",
|
|
40
42
|
};
|
|
41
43
|
const getAuthRoute = (conf, route) => {
|
|
42
|
-
|
|
43
|
-
return `${basePath}${exports.AUTH_ROUTES[route]}`;
|
|
44
|
+
return `${(0, exports.getAuthRoutesBasePath)(conf)}${exports.AUTH_ROUTES[route]}`;
|
|
44
45
|
};
|
|
45
46
|
exports.getAuthRoute = getAuthRoute;
|
|
47
|
+
const getAuthRoutesBasePath = (conf) => {
|
|
48
|
+
const basePath = conf?.authRoutesBasePath ?? "/auth";
|
|
49
|
+
if (!basePath.startsWith("/") || basePath.endsWith("/")) {
|
|
50
|
+
throw new Error("authRoutesBasePath must be a non-empty path starting with '/' and without a trailing '/'");
|
|
51
|
+
}
|
|
52
|
+
return basePath;
|
|
53
|
+
};
|
|
54
|
+
exports.getAuthRoutesBasePath = getAuthRoutesBasePath;
|
|
46
55
|
const getAllAuthRoutes = (conf) => {
|
|
47
56
|
return (0, prostgles_types_1.fromEntries)((0, prostgles_types_1.getEntries)(exports.AUTH_ROUTES).map(([key]) => [key, (0, exports.getAuthRoute)(conf, key)]));
|
|
48
57
|
};
|
|
@@ -133,6 +142,9 @@ class AuthHandler {
|
|
|
133
142
|
destroy = () => {
|
|
134
143
|
this.socketSessions.destroy();
|
|
135
144
|
const app = this.config?.loginSignupConfig?.app;
|
|
145
|
+
if (app) {
|
|
146
|
+
(0, upsertNamedExpressMiddleware_1.removeExpressRouteByName)(app, exports.AUTH_CACHE_CONTROL_MIDDLEWARE_NAME);
|
|
147
|
+
}
|
|
136
148
|
const { login, logout, magicLinkWithId: magicLinksIdParam, loginWithProvider, emailRegistration, magicLinks, } = (0, exports.getAllAuthRoutes)(this.config?.loginSignupConfig);
|
|
137
149
|
(0, removeExpressRoute_1.removeExpressRoute)(app, [
|
|
138
150
|
login,
|
|
@@ -183,7 +195,8 @@ class AuthHandler {
|
|
|
183
195
|
throw "Only Bearer Authorization header allowed";
|
|
184
196
|
}
|
|
185
197
|
const bearerSid = authToken && Buffer.from(authToken.token, "base64").toString();
|
|
186
|
-
return this.validateSid(bearerSid ??
|
|
198
|
+
return this.validateSid(bearerSid ??
|
|
199
|
+
(0, prostgles_types_1.getProperty)(maybeClientReq.httpReq.cookies ?? {}, sidKeyName));
|
|
187
200
|
}
|
|
188
201
|
/**
|
|
189
202
|
* Used for logging
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthHandler.js","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":";;;AACA,qDAA4F;AAK5F,mDAAgD;AAChD,mCAAgC;AAChC,uDAAoD;AACpD,6DAA0D;AAC1D,6EAA0E;
|
|
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
|
@@ -71,6 +71,8 @@ export type SignupWithEmail = {
|
|
|
71
71
|
* If true, the user will have to provide a password
|
|
72
72
|
*/
|
|
73
73
|
requirePassword?: boolean;
|
|
74
|
+
/** Require an invitation token and hide public signup from clients. */
|
|
75
|
+
requireInvitation?: boolean;
|
|
74
76
|
/**
|
|
75
77
|
* Called when the user has registered.
|
|
76
78
|
*/
|
|
@@ -81,10 +83,11 @@ export type SignupWithEmail = {
|
|
|
81
83
|
* Will be empty if requirePassword is false
|
|
82
84
|
*/
|
|
83
85
|
password: string;
|
|
86
|
+
invitationToken: AuthInput<"register">["invitationToken"];
|
|
84
87
|
clientInfo: LoginClientInfo;
|
|
85
88
|
/**
|
|
86
89
|
* Returns a URL that the user can click or enter the verification code to confirm their email address.
|
|
87
|
-
* Will point to /magic-link
|
|
90
|
+
* Will point to /auth/magic-link?email=...&code=... by default
|
|
88
91
|
*/
|
|
89
92
|
getConfirmationUrl: (data: {
|
|
90
93
|
code: string;
|
|
@@ -238,10 +241,7 @@ export type AuthConfig<S = void, SUser extends SessionUser = SessionUser> = {
|
|
|
238
241
|
*/
|
|
239
242
|
sessionFields?: FieldFilter<SUser["user"]>;
|
|
240
243
|
/**
|
|
241
|
-
* Will setup auth routes
|
|
242
|
-
* /login
|
|
243
|
-
* /logout
|
|
244
|
-
* /magic-link/:id
|
|
244
|
+
* Will setup auth routes under authRoutesBasePath (defaults to /auth).
|
|
245
245
|
*/
|
|
246
246
|
loginSignupConfig?: LoginSignupConfig<S, SUser>;
|
|
247
247
|
/**
|
|
@@ -295,6 +295,7 @@ export type LoginSignupConfig<S, SUser extends SessionUser> = {
|
|
|
295
295
|
* Express app instance. If provided Prostgles will attempt to set sidKeyName to user cookie
|
|
296
296
|
*/
|
|
297
297
|
app: Express;
|
|
298
|
+
/** Defaults to /auth. Must start with / and cannot be empty, / or end with /. */
|
|
298
299
|
authRoutesBasePath?: string;
|
|
299
300
|
/**
|
|
300
301
|
* Options used in setting the cookie after a successful login
|
|
@@ -316,8 +317,9 @@ export type LoginSignupConfig<S, SUser extends SessionUser> = {
|
|
|
316
317
|
onGetRequestOK?: (req: ExpressReq, res: ExpressRes, params: AuthRequestParams<S, SUser>) => Awaitable<void>;
|
|
317
318
|
/**
|
|
318
319
|
* If defined, will enable:
|
|
319
|
-
* - GET /magic-link/:id route.
|
|
320
|
-
* - POST /magic-link { email, code } route.
|
|
320
|
+
* - GET /auth/magic-link/:id route.
|
|
321
|
+
* - POST /auth/magic-link { email, code } route.
|
|
322
|
+
* The /auth prefix is configurable through authRoutesBasePath.
|
|
321
323
|
* Successful requests that return a session will be logged in
|
|
322
324
|
* and redirected to the returnUrl if set.
|
|
323
325
|
* Otherwise just the response will be sent
|
|
@@ -342,7 +344,7 @@ export type LoginSignupConfig<S, SUser extends SessionUser> = {
|
|
|
342
344
|
localLoginMode?: LocalLoginMode;
|
|
343
345
|
/**
|
|
344
346
|
* If provided then the user will be able to login with a username and/or password
|
|
345
|
-
* through the POST /login route.
|
|
347
|
+
* through the POST /auth/login route (prefix configurable through authRoutesBasePath).
|
|
346
348
|
*/
|
|
347
349
|
login: (params: LoginParams, dbo: DBHandlerServer<S>, db: DB, client: LoginClientInfo, getMagicLinkUrl: (data: MagicLinkOrOTPData, websiteUrl: string) => string) => Awaitable<LoginResponse>;
|
|
348
350
|
logout: (sid: string | undefined, dbo: DBHandlerServer<S>, db: DB) => Awaitable<void>;
|
|
@@ -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":";;;AA8BA,+CAA6C;
|
|
1
|
+
{"version":3,"file":"AuthTypes.js","sourceRoot":"","sources":["../../lib/Auth/AuthTypes.ts"],"names":[],"mappings":";;;AA8BA,+CAA6C;AAoUtC,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,IAAI,GAAG,CACZ,GAAG,IAAA,0BAAY,EAAC,iBAAiB,EAAE,YAAY,CAAC,IAAI,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EACjF,UAAU,CACX,CAAC,QAAQ,EAAE,CAAC;IACf,CAAC;IACD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IAC7B,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,GAAG,UAAU,GAAG,IAAA,0BAAY,EAAC,iBAAiB,EAAE,YAAY,CAAC,EAAE,CAAC,CAAC;IACjG,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;AApBW,QAAA,eAAe,mBAoB1B"}
|
|
@@ -53,7 +53,7 @@ function setOAuthRequestHandlers(app, loginWithOAuthConfig) {
|
|
|
53
53
|
}
|
|
54
54
|
passport_1.default.authenticate(providerName, {
|
|
55
55
|
session: false,
|
|
56
|
-
failureRedirect:
|
|
56
|
+
failureRedirect: this.authRoutes.login,
|
|
57
57
|
failWithError: true,
|
|
58
58
|
}, async (error, _profile, authInfo) => {
|
|
59
59
|
if (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setOAuthRequestHandlers.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setOAuthRequestHandlers.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"setOAuthRequestHandlers.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setOAuthRequestHandlers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type e from "express";
|
|
2
2
|
import type { AuthHandler } from "../AuthHandler";
|
|
3
3
|
import { type SignupWithEmail } from "../AuthTypes";
|
|
4
|
-
export declare function setRegisterRequestHandler(this: AuthHandler, { onRegister, minPasswordLength, requirePassword }: SignupWithEmail, app: e.Express): void;
|
|
4
|
+
export declare function setRegisterRequestHandler(this: AuthHandler, { onRegister, minPasswordLength, requirePassword, requireInvitation }: SignupWithEmail, app: e.Express): void;
|
|
5
5
|
//# sourceMappingURL=setRegisterRequestHandler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setRegisterRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setRegisterRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAC7B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAmB,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"setRegisterRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setRegisterRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAC7B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAmB,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AAKrE,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,WAAW,EACjB,EAAE,UAAU,EAAE,iBAAqB,EAAE,eAAe,EAAE,iBAAiB,EAAE,EAAE,eAAe,EAC1F,GAAG,EAAE,CAAC,CAAC,OAAO,QA2Df"}
|
|
@@ -4,15 +4,23 @@ exports.setRegisterRequestHandler = setRegisterRequestHandler;
|
|
|
4
4
|
const AuthTypes_1 = require("../AuthTypes");
|
|
5
5
|
const getClientRequestIPsInfo_1 = require("../utils/getClientRequestIPsInfo");
|
|
6
6
|
const createAuthRequestHandler_1 = require("../utils/createAuthRequestHandler");
|
|
7
|
-
|
|
8
|
-
|
|
7
|
+
const throttledReject_1 = require("../utils/throttledReject");
|
|
8
|
+
function setRegisterRequestHandler({ onRegister, minPasswordLength = 8, requirePassword, requireInvitation }, app) {
|
|
9
|
+
const registerRequestHandler = (0, createAuthRequestHandler_1.createAuthRequestHandler)("register", async ({ username, password = "", invitationToken }, req) => {
|
|
10
|
+
if (requireInvitation && !invitationToken) {
|
|
11
|
+
return {
|
|
12
|
+
success: false,
|
|
13
|
+
code: "invalid-email-confirmation-code",
|
|
14
|
+
message: "An invitation is required to register",
|
|
15
|
+
};
|
|
16
|
+
}
|
|
9
17
|
if (!username) {
|
|
10
18
|
return { success: false, code: "username-missing" };
|
|
11
19
|
}
|
|
12
20
|
if (!password && requirePassword) {
|
|
13
21
|
return { success: false, code: "password-missing" };
|
|
14
22
|
}
|
|
15
|
-
else if (password.length < minPasswordLength) {
|
|
23
|
+
else if (password && password.length < minPasswordLength) {
|
|
16
24
|
return {
|
|
17
25
|
success: false,
|
|
18
26
|
code: "weak-password",
|
|
@@ -20,17 +28,23 @@ function setRegisterRequestHandler({ onRegister, minPasswordLength = 8, requireP
|
|
|
20
28
|
};
|
|
21
29
|
}
|
|
22
30
|
const clientInfo = (0, getClientRequestIPsInfo_1.getClientRequestIPsInfo)({ httpReq: req });
|
|
23
|
-
return onRegister({
|
|
31
|
+
return (0, throttledReject_1.throttledAuthCall)(async () => onRegister({
|
|
24
32
|
email: username,
|
|
25
33
|
password,
|
|
34
|
+
invitationToken,
|
|
26
35
|
getConfirmationUrl: ({ code, websiteUrl }) => (0, AuthTypes_1.getMagicLinkUrl)({
|
|
27
36
|
loginSignupConfig: this.config?.loginSignupConfig,
|
|
28
37
|
websiteUrl,
|
|
29
|
-
data: {
|
|
38
|
+
data: {
|
|
39
|
+
type: "otp",
|
|
40
|
+
code,
|
|
41
|
+
email: username,
|
|
42
|
+
returnToken: false,
|
|
43
|
+
},
|
|
30
44
|
}),
|
|
31
45
|
clientInfo,
|
|
32
46
|
req,
|
|
33
|
-
});
|
|
47
|
+
}), this.config?.responseThrottle);
|
|
34
48
|
}, {
|
|
35
49
|
/* Existing clients also send login form fields when registering. */
|
|
36
50
|
allowExtraProperties: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setRegisterRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setRegisterRequestHandler.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"setRegisterRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setRegisterRequestHandler.ts"],"names":[],"mappings":";;AAOA,8DA8DC;AAnED,4CAAqE;AACrE,8EAA2E;AAC3E,gFAA6E;AAC7E,8DAA6D;AAE7D,SAAgB,yBAAyB,CAEvC,EAAE,UAAU,EAAE,iBAAiB,GAAG,CAAC,EAAE,eAAe,EAAE,iBAAiB,EAAmB,EAC1F,GAAc;IAEd,MAAM,sBAAsB,GAAG,IAAA,mDAAwB,EACrD,UAAU,EACV,KAAK,EAAE,EAAE,QAAQ,EAAE,QAAQ,GAAG,EAAE,EAAE,eAAe,EAAE,EAAE,GAAG,EAAE,EAAE;QAC1D,IAAI,iBAAiB,IAAI,CAAC,eAAe,EAAE,CAAC;YAC1C,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,IAAI,EAAE,iCAAiC;gBACvC,OAAO,EAAE,uCAAuC;aACjD,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC;QACtD,CAAC;QACD,IAAI,CAAC,QAAQ,IAAI,eAAe,EAAE,CAAC;YACjC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC;QACtD,CAAC;aAAM,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,GAAG,iBAAiB,EAAE,CAAC;YAC3D,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,IAAI,EAAE,eAAe;gBACrB,OAAO,EAAE,6BAA6B,iBAAiB,kBAAkB;aAC1E,CAAC;QACJ,CAAC;QACD,MAAM,UAAU,GAAG,IAAA,iDAAuB,EAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;QAC7D,OAAO,IAAA,mCAAiB,EACtB,KAAK,IAAI,EAAE,CACT,UAAU,CAAC;YACT,KAAK,EAAE,QAAQ;YACf,QAAQ;YACR,eAAe;YACf,kBAAkB,EAAE,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,CAC3C,IAAA,2BAAe,EAAC;gBACd,iBAAiB,EAAE,IAAI,CAAC,MAAM,EAAE,iBAAiB;gBACjD,UAAU;gBACV,IAAI,EAAE;oBACJ,IAAI,EAAE,KAAK;oBACX,IAAI;oBACJ,KAAK,EAAE,QAAQ;oBACf,WAAW,EAAE,KAAK;iBACnB;aACF,CAAC;YACJ,UAAU;YACV,GAAG;SACJ,CAAC,EACJ,IAAI,CAAC,MAAM,EAAE,gBAAgB,CAC9B,CAAC;IACJ,CAAC,EACD;QACE,oEAAoE;QACpE,oBAAoB,EAAE,IAAI;QAC1B,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YACjB,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,KAAK,CAAC,CAAC;YAC7C,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,sBAAsB,EAAE,CAAC;QACnF,CAAC;KACF,CACF,CAAC;IAEF,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,iBAAiB,EAAE,sBAAsB,CAAC,CAAC;AACtE,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { AuthSocketSchema } from "prostgles-types";
|
|
2
|
-
import {
|
|
2
|
+
import type { AuthHandler } from "./AuthHandler";
|
|
3
3
|
import type { AuthClientRequest, AuthResultWithSID } from "./AuthTypes";
|
|
4
4
|
export declare function getClientAuth(this: AuthHandler, clientReq: AuthClientRequest): Promise<{
|
|
5
5
|
auth: AuthSocketSchema;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getClientAuth.d.ts","sourceRoot":"","sources":["../../lib/Auth/getClientAuth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,gBAAgB,EACjB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,
|
|
1
|
+
{"version":3,"file":"getClientAuth.d.ts","sourceRoot":"","sources":["../../lib/Auth/getClientAuth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,gBAAgB,EACjB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,KAAK,EAAE,iBAAiB,EAAc,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGpF,wBAAsB,aAAa,CACjC,IAAI,EAAE,WAAW,EACjB,SAAS,EAAE,iBAAiB,GAC3B,OAAO,CAAC;IAAE,IAAI,EAAE,gBAAgB,CAAC;IAAC,QAAQ,EAAE,iBAAiB,CAAA;CAAE,GAAG,sBAAsB,CAAC,CAiG3F"}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getClientAuth = getClientAuth;
|
|
4
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
|
-
const AuthHandler_1 = require("./AuthHandler");
|
|
6
5
|
async function getClientAuth(clientReq) {
|
|
7
6
|
let pathGuard = false;
|
|
8
7
|
const { loginWithOAuth, signupWithEmail, localLoginMode, login, publicRoutes, disableSocketAuthGuard, } = this.config?.loginSignupConfig ?? {};
|
|
@@ -52,19 +51,30 @@ async function getClientAuth(clientReq) {
|
|
|
52
51
|
return userData;
|
|
53
52
|
}
|
|
54
53
|
const loginMode = localLoginMode ?? (login ? "email+password" : undefined);
|
|
54
|
+
const authRoutes = this.authRoutes;
|
|
55
|
+
const signupWithEmailOptions = signupWithEmail && {
|
|
56
|
+
minPasswordLength: signupWithEmail.minPasswordLength ?? 8,
|
|
57
|
+
requirePassword: signupWithEmail.requirePassword ?? false,
|
|
58
|
+
requireInvitation: signupWithEmail.requireInvitation ?? false,
|
|
59
|
+
url: authRoutes.emailRegistration,
|
|
60
|
+
emailConfirmationRoute: authRoutes.magicLinks,
|
|
61
|
+
};
|
|
55
62
|
const auth = {
|
|
56
63
|
providers: getOAuthProviders(this, loginWithOAuth),
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
64
|
+
signupWithEmail: signupWithEmailOptions,
|
|
65
|
+
signupWithEmailAndPassword: signupWithEmailOptions && !signupWithEmailOptions.requireInvitation ?
|
|
66
|
+
{
|
|
67
|
+
minPasswordLength: signupWithEmailOptions.minPasswordLength,
|
|
68
|
+
url: signupWithEmailOptions.url,
|
|
69
|
+
emailConfirmationRoute: signupWithEmailOptions.emailConfirmationRoute,
|
|
70
|
+
}
|
|
71
|
+
: undefined,
|
|
62
72
|
preferredLogin: userData.preferredLogin,
|
|
63
73
|
user: userData.clientUser,
|
|
64
74
|
login: loginMode && {
|
|
65
75
|
mode: loginMode,
|
|
66
|
-
loginRoute:
|
|
67
|
-
logoutRoute:
|
|
76
|
+
loginRoute: authRoutes.login,
|
|
77
|
+
logoutRoute: authRoutes.logout,
|
|
68
78
|
},
|
|
69
79
|
pathGuard,
|
|
70
80
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getClientAuth.js","sourceRoot":"","sources":["../../lib/Auth/getClientAuth.ts"],"names":[],"mappings":";;AAUA,
|
|
1
|
+
{"version":3,"file":"getClientAuth.js","sourceRoot":"","sources":["../../lib/Auth/getClientAuth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupAuthRoutes.d.ts","sourceRoot":"","sources":["../../lib/Auth/setupAuthRoutes.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,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;AAcjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,wBAAgB,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,UAAU,QA2EpE"}
|
|
@@ -22,6 +22,11 @@ function setupAuthRoutes(config) {
|
|
|
22
22
|
if (publicRoutes.find((r) => typeof r !== "string" || !r)) {
|
|
23
23
|
throw "Invalid or empty string provided within publicRoutes ";
|
|
24
24
|
}
|
|
25
|
+
const authRoutesBasePath = (0, AuthHandler_1.getAuthRoutesBasePath)(loginSignupConfig);
|
|
26
|
+
(0, upsertNamedExpressMiddleware_1.upsertNamedExpressMiddleware)(app, (_req, res, next) => {
|
|
27
|
+
res.set("Cache-Control", "no-store");
|
|
28
|
+
next();
|
|
29
|
+
}, AuthHandler_1.AUTH_CACHE_CONTROL_MIDDLEWARE_NAME, authRoutesBasePath);
|
|
25
30
|
userContextMiddleware_1.setupUserContextMiddleware.bind(this)(app);
|
|
26
31
|
if (signupWithEmail) {
|
|
27
32
|
setRegisterRequestHandler_1.setRegisterRequestHandler.bind(this)(signupWithEmail, app);
|
|
@@ -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":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type e from "express";
|
|
2
2
|
import type { RequestHandler } from "express";
|
|
3
3
|
import type { ExpressApp } from "../../RestApi";
|
|
4
|
-
export declare const upsertNamedExpressMiddleware: (app: e.Express, handler: RequestHandler, name: string) => void;
|
|
5
|
-
export declare const removeExpressRouteByName: (app: ExpressApp, name: string) => void;
|
|
4
|
+
export declare const upsertNamedExpressMiddleware: (app: e.Express, handler: RequestHandler, name: string, routePath?: string) => void;
|
|
5
|
+
export declare const removeExpressRouteByName: (app: ExpressApp | e.Express, name: string) => void;
|
|
6
6
|
//# sourceMappingURL=upsertNamedExpressMiddleware.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upsertNamedExpressMiddleware.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/upsertNamedExpressMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAC7B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAGhD,eAAO,MAAM,4BAA4B,GACvC,KAAK,CAAC,CAAC,OAAO,EACd,SAAS,cAAc,EACvB,MAAM,MAAM,
|
|
1
|
+
{"version":3,"file":"upsertNamedExpressMiddleware.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/upsertNamedExpressMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAC7B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAGhD,eAAO,MAAM,4BAA4B,GACvC,KAAK,CAAC,CAAC,OAAO,EACd,SAAS,cAAc,EACvB,MAAM,MAAM,EACZ,kBAAe,SAMhB,CAAC;AAEF,eAAO,MAAM,wBAAwB,GAAI,KAAK,UAAU,GAAG,CAAC,CAAC,OAAO,EAAE,MAAM,MAAM,SASjF,CAAC"}
|
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.removeExpressRouteByName = exports.upsertNamedExpressMiddleware = void 0;
|
|
4
4
|
const removeExpressRoute_1 = require("./removeExpressRoute");
|
|
5
|
-
const upsertNamedExpressMiddleware = (app, handler, name) => {
|
|
5
|
+
const upsertNamedExpressMiddleware = (app, handler, name, routePath = "/") => {
|
|
6
6
|
const funcName = name;
|
|
7
7
|
Object.defineProperty(handler, "name", { value: funcName });
|
|
8
8
|
(0, exports.removeExpressRouteByName)(app, name);
|
|
9
|
-
app.use(handler);
|
|
9
|
+
app.use(routePath, handler);
|
|
10
10
|
};
|
|
11
11
|
exports.upsertNamedExpressMiddleware = upsertNamedExpressMiddleware;
|
|
12
12
|
const removeExpressRouteByName = (app, name) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upsertNamedExpressMiddleware.js","sourceRoot":"","sources":["../../../lib/Auth/utils/upsertNamedExpressMiddleware.ts"],"names":[],"mappings":";;;AAGA,6DAAiD;AAE1C,MAAM,4BAA4B,GAAG,CAC1C,GAAc,EACd,OAAuB,EACvB,IAAY,EACZ,EAAE;IACF,MAAM,QAAQ,GAAG,IAAI,CAAC;IACtB,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC5D,IAAA,gCAAwB,EAAC,GAAiB,EAAE,IAAI,CAAC,CAAC;IAClD,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"upsertNamedExpressMiddleware.js","sourceRoot":"","sources":["../../../lib/Auth/utils/upsertNamedExpressMiddleware.ts"],"names":[],"mappings":";;;AAGA,6DAAiD;AAE1C,MAAM,4BAA4B,GAAG,CAC1C,GAAc,EACd,OAAuB,EACvB,IAAY,EACZ,SAAS,GAAG,GAAG,EACf,EAAE;IACF,MAAM,QAAQ,GAAG,IAAI,CAAC;IACtB,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC5D,IAAA,gCAAwB,EAAC,GAAiB,EAAE,IAAI,CAAC,CAAC;IAClD,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;AAC9B,CAAC,CAAC;AAVW,QAAA,4BAA4B,gCAUvC;AAEK,MAAM,wBAAwB,GAAG,CAAC,GAA2B,EAAE,IAAY,EAAE,EAAE;IACpF,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,8BAAS,EAAC,GAAG,CAAC,CAAC;IAC5C,MAAM,SAAS,GAAG,QAAQ,EAAE,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;QAC5C,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;YACxB,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IACH,MAAM,CAAC,KAAK,GAAG,SAAS,CAAC;AAC3B,CAAC,CAAC;AATW,QAAA,wBAAwB,4BASnC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getJoinQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getJoinQuery.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAE1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAE9D,OAAO,EAAuB,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAGvE,KAAK,IAAI,GAAG;IACV,EAAE,EAAE,QAAQ,CAAC;IACb,EAAE,EAAE,YAAY,CAAC;IACjB,mBAAmB,EAAE,OAAO,CAAC;CAC9B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,UAAU,GAAI,SAAS,MAAM;;;CAMzC,CAAC;AAEF,eAAO,MAAM,mBAAmB,oCAAoC,CAAC;AACrE;;GAEG;AACH,eAAO,MAAM,uBAAuB,0BAA0B,CAAC;AAgB/D,MAAM,MAAM,kBAAkB,GAAG;IAC/B,WAAW,EAAE,YAAY,CAAC;IAC1B,wBAAwB,EAAE,MAAM,EAAE,CAAC;IACnC,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,KAAK,CAAC;IACZ,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,YAAY,GAAI,aAAa,WAAW,EAAE,YAAY,IAAI,KAAG,
|
|
1
|
+
{"version":3,"file":"getJoinQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getJoinQuery.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAE1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAE9D,OAAO,EAAuB,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAGvE,KAAK,IAAI,GAAG;IACV,EAAE,EAAE,QAAQ,CAAC;IACb,EAAE,EAAE,YAAY,CAAC;IACjB,mBAAmB,EAAE,OAAO,CAAC;CAC9B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,UAAU,GAAI,SAAS,MAAM;;;CAMzC,CAAC;AAEF,eAAO,MAAM,mBAAmB,oCAAoC,CAAC;AACrE;;GAEG;AACH,eAAO,MAAM,uBAAuB,0BAA0B,CAAC;AAgB/D,MAAM,MAAM,kBAAkB,GAAG;IAC/B,WAAW,EAAE,YAAY,CAAC;IAC1B,wBAAwB,EAAE,MAAM,EAAE,CAAC;IACnC,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,KAAK,CAAC;IACZ,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,YAAY,GAAI,aAAa,WAAW,EAAE,YAAY,IAAI,KAAG,kBAwKzE,CAAC;AA+FF,MAAM,MAAM,gBAAgB,GAAG,mBAAmB,GAAG;IACnD,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC"}
|
|
@@ -74,13 +74,21 @@ const getJoinQuery = (viewHandler, { q1, q2 }) => {
|
|
|
74
74
|
const rootNestedSort = q1.orderByItems.filter((d) => d.nested?.joinAlias.raw === q2.joinAlias.raw);
|
|
75
75
|
const jsonAgg = `json_agg((SELECT x FROM (SELECT ${selectedFields.join(", ")}) as x )${jsonAggSort}) ${jsonAggLimit} as ${exports.JSON_AGG_FIELD_NAME}`;
|
|
76
76
|
const isOrJoin = firstJoinTablePath.on.length > 1;
|
|
77
|
+
const targetTableHandler = viewHandler.dboBuilder.dboMap.get(firstJoinTablePath.table);
|
|
78
|
+
if (!targetTableHandler) {
|
|
79
|
+
throw new Error(`INTERNAL ERROR: Joined table handler missing for ${firstJoinTablePath.table}`);
|
|
80
|
+
}
|
|
77
81
|
/* Correlate unique-key lookups before aggregation and windowing. */
|
|
78
82
|
const useLateralJoin = !isOrJoin &&
|
|
79
83
|
paths.length === 1 &&
|
|
80
84
|
q2.source.expression === q2.table.escaped &&
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
85
|
+
/* Different types from custom joins can cast the indexed column and force a scan per parent. */
|
|
86
|
+
firstJoinTablePath.on.every((condition) => Object.entries(condition).every(([sourceColumnName, targetColumnName]) => {
|
|
87
|
+
const sourceColumn = viewHandler.columns.find((column) => column.name === sourceColumnName);
|
|
88
|
+
const targetColumn = targetTableHandler.columns.find((column) => column.name === targetColumnName);
|
|
89
|
+
return sourceColumn && sourceColumn.udt_name === targetColumn?.udt_name;
|
|
90
|
+
})) &&
|
|
91
|
+
targetTableHandler.tableOrViewInfo.uniqueColumnGroups?.some((columns) => columns.every((column) => firstJoinTableJoinFields.includes(column)));
|
|
84
92
|
const { innerQuery } = getInnerJoinQuery({
|
|
85
93
|
paths,
|
|
86
94
|
q1,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getJoinQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getJoinQuery.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"getJoinQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getJoinQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,7 +27,7 @@ function getRawInfo(lang, tableRules, localParams) {
|
|
|
27
27
|
!isVersionTable &&
|
|
28
28
|
fileTableName &&
|
|
29
29
|
this.columns.some((c) => c.references?.some((r) => r.ftable === fileTableName))),
|
|
30
|
-
fileTableName
|
|
30
|
+
fileTableName,
|
|
31
31
|
dynamicRules: {
|
|
32
32
|
update: Boolean(tableRules?.update?.dynamicFields?.length),
|
|
33
33
|
},
|