prostgles-server 4.2.290 → 4.2.291
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 +10 -4
- package/dist/Auth/AuthHandler.d.ts.map +1 -1
- package/dist/Auth/AuthHandler.js +16 -2
- package/dist/Auth/AuthHandler.js.map +1 -1
- package/dist/Auth/AuthTypes.d.ts +3 -13
- package/dist/Auth/AuthTypes.d.ts.map +1 -1
- package/dist/Auth/endpoints/setCatchAllRequestHandler.d.ts.map +1 -1
- package/dist/Auth/endpoints/setCatchAllRequestHandler.js +17 -9
- package/dist/Auth/endpoints/setCatchAllRequestHandler.js.map +1 -1
- package/dist/Auth/setupAuthRoutes.d.ts.map +1 -1
- package/dist/Auth/setupAuthRoutes.js +2 -26
- package/dist/Auth/setupAuthRoutes.js.map +1 -1
- package/dist/Auth/utils/handleGetUser.d.ts.map +1 -1
- package/dist/Auth/utils/handleGetUser.js +6 -2
- package/dist/Auth/utils/handleGetUser.js.map +1 -1
- package/dist/Auth/utils/removeExpressRoute.d.ts.map +1 -1
- package/dist/Auth/utils/removeExpressRoute.js +4 -5
- package/dist/Auth/utils/removeExpressRoute.js.map +1 -1
- package/dist/Auth/utils/setCookieAndGoToReturnURLIFSet.d.ts +1 -0
- package/dist/Auth/utils/setCookieAndGoToReturnURLIFSet.d.ts.map +1 -1
- package/dist/Auth/utils/setCookieAndGoToReturnURLIFSet.js +22 -4
- package/dist/Auth/utils/setCookieAndGoToReturnURLIFSet.js.map +1 -1
- package/dist/FileManager/FileManager.d.ts +1 -2
- package/dist/FileManager/FileManager.d.ts.map +1 -1
- package/dist/FileManager/FileManager.js +4 -5
- package/dist/FileManager/FileManager.js.map +1 -1
- package/dist/FileManager/initFileManager.js +2 -2
- package/dist/FileManager/initFileManager.js.map +1 -1
- package/dist/ProstglesTypes.d.ts +1 -1
- package/dist/ProstglesTypes.d.ts.map +1 -1
- package/dist/RestApi.d.ts +3 -2
- package/dist/RestApi.d.ts.map +1 -1
- package/dist/RestApi.js +12 -5
- package/dist/RestApi.js.map +1 -1
- package/lib/Auth/AuthHandler.ts +18 -4
- package/lib/Auth/AuthTypes.ts +4 -18
- package/lib/Auth/endpoints/setCatchAllRequestHandler.ts +17 -13
- package/lib/Auth/setupAuthRoutes.ts +2 -29
- package/lib/Auth/utils/handleGetUser.ts +7 -2
- package/lib/Auth/utils/removeExpressRoute.ts +6 -7
- package/lib/Auth/utils/setCookieAndGoToReturnURLIFSet.ts +23 -3
- package/lib/FileManager/FileManager.ts +4 -5
- package/lib/FileManager/initFileManager.ts +2 -2
- package/lib/ProstglesTypes.ts +1 -1
- package/lib/RestApi.ts +14 -7
- package/package.json +1 -1
- package/dist/Auth/utils/getUserOrError.d.ts +0 -10
- package/dist/Auth/utils/getUserOrError.d.ts.map +0 -1
- package/dist/Auth/utils/getUserOrError.js +0 -48
- package/dist/Auth/utils/getUserOrError.js.map +0 -1
- package/lib/Auth/utils/getUserOrError.ts +0 -56
|
@@ -2,6 +2,7 @@ import { PRGLIOSocket } from "../DboBuilder/DboBuilder";
|
|
|
2
2
|
import { DB, DBHandlerServer, Prostgles } from "../Prostgles";
|
|
3
3
|
import { AuthClientRequest, AuthConfig, BasicSession } from "./AuthTypes";
|
|
4
4
|
import { getClientRequestIPsInfo } from "./utils/getClientRequestIPsInfo";
|
|
5
|
+
import { type GetUserOrRedirected } from "./utils/handleGetUser";
|
|
5
6
|
import { removeExpressRoute, removeExpressRoutesTest } from "./utils/removeExpressRoute";
|
|
6
7
|
export { getClientRequestIPsInfo, removeExpressRoute, removeExpressRoutesTest };
|
|
7
8
|
export declare const HTTP_FAIL_CODES: {
|
|
@@ -50,8 +51,13 @@ export declare class AuthHandler {
|
|
|
50
51
|
req: import("./AuthTypes").ExpressReq;
|
|
51
52
|
res: import("./endpoints/setLoginRequestHandler").LoginResponseHandler;
|
|
52
53
|
}) => void;
|
|
53
|
-
handleGetUser: (clientReq: AuthClientRequest) => Promise<
|
|
54
|
-
|
|
54
|
+
handleGetUser: (clientReq: AuthClientRequest) => Promise<GetUserOrRedirected>;
|
|
55
|
+
/**
|
|
56
|
+
* Used by:
|
|
57
|
+
* - setCatchAllRequestHandler
|
|
58
|
+
* - loginSignupConfig.use
|
|
59
|
+
*/
|
|
60
|
+
getUserOrError: (clientReq: AuthClientRequest) => Promise<GetUserOrRedirected>;
|
|
55
61
|
init: () => void;
|
|
56
62
|
destroy: () => void;
|
|
57
63
|
login: (req: import("./AuthTypes").ExpressReq, res: import("./endpoints/setLoginRequestHandler").LoginResponseHandler, loginParams: import("./AuthTypes").LoginParams) => Promise<import("./endpoints/setLoginRequestHandler").LoginResponseHandler | undefined>;
|
|
@@ -67,12 +73,12 @@ export declare class AuthHandler {
|
|
|
67
73
|
* Used for logging
|
|
68
74
|
*/
|
|
69
75
|
getSIDNoError: (clientReq: AuthClientRequest | undefined) => string | undefined;
|
|
70
|
-
getSidAndUserFromRequest: (clientReq: AuthClientRequest) => Promise<
|
|
76
|
+
getSidAndUserFromRequest: (clientReq: AuthClientRequest) => Promise<GetUserOrRedirected>;
|
|
71
77
|
isNonExpiredSocketSession: (socket: PRGLIOSocket, session: BasicSession | undefined) => boolean;
|
|
72
78
|
getClientAuth: (clientReq: AuthClientRequest) => Promise<{
|
|
73
79
|
auth: import("prostgles-types").AuthSocketSchema;
|
|
74
80
|
userData: import("./AuthTypes").AuthResultWithSID;
|
|
75
81
|
} | "new-session-redirect">;
|
|
76
82
|
}
|
|
77
|
-
export declare const matchesRoute: (baseRoute: string
|
|
83
|
+
export declare const matchesRoute: (baseRoute: string, fullRoute: string) => boolean;
|
|
78
84
|
//# sourceMappingURL=AuthHandler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthHandler.d.ts","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAI1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"AuthHandler.d.ts","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAI1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAE1E,OAAO,EAA0B,KAAK,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AACzF,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;AAEX,eAAO,MAAM,sBAAsB;;;;;;;;;;CAUzB,CAAC;AAEX,qBAAa,WAAW;IACtB,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IACxC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IACpC,GAAG,EAAE,eAAe,CAAC;IACrB,EAAE,EAAE,EAAE,CAAC;gBAEK,SAAS,EAAE,SAAS;IAShC,IAAI,UAAU,WAEb;IAED,WAAW,QAAS,MAAM,GAAG,SAAS,wBAIpC;IAEF,WAAW,aAAc,MAAM,aAkB7B;IAEF,8BAA8B;;;;;;eAA6C;IAC3E,2BAA2B;;;;;;eAA0C;IACrE,aAAa,iEAAqC;IAElD;;;;OAIG;IACH,cAAc,cAAqB,iBAAiB,KAAG,QAAQ,mBAAmB,CAAC,CASjF;IAEF,IAAI,aAA8B;IAElC,OAAO,aAqBL;IAEF,KAAK,4PAAoB;IAEzB;;;;;;OAMG;IACH,eAAe,CAAC,cAAc,EAAE,iBAAiB,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS;IA+BlF;;OAEG;IACH,aAAa,cAAe,iBAAiB,GAAG,SAAS,KAAG,MAAM,GAAG,SAAS,CAO5E;IAEF,wBAAwB,iEAAuC;IAE/D,yBAAyB,WACf,YAAY,WACX,YAAY,GAAG,SAAS,KAChC,OAAO,CAiBR;IAEF,aAAa;;;gCAA4B;CAC1C;AAED,eAAO,MAAM,YAAY,cAAe,MAAM,aAAa,MAAM,YAKhE,CAAC"}
|
package/dist/Auth/AuthHandler.js
CHANGED
|
@@ -8,7 +8,6 @@ const setupAuthRoutes_1 = require("./setupAuthRoutes");
|
|
|
8
8
|
const getClientRequestIPsInfo_1 = require("./utils/getClientRequestIPsInfo");
|
|
9
9
|
Object.defineProperty(exports, "getClientRequestIPsInfo", { enumerable: true, get: function () { return getClientRequestIPsInfo_1.getClientRequestIPsInfo; } });
|
|
10
10
|
const getSidAndUserFromRequest_1 = require("./utils/getSidAndUserFromRequest");
|
|
11
|
-
const getUserOrError_1 = require("./utils/getUserOrError");
|
|
12
11
|
const handleGetUser_1 = require("./utils/handleGetUser");
|
|
13
12
|
const removeExpressRoute_1 = require("./utils/removeExpressRoute");
|
|
14
13
|
Object.defineProperty(exports, "removeExpressRoute", { enumerable: true, get: function () { return removeExpressRoute_1.removeExpressRoute; } });
|
|
@@ -78,7 +77,22 @@ class AuthHandler {
|
|
|
78
77
|
setCookieAndGoToReturnURLIFSet = setCookieAndGoToReturnURLIFSet_1.setCookieAndGoToReturnURLIFSet.bind(this);
|
|
79
78
|
validateSessionAndSetCookie = setCookieAndGoToReturnURLIFSet_1.validateSessionAndSetCookie.bind(this);
|
|
80
79
|
handleGetUser = handleGetUser_1.handleGetUserThrottled.bind(this);
|
|
81
|
-
|
|
80
|
+
/**
|
|
81
|
+
* Used by:
|
|
82
|
+
* - setCatchAllRequestHandler
|
|
83
|
+
* - loginSignupConfig.use
|
|
84
|
+
*/
|
|
85
|
+
getUserOrError = async (clientReq) => {
|
|
86
|
+
try {
|
|
87
|
+
return this.handleGetUser(clientReq);
|
|
88
|
+
}
|
|
89
|
+
catch (_err) {
|
|
90
|
+
return {
|
|
91
|
+
sid: this.getValidatedSid(clientReq),
|
|
92
|
+
error: { success: false, code: "server-error" },
|
|
93
|
+
};
|
|
94
|
+
}
|
|
95
|
+
};
|
|
82
96
|
init = setupAuthRoutes_1.setupAuthRoutes.bind(this);
|
|
83
97
|
destroy = () => {
|
|
84
98
|
const app = this.opts.loginSignupConfig?.app;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthHandler.js","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":";;;AAAA,qDAAsD;AAItD,mDAAgD;AAChD,mCAAgC;AAChC,uDAAoD;AACpD,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
|
@@ -1,15 +1,15 @@
|
|
|
1
|
-
import { Express,
|
|
1
|
+
import { Express, Request, Response } from "express";
|
|
2
2
|
import Mail from "nodemailer/lib/mailer";
|
|
3
3
|
import type { AuthenticateOptions } from "passport";
|
|
4
4
|
import type { Profile as FacebookProfile, StrategyOptions as FacebookStrategy } from "passport-facebook";
|
|
5
5
|
import type { Profile as GitHubProfile, StrategyOptions as GitHubStrategy } from "passport-github2";
|
|
6
6
|
import type { Profile as GoogleProfile, StrategyOptions as GoogleStrategy } from "passport-google-oauth20";
|
|
7
7
|
import type { MicrosoftStrategyOptions } from "passport-microsoft";
|
|
8
|
-
import
|
|
8
|
+
import OAuth2Strategy from "passport-oauth2";
|
|
9
|
+
import { AnyObject, AuthRequest, AuthResponse, AuthSocketSchema, ClientSchema, FieldFilter, IdentityProvider, UserLike } from "prostgles-types";
|
|
9
10
|
import { DBOFullyTyped } from "../DBSchemaBuilder";
|
|
10
11
|
import { PRGLIOSocket, type CachedSession } from "../DboBuilder/DboBuilderTypes";
|
|
11
12
|
import { DB } from "../Prostgles";
|
|
12
|
-
import OAuth2Strategy from "passport-oauth2";
|
|
13
13
|
type Awaitable<T> = T | Promise<T>;
|
|
14
14
|
export type ExpressReq = Request & CachedSession;
|
|
15
15
|
export type ExpressRes = Response;
|
|
@@ -321,11 +321,6 @@ export type LoginSignupConfig<S, SUser extends SessionUser> = {
|
|
|
321
321
|
* If logged in the user is allowed to access these routes
|
|
322
322
|
*/
|
|
323
323
|
publicRoutes?: string[];
|
|
324
|
-
/**
|
|
325
|
-
* Will attach a app.use listener and will expose getUser
|
|
326
|
-
* Used in UI for blocking access
|
|
327
|
-
*/
|
|
328
|
-
use?: ExpressMiddleware<S, SUser>;
|
|
329
324
|
/**
|
|
330
325
|
* Will be called after a GET request is authorised
|
|
331
326
|
* This means that
|
|
@@ -360,10 +355,5 @@ export type LoginSignupConfig<S, SUser extends SessionUser> = {
|
|
|
360
355
|
login: (params: LoginParams, dbo: DBOFullyTyped<S>, db: DB, client: LoginClientInfo) => Awaitable<LoginResponse>;
|
|
361
356
|
logout: (sid: string | undefined, dbo: DBOFullyTyped<S>, db: DB) => Awaitable<void>;
|
|
362
357
|
};
|
|
363
|
-
type ExpressMiddleware<S, SUser extends SessionUser> = (args: {
|
|
364
|
-
req: ExpressReq;
|
|
365
|
-
res: ExpressRes;
|
|
366
|
-
next: NextFunction;
|
|
367
|
-
} & AuthRequestParams<S, SUser>) => void | Promise<void>;
|
|
368
358
|
export {};
|
|
369
359
|
//# sourceMappingURL=AuthTypes.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthTypes.d.ts","sourceRoot":"","sources":["../../lib/Auth/AuthTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,
|
|
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":"setCatchAllRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setCatchAllRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,CAAqB,MAAM,SAAS,CAAC;AAE5C,OAAO,EAA0B,WAAW,EAAiC,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"setCatchAllRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setCatchAllRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,CAAqB,MAAM,SAAS,CAAC;AAE5C,OAAO,EAA0B,WAAW,EAAiC,MAAM,gBAAgB,CAAC;AAKpG,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO,QAwF1E"}
|
|
@@ -3,15 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.setCatchAllRequestHandler = void 0;
|
|
4
4
|
const AuthHandler_1 = require("../AuthHandler");
|
|
5
5
|
const getReturnUrl_1 = require("../utils/getReturnUrl");
|
|
6
|
+
const prostgles_types_1 = require("prostgles-types");
|
|
6
7
|
function setCatchAllRequestHandler(app) {
|
|
7
8
|
const requestHandlerCatchAll = async (req, res, next) => {
|
|
8
9
|
const { onGetRequestOK } = this.opts.loginSignupConfig ?? {};
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
10
|
+
const { restApi, fileManager, authHandler } = this.prostgles;
|
|
11
|
+
const pathsHandledByProstgles = [
|
|
12
|
+
restApi?.path,
|
|
13
|
+
fileManager?.path,
|
|
14
|
+
authHandler && AuthHandler_1.AUTH_ROUTES_AND_PARAMS.loginWithProvider,
|
|
15
|
+
].filter(prostgles_types_1.isDefined);
|
|
16
|
+
if (pathsHandledByProstgles.some((path) => (0, AuthHandler_1.matchesRoute)(path, req.path))) {
|
|
15
17
|
next();
|
|
16
18
|
return;
|
|
17
19
|
}
|
|
@@ -32,7 +34,7 @@ function setCatchAllRequestHandler(app) {
|
|
|
32
34
|
};
|
|
33
35
|
const returnURL = (0, getReturnUrl_1.getReturnUrl)(req);
|
|
34
36
|
/**
|
|
35
|
-
* Requesting a User route
|
|
37
|
+
* Requesting a User route (must be logged in)
|
|
36
38
|
*/
|
|
37
39
|
if (this.isUserRoute(req.path)) {
|
|
38
40
|
/* Check auth. Redirect to login if unauthorized */
|
|
@@ -41,12 +43,18 @@ function setCatchAllRequestHandler(app) {
|
|
|
41
43
|
res.redirect(`${AuthHandler_1.AUTH_ROUTES_AND_PARAMS.login}?returnURL=${encodeURIComponent(req.originalUrl)}`);
|
|
42
44
|
return;
|
|
43
45
|
}
|
|
44
|
-
|
|
46
|
+
/**
|
|
47
|
+
* If authorized and going to returnUrl then redirect. Otherwise serve file
|
|
48
|
+
* */
|
|
45
49
|
}
|
|
46
50
|
else if (returnURL && (await isLoggedInUser())) {
|
|
47
51
|
res.redirect(returnURL);
|
|
48
52
|
return;
|
|
49
|
-
/**
|
|
53
|
+
/**
|
|
54
|
+
* Visiting login:
|
|
55
|
+
* 1) If logged in and not anonymous then redirect to main page
|
|
56
|
+
* 2) If logged in and anonymous then allow visiting /login (it will be caught earlier by new-session-redirect)
|
|
57
|
+
* */
|
|
50
58
|
}
|
|
51
59
|
else if ((0, AuthHandler_1.matchesRoute)(AuthHandler_1.AUTH_ROUTES_AND_PARAMS.login, req.path)) {
|
|
52
60
|
const { user, isAnonymous, error } = await getUser();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setCatchAllRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setCatchAllRequestHandler.ts"],"names":[],"mappings":";;;AAEA,gDAAoG;AAEpG,wDAAqD;
|
|
1
|
+
{"version":3,"file":"setCatchAllRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setCatchAllRequestHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupAuthRoutes.d.ts","sourceRoot":"","sources":["../../lib/Auth/setupAuthRoutes.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"setupAuthRoutes.d.ts","sourceRoot":"","sources":["../../lib/Auth/setupAuthRoutes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAA2B,MAAM,eAAe,CAAC;AASrE,wBAAgB,eAAe,CAAC,IAAI,EAAE,WAAW,QA+DhD"}
|
|
@@ -17,7 +17,7 @@ function setupAuthRoutes() {
|
|
|
17
17
|
if (!loginSignupConfig) {
|
|
18
18
|
return;
|
|
19
19
|
}
|
|
20
|
-
const { app, publicRoutes = [], onMagicLinkOrOTP,
|
|
20
|
+
const { app, publicRoutes = [], onMagicLinkOrOTP, loginWithOAuth, signupWithEmail: signupWithEmailAndPassword, } = loginSignupConfig;
|
|
21
21
|
if (publicRoutes.find((r) => typeof r !== "string" || !r)) {
|
|
22
22
|
throw "Invalid or empty string provided within publicRoutes ";
|
|
23
23
|
}
|
|
@@ -38,36 +38,12 @@ function setupAuthRoutes() {
|
|
|
38
38
|
}
|
|
39
39
|
if (errorInfoOrSession && "session" in errorInfoOrSession) {
|
|
40
40
|
const { session } = errorInfoOrSession;
|
|
41
|
-
this.validateSessionAndSetCookie(session, { req, res });
|
|
42
|
-
return;
|
|
41
|
+
return this.validateSessionAndSetCookie(session, { req, res });
|
|
43
42
|
}
|
|
44
43
|
next();
|
|
45
44
|
};
|
|
46
45
|
(0, upsertNamedExpressMiddleware_1.upsertNamedExpressMiddleware)(app, prostglesUseMiddleware, "prostglesonUseOrSocketConnected");
|
|
47
46
|
}
|
|
48
|
-
if (use) {
|
|
49
|
-
const prostglesUseMiddleware = (req, res, next) => {
|
|
50
|
-
void use({
|
|
51
|
-
req,
|
|
52
|
-
res,
|
|
53
|
-
next,
|
|
54
|
-
getUser: async () => {
|
|
55
|
-
const userOrErr = await this.getUserOrError({ httpReq: req, res });
|
|
56
|
-
if (userOrErr === "new-session-redirect") {
|
|
57
|
-
throw "new-session-redirect";
|
|
58
|
-
}
|
|
59
|
-
if (userOrErr.error) {
|
|
60
|
-
res.status(AuthHandler_1.HTTP_FAIL_CODES.BAD_REQUEST).json(userOrErr.error);
|
|
61
|
-
throw userOrErr.error;
|
|
62
|
-
}
|
|
63
|
-
return userOrErr;
|
|
64
|
-
},
|
|
65
|
-
dbo: this.dbo,
|
|
66
|
-
db: this.db,
|
|
67
|
-
});
|
|
68
|
-
};
|
|
69
|
-
(0, upsertNamedExpressMiddleware_1.upsertNamedExpressMiddleware)(app, prostglesUseMiddleware, "prostglesUse");
|
|
70
|
-
}
|
|
71
47
|
if (onMagicLinkOrOTP) {
|
|
72
48
|
setMagicLinkOrOTPRequestHandler_1.setMagicLinkOrOTPRequestHandler.bind(this)(onMagicLinkOrOTP, app);
|
|
73
49
|
}
|
|
@@ -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":";;;AACA,+CAAqE;AACrE,qFAAkF;AAClF,+EAA4E;AAC5E,iFAA8E;AAC9E,iGAA8F;AAC9F,iFAA8E;AAC9E,qFAAkF;AAClF,uFAAoF;AAEpF,SAAgB,eAAe;IAC7B,MAAM,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;IAEhE,IAAI,IAAI,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;QAC9B,MAAM,4DAA4D,CAAC;IACrE,CAAC;IAED,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvB,OAAO;IACT,CAAC;IACD,MAAM,EACJ,GAAG,EACH,YAAY,GAAG,EAAE,EACjB,gBAAgB,EAChB,cAAc,EACd,eAAe,EAAE,0BAA0B,GAC5C,GAAG,iBAAiB,CAAC;IACtB,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1D,MAAM,uDAAuD,CAAC;IAChE,CAAC;IAED,IAAI,0BAA0B,EAAE,CAAC;QAC/B,IAAA,qDAAyB,EAAC,0BAA0B,EAAE,GAAG,CAAC,CAAC;IAC7D,CAAC;IAED,IAAI,cAAc,EAAE,CAAC;QACnB,iDAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;IAC1D,CAAC;IAED,IAAI,sBAAsB,EAAE,CAAC;QAC3B,MAAM,sBAAsB,GAAmB,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACtE,MAAM,OAAO,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;YACtC,MAAM,kBAAkB,GAAG,MAAM,sBAAsB,CACrD,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAC3B,IAAA,qCAAuB,EAAC,OAAO,CAAC,EAChC,OAAO,CACR,CAAC;YAEF,IAAI,kBAAkB,IAAI,OAAO,IAAI,kBAAkB,EAAE,CAAC;gBACxD,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,kBAAkB,CAAC;gBAC/C,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;gBACrC,OAAO;YACT,CAAC;YAED,IAAI,kBAAkB,IAAI,SAAS,IAAI,kBAAkB,EAAE,CAAC;gBAC1D,MAAM,EAAE,OAAO,EAAE,GAAG,kBAAkB,CAAC;gBACvC,OAAO,IAAI,CAAC,2BAA2B,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;YACjE,CAAC;YACD,IAAI,EAAE,CAAC;QACT,CAAC,CAAC;QACF,IAAA,2DAA4B,EAAC,GAAG,EAAE,sBAAsB,EAAE,iCAAiC,CAAC,CAAC;IAC/F,CAAC;IAED,IAAI,gBAAgB,EAAE,CAAC;QACrB,iEAA+B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;IACpE,CAAC;IAED,+CAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IAEvC,iEAAiE;IACjE,qDAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IAE1C,iDAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;AAC1C,CAAC;AA/DD,0CA+DC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleGetUser.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/handleGetUser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAY,MAAM,iBAAiB,CAAC;AAEzD,OAAO,EAA2B,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"handleGetUser.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/handleGetUser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAY,MAAM,iBAAiB,CAAC;AAEzD,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,CAyE9B;AAED,eAAO,MAAM,WAAW,gBACT,iBAAiB,gJAG/B,CAAC"}
|
|
@@ -37,10 +37,14 @@ async function handleGetUserThrottled(clientReq) {
|
|
|
37
37
|
}
|
|
38
38
|
const clientInfo = clientInfoOrErr;
|
|
39
39
|
if (clientInfo && "type" in clientInfo) {
|
|
40
|
-
if (!("httpReq" in clientReq) || !clientReq.httpReq)
|
|
40
|
+
if (!("httpReq" in clientReq) || !clientReq.httpReq) {
|
|
41
41
|
throw "httpReq missing. new-session not implemented for sockets.";
|
|
42
|
+
}
|
|
42
43
|
const { httpReq, res } = clientReq;
|
|
43
|
-
this.validateSessionAndSetCookie(clientInfo.session, {
|
|
44
|
+
this.validateSessionAndSetCookie(clientInfo.session, {
|
|
45
|
+
req: httpReq,
|
|
46
|
+
res: res,
|
|
47
|
+
});
|
|
44
48
|
return "new-session-redirect";
|
|
45
49
|
}
|
|
46
50
|
/** Set cached session data */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleGetUser.js","sourceRoot":"","sources":["../../../lib/Auth/utils/handleGetUser.ts"],"names":[],"mappings":";;;AAAA,qDAAyD;AAEzD,gDAA2E;AAE3E,uDAAsD;
|
|
1
|
+
{"version":3,"file":"handleGetUser.js","sourceRoot":"","sources":["../../../lib/Auth/utils/handleGetUser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"removeExpressRoute.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/removeExpressRoute.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAGhD,eAAO,MAAM,kBAAkB,QACxB,UAAU,GAAG,SAAS,eACd,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,WAC1B,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,
|
|
1
|
+
{"version":3,"file":"removeExpressRoute.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/removeExpressRoute.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAGhD,eAAO,MAAM,kBAAkB,QACxB,UAAU,GAAG,SAAS,eACd,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,WAC1B,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,SAe3C,CAAC;AAGF,eAAO,MAAM,uBAAuB,QAAe,UAAU,kBA6B5D,CAAC"}
|
|
@@ -9,11 +9,10 @@ const removeExpressRoute = (app, _routePaths, method) => {
|
|
|
9
9
|
if (routes) {
|
|
10
10
|
app._router.stack = routes.filter((route) => {
|
|
11
11
|
const path = route.route?.path;
|
|
12
|
-
|
|
13
|
-
(
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
return true;
|
|
12
|
+
const matchesForRemoval = path &&
|
|
13
|
+
routePaths.some((routePath) => (0, AuthHandler_1.matchesRoute)(routePath, path)) &&
|
|
14
|
+
(!method || route.route?.methods?.[method]);
|
|
15
|
+
return !matchesForRemoval;
|
|
17
16
|
});
|
|
18
17
|
}
|
|
19
18
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"removeExpressRoute.js","sourceRoot":"","sources":["../../../lib/Auth/utils/removeExpressRoute.ts"],"names":[],"mappings":";;;AAAA,qDAA4C;AAE5C,gDAA8C;AAEvC,MAAM,kBAAkB,GAAG,CAChC,GAA2B,EAC3B,WAAmC,EACnC,MAA0C,EAC1C,EAAE;IACF,MAAM,MAAM,GAAG,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC;IACnC,MAAM,UAAU,GAAG,WAAW,CAAC,MAAM,CAAC,2BAAS,CAAC,CAAC;IACjD,IAAI,MAAM,EAAE,CAAC;QACX,GAAG,CAAC,OAAQ,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;YAC3C,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC;YAC/B,
|
|
1
|
+
{"version":3,"file":"removeExpressRoute.js","sourceRoot":"","sources":["../../../lib/Auth/utils/removeExpressRoute.ts"],"names":[],"mappings":";;;AAAA,qDAA4C;AAE5C,gDAA8C;AAEvC,MAAM,kBAAkB,GAAG,CAChC,GAA2B,EAC3B,WAAmC,EACnC,MAA0C,EAC1C,EAAE;IACF,MAAM,MAAM,GAAG,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC;IACnC,MAAM,UAAU,GAAG,WAAW,CAAC,MAAM,CAAC,2BAAS,CAAC,CAAC;IACjD,IAAI,MAAM,EAAE,CAAC;QACX,GAAG,CAAC,OAAQ,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;YAC3C,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC;YAC/B,MAAM,iBAAiB,GACrB,IAAI;gBACJ,UAAU,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,IAAA,0BAAY,EAAC,SAAS,EAAE,IAAI,CAAC,CAAC;gBAC7D,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;YAE9C,OAAO,CAAC,iBAAiB,CAAC;QAC5B,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC;AAlBW,QAAA,kBAAkB,sBAkB7B;AAEF,IAAI,SAAiC,CAAC;AAC/B,MAAM,uBAAuB,GAAG,KAAK,EAAE,GAAe,EAAE,EAAE;IAC/D,IAAI,SAAS;QAAE,OAAO;IACtB,GAAG,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QAC1C,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IACrB,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC;QACxB,MAAM,6DAA6D,CAAC;IACtE,CAAC;IACD,MAAM,aAAa,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACjD,IAAA,0BAAkB,EAAC,GAAG,EAAE,CAAC,qBAAqB,CAAC,CAAC,CAAC;IACjD,IAAI,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,KAAK,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1D,MAAM,wEAAwE,CAAC;IACjF,CAAC;IACD,gBAAgB;IAChB,IAAI,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,KAAK,QAAQ,EAAE,CAAC;QACxE,GAAG,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAC1C,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,GAAG,CAAC,MAAM,KAAK,CAAC,0CAA0C,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAC9E,GAAG,CAAC,IAAI,EAAE,CACX,CAEA,CAAC;QACF,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;YACd,MAAM,4BAA4B,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACzD,CAAC;QACD,IAAA,0BAAkB,EAAC,GAAG,EAAE,CAAC,qBAAqB,CAAC,CAAC,CAAC;IACnD,CAAC;IACD,SAAS,GAAG,GAAG,CAAC;AAClB,CAAC,CAAC;AA7BW,QAAA,uBAAuB,2BA6BlC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { type AuthHandler } from "../AuthHandler";
|
|
2
2
|
import type { ExpressReq } from "../AuthTypes";
|
|
3
3
|
import type { LoginResponseHandler } from "../endpoints/setLoginRequestHandler";
|
|
4
|
+
export type NewSessionRedirect = "isAnonimous" | "normalUser";
|
|
4
5
|
export declare function validateSessionAndSetCookie(this: AuthHandler, cookie: {
|
|
5
6
|
sid: string;
|
|
6
7
|
expires: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setCookieAndGoToReturnURLIFSet.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/setCookieAndGoToReturnURLIFSet.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"setCookieAndGoToReturnURLIFSet.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/setCookieAndGoToReturnURLIFSet.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2C,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC3F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAKhF,MAAM,MAAM,kBAAkB,GAAG,aAAa,GAAG,YAAY,CAAC;AAC9D,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,QAa/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,QAoD/D"}
|
|
@@ -4,7 +4,10 @@ exports.setCookieAndGoToReturnURLIFSet = exports.validateSessionAndSetCookie = v
|
|
|
4
4
|
const AuthHandler_1 = require("../AuthHandler");
|
|
5
5
|
const login_1 = require("../login");
|
|
6
6
|
const getReturnUrl_1 = require("./getReturnUrl");
|
|
7
|
-
|
|
7
|
+
const getSafeReturnURL_1 = require("./getSafeReturnURL");
|
|
8
|
+
function validateSessionAndSetCookie(cookie, requestHandler
|
|
9
|
+
// newSessionRedirect: NewSessionRedirect | undefined
|
|
10
|
+
) {
|
|
8
11
|
const sessionErrorCode = (0, login_1.getBasicSessionErrorCode)(cookie);
|
|
9
12
|
if (sessionErrorCode) {
|
|
10
13
|
const { res } = requestHandler;
|
|
@@ -17,7 +20,9 @@ function validateSessionAndSetCookie(cookie, requestHandler) {
|
|
|
17
20
|
return this.setCookieAndGoToReturnURLIFSet(cookie, requestHandler);
|
|
18
21
|
}
|
|
19
22
|
exports.validateSessionAndSetCookie = validateSessionAndSetCookie;
|
|
20
|
-
function setCookieAndGoToReturnURLIFSet(cookie, requestHandler
|
|
23
|
+
function setCookieAndGoToReturnURLIFSet(cookie, requestHandler
|
|
24
|
+
// newSessionRedirect: NewSessionRedirect | undefined
|
|
25
|
+
) {
|
|
21
26
|
const { sid, expires } = cookie;
|
|
22
27
|
const { res, req } = requestHandler;
|
|
23
28
|
if (!sid) {
|
|
@@ -45,8 +50,21 @@ function setCookieAndGoToReturnURLIFSet(cookie, requestHandler) {
|
|
|
45
50
|
};
|
|
46
51
|
const cookieData = sid;
|
|
47
52
|
res.cookie(this.sidKeyName, cookieData, cookieOpts);
|
|
48
|
-
const
|
|
49
|
-
|
|
53
|
+
const safeReturnUrl = (0, getReturnUrl_1.getReturnUrl)(req);
|
|
54
|
+
if (safeReturnUrl) {
|
|
55
|
+
return res.redirect(safeReturnUrl);
|
|
56
|
+
}
|
|
57
|
+
const safeOriginalUrl = (0, getSafeReturnURL_1.getSafeReturnURL)(req.originalUrl, AuthHandler_1.AUTH_ROUTES_AND_PARAMS.returnUrlParamName);
|
|
58
|
+
if (safeOriginalUrl) {
|
|
59
|
+
// if (safeOriginalUrl === AUTH_ROUTES_AND_PARAMS.login) {
|
|
60
|
+
// if (newSessionRedirect === "isAnonimous") {
|
|
61
|
+
// return res.redirect(AUTH_ROUTES_AND_PARAMS.login);
|
|
62
|
+
// }
|
|
63
|
+
// } else {
|
|
64
|
+
// }
|
|
65
|
+
return res.redirect(safeOriginalUrl);
|
|
66
|
+
}
|
|
67
|
+
return res.redirect("/");
|
|
50
68
|
}
|
|
51
69
|
exports.setCookieAndGoToReturnURLIFSet = setCookieAndGoToReturnURLIFSet;
|
|
52
70
|
//# sourceMappingURL=setCookieAndGoToReturnURLIFSet.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setCookieAndGoToReturnURLIFSet.js","sourceRoot":"","sources":["../../../lib/Auth/utils/setCookieAndGoToReturnURLIFSet.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"setCookieAndGoToReturnURLIFSet.js","sourceRoot":"","sources":["../../../lib/Auth/utils/setCookieAndGoToReturnURLIFSet.ts"],"names":[],"mappings":";;;AAAA,gDAA2F;AAG3F,oCAAoD;AACpD,iDAA8C;AAC9C,yDAAsD;AAGtD,SAAgB,2BAA2B,CAEzC,MAAwC,EACxC,cAA8D;AAC9D,qDAAqD;;IAErD,MAAM,gBAAgB,GAAG,IAAA,gCAAwB,EAAC,MAAM,CAAC,CAAC;IAC1D,IAAI,gBAAgB,EAAE,CAAC;QACrB,MAAM,EAAE,GAAG,EAAE,GAAG,cAAc,CAAC;QAC/B,GAAG,CAAC,MAAM,CAAC,6BAAe,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC;YAC5C,OAAO,EAAE,KAAK;YACd,IAAI,EAAE,gBAAgB;SACvB,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IACD,OAAO,IAAI,CAAC,8BAA8B,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;AACrE,CAAC;AAhBD,kEAgBC;AAED,SAAgB,8BAA8B,CAE5C,MAAwC,EACxC,cAA8D;AAC9D,qDAAqD;;IAErD,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAChC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,cAAc,CAAC;IACpC,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,QAAQ,CAAC;IACjB,CAAC;IAED,MAAM,YAAY,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,YAAY;IAE/C,IAAI,cAAc,GAA4B;QAC5C,MAAM,EAAE,YAAY;KACrB,CAAC;IAEF,IAAI,OAAO,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;QACtE,cAAc,GAAG,EAAE,OAAO,EAAE,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QAChD,MAAM,IAAI,GAAG,CAAC,CAAC,cAAc,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;QACvE,IAAI,IAAI,IAAI,GAAG,EAAE,CAAC;YAChB,OAAO,CAAC,IAAI,CAAC,8DAA8D,IAAI,MAAM,CAAC,CAAC;QACzF,CAAC;IACH,CAAC;IAED,MAAM,UAAU,GAAG;QACjB,GAAG,cAAc;QACjB,+CAA+C;QAC/C,QAAQ,EAAE,IAAI;QACd,cAAc;QACd,MAAM,EAAE,IAAI;QACZ,QAAQ,EAAE,QAAiB;QAC3B,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,aAAa,IAAI,EAAE,CAAC;KACtD,CAAC;IACF,MAAM,UAAU,GAAG,GAAG,CAAC;IACvB,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IACpD,MAAM,aAAa,GAAG,IAAA,2BAAY,EAAC,GAAG,CAAC,CAAC;IACxC,IAAI,aAAa,EAAE,CAAC;QAClB,OAAO,GAAG,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;IACrC,CAAC;IACD,MAAM,eAAe,GAAG,IAAA,mCAAgB,EACtC,GAAG,CAAC,WAAW,EACf,oCAAsB,CAAC,kBAAkB,CAC1C,CAAC;IACF,IAAI,eAAe,EAAE,CAAC;QACpB,0DAA0D;QAC1D,gDAAgD;QAChD,yDAAyD;QACzD,MAAM;QACN,WAAW;QACX,IAAI;QACJ,OAAO,GAAG,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IACvC,CAAC;IACD,OAAO,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;AAC3B,CAAC;AAvDD,wEAuDC"}
|
|
@@ -90,9 +90,8 @@ export declare class FileManager {
|
|
|
90
90
|
get dbo(): DBHandlerServer;
|
|
91
91
|
get db(): DB;
|
|
92
92
|
tableName?: string;
|
|
93
|
-
|
|
93
|
+
path?: string;
|
|
94
94
|
get fileRouteExpress(): string;
|
|
95
|
-
private checkInterval?;
|
|
96
95
|
constructor(config: FileManager["config"], imageOptions?: ImageOptions);
|
|
97
96
|
getFileStream(name: string): Promise<stream.Readable>;
|
|
98
97
|
deleteFile(name: string): Promise<true | void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileManager.d.ts","sourceRoot":"","sources":["../../lib/FileManager/FileManager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"FileManager.d.ts","sourceRoot":"","sources":["../../lib/FileManager/FileManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,11 +33,10 @@ class FileManager {
|
|
|
33
33
|
return this.prostgles.db;
|
|
34
34
|
}
|
|
35
35
|
tableName;
|
|
36
|
-
|
|
36
|
+
path;
|
|
37
37
|
get fileRouteExpress() {
|
|
38
|
-
return this.
|
|
38
|
+
return this.path + "/:name";
|
|
39
39
|
}
|
|
40
|
-
checkInterval;
|
|
41
40
|
constructor(config, imageOptions) {
|
|
42
41
|
this.config = config;
|
|
43
42
|
this.imageOptions = imageOptions;
|
|
@@ -46,7 +45,7 @@ class FileManager {
|
|
|
46
45
|
}
|
|
47
46
|
const fullConfig = this.prostgles?.opts.fileTable;
|
|
48
47
|
if (fullConfig?.delayedDelete) {
|
|
49
|
-
|
|
48
|
+
setInterval(() => {
|
|
50
49
|
void (async () => {
|
|
51
50
|
const fileTable = fullConfig.tableName;
|
|
52
51
|
const daysDelay = fullConfig.delayedDelete?.deleteAfterNDays ?? 0;
|
|
@@ -97,7 +96,7 @@ class FileManager {
|
|
|
97
96
|
return true;
|
|
98
97
|
}
|
|
99
98
|
getValidatedFileType = getValidatedFileType_1.getValidatedFileType.bind(this);
|
|
100
|
-
getLocalFileUrl = (name) => (this.
|
|
99
|
+
getLocalFileUrl = (name) => (this.path ? `${this.path}/${name}` : "");
|
|
101
100
|
checkFreeSpace = async (folderPath, fileSize = 0) => {
|
|
102
101
|
if (!this.cloudClient && "localFolderPath" in this.config) {
|
|
103
102
|
const { minFreeBytes = 1.048e6 } = this.config;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileManager.js","sourceRoot":"","sources":["../../lib/FileManager/FileManager.ts"],"names":[],"mappings":";;;AAAA,yBAAyB;AAGzB,kCAAkC;AAClC,uDAA8C;AAE9C,qDAMyB;AAGzB,6BAA6B;AAC7B,yEAAsE;AAEtE,iEAA8D;AAC9D,uDAAoD;AACpD,qCAAkC;AAClC,iDAA8C;AAEjC,QAAA,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;AAEzB,MAAM,eAAe,GAAG,KAAK,EAAE,IAAY,EAAE,EAAM,EAAmB,EAAE;IAC7E,OAAO,CAAC,MAAM,EAAE,CAAC,GAAG,CAAmB,iCAAiC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAC1F,CAAC,CAAC;AAFW,QAAA,eAAe,mBAE1B;AA4EF,MAAa,WAAW;IACtB,WAAW,CAAe;IAE1B,MAAM,CAA4B;IAClC,YAAY,CAAgB;IAE5B,SAAS,CAAa;IACtB,IAAI,GAAG;QACL,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC;YACzB,MAAM,4BAA4B,CAAC;QACrC,CAAC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC;IAC5B,CAAC;IAED,IAAI,EAAE;QACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE;YAAE,MAAM,2BAA2B,CAAC;QAC3D,OAAO,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;IAC3B,CAAC;IAED,SAAS,CAAU;IAEnB,
|
|
1
|
+
{"version":3,"file":"FileManager.js","sourceRoot":"","sources":["../../lib/FileManager/FileManager.ts"],"names":[],"mappings":"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"}
|