prostgles-server 4.2.224 → 4.2.226
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 +1 -1
- package/dist/Auth/AuthHandler.d.ts.map +1 -1
- package/dist/Auth/AuthHandler.js +10 -9
- package/dist/Auth/AuthHandler.js.map +1 -1
- package/dist/Auth/AuthTypes.d.ts +18 -3
- 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 +4 -4
- package/dist/Auth/endpoints/setCatchAllRequestHandler.js.map +1 -1
- package/dist/Auth/endpoints/setOAuthRequestHandlers.d.ts.map +1 -1
- package/dist/Auth/endpoints/setOAuthRequestHandlers.js +6 -3
- package/dist/Auth/endpoints/setOAuthRequestHandlers.js.map +1 -1
- package/dist/Auth/getClientAuth.d.ts.map +1 -1
- package/dist/Auth/getClientAuth.js +5 -0
- package/dist/Auth/getClientAuth.js.map +1 -1
- package/dist/Auth/setupAuthRoutes.d.ts.map +1 -1
- package/dist/Auth/setupAuthRoutes.js.map +1 -1
- package/dist/Auth/utils/getSidAndUserFromRequest.js +1 -1
- package/dist/Auth/utils/getSidAndUserFromRequest.js.map +1 -1
- package/dist/FileManager/FileManager.d.ts +1 -1
- package/dist/FileManager/FileManager.d.ts.map +1 -1
- package/dist/FileManager/FileManager.js +5 -2
- package/dist/FileManager/FileManager.js.map +1 -1
- package/lib/Auth/AuthHandler.ts +12 -11
- package/lib/Auth/AuthTypes.ts +22 -3
- package/lib/Auth/endpoints/setCatchAllRequestHandler.ts +5 -5
- package/lib/Auth/endpoints/setOAuthRequestHandlers.ts +8 -9
- package/lib/Auth/getClientAuth.ts +5 -0
- package/lib/Auth/setupAuthRoutes.ts +2 -1
- package/lib/Auth/utils/getSidAndUserFromRequest.ts +1 -1
- package/lib/FileManager/FileManager.ts +8 -2
- package/package.json +3 -2
|
@@ -37,7 +37,6 @@ export declare class AuthHandler {
|
|
|
37
37
|
constructor(prostgles: Prostgles);
|
|
38
38
|
get sidKeyName(): string;
|
|
39
39
|
validateSid: (sid: string | undefined) => string | undefined;
|
|
40
|
-
matchesRoute: (route: string | undefined, clientFullRoute: string) => boolean | "" | undefined;
|
|
41
40
|
isUserRoute: (pathname: string) => boolean;
|
|
42
41
|
setCookieAndGoToReturnURLIFSet: (cookie: {
|
|
43
42
|
sid: string;
|
|
@@ -70,4 +69,5 @@ export declare class AuthHandler {
|
|
|
70
69
|
userData: AuthResultWithSID;
|
|
71
70
|
}>;
|
|
72
71
|
}
|
|
72
|
+
export declare const matchesRoute: (shorterRoute: string | undefined, longerRoute: string) => boolean | "" | undefined;
|
|
73
73
|
//# 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;AAGxD,OAAO,EAAE,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EACL,iBAAiB,EACjB,UAAU,EACV,UAAU,EACV,iBAAiB,EACjB,YAAY,EACZ,UAAU,EACX,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAI1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAK1E,OAAO,EAAE,uBAAuB,EAAE,CAAC;AACnC,eAAO,MAAM,eAAe;;;;;;;CAOlB,CAAC;AAEX,eAAO,MAAM,kBAAkB;;;CAGrB,CAAC;AAEX,eAAO,MAAM,sBAAsB;;;;;;;;;;;;CAYzB,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,
|
|
1
|
+
{"version":3,"file":"AuthHandler.d.ts","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAGxD,OAAO,EAAE,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EACL,iBAAiB,EACjB,UAAU,EACV,UAAU,EACV,iBAAiB,EACjB,YAAY,EACZ,UAAU,EACX,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAI1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAK1E,OAAO,EAAE,uBAAuB,EAAE,CAAC;AACnC,eAAO,MAAM,eAAe;;;;;;;CAOlB,CAAC;AAEX,eAAO,MAAM,kBAAkB;;;CAGrB,CAAC;AAEX,eAAO,MAAM,sBAAsB;;;;;;;;;;;;CAYzB,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,aAa7B;IAEF,8BAA8B,WACpB;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,KACrC;QAAE,GAAG,EAAE,UAAU,CAAC;QAAC,GAAG,EAAE,oBAAoB,CAAA;KAAE,UAmCjD;IAEF,cAAc,gBAAuB,iBAAiB,KAAG,QAAQ,iBAAiB,CAAC,CA2CjF;IAEF,IAAI,sBAA8B;IAElC,OAAO,aAyBL;IAEF,KAAK,4IAAoB;IAEzB;;;;;;OAMG;IACH,MAAM,CAAC,cAAc,EAAE,iBAAiB,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS;IA0CzE;;OAEG;IACH,aAAa,cAAe,iBAAiB,GAAG,SAAS,KAAG,MAAM,GAAG,SAAS,CAO5E;IAEF,kBAAkB,cAAqB,iBAAiB,KAAG,QAAQ,UAAU,CAAC,CAK5E;IACF,wBAAwB,+DAAuC;IAE/D,yBAAyB,WACf,YAAY,WACX,YAAY,GAAG,SAAS,KAChC,OAAO,CAiBR;IAEF,aAAa;;;OAA4B;CAC1C;AAED,eAAO,MAAM,YAAY,iBAAkB,MAAM,GAAG,SAAS,eAAe,MAAM,6BAQjF,CAAC"}
|
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.AUTH_ROUTES_AND_PARAMS = exports.HTTP_SUCCESS_CODES = exports.HTTP_FAIL_CODES = exports.getClientRequestIPsInfo = void 0;
|
|
3
|
+
exports.matchesRoute = exports.AuthHandler = exports.AUTH_ROUTES_AND_PARAMS = exports.HTTP_SUCCESS_CODES = exports.HTTP_FAIL_CODES = exports.getClientRequestIPsInfo = void 0;
|
|
4
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
5
|
const FileManager_1 = require("../FileManager/FileManager");
|
|
6
6
|
const getClientAuth_1 = require("./getClientAuth");
|
|
@@ -61,13 +61,6 @@ class AuthHandler {
|
|
|
61
61
|
throw new Error("sid missing or not a string");
|
|
62
62
|
return sid;
|
|
63
63
|
};
|
|
64
|
-
matchesRoute = (route, clientFullRoute) => {
|
|
65
|
-
return (route &&
|
|
66
|
-
clientFullRoute &&
|
|
67
|
-
(route === clientFullRoute ||
|
|
68
|
-
(clientFullRoute.startsWith(route) &&
|
|
69
|
-
["/", "?", "#"].includes(clientFullRoute[route.length] ?? ""))));
|
|
70
|
-
};
|
|
71
64
|
isUserRoute = (pathname) => {
|
|
72
65
|
const { login, logoutGetPath, magicLinksRoute, loginWithProvider } = exports.AUTH_ROUTES_AND_PARAMS;
|
|
73
66
|
const pubRoutes = [
|
|
@@ -78,7 +71,7 @@ class AuthHandler {
|
|
|
78
71
|
loginWithProvider,
|
|
79
72
|
].filter((publicRoute) => publicRoute);
|
|
80
73
|
return !pubRoutes.some((publicRoute) => {
|
|
81
|
-
return
|
|
74
|
+
return (0, exports.matchesRoute)(publicRoute, pathname);
|
|
82
75
|
});
|
|
83
76
|
};
|
|
84
77
|
setCookieAndGoToReturnURLIFSet = (cookie, r) => {
|
|
@@ -249,4 +242,12 @@ class AuthHandler {
|
|
|
249
242
|
getClientAuth = getClientAuth_1.getClientAuth.bind(this);
|
|
250
243
|
}
|
|
251
244
|
exports.AuthHandler = AuthHandler;
|
|
245
|
+
const matchesRoute = (shorterRoute, longerRoute) => {
|
|
246
|
+
return (shorterRoute &&
|
|
247
|
+
longerRoute &&
|
|
248
|
+
(shorterRoute === longerRoute ||
|
|
249
|
+
(longerRoute.startsWith(shorterRoute) &&
|
|
250
|
+
["/", "?", "#"].includes(longerRoute[shorterRoute.length] ?? ""))));
|
|
251
|
+
};
|
|
252
|
+
exports.matchesRoute = matchesRoute;
|
|
252
253
|
//# sourceMappingURL=AuthHandler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthHandler.js","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":";;;AAAA,qDAAoE;AAGpE,4DAAgE;AAWhE,mDAAgD;AAChD,mCAAgC;AAChC,uDAAoD;AACpD,6EAA0E;AAKjE,wGALA,iDAAuB,OAKA;AAJhC,uDAAoD;AACpD,+EAA4E;AAC5E,6DAA4D;AAG/C,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;AAEE,QAAA,sBAAsB,GAAG;IACpC,KAAK,EAAE,QAAQ;IACf,iBAAiB,EAAE,QAAQ;IAC3B,iBAAiB,EAAE,WAAW;IAC9B,kBAAkB,EAAE,WAAW;IAC/B,UAAU,EAAE,YAAY;IACxB,aAAa,EAAE,SAAS;IACxB,eAAe,EAAE,aAAa;IAC9B,sBAAsB,EAAE,iBAAiB;IACzC,YAAY,EAAE,gBAAgB;IAC9B,wBAAwB,EAAE,gBAAgB;IAC1C,QAAQ,EAAE,GAAG;CACL,CAAC;AAEX,MAAa,WAAW;IACH,SAAS,CAAY;IACrB,IAAI,CAAa;IACpC,GAAG,CAAkB;IACrB,EAAE,CAAK;IAEP,YAAY,SAAoB;QAC9B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACzE,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;QAChC,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAC1E,IAAI,CAAC,GAAG,GAAG,SAAS,CAAC,GAAG,CAAC;QACzB,IAAI,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC;IACzB,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,8BAAsB,CAAC,UAAU,CAAC;IACnE,CAAC;IAED,WAAW,GAAG,CAAC,GAAuB,EAAE,EAAE;QACxC,IAAI,CAAC,GAAG;YAAE,OAAO,SAAS,CAAC;QAC3B,IAAI,OAAO,GAAG,KAAK,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;QAC5E,OAAO,GAAG,CAAC;IACb,CAAC,CAAC;IAEF,
|
|
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
|
@@ -5,10 +5,11 @@ import type { Profile as FacebookProfile, StrategyOptions as FacebookStrategy }
|
|
|
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 { AnyObject, AuthRequest, AuthResponse, FieldFilter, IdentityProvider, UserLike, AuthSocketSchema } from "prostgles-types";
|
|
8
|
+
import { AnyObject, AuthRequest, AuthResponse, FieldFilter, IdentityProvider, UserLike, AuthSocketSchema, ClientSchema } from "prostgles-types";
|
|
9
9
|
import { DBOFullyTyped } from "../DBSchemaBuilder";
|
|
10
10
|
import { PRGLIOSocket } from "../DboBuilder/DboBuilderTypes";
|
|
11
11
|
import { DB } from "../Prostgles";
|
|
12
|
+
import OAuth2Strategy from "passport-oauth2";
|
|
12
13
|
type Awaitable<T> = T | Promise<T>;
|
|
13
14
|
export type ExpressReq = Request;
|
|
14
15
|
export type ExpressRes = Response;
|
|
@@ -36,7 +37,7 @@ type HttpClientRequest = {
|
|
|
36
37
|
socket?: undefined;
|
|
37
38
|
};
|
|
38
39
|
export type AuthClientRequest = SocketClientRequest | HttpClientRequest;
|
|
39
|
-
type ThirdPartyProviders = {
|
|
40
|
+
export type ThirdPartyProviders = {
|
|
40
41
|
facebook?: Pick<FacebookStrategy, "clientID" | "clientSecret"> & {
|
|
41
42
|
authOpts?: AuthenticateOptions;
|
|
42
43
|
};
|
|
@@ -49,6 +50,11 @@ type ThirdPartyProviders = {
|
|
|
49
50
|
microsoft?: Pick<MicrosoftStrategyOptions, "clientID" | "clientSecret"> & {
|
|
50
51
|
authOpts?: AuthenticateOptions;
|
|
51
52
|
};
|
|
53
|
+
customOAuth?: OAuth2Strategy.StrategyOptions & {
|
|
54
|
+
authOpts?: AuthenticateOptions;
|
|
55
|
+
displayName?: string;
|
|
56
|
+
displayIconPath?: string;
|
|
57
|
+
};
|
|
52
58
|
};
|
|
53
59
|
type TLSConfig = {
|
|
54
60
|
rejectUnauthorized?: boolean;
|
|
@@ -142,6 +148,11 @@ export type AuthProviderUserData = {
|
|
|
142
148
|
profile: any;
|
|
143
149
|
accessToken: string;
|
|
144
150
|
refreshToken: string;
|
|
151
|
+
} | {
|
|
152
|
+
provider: "customOAuth";
|
|
153
|
+
profile: any;
|
|
154
|
+
accessToken: string;
|
|
155
|
+
refreshToken: string;
|
|
145
156
|
};
|
|
146
157
|
export type RegistrationData = {
|
|
147
158
|
provider: "email";
|
|
@@ -205,11 +216,15 @@ type AllNeverAndOptional<T> = {
|
|
|
205
216
|
export type AuthResultWithSID<SU = SessionUser> = (SU & {
|
|
206
217
|
sid: string;
|
|
207
218
|
error?: undefined;
|
|
219
|
+
preferredLogin?: undefined;
|
|
208
220
|
}) | (AllNeverAndOptional<SU> & {
|
|
209
221
|
sid: string | undefined;
|
|
210
222
|
error?: AuthResponse.AuthFailure;
|
|
223
|
+
preferredLogin?: NonNullable<ClientSchema["auth"]>["preferredLogin"];
|
|
224
|
+
});
|
|
225
|
+
export type AuthResult<SU = SessionUser> = SU | undefined | (AllNeverAndOptional<SU> & {
|
|
226
|
+
preferredLogin?: NonNullable<ClientSchema["auth"]>["preferredLogin"];
|
|
211
227
|
});
|
|
212
|
-
export type AuthResult<SU = SessionUser> = SU | undefined;
|
|
213
228
|
export type AuthResultOrError<SU = SessionUser> = AuthResponse.AuthFailure | AuthResponse.AuthFailure["code"] | AuthResult<SU>;
|
|
214
229
|
export type AuthRequestParams<S, SUser extends SessionUser> = {
|
|
215
230
|
db: DB;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthTypes.d.ts","sourceRoot":"","sources":["../../lib/Auth/AuthTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnE,OAAO,IAAI,MAAM,uBAAuB,CAAC;AACzC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AACpD,OAAO,KAAK,EACV,OAAO,IAAI,eAAe,EAC1B,eAAe,IAAI,gBAAgB,EACpC,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,OAAO,IAAI,aAAa,EAAE,eAAe,IAAI,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACpG,OAAO,KAAK,EACV,OAAO,IAAI,aAAa,EACxB,eAAe,IAAI,cAAc,EAClC,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,EACL,SAAS,EACT,WAAW,EACX,YAAY,EACZ,WAAW,EACX,gBAAgB,EAChB,QAAQ,EACR,gBAAgB,
|
|
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,CAAwC,MAAM,SAAS,CAAC;AAE/D,OAAO,EAA0B,WAAW,
|
|
1
|
+
{"version":3,"file":"setCatchAllRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setCatchAllRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,CAAwC,MAAM,SAAS,CAAC;AAE/D,OAAO,EAA0B,WAAW,EAAiC,MAAM,gBAAgB,CAAC;AAKpG,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO,QAsG1E"}
|
|
@@ -30,18 +30,18 @@ function setCatchAllRequestHandler(app) {
|
|
|
30
30
|
return !!userInfo.user;
|
|
31
31
|
};
|
|
32
32
|
if (this.prostgles.restApi) {
|
|
33
|
-
if (Object.values(this.prostgles.restApi.routes).some((restRoute) =>
|
|
33
|
+
if (Object.values(this.prostgles.restApi.routes).some((restRoute) => (0, AuthHandler_1.matchesRoute)(restRoute.split("/:")[0], req.path))) {
|
|
34
34
|
next();
|
|
35
35
|
return;
|
|
36
36
|
}
|
|
37
37
|
}
|
|
38
38
|
try {
|
|
39
39
|
const returnURL = (0, getReturnUrl_1.getReturnUrl)(req);
|
|
40
|
-
if (
|
|
40
|
+
if ((0, AuthHandler_1.matchesRoute)(AuthHandler_1.AUTH_ROUTES_AND_PARAMS.logoutGetPath, req.path)) {
|
|
41
41
|
await onLogout(req, res);
|
|
42
42
|
return;
|
|
43
43
|
}
|
|
44
|
-
if (
|
|
44
|
+
if ((0, AuthHandler_1.matchesRoute)(AuthHandler_1.AUTH_ROUTES_AND_PARAMS.loginWithProvider, req.path)) {
|
|
45
45
|
next();
|
|
46
46
|
return;
|
|
47
47
|
}
|
|
@@ -62,7 +62,7 @@ function setCatchAllRequestHandler(app) {
|
|
|
62
62
|
return;
|
|
63
63
|
/** If Logged in and requesting login then redirect to main page */
|
|
64
64
|
}
|
|
65
|
-
else if (
|
|
65
|
+
else if ((0, AuthHandler_1.matchesRoute)(AuthHandler_1.AUTH_ROUTES_AND_PARAMS.login, req.path)) {
|
|
66
66
|
const { user, isAnonymous, error } = await getUser();
|
|
67
67
|
if (error) {
|
|
68
68
|
res.status(AuthHandler_1.HTTP_FAIL_CODES.BAD_REQUEST).json(error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setCatchAllRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setCatchAllRequestHandler.ts"],"names":[],"mappings":";;;AAEA,
|
|
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":"setOAuthRequestHandlers.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setOAuthRequestHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,SAAS,CAAC;AASxB,OAAO,EAA0B,WAAW,EAAmB,MAAM,gBAAgB,CAAC;AACtF,OAAO,
|
|
1
|
+
{"version":3,"file":"setOAuthRequestHandlers.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setOAuthRequestHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,SAAS,CAAC;AASxB,OAAO,EAA0B,WAAW,EAAmB,MAAM,gBAAgB,CAAC;AACtF,OAAO,EAAwB,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAK1E,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,CAAC,CAAC,OAAO,EACd,oBAAoB,EAAE,oBAAoB,CAAC,IAAI,CAAC,QAoFjD"}
|
|
@@ -11,6 +11,7 @@ const dboBuilderUtils_1 = require("../../DboBuilder/dboBuilderUtils");
|
|
|
11
11
|
const AuthHandler_1 = require("../AuthHandler");
|
|
12
12
|
const getClientRequestIPsInfo_1 = require("../utils/getClientRequestIPsInfo");
|
|
13
13
|
const upsertNamedExpressMiddleware_1 = require("../utils/upsertNamedExpressMiddleware");
|
|
14
|
+
const passport_oauth2_1 = require("passport-oauth2");
|
|
14
15
|
function setOAuthRequestHandlers(app, loginWithOAuthConfig) {
|
|
15
16
|
const { onProviderLoginFail, onProviderLoginStart, websiteUrl, OAuthProviders } = loginWithOAuthConfig;
|
|
16
17
|
if ((0, prostgles_types_1.isEmpty)(OAuthProviders)) {
|
|
@@ -25,7 +26,8 @@ function setOAuthRequestHandlers(app, loginWithOAuthConfig) {
|
|
|
25
26
|
const strategy = providerName === "google" ? passport_google_oauth20_1.Strategy
|
|
26
27
|
: providerName === "github" ? passport_github2_1.Strategy
|
|
27
28
|
: providerName === "facebook" ? passport_facebook_1.Strategy
|
|
28
|
-
:
|
|
29
|
+
: providerName === "customOAuth" ? passport_oauth2_1.default
|
|
30
|
+
: passport_microsoft_1.Strategy;
|
|
29
31
|
const callbackPath = `${AuthHandler_1.AUTH_ROUTES_AND_PARAMS.loginWithProvider}/${providerName}/callback`;
|
|
30
32
|
passport.use(new strategy({
|
|
31
33
|
...config,
|
|
@@ -34,7 +36,8 @@ function setOAuthRequestHandlers(app, loginWithOAuthConfig) {
|
|
|
34
36
|
// This callback is where you would normally store or retrieve user info from the database
|
|
35
37
|
return done(null, profile, { accessToken, refreshToken, profile });
|
|
36
38
|
}));
|
|
37
|
-
|
|
39
|
+
const authPath = `${AuthHandler_1.AUTH_ROUTES_AND_PARAMS.loginWithProvider}/${providerName}`;
|
|
40
|
+
app.get(authPath, passport.authenticate(providerName, authOpts ?? {}));
|
|
38
41
|
app.get(callbackPath, async (req, res) => {
|
|
39
42
|
try {
|
|
40
43
|
const clientInfo = (0, getClientRequestIPsInfo_1.getClientRequestIPsInfo)({ httpReq: req });
|
|
@@ -62,7 +65,7 @@ function setOAuthRequestHandlers(app, loginWithOAuthConfig) {
|
|
|
62
65
|
else {
|
|
63
66
|
this.login(req, res, {
|
|
64
67
|
...authInfo,
|
|
65
|
-
type: "
|
|
68
|
+
type: "OAuth",
|
|
66
69
|
provider: providerName,
|
|
67
70
|
}).catch((e) => {
|
|
68
71
|
res.status(AuthHandler_1.HTTP_FAIL_CODES.INTERNAL_SERVER_ERROR).json((0, dboBuilderUtils_1.getErrorAsObject)(e));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setOAuthRequestHandlers.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setOAuthRequestHandlers.ts"],"names":[],"mappings":";;;AACA,qCAAqC;AACrC,yDAAiE;AACjE,uDAA8D;AAC9D,qEAAqE;AACrE,2DAAmE;AACnE,qDAA4D;AAC5D,sEAAoE;AAEpE,gDAAsF;AAEtF,8EAA2E;AAC3E,wFAAqF;
|
|
1
|
+
{"version":3,"file":"setOAuthRequestHandlers.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setOAuthRequestHandlers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getClientAuth.d.ts","sourceRoot":"","sources":["../../lib/Auth/getClientAuth.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,gBAAgB,EAIjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,iBAAiB,EAAwB,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACzF,OAAO,EAA0B,WAAW,EAAE,MAAM,eAAe,CAAC;AAEpE,wBAAsB,aAAa,CACjC,IAAI,EAAE,WAAW,EACjB,SAAS,EAAE,iBAAiB,GAC3B,OAAO,CAAC;IAAE,IAAI,EAAE,gBAAgB,CAAC;IAAC,QAAQ,EAAE,iBAAiB,CAAA;CAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"getClientAuth.d.ts","sourceRoot":"","sources":["../../lib/Auth/getClientAuth.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,gBAAgB,EAIjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,iBAAiB,EAAwB,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACzF,OAAO,EAA0B,WAAW,EAAE,MAAM,eAAe,CAAC;AAEpE,wBAAsB,aAAa,CACjC,IAAI,EAAE,WAAW,EACjB,SAAS,EAAE,iBAAiB,GAC3B,OAAO,CAAC;IAAE,IAAI,EAAE,gBAAgB,CAAC;IAAC,QAAQ,EAAE,iBAAiB,CAAA;CAAE,CAAC,CAmElE"}
|
|
@@ -50,6 +50,7 @@ async function getClientAuth(clientReq) {
|
|
|
50
50
|
minPasswordLength: signupWithEmailAndPassword.minPasswordLength ?? 8,
|
|
51
51
|
url: AuthHandler_1.AUTH_ROUTES_AND_PARAMS.emailRegistration,
|
|
52
52
|
},
|
|
53
|
+
preferredLogin: userData.preferredLogin,
|
|
53
54
|
user: userData.clientUser,
|
|
54
55
|
loginType: localLoginMode ?? (login ? "email+password" : undefined),
|
|
55
56
|
pathGuard,
|
|
@@ -68,6 +69,10 @@ const getOAuthProviders = (loginWithOAuth) => {
|
|
|
68
69
|
if (config?.clientID) {
|
|
69
70
|
result[providerName] = {
|
|
70
71
|
url: `${AuthHandler_1.AUTH_ROUTES_AND_PARAMS.loginWithProvider}/${providerName}`,
|
|
72
|
+
...(providerName === "customOAuth" && {
|
|
73
|
+
displayName: OAuthProviders.customOAuth?.displayName,
|
|
74
|
+
displayIconPath: OAuthProviders.customOAuth?.displayIconPath,
|
|
75
|
+
}),
|
|
71
76
|
};
|
|
72
77
|
}
|
|
73
78
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getClientAuth.js","sourceRoot":"","sources":["../../lib/Auth/getClientAuth.ts"],"names":[],"mappings":";;;AAAA,qDAOyB;AAEzB,+CAAoE;AAE7D,KAAK,UAAU,aAAa,CAEjC,SAA4B;IAE5B,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,IACE,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,YAAY;QACzC,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,EACnD,CAAC;QACD,SAAS,GAAG,IAAI,CAAC;QAEjB;;WAEG;QACH,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;YACrB,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;YAC7B,MAAM,CAAC,kBAAkB,CAAC,0BAAQ,CAAC,SAAS,CAAC,CAAC;YAC9C,MAAM,CAAC,EAAE,CACP,0BAAQ,CAAC,SAAS,EAClB,KAAK,EACH,MAAyB,EACzB,KAAK,CAAC,IAAS,EAAE,IAAgC,EAAE,EAAE;gBACnD,YAAY;YACd,CAAC,EACD,EAAE;gBACF,IAAI,CAAC;oBACH,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GACxB,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAuB,CAAC,CAAC,CAAC,MAAM,CAAC;oBAClF,IAAI,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;wBAC7C,OAAO,CAAC,IAAI,CAAC,mDAAmD,EAAE,QAAQ,CAAC,CAAC;oBAC9E,CAAC;oBAED,qBAAqB;oBACrB,MAAM,mBAAmB,GAAG,CAAC,SAAS,CAAC,CAAC;oBACxC,IACE,CAAC,mBAAmB,CAAC,QAAQ,CAAC,MAAM,CAAC;wBACrC,QAAQ;wBACR,OAAO,QAAQ,KAAK,QAAQ;wBAC5B,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC;wBAC1B,CAAC,CAAC,MAAM,IAAI,CAAC,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAC5C,CAAC;wBACD,EAAE,CAAC,IAAI,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;oBACnC,CAAC;yBAAM,CAAC;wBACN,EAAE,CAAC,IAAI,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,CAAC;oBACpC,CAAC;gBACH,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,OAAO,CAAC,KAAK,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAC;oBACtC,EAAE,CAAC,GAAG,CAAC,CAAC;gBACV,CAAC;YACH,CAAC,CACF,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;IAChE,MAAM,EAAE,cAAc,EAAE,0BAA0B,EAAE,cAAc,EAAE,KAAK,EAAE,GACzE,IAAI,CAAC,IAAI,CAAC,iBAAiB,IAAI,EAAE,CAAC;IAEpC,MAAM,IAAI,GAAqB;QAC7B,SAAS,EAAE,iBAAiB,CAAC,cAAc,CAAC;QAC5C,0BAA0B,EAAE,0BAA0B,IAAI;YACxD,iBAAiB,EAAE,0BAA0B,CAAC,iBAAiB,IAAI,CAAC;YACpE,GAAG,EAAE,oCAAsB,CAAC,iBAAiB;SAC9C;QACD,IAAI,EAAE,QAAQ,CAAC,UAAU;QACzB,SAAS,EAAE,cAAc,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC;QACnE,SAAS;KACV,CAAC;IACF,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;AAC5B,CAAC;
|
|
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":"AAEA,OAAO,EAAE,WAAW,EAAmB,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"setupAuthRoutes.d.ts","sourceRoot":"","sources":["../../lib/Auth/setupAuthRoutes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAmB,MAAM,eAAe,CAAC;AAU7D,wBAAsB,eAAe,CAAC,IAAI,EAAE,WAAW,iBA4DtD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupAuthRoutes.js","sourceRoot":"","sources":["../../lib/Auth/setupAuthRoutes.ts"],"names":[],"mappings":";;;AAEA,+CAA6D;AAC7D,qFAAkF;AAClF,6FAA0F;AAC1F,+EAA4E;AAC5E,uFAAoF;AACpF,iFAA8E;AAC9E,qFAAkF;AAClF,uFAAoF;
|
|
1
|
+
{"version":3,"file":"setupAuthRoutes.js","sourceRoot":"","sources":["../../lib/Auth/setupAuthRoutes.ts"],"names":[],"mappings":";;;AAEA,+CAA6D;AAC7D,qFAAkF;AAClF,6FAA0F;AAC1F,+EAA4E;AAC5E,uFAAoF;AACpF,iFAA8E;AAC9E,qFAAkF;AAClF,uFAAoF;AAG7E,KAAK,UAAU,eAAe;IACnC,MAAM,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;IAExC,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,WAAW,EACX,GAAG,EACH,cAAc,EACd,0BAA0B,GAC3B,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;QAC3D,6DAA6B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,0BAA0B,EAAE,GAAG,CAAC,CAAC;IAC5E,CAAC;IAED,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,iDAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;IAChE,CAAC;IAED,IAAI,GAAG,EAAE,CAAC;QACR,MAAM,sBAAsB,GAAmB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YAChE,GAAG,CAAC;gBACF,GAAG;gBACH,GAAG;gBACH,IAAI;gBACJ,OAAO,EAAE,KAAK,IAAI,EAAE;oBAClB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;oBACnE,IAAI,SAAS,CAAC,KAAK,EAAE,CAAC;wBACpB,GAAG,CAAC,MAAM,CAAC,6BAAe,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;wBAC9D,MAAM,SAAS,CAAC,KAAK,CAAC;oBACxB,CAAC;oBACD,OAAO,SAAS,CAAC;gBACnB,CAAC;gBACD,GAAG,EAAE,IAAI,CAAC,GAAoB;gBAC9B,EAAE,EAAE,IAAI,CAAC,EAAE;aACZ,CAAC,CAAC;QACL,CAAC,CAAC;QACF,IAAA,2DAA4B,EAAC,GAAG,EAAE,sBAAsB,EAAE,wBAAwB,CAAC,CAAC;IACtF,CAAC;IAED,IAAI,WAAW,EAAE,CAAC;QAChB,uDAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;IAC1D,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;AAC5C,CAAC;AA5DD,0CA4DC"}
|
|
@@ -49,7 +49,7 @@ async function getSidAndUserFromRequest(clientReq) {
|
|
|
49
49
|
if (clientInfo?.user && sid) {
|
|
50
50
|
return { sid, ...clientInfo };
|
|
51
51
|
}
|
|
52
|
-
return { sid };
|
|
52
|
+
return { sid, preferredLogin: !clientInfo?.user ? clientInfo?.preferredLogin : undefined };
|
|
53
53
|
}, 100);
|
|
54
54
|
await this.prostgles.opts.onLog?.({
|
|
55
55
|
type: "auth",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSidAndUserFromRequest.js","sourceRoot":"","sources":["../../../lib/Auth/utils/getSidAndUserFromRequest.ts"],"names":[],"mappings":";;;AACA,gDAAsE;AAEtE,uDAAsD;AAEtD;;;GAGG;AACI,KAAK,UAAU,wBAAwB,CAE5C,SAA4B;IAE5B;;OAEG;IACH,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,UAAU,CAAC;IACtD,IAAI,SAAS,CAAC,MAAM,IAAI,UAAU,IAAI,SAAS,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;QACnE,MAAM,EAAE,OAAO,EAAE,GAAG,QAAQ,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC;QAC9D,MAAM,OAAO,GAAG,IAAI,CAAC,yBAAyB,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC1E,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO;gBACL,GAAG,QAAQ;gBACX,GAAG,EAAE,OAAO,CAAC,GAAG;aACjB,CAAC;QACJ,CAAC;;YACC,OAAO;gBACL,GAAG,EAAE,OAAO,CAAC,GAAG;aACjB,CAAC;IACN,CAAC;IAED;;OAEG;IACH,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC7B,MAAM,MAAM,GAAG,MAAM,IAAA,mCAAiB,EAAC,KAAK,IAAI,EAAE;QAChD,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAE9B,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACnC,MAAM,eAAe,GACnB,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CACjB,MAAM,OAAO,CACX,GAAG,EACH,IAAI,CAAC,GAAoB,EACzB,IAAI,CAAC,EAAE,EACP,IAAA,qCAAuB,EAAC,SAAS,CAAC,EAClC,SAAS,CACV,CACF,CAAC;QACJ,IAAI,eAAe,IAAI,CAAC,OAAO,eAAe,KAAK,QAAQ,IAAI,SAAS,IAAI,eAAe,CAAC;YAC1F,MAAM,eAAe,CAAC;QACxB,MAAM,UAAU,GAAG,eAAe,CAAC;QACnC,IAAI,UAAU,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;YACnC,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,GAAoB,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;YAC1E,IAAI,OAAO,IAAI,OAAO,CAAC,OAAO,IAAI,UAAU,EAAE,IAAI,EAAE,CAAC;gBACnD,SAAS,CAAC,MAAM,CAAC,WAAW,GAAG;oBAC7B,GAAG,UAAU;oBACb,OAAO;iBACR,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,UAAU,EAAE,IAAI,IAAI,GAAG,EAAE,CAAC;YAC5B,OAAO,EAAE,GAAG,EAAE,GAAG,UAAU,EAAE,CAAC;QAChC,CAAC;QAED,OAAO,EAAE,GAAG,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"getSidAndUserFromRequest.js","sourceRoot":"","sources":["../../../lib/Auth/utils/getSidAndUserFromRequest.ts"],"names":[],"mappings":";;;AACA,gDAAsE;AAEtE,uDAAsD;AAEtD;;;GAGG;AACI,KAAK,UAAU,wBAAwB,CAE5C,SAA4B;IAE5B;;OAEG;IACH,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,UAAU,CAAC;IACtD,IAAI,SAAS,CAAC,MAAM,IAAI,UAAU,IAAI,SAAS,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;QACnE,MAAM,EAAE,OAAO,EAAE,GAAG,QAAQ,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC;QAC9D,MAAM,OAAO,GAAG,IAAI,CAAC,yBAAyB,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC1E,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO;gBACL,GAAG,QAAQ;gBACX,GAAG,EAAE,OAAO,CAAC,GAAG;aACjB,CAAC;QACJ,CAAC;;YACC,OAAO;gBACL,GAAG,EAAE,OAAO,CAAC,GAAG;aACjB,CAAC;IACN,CAAC;IAED;;OAEG;IACH,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC7B,MAAM,MAAM,GAAG,MAAM,IAAA,mCAAiB,EAAC,KAAK,IAAI,EAAE;QAChD,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAE9B,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACnC,MAAM,eAAe,GACnB,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CACjB,MAAM,OAAO,CACX,GAAG,EACH,IAAI,CAAC,GAAoB,EACzB,IAAI,CAAC,EAAE,EACP,IAAA,qCAAuB,EAAC,SAAS,CAAC,EAClC,SAAS,CACV,CACF,CAAC;QACJ,IAAI,eAAe,IAAI,CAAC,OAAO,eAAe,KAAK,QAAQ,IAAI,SAAS,IAAI,eAAe,CAAC;YAC1F,MAAM,eAAe,CAAC;QACxB,MAAM,UAAU,GAAG,eAAe,CAAC;QACnC,IAAI,UAAU,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;YACnC,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,GAAoB,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;YAC1E,IAAI,OAAO,IAAI,OAAO,CAAC,OAAO,IAAI,UAAU,EAAE,IAAI,EAAE,CAAC;gBACnD,SAAS,CAAC,MAAM,CAAC,WAAW,GAAG;oBAC7B,GAAG,UAAU;oBACb,OAAO;iBACR,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,UAAU,EAAE,IAAI,IAAI,GAAG,EAAE,CAAC;YAC5B,OAAO,EAAE,GAAG,EAAE,GAAG,UAAU,EAAE,CAAC;QAChC,CAAC;QAED,OAAO,EAAE,GAAG,EAAE,cAAc,EAAE,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;IAC7F,CAAC,EAAE,GAAG,CAAC,CAAC;IAER,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QAChC,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,eAAe;QACxB,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS;QAChC,GAAG,EAAE,MAAM,CAAC,GAAG;QACf,QAAQ,EAAE,SAAS,CAAC,MAAM,EAAE,EAAE;KAC/B,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC;AApED,4DAoEC"}
|
|
@@ -124,7 +124,7 @@ export declare class FileManager {
|
|
|
124
124
|
init: (prg: Prostgles) => Promise<void>;
|
|
125
125
|
destroy: () => void;
|
|
126
126
|
}
|
|
127
|
-
export declare const removeExpressRoute: (app: ExpressApp | undefined,
|
|
127
|
+
export declare const removeExpressRoute: (app: ExpressApp | undefined, _routePaths: (string | undefined)[], method?: "get" | "post" | "put" | "delete") => void;
|
|
128
128
|
export declare const removeExpressRouteByName: (app: ExpressApp | undefined, name: string) => void;
|
|
129
129
|
export declare const getFileTypeFromFilename: (fileName: string) => {
|
|
130
130
|
mime: ALLOWED_CONTENT_TYPE;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileManager.d.ts","sourceRoot":"","sources":["../../lib/FileManager/FileManager.ts"],"names":[],"mappings":";;;AACA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAKjC,OAAO,EAAE,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EACL,oBAAoB,EACpB,iBAAiB,EAIjB,mBAAmB,EACpB,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"FileManager.d.ts","sourceRoot":"","sources":["../../lib/FileManager/FileManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ const initFileManager_1 = require("./initFileManager");
|
|
|
10
10
|
const getValidatedFileType_1 = require("./getValidatedFileType");
|
|
11
11
|
const upload_1 = require("./upload");
|
|
12
12
|
const uploadStream_1 = require("./uploadStream");
|
|
13
|
+
const AuthHandler_1 = require("../Auth/AuthHandler");
|
|
13
14
|
exports.HOUR = 3600 * 1000;
|
|
14
15
|
const asSQLIdentifier = async (name, db) => {
|
|
15
16
|
return (await db.one("select format('%I', $1) as name", [name]))?.name;
|
|
@@ -183,12 +184,14 @@ class FileManager {
|
|
|
183
184
|
};
|
|
184
185
|
}
|
|
185
186
|
exports.FileManager = FileManager;
|
|
186
|
-
const removeExpressRoute = (app,
|
|
187
|
+
const removeExpressRoute = (app, _routePaths, method) => {
|
|
187
188
|
const routes = app?._router?.stack;
|
|
189
|
+
const routePaths = _routePaths.filter(prostgles_types_1.isDefined);
|
|
188
190
|
if (routes) {
|
|
189
191
|
app._router.stack = routes.filter((route) => {
|
|
190
192
|
const path = route.route?.path;
|
|
191
|
-
if (
|
|
193
|
+
if (routePaths.some((routePath) => (0, AuthHandler_1.matchesRoute)(path, routePath)) &&
|
|
194
|
+
(!method || route.route?.methods?.[method])) {
|
|
192
195
|
return false;
|
|
193
196
|
}
|
|
194
197
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileManager.js","sourceRoot":"","sources":["../../lib/FileManager/FileManager.ts"],"names":[],"mappings":";;;AAAA,yBAAyB;AAGzB,kCAAkC;AAClC,uDAA8C;AAG9C,qDAOyB;AAEzB,6BAA6B;AAC7B,uDAAoD;AACpD,iEAA8D;AAC9D,qCAAkC;AAClC,iDAA8C;
|
|
1
|
+
{"version":3,"file":"FileManager.js","sourceRoot":"","sources":["../../lib/FileManager/FileManager.ts"],"names":[],"mappings":"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"}
|
package/lib/Auth/AuthHandler.ts
CHANGED
|
@@ -74,16 +74,6 @@ export class AuthHandler {
|
|
|
74
74
|
return sid;
|
|
75
75
|
};
|
|
76
76
|
|
|
77
|
-
matchesRoute = (route: string | undefined, clientFullRoute: string) => {
|
|
78
|
-
return (
|
|
79
|
-
route &&
|
|
80
|
-
clientFullRoute &&
|
|
81
|
-
(route === clientFullRoute ||
|
|
82
|
-
(clientFullRoute.startsWith(route) &&
|
|
83
|
-
["/", "?", "#"].includes(clientFullRoute[route.length] ?? "")))
|
|
84
|
-
);
|
|
85
|
-
};
|
|
86
|
-
|
|
87
77
|
isUserRoute = (pathname: string) => {
|
|
88
78
|
const { login, logoutGetPath, magicLinksRoute, loginWithProvider } = AUTH_ROUTES_AND_PARAMS;
|
|
89
79
|
const pubRoutes = [
|
|
@@ -95,7 +85,7 @@ export class AuthHandler {
|
|
|
95
85
|
].filter((publicRoute) => publicRoute);
|
|
96
86
|
|
|
97
87
|
return !pubRoutes.some((publicRoute) => {
|
|
98
|
-
return
|
|
88
|
+
return matchesRoute(publicRoute, pathname);
|
|
99
89
|
});
|
|
100
90
|
};
|
|
101
91
|
|
|
@@ -198,6 +188,7 @@ export class AuthHandler {
|
|
|
198
188
|
confirmEmail,
|
|
199
189
|
confirmEmailExpressRoute,
|
|
200
190
|
} = AUTH_ROUTES_AND_PARAMS;
|
|
191
|
+
|
|
201
192
|
removeExpressRoute(app, [
|
|
202
193
|
login,
|
|
203
194
|
logoutGetPath,
|
|
@@ -306,3 +297,13 @@ export class AuthHandler {
|
|
|
306
297
|
|
|
307
298
|
getClientAuth = getClientAuth.bind(this);
|
|
308
299
|
}
|
|
300
|
+
|
|
301
|
+
export const matchesRoute = (shorterRoute: string | undefined, longerRoute: string) => {
|
|
302
|
+
return (
|
|
303
|
+
shorterRoute &&
|
|
304
|
+
longerRoute &&
|
|
305
|
+
(shorterRoute === longerRoute ||
|
|
306
|
+
(longerRoute.startsWith(shorterRoute) &&
|
|
307
|
+
["/", "?", "#"].includes(longerRoute[shorterRoute.length] ?? "")))
|
|
308
|
+
);
|
|
309
|
+
};
|
package/lib/Auth/AuthTypes.ts
CHANGED
|
@@ -19,10 +19,12 @@ import {
|
|
|
19
19
|
IdentityProvider,
|
|
20
20
|
UserLike,
|
|
21
21
|
AuthSocketSchema,
|
|
22
|
+
ClientSchema,
|
|
22
23
|
} from "prostgles-types";
|
|
23
24
|
import { DBOFullyTyped } from "../DBSchemaBuilder";
|
|
24
25
|
import { PRGLIOSocket } from "../DboBuilder/DboBuilderTypes";
|
|
25
26
|
import { DB } from "../Prostgles";
|
|
27
|
+
import OAuth2Strategy from "passport-oauth2";
|
|
26
28
|
|
|
27
29
|
type Awaitable<T> = T | Promise<T>;
|
|
28
30
|
|
|
@@ -51,7 +53,7 @@ type SocketClientRequest = { socket: PRGLIOSocket; httpReq?: undefined };
|
|
|
51
53
|
type HttpClientRequest = { httpReq: ExpressReq; res: ExpressRes; socket?: undefined };
|
|
52
54
|
export type AuthClientRequest = SocketClientRequest | HttpClientRequest;
|
|
53
55
|
|
|
54
|
-
type ThirdPartyProviders = {
|
|
56
|
+
export type ThirdPartyProviders = {
|
|
55
57
|
facebook?: Pick<FacebookStrategy, "clientID" | "clientSecret"> & {
|
|
56
58
|
authOpts?: AuthenticateOptions;
|
|
57
59
|
};
|
|
@@ -64,6 +66,11 @@ type ThirdPartyProviders = {
|
|
|
64
66
|
microsoft?: Pick<MicrosoftStrategyOptions, "clientID" | "clientSecret"> & {
|
|
65
67
|
authOpts?: AuthenticateOptions;
|
|
66
68
|
};
|
|
69
|
+
customOAuth?: OAuth2Strategy.StrategyOptions & {
|
|
70
|
+
authOpts?: AuthenticateOptions;
|
|
71
|
+
displayName?: string;
|
|
72
|
+
displayIconPath?: string;
|
|
73
|
+
};
|
|
67
74
|
};
|
|
68
75
|
|
|
69
76
|
type TLSConfig = {
|
|
@@ -167,6 +174,12 @@ export type AuthProviderUserData =
|
|
|
167
174
|
profile: any;
|
|
168
175
|
accessToken: string;
|
|
169
176
|
refreshToken: string;
|
|
177
|
+
}
|
|
178
|
+
| {
|
|
179
|
+
provider: "customOAuth";
|
|
180
|
+
profile: any;
|
|
181
|
+
accessToken: string;
|
|
182
|
+
refreshToken: string;
|
|
170
183
|
};
|
|
171
184
|
|
|
172
185
|
export type RegistrationData =
|
|
@@ -244,13 +257,19 @@ type AllNeverAndOptional<T> = {
|
|
|
244
257
|
[P in keyof T]?: never;
|
|
245
258
|
};
|
|
246
259
|
export type AuthResultWithSID<SU = SessionUser> =
|
|
247
|
-
| (SU & { sid: string; error?: undefined })
|
|
260
|
+
| (SU & { sid: string; error?: undefined; preferredLogin?: undefined })
|
|
248
261
|
| (AllNeverAndOptional<SU> & {
|
|
249
262
|
sid: string | undefined;
|
|
250
263
|
error?: AuthResponse.AuthFailure;
|
|
264
|
+
preferredLogin?: NonNullable<ClientSchema["auth"]>["preferredLogin"];
|
|
251
265
|
});
|
|
252
266
|
|
|
253
|
-
export type AuthResult<SU = SessionUser> =
|
|
267
|
+
export type AuthResult<SU = SessionUser> =
|
|
268
|
+
| SU
|
|
269
|
+
| undefined
|
|
270
|
+
| (AllNeverAndOptional<SU> & {
|
|
271
|
+
preferredLogin?: NonNullable<ClientSchema["auth"]>["preferredLogin"];
|
|
272
|
+
});
|
|
254
273
|
export type AuthResultOrError<SU = SessionUser> =
|
|
255
274
|
| AuthResponse.AuthFailure
|
|
256
275
|
| AuthResponse.AuthFailure["code"]
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import e, { Request, RequestHandler, Response } from "express";
|
|
2
2
|
import { DBOFullyTyped } from "../../DBSchemaBuilder";
|
|
3
|
-
import { AUTH_ROUTES_AND_PARAMS, AuthHandler, HTTP_FAIL_CODES } from "../AuthHandler";
|
|
3
|
+
import { AUTH_ROUTES_AND_PARAMS, AuthHandler, HTTP_FAIL_CODES, matchesRoute } from "../AuthHandler";
|
|
4
4
|
import { AuthClientRequest } from "../AuthTypes";
|
|
5
5
|
import { getReturnUrl } from "../utils/getReturnUrl";
|
|
6
6
|
import { throttledReject } from "../utils/throttledReject";
|
|
@@ -37,7 +37,7 @@ export function setCatchAllRequestHandler(this: AuthHandler, app: e.Express) {
|
|
|
37
37
|
if (this.prostgles.restApi) {
|
|
38
38
|
if (
|
|
39
39
|
Object.values(this.prostgles.restApi.routes).some((restRoute) =>
|
|
40
|
-
|
|
40
|
+
matchesRoute(restRoute.split("/:")[0], req.path)
|
|
41
41
|
)
|
|
42
42
|
) {
|
|
43
43
|
next();
|
|
@@ -47,12 +47,12 @@ export function setCatchAllRequestHandler(this: AuthHandler, app: e.Express) {
|
|
|
47
47
|
try {
|
|
48
48
|
const returnURL = getReturnUrl(req);
|
|
49
49
|
|
|
50
|
-
if (
|
|
50
|
+
if (matchesRoute(AUTH_ROUTES_AND_PARAMS.logoutGetPath, req.path)) {
|
|
51
51
|
await onLogout(req, res);
|
|
52
52
|
return;
|
|
53
53
|
}
|
|
54
54
|
|
|
55
|
-
if (
|
|
55
|
+
if (matchesRoute(AUTH_ROUTES_AND_PARAMS.loginWithProvider, req.path)) {
|
|
56
56
|
next();
|
|
57
57
|
return;
|
|
58
58
|
}
|
|
@@ -75,7 +75,7 @@ export function setCatchAllRequestHandler(this: AuthHandler, app: e.Express) {
|
|
|
75
75
|
return;
|
|
76
76
|
|
|
77
77
|
/** If Logged in and requesting login then redirect to main page */
|
|
78
|
-
} else if (
|
|
78
|
+
} else if (matchesRoute(AUTH_ROUTES_AND_PARAMS.login, req.path)) {
|
|
79
79
|
const { user, isAnonymous, error } = await getUser();
|
|
80
80
|
if (error) {
|
|
81
81
|
res.status(HTTP_FAIL_CODES.BAD_REQUEST).json(error);
|
|
@@ -8,11 +8,11 @@ import { getObjectEntries, isEmpty } from "prostgles-types";
|
|
|
8
8
|
import { getErrorAsObject } from "../../DboBuilder/dboBuilderUtils";
|
|
9
9
|
import { DBOFullyTyped } from "../../DBSchemaBuilder";
|
|
10
10
|
import { AUTH_ROUTES_AND_PARAMS, AuthHandler, HTTP_FAIL_CODES } from "../AuthHandler";
|
|
11
|
-
import { LoginWithOAuthConfig } from "../AuthTypes";
|
|
11
|
+
import { AuthProviderUserData, LoginWithOAuthConfig } from "../AuthTypes";
|
|
12
12
|
import { getClientRequestIPsInfo } from "../utils/getClientRequestIPsInfo";
|
|
13
13
|
import { upsertNamedExpressMiddleware } from "../utils/upsertNamedExpressMiddleware";
|
|
14
14
|
import { LoginResponseHandler } from "./setLoginRequestHandler";
|
|
15
|
-
|
|
15
|
+
import OAuth2Strategy from "passport-oauth2";
|
|
16
16
|
export function setOAuthRequestHandlers(
|
|
17
17
|
this: AuthHandler,
|
|
18
18
|
app: e.Express,
|
|
@@ -37,6 +37,7 @@ export function setOAuthRequestHandlers(
|
|
|
37
37
|
providerName === "google" ? GoogleStrategy
|
|
38
38
|
: providerName === "github" ? GitHubStrategy
|
|
39
39
|
: providerName === "facebook" ? FacebookStrategy
|
|
40
|
+
: providerName === "customOAuth" ? OAuth2Strategy
|
|
40
41
|
: MicrosoftStrategy;
|
|
41
42
|
const callbackPath = `${AUTH_ROUTES_AND_PARAMS.loginWithProvider}/${providerName}/callback`;
|
|
42
43
|
passport.use(
|
|
@@ -52,10 +53,8 @@ export function setOAuthRequestHandlers(
|
|
|
52
53
|
)
|
|
53
54
|
);
|
|
54
55
|
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
passport.authenticate(providerName, authOpts ?? {})
|
|
58
|
-
);
|
|
56
|
+
const authPath = `${AUTH_ROUTES_AND_PARAMS.loginWithProvider}/${providerName}`;
|
|
57
|
+
app.get(authPath, passport.authenticate(providerName, authOpts ?? {}));
|
|
59
58
|
|
|
60
59
|
app.get(callbackPath, async (req, res: LoginResponseHandler) => {
|
|
61
60
|
try {
|
|
@@ -75,7 +74,7 @@ export function setOAuthRequestHandlers(
|
|
|
75
74
|
failureRedirect: "/login",
|
|
76
75
|
failWithError: true,
|
|
77
76
|
},
|
|
78
|
-
async (error: any, _profile: any, authInfo:
|
|
77
|
+
async (error: any, _profile: any, authInfo: AuthProviderUserData) => {
|
|
79
78
|
if (error) {
|
|
80
79
|
await onProviderLoginFail?.({ ...args, error });
|
|
81
80
|
res.status(HTTP_FAIL_CODES.BAD_REQUEST).json({
|
|
@@ -86,8 +85,8 @@ export function setOAuthRequestHandlers(
|
|
|
86
85
|
} else {
|
|
87
86
|
this.login(req, res, {
|
|
88
87
|
...authInfo,
|
|
89
|
-
type: "
|
|
90
|
-
provider: providerName,
|
|
88
|
+
type: "OAuth",
|
|
89
|
+
provider: providerName as "customOAuth",
|
|
91
90
|
}).catch((e: any) => {
|
|
92
91
|
res.status(HTTP_FAIL_CODES.INTERNAL_SERVER_ERROR).json(getErrorAsObject(e));
|
|
93
92
|
});
|
|
@@ -73,6 +73,7 @@ export async function getClientAuth(
|
|
|
73
73
|
minPasswordLength: signupWithEmailAndPassword.minPasswordLength ?? 8,
|
|
74
74
|
url: AUTH_ROUTES_AND_PARAMS.emailRegistration,
|
|
75
75
|
},
|
|
76
|
+
preferredLogin: userData.preferredLogin,
|
|
76
77
|
user: userData.clientUser,
|
|
77
78
|
loginType: localLoginMode ?? (login ? "email+password" : undefined),
|
|
78
79
|
pathGuard,
|
|
@@ -92,6 +93,10 @@ const getOAuthProviders = (
|
|
|
92
93
|
if (config?.clientID) {
|
|
93
94
|
result[providerName] = {
|
|
94
95
|
url: `${AUTH_ROUTES_AND_PARAMS.loginWithProvider}/${providerName}`,
|
|
96
|
+
...(providerName === "customOAuth" && {
|
|
97
|
+
displayName: OAuthProviders.customOAuth?.displayName,
|
|
98
|
+
displayIconPath: OAuthProviders.customOAuth?.displayIconPath,
|
|
99
|
+
}),
|
|
95
100
|
};
|
|
96
101
|
}
|
|
97
102
|
});
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { RequestHandler } from "express";
|
|
1
|
+
import e, { RequestHandler } from "express";
|
|
2
2
|
import { DBOFullyTyped } from "../DBSchemaBuilder";
|
|
3
3
|
import { AuthHandler, HTTP_FAIL_CODES } from "./AuthHandler";
|
|
4
4
|
import { setCatchAllRequestHandler } from "./endpoints/setCatchAllRequestHandler";
|
|
@@ -8,6 +8,7 @@ import { setMagicLinkRequestHandler } from "./endpoints/setMagicLinkRequestHandl
|
|
|
8
8
|
import { setOAuthRequestHandlers } from "./endpoints/setOAuthRequestHandlers";
|
|
9
9
|
import { setRegisterRequestHandler } from "./endpoints/setRegisterRequestHandler";
|
|
10
10
|
import { upsertNamedExpressMiddleware } from "./utils/upsertNamedExpressMiddleware";
|
|
11
|
+
import { removeExpressRoute } from "../FileManager/FileManager";
|
|
11
12
|
|
|
12
13
|
export async function setupAuthRoutes(this: AuthHandler) {
|
|
13
14
|
const { loginSignupConfig } = this.opts;
|
|
@@ -20,6 +20,7 @@ import { getValidatedFileType } from "./getValidatedFileType";
|
|
|
20
20
|
import { upload } from "./upload";
|
|
21
21
|
import { uploadStream } from "./uploadStream";
|
|
22
22
|
import { ExpressApp } from "../RestApi";
|
|
23
|
+
import { matchesRoute } from "../Auth/AuthHandler";
|
|
23
24
|
|
|
24
25
|
export const HOUR = 3600 * 1000;
|
|
25
26
|
|
|
@@ -307,13 +308,18 @@ export class FileManager {
|
|
|
307
308
|
|
|
308
309
|
export const removeExpressRoute = (
|
|
309
310
|
app: ExpressApp | undefined,
|
|
310
|
-
|
|
311
|
+
_routePaths: (string | undefined)[],
|
|
312
|
+
method?: "get" | "post" | "put" | "delete"
|
|
311
313
|
) => {
|
|
312
314
|
const routes = app?._router?.stack;
|
|
315
|
+
const routePaths = _routePaths.filter(isDefined);
|
|
313
316
|
if (routes) {
|
|
314
317
|
app._router!.stack = routes.filter((route) => {
|
|
315
318
|
const path = route.route?.path;
|
|
316
|
-
if (
|
|
319
|
+
if (
|
|
320
|
+
routePaths.some((routePath) => matchesRoute(path, routePath)) &&
|
|
321
|
+
(!method || route.route?.methods?.[method])
|
|
322
|
+
) {
|
|
317
323
|
return false;
|
|
318
324
|
}
|
|
319
325
|
return true;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "prostgles-server",
|
|
3
|
-
"version": "4.2.
|
|
3
|
+
"version": "4.2.226",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -52,10 +52,11 @@
|
|
|
52
52
|
"passport-github2": "^0.1.12",
|
|
53
53
|
"passport-google-oauth20": "^2.0.0",
|
|
54
54
|
"passport-microsoft": "^2.1.0",
|
|
55
|
+
"passport-oauth2": "^1.8.0",
|
|
55
56
|
"pg": "^8.11.5",
|
|
56
57
|
"pg-cursor": "^2.11.0",
|
|
57
58
|
"pg-promise": "^11.9.1",
|
|
58
|
-
"prostgles-types": "^4.0.
|
|
59
|
+
"prostgles-types": "^4.0.142"
|
|
59
60
|
},
|
|
60
61
|
"devDependencies": {
|
|
61
62
|
"@types/express": "^4.17.21",
|