prostgles-server 4.2.369 → 4.2.371
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 +20 -4
- package/dist/Auth/AuthHandler.d.ts.map +1 -1
- package/dist/Auth/AuthHandler.js +24 -9
- package/dist/Auth/AuthHandler.js.map +1 -1
- package/dist/Auth/AuthTypes.d.ts +7 -2
- package/dist/Auth/AuthTypes.d.ts.map +1 -1
- package/dist/Auth/AuthTypes.js +3 -3
- package/dist/Auth/AuthTypes.js.map +1 -1
- package/dist/Auth/endpoints/setCatchAllRequestHandler.d.ts.map +1 -1
- package/dist/Auth/endpoints/setCatchAllRequestHandler.js +5 -4
- package/dist/Auth/endpoints/setCatchAllRequestHandler.js.map +1 -1
- package/dist/Auth/endpoints/setLoginRequestHandler.d.ts +1 -1
- package/dist/Auth/endpoints/setLoginRequestHandler.d.ts.map +1 -1
- package/dist/Auth/endpoints/setLoginRequestHandler.js +1 -1
- package/dist/Auth/endpoints/setLoginRequestHandler.js.map +1 -1
- package/dist/Auth/endpoints/setLogoutRequestHandler.d.ts.map +1 -1
- package/dist/Auth/endpoints/setLogoutRequestHandler.js +1 -2
- package/dist/Auth/endpoints/setLogoutRequestHandler.js.map +1 -1
- package/dist/Auth/endpoints/setMagicLinkOrOTPRequestHandler.d.ts.map +1 -1
- package/dist/Auth/endpoints/setMagicLinkOrOTPRequestHandler.js +4 -4
- package/dist/Auth/endpoints/setMagicLinkOrOTPRequestHandler.js.map +1 -1
- package/dist/Auth/endpoints/setOAuthRequestHandlers.js +2 -2
- package/dist/Auth/endpoints/setOAuthRequestHandlers.js.map +1 -1
- package/dist/Auth/endpoints/setRegisterRequestHandler.d.ts +2 -3
- package/dist/Auth/endpoints/setRegisterRequestHandler.d.ts.map +1 -1
- package/dist/Auth/endpoints/setRegisterRequestHandler.js +8 -4
- 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 +4 -6
- package/dist/Auth/getClientAuth.js.map +1 -1
- package/dist/Auth/login.d.ts.map +1 -1
- package/dist/Auth/login.js +6 -1
- package/dist/Auth/login.js.map +1 -1
- package/dist/Auth/setupAuthRoutes.d.ts.map +1 -1
- package/dist/Auth/setupAuthRoutes.js +1 -1
- package/dist/Auth/setupAuthRoutes.js.map +1 -1
- package/dist/Auth/utils/getReturnUrl.d.ts.map +1 -1
- package/dist/Auth/utils/getReturnUrl.js +3 -4
- package/dist/Auth/utils/getReturnUrl.js.map +1 -1
- package/dist/Auth/utils/setCookieAndGoToReturnURLIFSet.d.ts.map +1 -1
- package/dist/Auth/utils/setCookieAndGoToReturnURLIFSet.js +2 -3
- package/dist/Auth/utils/setCookieAndGoToReturnURLIFSet.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts +1 -1
- package/dist/Filtering.d.ts +2 -2
- package/dist/PublishParser/publishTypesAndUtils.d.ts.map +1 -1
- package/dist/PublishParser/publishTypesAndUtils.js.map +1 -1
- package/dist/WebsocketAPI/getClientHandlers.d.ts +3 -3
- package/dist/WebsocketAPI/getClientHandlers.d.ts.map +1 -1
- package/dist/WebsocketAPI/getClientHandlers.js.map +1 -1
- package/dist/runClientRequest.d.ts.map +1 -1
- package/dist/runClientRequest.js +2 -1
- package/dist/runClientRequest.js.map +1 -1
- package/lib/Auth/AuthHandler.ts +29 -9
- package/lib/Auth/AuthTypes.ts +19 -6
- package/lib/Auth/endpoints/setCatchAllRequestHandler.ts +6 -7
- package/lib/Auth/endpoints/setLoginRequestHandler.ts +5 -5
- package/lib/Auth/endpoints/setLogoutRequestHandler.ts +2 -3
- package/lib/Auth/endpoints/setMagicLinkOrOTPRequestHandler.ts +7 -13
- package/lib/Auth/endpoints/setOAuthRequestHandlers.ts +3 -3
- package/lib/Auth/endpoints/setRegisterRequestHandler.ts +12 -7
- package/lib/Auth/getClientAuth.ts +9 -19
- package/lib/Auth/login.ts +10 -4
- package/lib/Auth/setupAuthRoutes.ts +2 -2
- package/lib/Auth/utils/getReturnUrl.ts +4 -5
- package/lib/Auth/utils/setCookieAndGoToReturnURLIFSet.ts +3 -11
- package/lib/PublishParser/publishTypesAndUtils.ts +12 -7
- package/lib/WebsocketAPI/getClientHandlers.ts +5 -5
- package/lib/runClientRequest.ts +10 -2
- package/package.json +1 -1
|
@@ -17,16 +17,24 @@ export declare const HTTP_SUCCESS_CODES: {
|
|
|
17
17
|
readonly OK: 200;
|
|
18
18
|
readonly CREATED: 201;
|
|
19
19
|
};
|
|
20
|
-
export declare const
|
|
20
|
+
export declare const EXPRESS_CATCH_ALL_ROUTE = "*splat";
|
|
21
|
+
export declare const AUTH_RETURN_URL_PARAM_NAME = "returnURL";
|
|
22
|
+
declare const AUTH_ROUTES: {
|
|
21
23
|
readonly login: "/login";
|
|
22
24
|
readonly loginWithProvider: "/oauth";
|
|
23
25
|
readonly emailRegistration: "/register";
|
|
24
|
-
readonly returnUrlParamName: "returnURL";
|
|
25
|
-
readonly sidKeyName: "session_id";
|
|
26
26
|
readonly logout: "/logout";
|
|
27
27
|
readonly magicLinks: "/magic-link";
|
|
28
28
|
readonly magicLinkWithId: "/magic-link/:id";
|
|
29
|
-
|
|
29
|
+
};
|
|
30
|
+
export declare const GET_AUTH_ROUTE: (conf: AuthConfig["loginSignupConfig"], route: keyof typeof AUTH_ROUTES) => string;
|
|
31
|
+
export declare const GET_ALL_AUTH_ROUTES: (conf: AuthConfig["loginSignupConfig"]) => {
|
|
32
|
+
readonly login: string;
|
|
33
|
+
readonly loginWithProvider: string;
|
|
34
|
+
readonly emailRegistration: string;
|
|
35
|
+
readonly logout: string;
|
|
36
|
+
readonly magicLinks: string;
|
|
37
|
+
readonly magicLinkWithId: string;
|
|
30
38
|
};
|
|
31
39
|
export declare class AuthHandler {
|
|
32
40
|
protected readonly prostgles: Prostgles;
|
|
@@ -35,6 +43,14 @@ export declare class AuthHandler {
|
|
|
35
43
|
db: DB;
|
|
36
44
|
constructor(prostgles: Prostgles);
|
|
37
45
|
get sidKeyName(): string;
|
|
46
|
+
get authRoutes(): {
|
|
47
|
+
readonly login: string;
|
|
48
|
+
readonly loginWithProvider: string;
|
|
49
|
+
readonly emailRegistration: string;
|
|
50
|
+
readonly logout: string;
|
|
51
|
+
readonly magicLinks: string;
|
|
52
|
+
readonly magicLinkWithId: string;
|
|
53
|
+
};
|
|
38
54
|
validateSid: (sid: string | undefined) => string | undefined;
|
|
39
55
|
isUserRoute: (pathname: string) => boolean;
|
|
40
56
|
setCookieAndGoToReturnURLIFSet: (cookie: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthHandler.d.ts","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,EAAE,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACnE,OAAO,KAAK,EAAE,iBAAiB,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAI/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAE1E,OAAO,EAA0B,KAAK,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AACzF,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;
|
|
1
|
+
{"version":3,"file":"AuthHandler.d.ts","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,EAAE,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACnE,OAAO,KAAK,EAAE,iBAAiB,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAI/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAE1E,OAAO,EAA0B,KAAK,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AACzF,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,QAAA,MAAM,WAAW;;;;;;;CAOP,CAAC;AACX,eAAO,MAAM,cAAc,SACnB,UAAU,CAAC,mBAAmB,CAAC,SAC9B,MAAM,kBAAkB,WAIhC,CAAC;AACF,eAAO,MAAM,mBAAmB,SAAU,UAAU,CAAC,mBAAmB,CAAC;;;;;;;CASxE,CAAC;AAEF,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,IAAI,UAAU;;;;;;;MAEb;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,aAoBL;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"}
|
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.
|
|
3
|
+
exports.AuthHandler = exports.GET_ALL_AUTH_ROUTES = exports.GET_AUTH_ROUTE = 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");
|
|
@@ -26,17 +26,29 @@ exports.HTTP_SUCCESS_CODES = {
|
|
|
26
26
|
OK: 200,
|
|
27
27
|
CREATED: 201,
|
|
28
28
|
};
|
|
29
|
-
|
|
29
|
+
const SID_KEY_NAME = "session_id";
|
|
30
|
+
exports.EXPRESS_CATCH_ALL_ROUTE = "*splat"; //v5 "*splat" //v4 "*"
|
|
31
|
+
exports.AUTH_RETURN_URL_PARAM_NAME = "returnURL";
|
|
32
|
+
const AUTH_ROUTES = {
|
|
30
33
|
login: "/login",
|
|
31
34
|
loginWithProvider: "/oauth",
|
|
32
35
|
emailRegistration: "/register",
|
|
33
|
-
returnUrlParamName: "returnURL",
|
|
34
|
-
sidKeyName: "session_id",
|
|
35
36
|
logout: "/logout",
|
|
36
37
|
magicLinks: "/magic-link",
|
|
37
38
|
magicLinkWithId: "/magic-link/:id",
|
|
38
|
-
catchAll: "*splat", //v5 "*splat" //v4 "*"
|
|
39
39
|
};
|
|
40
|
+
const GET_AUTH_ROUTE = (conf, route) => {
|
|
41
|
+
const basePath = conf?.authRoutesBasePath || "";
|
|
42
|
+
return `${basePath}/auth${AUTH_ROUTES[route]}`;
|
|
43
|
+
};
|
|
44
|
+
exports.GET_AUTH_ROUTE = GET_AUTH_ROUTE;
|
|
45
|
+
const GET_ALL_AUTH_ROUTES = (conf) => {
|
|
46
|
+
return Object.fromEntries(Object.entries(AUTH_ROUTES).map(([key]) => [
|
|
47
|
+
key,
|
|
48
|
+
(0, exports.GET_AUTH_ROUTE)(conf, key),
|
|
49
|
+
]));
|
|
50
|
+
};
|
|
51
|
+
exports.GET_ALL_AUTH_ROUTES = GET_ALL_AUTH_ROUTES;
|
|
40
52
|
class AuthHandler {
|
|
41
53
|
prostgles;
|
|
42
54
|
opts;
|
|
@@ -53,7 +65,10 @@ class AuthHandler {
|
|
|
53
65
|
this.db = prostgles.db;
|
|
54
66
|
}
|
|
55
67
|
get sidKeyName() {
|
|
56
|
-
return this.opts.sidKeyName ??
|
|
68
|
+
return this.opts.sidKeyName ?? SID_KEY_NAME;
|
|
69
|
+
}
|
|
70
|
+
get authRoutes() {
|
|
71
|
+
return (0, exports.GET_ALL_AUTH_ROUTES)(this.opts.loginSignupConfig);
|
|
57
72
|
}
|
|
58
73
|
validateSid = (sid) => {
|
|
59
74
|
if (!sid)
|
|
@@ -63,7 +78,7 @@ class AuthHandler {
|
|
|
63
78
|
return sid;
|
|
64
79
|
};
|
|
65
80
|
isUserRoute = (pathname) => {
|
|
66
|
-
const { login, logout: logoutRoute, magicLinks: magicLinksRoute, loginWithProvider, } = exports.
|
|
81
|
+
const { login, logout: logoutRoute, magicLinks: magicLinksRoute, loginWithProvider, } = (0, exports.GET_ALL_AUTH_ROUTES)(this.opts.loginSignupConfig);
|
|
67
82
|
const pubRoutes = [
|
|
68
83
|
...(this.opts.loginSignupConfig?.publicRoutes || []),
|
|
69
84
|
login,
|
|
@@ -97,12 +112,12 @@ class AuthHandler {
|
|
|
97
112
|
init = setupAuthRoutes_1.setupAuthRoutes.bind(this);
|
|
98
113
|
destroy = () => {
|
|
99
114
|
const app = this.opts.loginSignupConfig?.app;
|
|
100
|
-
const { login, logout, magicLinkWithId: magicLinksIdParam,
|
|
115
|
+
const { login, logout, magicLinkWithId: magicLinksIdParam, loginWithProvider, emailRegistration, magicLinks, } = (0, exports.GET_ALL_AUTH_ROUTES)(this.opts.loginSignupConfig);
|
|
101
116
|
(0, removeExpressRoute_1.removeExpressRoute)(app, [
|
|
102
117
|
login,
|
|
103
118
|
logout,
|
|
104
119
|
magicLinksIdParam,
|
|
105
|
-
|
|
120
|
+
exports.EXPRESS_CATCH_ALL_ROUTE,
|
|
106
121
|
loginWithProvider,
|
|
107
122
|
emailRegistration,
|
|
108
123
|
magicLinks,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthHandler.js","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":";;;AACA,qDAA2C;AAI3C,mDAAgD;AAChD,mCAAgC;AAChC,uDAAoD;AACpD,6EAA0E;AAUjE,wGAVA,iDAAuB,OAUA;AAThC,+EAA4E;AAC5E,yDAAyF;AACzF,mEAAyF;AAOvD,mGAPzB,uCAAkB,OAOyB;AAAE,wGAPzB,4CAAuB,OAOyB;AAN7E,2FAGgD;AAChD,uDAAoD;AAGvC,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;
|
|
1
|
+
{"version":3,"file":"AuthHandler.js","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":";;;AACA,qDAA2C;AAI3C,mDAAgD;AAChD,mCAAgC;AAChC,uDAAoD;AACpD,6EAA0E;AAUjE,wGAVA,iDAAuB,OAUA;AAThC,+EAA4E;AAC5E,yDAAyF;AACzF,mEAAyF;AAOvD,mGAPzB,uCAAkB,OAOyB;AAAE,wGAPzB,4CAAuB,OAOyB;AAN7E,2FAGgD;AAChD,uDAAoD;AAGvC,QAAA,eAAe,GAAG;IAC7B,YAAY,EAAE,GAAG;IACjB,SAAS,EAAE,GAAG;IACd,WAAW,EAAE,GAAG;IAChB,qBAAqB,EAAE,GAAG;IAC1B,QAAQ,EAAE,GAAG;IACb,iBAAiB,EAAE,GAAG;CACd,CAAC;AAEE,QAAA,kBAAkB,GAAG;IAChC,EAAE,EAAE,GAAG;IACP,OAAO,EAAE,GAAG;CACJ,CAAC;AAEX,MAAM,YAAY,GAAG,YAAqB,CAAC;AAC9B,QAAA,uBAAuB,GAAG,QAAQ,CAAC,CAAC,sBAAsB;AAC1D,QAAA,0BAA0B,GAAG,WAAW,CAAC;AACtD,MAAM,WAAW,GAAG;IAClB,KAAK,EAAE,QAAQ;IACf,iBAAiB,EAAE,QAAQ;IAC3B,iBAAiB,EAAE,WAAW;IAC9B,MAAM,EAAE,SAAS;IACjB,UAAU,EAAE,aAAa;IACzB,eAAe,EAAE,iBAAiB;CAC1B,CAAC;AACJ,MAAM,cAAc,GAAG,CAC5B,IAAqC,EACrC,KAA+B,EAC/B,EAAE;IACF,MAAM,QAAQ,GAAG,IAAI,EAAE,kBAAkB,IAAI,EAAE,CAAC;IAChD,OAAO,GAAG,QAAQ,QAAQ,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;AACjD,CAAC,CAAC;AANW,QAAA,cAAc,kBAMzB;AACK,MAAM,mBAAmB,GAAG,CAAC,IAAqC,EAAE,EAAE;IAC3E,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;QACzC,GAAG;QACH,IAAA,sBAAc,EAAC,IAAI,EAAE,GAA+B,CAAC;KACtD,CAAC,CAGH,CAAC;AACJ,CAAC,CAAC;AATW,QAAA,mBAAmB,uBAS9B;AAEF,MAAa,WAAW;IACH,SAAS,CAAY;IACrB,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,YAAY,CAAC;IAC9C,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAA,2BAAmB,EAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAC1D,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,WAAW,GAAG,CAAC,QAAgB,EAAE,EAAE;QACjC,MAAM,EACJ,KAAK,EACL,MAAM,EAAE,WAAW,EACnB,UAAU,EAAE,eAAe,EAC3B,iBAAiB,GAClB,GAAG,IAAA,2BAAmB,EAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACrD,MAAM,SAAS,GAAG;YAChB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,YAAY,IAAI,EAAE,CAAC;YACpD,KAAK;YACL,WAAW;YACX,eAAe;YACf,iBAAiB;SAClB,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC;QAEvC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE;YACrC,OAAO,IAAA,2BAAY,EAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,8BAA8B,GAAG,+DAA8B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3E,2BAA2B,GAAG,4DAA2B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACrE,aAAa,GAAG,sCAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAElD;;;;OAIG;IACH,cAAc,GAAG,KAAK,EAAE,SAA4B,EAAgC,EAAE;QACpF,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QACvC,CAAC;QAAC,OAAO,IAAI,EAAE,CAAC;YACd,OAAO;gBACL,GAAG,EAAE,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC;gBACpC,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE;aAChD,CAAC;QACJ,CAAC;IACH,CAAC,CAAC;IAEF,IAAI,GAAG,iCAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAElC,OAAO,GAAG,GAAG,EAAE;QACb,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,GAAG,CAAC;QAC7C,MAAM,EACJ,KAAK,EACL,MAAM,EACN,eAAe,EAAE,iBAAiB,EAClC,iBAAiB,EACjB,iBAAiB,EACjB,UAAU,GACX,GAAG,IAAA,2BAAmB,EAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAErD,IAAA,uCAAkB,EAAC,GAAG,EAAE;YACtB,KAAK;YACL,MAAM;YACN,iBAAiB;YACjB,+BAAuB;YACvB,iBAAiB;YACjB,iBAAiB;YACjB,UAAU;SACX,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,KAAK,GAAG,aAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEzB;;;;;;OAMG;IACH,eAAe,CAAC,cAA6C;QAC3D,IAAI,CAAC,cAAc;YAAE,OAAO,SAAS,CAAC;QACtC,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;QAC5B,IAAI,cAAc,CAAC,MAAM,EAAE,CAAC;YAC1B,MAAM,EAAE,SAAS,EAAE,GAAG,cAAc,CAAC,MAAM,CAAC;YAC5C,MAAM,QAAQ,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,SAAS,CAAC,KAAK,EAAE,CAAC,UAAU,CAAC,CAElE,CAAC;YACd,IAAI,MAAM,GAAG,QAAQ,CAAC;YACtB,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,MAAM,UAAU,GAAG,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;gBACnE,MAAM,MAAM,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC;gBAC1C,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;YAC9B,CAAC;YACD,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAClC,CAAC;QAED,MAAM,CAAC,SAAS,EAAE,WAAW,CAAC,GAAG,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;QAChG,IAAI,SAA6B,CAAC;QAClC,IAAI,SAAS,IAAI,WAAW,EAAE,CAAC;YAC7B,IAAI,SAAS,CAAC,IAAI,EAAE,KAAK,QAAQ,EAAE,CAAC;gBAClC,MAAM,0CAA0C,CAAC;YACnD,CAAC;YACD,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC5D,CAAC;QACD,OAAO,IAAI,CAAC,WAAW;QACrB,sEAAsE;QACtE,SAAS,IAAK,cAAc,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,UAAU,CAAwB,CAClF,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,aAAa,GAAG,CAAC,SAAwC,EAAsB,EAAE;QAC/E,IAAI,CAAC,SAAS;YAAE,OAAO,SAAS,CAAC;QACjC,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QACzC,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC,CAAC;IAEF,wBAAwB,GAAG,mDAAwB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAE/D,yBAAyB,GAAG,CAC1B,MAAoB,EACpB,OAAiC,EACxB,EAAE;QACX,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QACrE,IACE,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,YAAY;YACzC,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,EACnD,CAAC;YACD,MAAM,KAAK,GAAG,qBAAqB,CAAC;YACpC,IAAI,UAAU,EAAE,CAAC;gBACf,IAAI,OAAO,EAAE,YAAY,KAAK,UAAU;oBACtC,MAAM,CAAC,IAAI,CAAC,0BAAQ,CAAC,SAAS,EAAE;wBAC9B,YAAY,EAAE,IAAI;wBAClB,KAAK;qBACN,CAAC,CAAC;gBACL,MAAM,KAAK,CAAC;YACd,CAAC;QACH,CAAC;QACD,OAAO,OAAO,CAAC,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC;IACzC,CAAC,CAAC;IAEF,aAAa,GAAG,6BAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;CAC1C;AA1KD,kCA0KC;AAED,MAAM,cAAc,GAAG,CAAC,UAA8B,EAA0B,EAAE;IAChF,IAAI,CAAC,UAAU,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;QAClD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,OAAO,UAAU;SACd,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;SAClB,KAAK,CAAC,GAAG,CAAC;SACV,MAAM,CAAY,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACnC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACzC,IAAI,CAAC,IAAK,CAAC,GAAG,KAAK,CAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC,EAAE,EAAE,CAAC,CAAC;AACX,CAAC,CAAC"}
|
package/dist/Auth/AuthTypes.d.ts
CHANGED
|
@@ -298,7 +298,11 @@ export type MagicLinkOrOTPData = {
|
|
|
298
298
|
email: string;
|
|
299
299
|
returnToken: boolean;
|
|
300
300
|
};
|
|
301
|
-
export declare const getMagicLinkUrl: (websiteUrl
|
|
301
|
+
export declare const getMagicLinkUrl: ({ websiteUrl, data, loginSignupConfig, }: {
|
|
302
|
+
websiteUrl: string;
|
|
303
|
+
data: MagicLinkOrOTPData;
|
|
304
|
+
loginSignupConfig: AuthConfig["loginSignupConfig"];
|
|
305
|
+
}) => string;
|
|
302
306
|
export type LoginParams = ({
|
|
303
307
|
type: "username";
|
|
304
308
|
} & AuthRequest.LoginData) | ({
|
|
@@ -309,6 +313,7 @@ export type LoginSignupConfig<S, SUser extends SessionUser> = {
|
|
|
309
313
|
* Express app instance. If provided Prostgles will attempt to set sidKeyName to user cookie
|
|
310
314
|
*/
|
|
311
315
|
app: Express;
|
|
316
|
+
authRoutesBasePath?: string;
|
|
312
317
|
/**
|
|
313
318
|
* Options used in setting the cookie after a successful login
|
|
314
319
|
*/
|
|
@@ -353,7 +358,7 @@ export type LoginSignupConfig<S, SUser extends SessionUser> = {
|
|
|
353
358
|
* If provided then the user will be able to login with a username and/or password
|
|
354
359
|
* through the POST /login route.
|
|
355
360
|
*/
|
|
356
|
-
login: (params: LoginParams, dbo: DBOFullyTyped<S>, db: DB, client: LoginClientInfo) => Awaitable<LoginResponse>;
|
|
361
|
+
login: (params: LoginParams, dbo: DBOFullyTyped<S>, db: DB, client: LoginClientInfo, getMagicLinkUrl: (data: MagicLinkOrOTPData, websiteUrl: string) => string) => Awaitable<LoginResponse>;
|
|
357
362
|
logout: (sid: string | undefined, dbo: DBOFullyTyped<S>, db: DB) => Awaitable<void>;
|
|
358
363
|
};
|
|
359
364
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthTypes.d.ts","sourceRoot":"","sources":["../../lib/Auth/AuthTypes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,KAAK,IAAI,MAAM,uBAAuB,CAAC;AAC9C,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,KAAK,cAAc,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EACV,SAAS,EACT,WAAW,EACX,YAAY,EACZ,gBAAgB,EAChB,YAAY,EACZ,WAAW,EACX,gBAAgB,EAChB,QAAQ,EACT,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"AuthTypes.d.ts","sourceRoot":"","sources":["../../lib/Auth/AuthTypes.ts"],"names":[],"mappings":"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"}
|
package/dist/Auth/AuthTypes.js
CHANGED
|
@@ -2,12 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getMagicLinkUrl = void 0;
|
|
4
4
|
const AuthHandler_1 = require("./AuthHandler");
|
|
5
|
-
const getMagicLinkUrl = (websiteUrl, data) => {
|
|
5
|
+
const getMagicLinkUrl = ({ websiteUrl, data, loginSignupConfig, }) => {
|
|
6
6
|
if (data.type === "magic-link") {
|
|
7
|
-
return `${AuthHandler_1.
|
|
7
|
+
return `${(0, AuthHandler_1.GET_AUTH_ROUTE)(loginSignupConfig, "magicLinkWithId")}/${data.id}`;
|
|
8
8
|
}
|
|
9
9
|
const { code, email } = data;
|
|
10
|
-
const confirmationUrl = new URL(`${websiteUrl}${AuthHandler_1.
|
|
10
|
+
const confirmationUrl = new URL(`${websiteUrl}${(0, AuthHandler_1.GET_AUTH_ROUTE)(loginSignupConfig, "magicLinks")}`);
|
|
11
11
|
confirmationUrl.searchParams.set("email", email);
|
|
12
12
|
confirmationUrl.searchParams.set("code", code);
|
|
13
13
|
return confirmationUrl.toString();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthTypes.js","sourceRoot":"","sources":["../../lib/Auth/AuthTypes.ts"],"names":[],"mappings":";;;AA4BA,+
|
|
1
|
+
{"version":3,"file":"AuthTypes.js","sourceRoot":"","sources":["../../lib/Auth/AuthTypes.ts"],"names":[],"mappings":";;;AA4BA,+CAA+C;AAiVxC,MAAM,eAAe,GAAG,CAAC,EAC9B,UAAU,EACV,IAAI,EACJ,iBAAiB,GAKlB,EAAE,EAAE;IACH,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;QAC/B,OAAO,GAAG,IAAA,4BAAc,EAAC,iBAAiB,EAAE,iBAAiB,CAAC,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;IAC9E,CAAC;IACD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IAC7B,MAAM,eAAe,GAAG,IAAI,GAAG,CAC7B,GAAG,UAAU,GAAG,IAAA,4BAAc,EAAC,iBAAiB,EAAE,YAAY,CAAC,EAAE,CAClE,CAAC;IACF,eAAe,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACjD,eAAe,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC/C,OAAO,eAAe,CAAC,QAAQ,EAAE,CAAC;AACpC,CAAC,CAAC;AAnBW,QAAA,eAAe,mBAmB1B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setCatchAllRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setCatchAllRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAI7B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAMlD,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"setCatchAllRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setCatchAllRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAI7B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAMlD,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO,QAuF1E"}
|
|
@@ -12,7 +12,7 @@ function setCatchAllRequestHandler(app) {
|
|
|
12
12
|
const pathsHandledByProstgles = [
|
|
13
13
|
restApi?.path,
|
|
14
14
|
fileManager?.path,
|
|
15
|
-
authHandler &&
|
|
15
|
+
authHandler && this.authRoutes.loginWithProvider,
|
|
16
16
|
].filter(prostgles_types_1.isDefined);
|
|
17
17
|
if (pathsHandledByProstgles.some((path) => (0, matchesRoute_1.matchesRoute)(path, req.path))) {
|
|
18
18
|
next();
|
|
@@ -37,11 +37,12 @@ function setCatchAllRequestHandler(app) {
|
|
|
37
37
|
/**
|
|
38
38
|
* Requesting a User route (must be logged in)
|
|
39
39
|
*/
|
|
40
|
+
const loginRoute = this.authRoutes.login;
|
|
40
41
|
if (this.isUserRoute(req.path)) {
|
|
41
42
|
/* Check auth. Redirect to login if unauthorized */
|
|
42
43
|
const isLoggedIn = await isLoggedInUser();
|
|
43
44
|
if (!isLoggedIn) {
|
|
44
|
-
res.redirect(`${
|
|
45
|
+
res.redirect(`${loginRoute}?returnURL=${encodeURIComponent(req.originalUrl)}`);
|
|
45
46
|
return;
|
|
46
47
|
}
|
|
47
48
|
/**
|
|
@@ -57,7 +58,7 @@ function setCatchAllRequestHandler(app) {
|
|
|
57
58
|
* 2) If logged in and anonymous then allow visiting /login (it will be caught earlier by new-session-redirect)
|
|
58
59
|
* */
|
|
59
60
|
}
|
|
60
|
-
else if ((0, matchesRoute_1.matchesRoute)(
|
|
61
|
+
else if ((0, matchesRoute_1.matchesRoute)(loginRoute, req.path)) {
|
|
61
62
|
const { user, isAnonymous, error } = await getUser();
|
|
62
63
|
if (error) {
|
|
63
64
|
res.status(AuthHandler_1.HTTP_FAIL_CODES.BAD_REQUEST).json(error);
|
|
@@ -87,7 +88,7 @@ function setCatchAllRequestHandler(app) {
|
|
|
87
88
|
});
|
|
88
89
|
}
|
|
89
90
|
};
|
|
90
|
-
app.get(AuthHandler_1.
|
|
91
|
+
app.get(AuthHandler_1.EXPRESS_CATCH_ALL_ROUTE, requestHandlerCatchAll);
|
|
91
92
|
}
|
|
92
93
|
exports.setCatchAllRequestHandler = setCatchAllRequestHandler;
|
|
93
94
|
//# sourceMappingURL=setCatchAllRequestHandler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setCatchAllRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setCatchAllRequestHandler.ts"],"names":[],"mappings":";;;AAEA,qDAA4C;AAG5C,
|
|
1
|
+
{"version":3,"file":"setCatchAllRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setCatchAllRequestHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { Response } from "express";
|
|
2
1
|
import type e from "express";
|
|
2
|
+
import type { Response } from "express";
|
|
3
3
|
import type { AuthRequest, AuthResponse } from "prostgles-types";
|
|
4
4
|
import type { AuthHandler } from "../AuthHandler";
|
|
5
5
|
export type LoginResponse = AuthResponse.OAuthRegisterSuccess | AuthResponse.OAuthRegisterFailure | AuthResponse.PasswordLoginFailure | AuthResponse.MagicLinkAuthFailure | AuthResponse.MagicLinkAuthSuccess | AuthResponse.CodeVerificationFailure;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setLoginRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setLoginRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"setLoginRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setLoginRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAC7B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAIlD,MAAM,MAAM,aAAa,GACrB,YAAY,CAAC,oBAAoB,GACjC,YAAY,CAAC,oBAAoB,GACjC,YAAY,CAAC,oBAAoB,GACjC,YAAY,CAAC,oBAAoB,GACjC,YAAY,CAAC,oBAAoB,GACjC,YAAY,CAAC,uBAAuB,CAAC;AACzC,MAAM,MAAM,oBAAoB,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAC;AAE3D,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO,QAmBvE;AAED,eAAO,MAAM,cAAc,aACf,GAAG,KACZ,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,YAAY,SAAS,CAsBzD,CAAC"}
|
|
@@ -4,7 +4,7 @@ exports.parseLoginData = exports.setLoginRequestHandler = void 0;
|
|
|
4
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
5
|
const AuthHandler_1 = require("../AuthHandler");
|
|
6
6
|
function setLoginRequestHandler(app) {
|
|
7
|
-
app.post(
|
|
7
|
+
app.post(this.authRoutes.login, async (req, res) => {
|
|
8
8
|
const [error, loginData] = (0, exports.parseLoginData)(req.body);
|
|
9
9
|
if (error || !loginData) {
|
|
10
10
|
return res
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setLoginRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setLoginRequestHandler.ts"],"names":[],"mappings":";;;AAGA,qDAAsD;AAEtD,
|
|
1
|
+
{"version":3,"file":"setLoginRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setLoginRequestHandler.ts"],"names":[],"mappings":";;;AAGA,qDAAsD;AAEtD,gDAAiD;AAYjD,SAAgB,sBAAsB,CAAoB,GAAc;IACtE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,GAAyB,EAAE,EAAE;QACvE,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,GAAG,IAAA,sBAAc,EAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACpD,IAAI,KAAK,IAAI,CAAC,SAAS,EAAE,CAAC;YACxB,OAAO,GAAG;iBACP,MAAM,CAAC,6BAAe,CAAC,WAAW,CAAC;iBACnC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,sBAAsB,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QAC5E,CAAC;QACD,IAAI,CAAC;YACH,MAAM,WAAW,GAAgB;gBAC/B,GAAG,SAAS;gBACZ,IAAI,EAAE,UAAU;aACjB,CAAC;YAEF,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC;QAC1C,CAAC;QAAC,OAAO,MAAM,EAAE,CAAC;YAChB,GAAG,CAAC,MAAM,CAAC,6BAAe,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAC;QACzF,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAnBD,wDAmBC;AAEM,MAAM,cAAc,GAAG,CAC5B,QAAa,EAC6C,EAAE;IAC5D,MAAM,SAAS,GAA0B;QACvC,QAAQ,EAAE,EAAE;QACZ,WAAW,EAAE,CAAC,CAAC,QAAQ,EAAE,WAAW;KACrC,CAAC;IAED,CAAC,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,oBAAoB,CAAW,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACvF,MAAM,UAAU,GAAG,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC;QAC9D,IAAI,IAAA,0BAAQ,EAAC,UAAU,CAAC,EAAE,CAAC;YACzB,OAAO,UAAU,CAAC;QACpB,CAAC;QACD,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;YACxB,IAAI,CAAC,IAAA,2BAAS,EAAC,UAAU,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;gBAC1C,OAAO,CAAC,2CAA2C,CAAC,CAAC;YACvD,CAAC;YACD,SAAS,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC;QAC/B,CAAC;aAAM,CAAC;YACN,SAAS,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC;QAC/B,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;AAChC,CAAC,CAAC;AAxBW,QAAA,cAAc,kBAwBzB;AAEF,MAAM,oBAAoB,GAAG,CAC3B,GAAQ,EACR,QAAgB,EACwB,EAAE;IAC1C,MAAM,mBAAmB,GAAG,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,SAAS,CAAC;IACzE,IAAI,CAAC,mBAAmB;QAAE,OAAO,EAAE,KAAK,EAAE,GAAG,QAAQ,sCAAsC,EAAE,CAAC;IAC9F,OAAO,GAAG,CAAC;AACb,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setLogoutRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setLogoutRequestHandler.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"setLogoutRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setLogoutRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAG7B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAGlD,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO,QAmBxE"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.setLogoutRequestHandler = void 0;
|
|
4
|
-
const AuthHandler_1 = require("../AuthHandler");
|
|
5
4
|
const throttledReject_1 = require("../utils/throttledReject");
|
|
6
5
|
function setLogoutRequestHandler(app) {
|
|
7
6
|
const logoutRequestHandler = async (req, res) => {
|
|
@@ -18,7 +17,7 @@ function setLogoutRequestHandler(app) {
|
|
|
18
17
|
}
|
|
19
18
|
res.redirect("/");
|
|
20
19
|
};
|
|
21
|
-
app.post(
|
|
20
|
+
app.post(this.authRoutes.logout, logoutRequestHandler);
|
|
22
21
|
}
|
|
23
22
|
exports.setLogoutRequestHandler = setLogoutRequestHandler;
|
|
24
23
|
//# sourceMappingURL=setLogoutRequestHandler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setLogoutRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setLogoutRequestHandler.ts"],"names":[],"mappings":";;;AAIA,
|
|
1
|
+
{"version":3,"file":"setLogoutRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setLogoutRequestHandler.ts"],"names":[],"mappings":";;;AAIA,8DAA2D;AAE3D,SAAgB,uBAAuB,CAAoB,GAAc;IACvE,MAAM,oBAAoB,GAAG,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;QACjE,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;QAC7D,IAAI,GAAG,EAAE,CAAC;YACR,IAAI,CAAC;gBACH,MAAM,IAAA,iCAAe,EAAC,KAAK,IAAI,EAAE;oBAC/B,OAAO,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,MAAM,CACxC,GAAG,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAC9B,IAAI,CAAC,GAAoB,EACzB,IAAI,CAAC,EAAE,CACR,CAAC;gBACJ,CAAC,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACrB,CAAC;QACH,CAAC;QACD,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACpB,CAAC,CAAC;IACF,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;AACzD,CAAC;AAnBD,0DAmBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setMagicLinkOrOTPRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setMagicLinkOrOTPRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"setMagicLinkOrOTPRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setMagicLinkOrOTPRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAI7B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD,OAAO,KAAK,EAAc,iBAAiB,EAAsB,WAAW,EAAE,MAAM,cAAc,CAAC;AAUnG,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,WAAW,EACjB,WAAW,EAAE,QAAQ,CAAC,iBAAiB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,kBAAkB,CAAC,EAC/E,GAAG,EAAE,CAAC,CAAC,OAAO,QAuDf"}
|
|
@@ -27,22 +27,22 @@ function setMagicLinkOrOTPRequestHandler(onMagicLink, app) {
|
|
|
27
27
|
.json({ success: false, code: "something-went-wrong" });
|
|
28
28
|
}
|
|
29
29
|
};
|
|
30
|
-
app.get(
|
|
30
|
+
app.get(this.authRoutes.magicLinkWithId, (req, res) => {
|
|
31
31
|
const { id } = req.params;
|
|
32
32
|
if (typeof id !== "string" || !id) {
|
|
33
|
-
res
|
|
33
|
+
return res
|
|
34
34
|
.status(AuthHandler_1.HTTP_FAIL_CODES.BAD_REQUEST)
|
|
35
35
|
.json({ success: false, code: "invalid-magic-link", message: "Invalid magic link" });
|
|
36
36
|
}
|
|
37
37
|
return handler(req, res, { type: "magic-link", id, returnToken: false });
|
|
38
38
|
});
|
|
39
|
-
app.get(
|
|
39
|
+
app.get(this.authRoutes.magicLinks, (req, res) => {
|
|
40
40
|
const data = parseMagicLinkOrOTPData(res, req.query);
|
|
41
41
|
if (!data)
|
|
42
42
|
return;
|
|
43
43
|
return handler(req, res, data);
|
|
44
44
|
});
|
|
45
|
-
app.post(
|
|
45
|
+
app.post(this.authRoutes.magicLinks, (req, res) => {
|
|
46
46
|
const data = parseMagicLinkOrOTPData(res, req.body);
|
|
47
47
|
if (!data)
|
|
48
48
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setMagicLinkOrOTPRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setMagicLinkOrOTPRequestHandler.ts"],"names":[],"mappings":";;;AAKA,
|
|
1
|
+
{"version":3,"file":"setMagicLinkOrOTPRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setMagicLinkOrOTPRequestHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,7 +28,7 @@ function setOAuthRequestHandlers(app, loginWithOAuthConfig) {
|
|
|
28
28
|
: providerName === "facebook" ? passport_facebook_1.Strategy
|
|
29
29
|
: providerName === "customOAuth" ? passport_oauth2_1.default
|
|
30
30
|
: passport_microsoft_1.Strategy;
|
|
31
|
-
const callbackPath = `${
|
|
31
|
+
const callbackPath = `${this.authRoutes.loginWithProvider}/${providerName}/callback`;
|
|
32
32
|
passport.use(new strategy({
|
|
33
33
|
...config,
|
|
34
34
|
callbackURL: `${websiteUrl}${callbackPath}`,
|
|
@@ -36,7 +36,7 @@ function setOAuthRequestHandlers(app, loginWithOAuthConfig) {
|
|
|
36
36
|
// This callback is where you would normally store or retrieve user info from the database
|
|
37
37
|
return done(null, profile, { accessToken, refreshToken, profile });
|
|
38
38
|
}));
|
|
39
|
-
const authPath = `${
|
|
39
|
+
const authPath = `${this.authRoutes.loginWithProvider}/${providerName}`;
|
|
40
40
|
app.get(authPath, passport.authenticate(providerName, authOpts ?? {}));
|
|
41
41
|
app.get(callbackPath, async (req, res) => {
|
|
42
42
|
try {
|
|
@@ -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;AAGpE,
|
|
1
|
+
{"version":3,"file":"setOAuthRequestHandlers.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setOAuthRequestHandlers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
/// <reference types="express-serve-static-core" />
|
|
2
|
-
/// <reference types="passport" />
|
|
3
1
|
import type e from "express";
|
|
2
|
+
import { type AuthHandler } from "../AuthHandler";
|
|
4
3
|
import { type SignupWithEmail } from "../AuthTypes";
|
|
5
|
-
export declare
|
|
4
|
+
export declare function setRegisterRequestHandler(this: AuthHandler, { onRegister, minPasswordLength, requirePassword }: SignupWithEmail, app: e.Express): void;
|
|
6
5
|
//# sourceMappingURL=setRegisterRequestHandler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setRegisterRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setRegisterRequestHandler.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"setRegisterRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setRegisterRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAG7B,OAAO,EAAmB,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAC;AACnE,OAAO,EAAmB,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AAYrE,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,WAAW,EACjB,EAAE,UAAU,EAAE,iBAAqB,EAAE,eAAe,EAAE,EAAE,eAAe,EACvE,GAAG,EAAE,CAAC,CAAC,OAAO,QAuDf"}
|
|
@@ -5,7 +5,7 @@ const AuthHandler_1 = require("../AuthHandler");
|
|
|
5
5
|
const AuthTypes_1 = require("../AuthTypes");
|
|
6
6
|
const getClientRequestIPsInfo_1 = require("../utils/getClientRequestIPsInfo");
|
|
7
7
|
const setLoginRequestHandler_1 = require("./setLoginRequestHandler");
|
|
8
|
-
|
|
8
|
+
function setRegisterRequestHandler({ onRegister, minPasswordLength = 8, requirePassword }, app) {
|
|
9
9
|
const registerRequestHandler = async (req, res) => {
|
|
10
10
|
const [error, data] = (0, setLoginRequestHandler_1.parseLoginData)(req.body);
|
|
11
11
|
if (error || !data) {
|
|
@@ -40,7 +40,11 @@ const setRegisterRequestHandler = ({ onRegister, minPasswordLength = 8, requireP
|
|
|
40
40
|
const result = await onRegister({
|
|
41
41
|
email: username,
|
|
42
42
|
password,
|
|
43
|
-
getConfirmationUrl: ({ code, websiteUrl }) => (0, AuthTypes_1.getMagicLinkUrl)(
|
|
43
|
+
getConfirmationUrl: ({ code, websiteUrl }) => (0, AuthTypes_1.getMagicLinkUrl)({
|
|
44
|
+
loginSignupConfig: this.opts.loginSignupConfig,
|
|
45
|
+
websiteUrl,
|
|
46
|
+
data: { type: "otp", code, email: username, returnToken: false },
|
|
47
|
+
}),
|
|
44
48
|
clientInfo,
|
|
45
49
|
req,
|
|
46
50
|
});
|
|
@@ -55,7 +59,7 @@ const setRegisterRequestHandler = ({ onRegister, minPasswordLength = 8, requireP
|
|
|
55
59
|
});
|
|
56
60
|
}
|
|
57
61
|
};
|
|
58
|
-
app.post(
|
|
59
|
-
}
|
|
62
|
+
app.post(this.authRoutes.emailRegistration, registerRequestHandler);
|
|
63
|
+
}
|
|
60
64
|
exports.setRegisterRequestHandler = setRegisterRequestHandler;
|
|
61
65
|
//# sourceMappingURL=setRegisterRequestHandler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setRegisterRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setRegisterRequestHandler.ts"],"names":[],"mappings":";;;AAGA,
|
|
1
|
+
{"version":3,"file":"setRegisterRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setRegisterRequestHandler.ts"],"names":[],"mappings":";;;AAGA,gDAAmE;AACnE,4CAAqE;AACrE,8EAA2E;AAC3E,qEAA0D;AAU1D,SAAgB,yBAAyB,CAEvC,EAAE,UAAU,EAAE,iBAAiB,GAAG,CAAC,EAAE,eAAe,EAAmB,EACvE,GAAc;IAEd,MAAM,sBAAsB,GAAG,KAAK,EAAE,GAAY,EAAE,GAA4B,EAAE,EAAE;QAClF,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,IAAA,uCAAc,EAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC/C,IAAI,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC;YACnB,OAAO,GAAG;iBACP,MAAM,CAAC,6BAAe,CAAC,WAAW,CAAC;iBACnC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,sBAAsB,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QAC5E,CAAC;QACD,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC;QACzC,MAAM,YAAY,GAAG,CAAC,QAAoB,EAAE,EAAE;YAC5C,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;gBACrB,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACrB,CAAC;iBAAM,CAAC;gBACN,GAAG,CAAC,MAAM,CAAC,6BAAe,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACzD,CAAC;QACH,CAAC,CAAC;QACF,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,YAAY,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC,CAAC;QACpE,CAAC;QACD,IAAI,CAAC,QAAQ,IAAI,eAAe,EAAE,CAAC;YACjC,OAAO,YAAY,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC,CAAC;QACpE,CAAC;aAAM,IAAI,QAAQ,CAAC,MAAM,GAAG,iBAAiB,EAAE,CAAC;YAC/C,OAAO,YAAY,CAAC;gBAClB,OAAO,EAAE,KAAK;gBACd,IAAI,EAAE,eAAe;gBACrB,OAAO,EAAE,6BAA6B,iBAAiB,kBAAkB;aAC1E,CAAC,CAAC;QACL,CAAC;QACD,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,IAAA,iDAAuB,EAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;YAC7D,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC;gBAC9B,KAAK,EAAE,QAAQ;gBACf,QAAQ;gBACR,kBAAkB,EAAE,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,CAC3C,IAAA,2BAAe,EAAC;oBACd,iBAAiB,EAAE,IAAI,CAAC,IAAI,CAAC,iBAAiB;oBAC9C,UAAU;oBACV,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,KAAK,EAAE;iBACjE,CAAC;gBACJ,UAAU;gBACV,GAAG;aACJ,CAAC,CAAC;YACH,OAAO,YAAY,CAAC,MAAM,CAAC,CAAC;QAC9B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,KAAK,CAAC,CAAC;YAC7C,OAAO,YAAY,CAAC;gBAClB,OAAO,EAAE,KAAK;gBACd,IAAI,EAAE,cAAc;gBACpB,OAAO,EAAE,sBAAsB;aAChC,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;IAEF,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,iBAAiB,EAAE,sBAAsB,CAAC,CAAC;AACtE,CAAC;AA1DD,8DA0DC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { AuthSocketSchema } from "prostgles-types";
|
|
2
|
-
import type { AuthClientRequest, AuthResultWithSID } from "./AuthTypes";
|
|
3
2
|
import type { AuthHandler } from "./AuthHandler";
|
|
3
|
+
import type { AuthClientRequest, AuthResultWithSID } from "./AuthTypes";
|
|
4
4
|
export declare function getClientAuth(this: AuthHandler, clientReq: AuthClientRequest): Promise<{
|
|
5
5
|
auth: AuthSocketSchema;
|
|
6
6
|
userData: AuthResultWithSID;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getClientAuth.d.ts","sourceRoot":"","sources":["../../lib/Auth/getClientAuth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,gBAAgB,
|
|
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,CA+E3F"}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getClientAuth = void 0;
|
|
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.opts.loginSignupConfig ?? {};
|
|
@@ -53,11 +52,10 @@ async function getClientAuth(clientReq) {
|
|
|
53
52
|
return userData;
|
|
54
53
|
}
|
|
55
54
|
const auth = {
|
|
56
|
-
|
|
57
|
-
providers: getOAuthProviders(loginWithOAuth),
|
|
55
|
+
providers: getOAuthProviders(this, loginWithOAuth),
|
|
58
56
|
signupWithEmailAndPassword: signupWithEmail && {
|
|
59
57
|
minPasswordLength: signupWithEmail.minPasswordLength ?? 8,
|
|
60
|
-
url:
|
|
58
|
+
url: this.authRoutes.emailRegistration,
|
|
61
59
|
},
|
|
62
60
|
preferredLogin: userData.preferredLogin,
|
|
63
61
|
user: userData.clientUser,
|
|
@@ -67,7 +65,7 @@ async function getClientAuth(clientReq) {
|
|
|
67
65
|
return { auth, userData };
|
|
68
66
|
}
|
|
69
67
|
exports.getClientAuth = getClientAuth;
|
|
70
|
-
const getOAuthProviders = (loginWithOAuth) => {
|
|
68
|
+
const getOAuthProviders = (authHandler, loginWithOAuth) => {
|
|
71
69
|
if (!loginWithOAuth)
|
|
72
70
|
return undefined;
|
|
73
71
|
const { OAuthProviders } = loginWithOAuth;
|
|
@@ -77,7 +75,7 @@ const getOAuthProviders = (loginWithOAuth) => {
|
|
|
77
75
|
(0, prostgles_types_1.getObjectEntries)(OAuthProviders).forEach(([providerName, config]) => {
|
|
78
76
|
if (config?.clientID) {
|
|
79
77
|
result[providerName] = {
|
|
80
|
-
url: `${
|
|
78
|
+
url: `${authHandler.authRoutes.loginWithProvider}/${providerName}`,
|
|
81
79
|
...(providerName === "customOAuth" && {
|
|
82
80
|
displayName: OAuthProviders.customOAuth?.displayName,
|
|
83
81
|
displayIconPath: OAuthProviders.customOAuth?.displayIconPath,
|