prostgles-server 4.2.184 → 4.2.186
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 +4 -10
- package/dist/Auth/AuthHandler.js.map +1 -1
- package/dist/Auth/AuthTypes.d.ts +16 -1
- package/dist/Auth/AuthTypes.d.ts.map +1 -1
- package/dist/Auth/setEmailProvider.d.ts.map +1 -1
- package/dist/Auth/setEmailProvider.js +15 -10
- package/dist/Auth/setEmailProvider.js.map +1 -1
- package/dist/PublishParser/PublishParser.d.ts.map +1 -1
- package/dist/PublishParser/PublishParser.js.map +1 -1
- package/lib/Auth/AuthHandler.ts +26 -65
- package/lib/Auth/AuthTypes.ts +28 -35
- package/lib/Auth/setEmailProvider.ts +23 -21
- package/lib/PublishParser/PublishParser.ts +1 -1
- package/package.json +1 -1
|
@@ -8,7 +8,7 @@ export declare const HTTPCODES: {
|
|
|
8
8
|
readonly BAD_REQUEST: 400;
|
|
9
9
|
readonly INTERNAL_SERVER_ERROR: 500;
|
|
10
10
|
};
|
|
11
|
-
export declare const getLoginClientInfo: (req:
|
|
11
|
+
export declare const getLoginClientInfo: <T extends AuthClientRequest>(req: T) => T & LoginClientInfo;
|
|
12
12
|
export declare const AUTH_ROUTES_AND_PARAMS: {
|
|
13
13
|
readonly login: "/login";
|
|
14
14
|
readonly loginWithProvider: "/auth";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthHandler.d.ts","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,gBAAgB,EACjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAGrE,OAAO,EAAE,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EACL,IAAI,EACJ,iBAAiB,EACjB,UAAU,EACV,YAAY,EACZ,UAAU,EACV,UAAU,EACV,eAAe,EACf,WAAW,EACZ,MAAM,aAAa,CAAC;AAKrB,eAAO,MAAM,SAAS;;;;;CAKZ,CAAC;AAEX,eAAO,MAAM,kBAAkB,
|
|
1
|
+
{"version":3,"file":"AuthHandler.d.ts","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,gBAAgB,EACjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAGrE,OAAO,EAAE,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EACL,IAAI,EACJ,iBAAiB,EACjB,UAAU,EACV,YAAY,EACZ,UAAU,EACV,UAAU,EACV,eAAe,EACf,WAAW,EACZ,MAAM,aAAa,CAAC;AAKrB,eAAO,MAAM,SAAS;;;;;CAKZ,CAAC;AAEX,eAAO,MAAM,kBAAkB,8DAqB9B,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;;;;;;;;;;CAYzB,CAAC;AAEX,qBAAa,WAAW;IACtB,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC;IAC/B,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC;IACtB,GAAG,EAAE,eAAe,CAAC;IACrB,EAAE,EAAE,EAAE,CAAC;gBAEK,SAAS,EAAE,SAAS;IAQhC,IAAI,UAAU,WAEb;IAED,WAAW,QAAS,MAAM,GAAG,SAAS,wBAIpC;IAEF,YAAY,UAAW,MAAM,GAAG,SAAS,mBAAmB,MAAM,8BAQhE;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,UAAU,CAAA;KAAE,UAkCvC;IAEF,OAAO,cAAqB;QAAE,OAAO,EAAE,UAAU,CAAA;KAAE,KAAG,QAAQ,UAAU,CAAC,CAoBvE;IAEF,IAAI,sBAA8B;IAElC,YAAY,QAAS,UAAU,+BAQ7B;IAEF,OAAO,aAwBL;IAEF,aAAa,+DA+BX;IAEF,cAAc,WAAkB,WAAW,UAAU,eAAe,KAAG,QAAQ,YAAY,CAAC,CA2B1F;IAEF,0BAA0B,QACnB,UAAU,OACV,UAAU,eACF,WAAW,mBAkBxB;IAEF;;;;;;OAMG;IACH,MAAM,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS;IA2CpD;;OAEG;IACH,aAAa,gBAAiB,WAAW,GAAG,SAAS,KAAG,MAAM,GAAG,SAAS,CAOxE;IAEI,aAAa,CAAC,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,QAAQ,GAAG,SAAS,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC;IAqE9F,oBAAoB,WAAY,YAAY,WAAW,YAAY,KAAG,OAAO,CAiB3E;IAEF,aAAa,cACA,KAAK,WAAW,EAAE,QAAQ,GAAG,SAAS,CAAC;cACjC,gBAAgB;kBAAY,UAAU;OA6DvD;CACH"}
|
package/dist/Auth/AuthHandler.js
CHANGED
|
@@ -13,7 +13,7 @@ exports.HTTPCODES = {
|
|
|
13
13
|
INTERNAL_SERVER_ERROR: 500,
|
|
14
14
|
};
|
|
15
15
|
const getLoginClientInfo = (req) => {
|
|
16
|
-
if (
|
|
16
|
+
if (req.httpReq) {
|
|
17
17
|
const ip_address = req.httpReq.ip;
|
|
18
18
|
if (!ip_address)
|
|
19
19
|
throw new Error("ip_address missing from req.httpReq");
|
|
@@ -208,9 +208,7 @@ class AuthHandler {
|
|
|
208
208
|
};
|
|
209
209
|
if (!result)
|
|
210
210
|
throw err;
|
|
211
|
-
if ((result &&
|
|
212
|
-
(typeof result.sid !== "string" ||
|
|
213
|
-
typeof result.expires !== "number")) ||
|
|
211
|
+
if ((result && (typeof result.sid !== "string" || typeof result.expires !== "number")) ||
|
|
214
212
|
(!result && ![undefined, null].includes(result))) {
|
|
215
213
|
throw err;
|
|
216
214
|
}
|
|
@@ -328,13 +326,9 @@ class AuthHandler {
|
|
|
328
326
|
const authStart = Date.now();
|
|
329
327
|
const res = await this.throttledFunc(async () => {
|
|
330
328
|
const { getUser } = this.opts ?? {};
|
|
331
|
-
if (getUser &&
|
|
332
|
-
localParams &&
|
|
333
|
-
(localParams.httpReq || localParams.socket)) {
|
|
329
|
+
if (getUser && localParams && (localParams.httpReq || localParams.socket)) {
|
|
334
330
|
const sid = this.getSID(localParams);
|
|
335
|
-
const clientReq = localParams.httpReq
|
|
336
|
-
? { httpReq: localParams.httpReq }
|
|
337
|
-
: { socket: localParams.socket };
|
|
331
|
+
const clientReq = localParams.httpReq ? { httpReq: localParams.httpReq } : { socket: localParams.socket };
|
|
338
332
|
let user, clientUser;
|
|
339
333
|
if (sid) {
|
|
340
334
|
const res = (await getUser(sid, this.dbo, this.db, (0, exports.getLoginClientInfo)(clientReq)));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthHandler.js","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":"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"}
|
|
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
|
@@ -28,8 +28,10 @@ export type BasicSession = {
|
|
|
28
28
|
};
|
|
29
29
|
export type AuthClientRequest = {
|
|
30
30
|
socket: PRGLIOSocket;
|
|
31
|
+
httpReq?: undefined;
|
|
31
32
|
} | {
|
|
32
33
|
httpReq: ExpressReq;
|
|
34
|
+
socket?: undefined;
|
|
33
35
|
};
|
|
34
36
|
type ThirdPartyProviders = {
|
|
35
37
|
facebook?: Pick<FacebookStrategy, "clientID" | "clientSecret"> & {
|
|
@@ -84,6 +86,8 @@ type EmailProvider = {
|
|
|
84
86
|
onSend: (data: {
|
|
85
87
|
email: string;
|
|
86
88
|
magicLinkPath: string;
|
|
89
|
+
clientInfo: LoginClientInfo;
|
|
90
|
+
req: ExpressReq;
|
|
87
91
|
}) => EmailWithoutTo | Promise<EmailWithoutTo>;
|
|
88
92
|
smtp: SMTPConfig;
|
|
89
93
|
};
|
|
@@ -92,7 +96,7 @@ type EmailProvider = {
|
|
|
92
96
|
onRegistered: (data: {
|
|
93
97
|
username: string;
|
|
94
98
|
password: string;
|
|
95
|
-
}) => void | Promise<void>;
|
|
99
|
+
}, clientInfo: LoginClientInfo) => void | Promise<void>;
|
|
96
100
|
/**
|
|
97
101
|
* Defaults to 8
|
|
98
102
|
*/
|
|
@@ -101,13 +105,24 @@ type EmailProvider = {
|
|
|
101
105
|
* If provided, the user will be required to confirm their email address
|
|
102
106
|
*/
|
|
103
107
|
emailConfirmation?: {
|
|
108
|
+
/**
|
|
109
|
+
* Called when the user has registered
|
|
110
|
+
*/
|
|
104
111
|
onSend: (data: {
|
|
105
112
|
email: string;
|
|
113
|
+
password: string;
|
|
106
114
|
confirmationUrlPath: string;
|
|
115
|
+
clientInfo: LoginClientInfo;
|
|
116
|
+
req: ExpressReq;
|
|
107
117
|
}) => EmailWithoutTo | Promise<EmailWithoutTo>;
|
|
108
118
|
smtp: SMTPConfig;
|
|
119
|
+
/**
|
|
120
|
+
* Called after the user has clicked the URL to confirm their email address
|
|
121
|
+
*/
|
|
109
122
|
onConfirmed: (data: {
|
|
110
123
|
confirmationCode: string;
|
|
124
|
+
clientInfo: LoginClientInfo;
|
|
125
|
+
req: ExpressReq;
|
|
111
126
|
}) => void | Promise<void>;
|
|
112
127
|
};
|
|
113
128
|
};
|
|
@@ -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,
|
|
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":"setEmailProvider.d.ts","sourceRoot":"","sources":["../../lib/Auth/setEmailProvider.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,SAAS,CAAC;AACxB,OAAO,EAA0B,WAAW,
|
|
1
|
+
{"version":3,"file":"setEmailProvider.d.ts","sourceRoot":"","sources":["../../lib/Auth/setEmailProvider.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,SAAS,CAAC;AACxB,OAAO,EAA0B,WAAW,EAAiC,MAAM,eAAe,CAAC;AAKnG,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO,iBA0FvE"}
|
|
@@ -38,19 +38,21 @@ async function setEmailProvider(app) {
|
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
40
|
if (validationError) {
|
|
41
|
-
res
|
|
42
|
-
.status(AuthHandler_1.HTTPCODES.AUTH_ERROR)
|
|
43
|
-
.json({ success: false, error: validationError });
|
|
41
|
+
res.status(AuthHandler_1.HTTPCODES.AUTH_ERROR).json({ success: false, error: validationError });
|
|
44
42
|
return;
|
|
45
43
|
}
|
|
46
44
|
try {
|
|
45
|
+
const { httpReq, ...clientInfo } = (0, AuthHandler_1.getLoginClientInfo)({ httpReq: req });
|
|
47
46
|
let emailMessage;
|
|
48
47
|
if (email.signupType === "withPassword") {
|
|
49
48
|
if (email.emailConfirmation) {
|
|
50
49
|
const { onSend, smtp } = email.emailConfirmation;
|
|
51
50
|
const message = await onSend({
|
|
52
51
|
email: username,
|
|
52
|
+
password,
|
|
53
53
|
confirmationUrlPath: `${websiteUrl}${AuthHandler_1.AUTH_ROUTES_AND_PARAMS.confirmEmail}`,
|
|
54
|
+
clientInfo,
|
|
55
|
+
req: httpReq,
|
|
54
56
|
});
|
|
55
57
|
emailMessage = { message: { ...message, to: username }, smtp };
|
|
56
58
|
}
|
|
@@ -60,6 +62,8 @@ async function setEmailProvider(app) {
|
|
|
60
62
|
const message = await emailMagicLink.onSend({
|
|
61
63
|
email: username,
|
|
62
64
|
magicLinkPath: `${websiteUrl}${AuthHandler_1.AUTH_ROUTES_AND_PARAMS.magicLinksRoute}`,
|
|
65
|
+
clientInfo,
|
|
66
|
+
req: httpReq,
|
|
63
67
|
});
|
|
64
68
|
emailMessage = {
|
|
65
69
|
message: { ...message, to: username },
|
|
@@ -72,22 +76,23 @@ async function setEmailProvider(app) {
|
|
|
72
76
|
}
|
|
73
77
|
}
|
|
74
78
|
catch {
|
|
75
|
-
res
|
|
76
|
-
.status(AuthHandler_1.HTTPCODES.AUTH_ERROR)
|
|
77
|
-
.json({ success: false, error: "Failed to send email" });
|
|
79
|
+
res.status(AuthHandler_1.HTTPCODES.AUTH_ERROR).json({ success: false, error: "Failed to send email" });
|
|
78
80
|
}
|
|
79
81
|
});
|
|
80
82
|
if (email.signupType === "withPassword" && email.emailConfirmation) {
|
|
81
83
|
app.get(AuthHandler_1.AUTH_ROUTES_AND_PARAMS.confirmEmailExpressRoute, async (req, res) => {
|
|
82
84
|
const { id } = req.params ?? {};
|
|
83
85
|
try {
|
|
84
|
-
|
|
86
|
+
const { httpReq, ...clientInfo } = (0, AuthHandler_1.getLoginClientInfo)({ httpReq: req });
|
|
87
|
+
await email.emailConfirmation?.onConfirmed({
|
|
88
|
+
confirmationCode: id,
|
|
89
|
+
clientInfo,
|
|
90
|
+
req: httpReq,
|
|
91
|
+
});
|
|
85
92
|
res.json({ success: true, message: "Email confirmed" });
|
|
86
93
|
}
|
|
87
94
|
catch (_e) {
|
|
88
|
-
res
|
|
89
|
-
.status(AuthHandler_1.HTTPCODES.AUTH_ERROR)
|
|
90
|
-
.json({ success: false, error: "Failed to confirm email" });
|
|
95
|
+
res.status(AuthHandler_1.HTTPCODES.AUTH_ERROR).json({ success: false, error: "Failed to confirm email" });
|
|
91
96
|
}
|
|
92
97
|
});
|
|
93
98
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setEmailProvider.js","sourceRoot":"","sources":["../../lib/Auth/setEmailProvider.ts"],"names":[],"mappings":";;;AACA,+
|
|
1
|
+
{"version":3,"file":"setEmailProvider.js","sourceRoot":"","sources":["../../lib/Auth/setEmailProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PublishParser.d.ts","sourceRoot":"","sources":["../../lib/PublishParser/PublishParser.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"PublishParser.d.ts","sourceRoot":"","sources":["../../lib/PublishParser/PublishParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAA8B,MAAM,iBAAiB,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAK9D,OAAO,EACL,QAAQ,EACR,eAAe,EACf,kBAAkB,EAClB,cAAc,EACd,aAAa,EACb,aAAa,EAEb,SAAS,EACV,MAAM,wBAAwB,CAAC;AAEhC,qBAAa,aAAa;IACxB,OAAO,EAAE,GAAG,CAAC;IACb,cAAc,CAAC,EAAE,cAAc,CAAC,IAAI,EAAE,WAAW,CAAC,GAAG,SAAS,CAAC;IAC/D,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,GAAG,EAAE,eAAe,CAAC;IACrB,EAAE,EAAE,EAAE,CAAC;IACP,SAAS,EAAE,SAAS,CAAC;gBAGnB,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,cAAc,CAAC,IAAI,EAAE,WAAW,CAAC,GAAG,SAAS,EAC7D,aAAa,EAAE,GAAG,EAClB,GAAG,EAAE,eAAe,EACpB,EAAE,EAAE,EAAE,EACN,SAAS,EAAE,SAAS;IAYhB,gBAAgB,CACpB,WAAW,EAAE,WAAW,EACxB,UAAU,CAAC,EAAE,UAAU,GACtB,OAAO,CAAC,aAAa,CAAC;IAWnB,iBAAiB,CACrB,OAAO,EAAE,IAAI,CAAC,WAAW,EAAE,SAAS,GAAG,QAAQ,CAAC,EAChD,QAAQ,CAAC,EAAE,UAAU,GACpB,OAAO,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IA0BrC;;;;OAIG;IACG,UAAU,CAAC,WAAW,EAAE,WAAW,EAAE,UAAU,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC;IAcrF,2BAA2B,CAAC,EAChC,SAAS,EACT,OAAO,EACP,WAAW,GACZ,EAAE,eAAe,GAAG,OAAO,CAAC,SAAS,CAAC;IASjC,uBAAuB,CAC3B,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE,eAAe,EACpD,UAAU,CAAC,EAAE,UAAU,GACtB,OAAO,CAAC,SAAS,CAAC;IAsDf,aAAa,CACjB,IAAI,EAAE,QAAQ,EACd,UAAU,CAAC,EAAE,UAAU,GACtB,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC;IAe1C,6BAA6B,uIAA4C;IAGzE,oBAAoB;;;;;;;;;;;;OAAmC;CACxD;AAED,cAAc,wBAAwB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PublishParser.js","sourceRoot":"","sources":["../../lib/PublishParser/PublishParser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"PublishParser.js","sourceRoot":"","sources":["../../lib/PublishParser/PublishParser.ts"],"names":[],"mappings":"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"}
|
package/lib/Auth/AuthHandler.ts
CHANGED
|
@@ -30,10 +30,8 @@ export const HTTPCODES = {
|
|
|
30
30
|
INTERNAL_SERVER_ERROR: 500,
|
|
31
31
|
} as const;
|
|
32
32
|
|
|
33
|
-
export const getLoginClientInfo = (
|
|
34
|
-
req
|
|
35
|
-
): AuthClientRequest & LoginClientInfo => {
|
|
36
|
-
if ("httpReq" in req) {
|
|
33
|
+
export const getLoginClientInfo = <T extends AuthClientRequest>(req: T): T & LoginClientInfo => {
|
|
34
|
+
if (req.httpReq) {
|
|
37
35
|
const ip_address = req.httpReq.ip;
|
|
38
36
|
if (!ip_address) throw new Error("ip_address missing from req.httpReq");
|
|
39
37
|
const user_agent = req.httpReq.headers["user-agent"];
|
|
@@ -104,8 +102,7 @@ export class AuthHandler {
|
|
|
104
102
|
};
|
|
105
103
|
|
|
106
104
|
isUserRoute = (pathname: string) => {
|
|
107
|
-
const { login, logoutGetPath, magicLinksRoute, loginWithProvider } =
|
|
108
|
-
AUTH_ROUTES_AND_PARAMS;
|
|
105
|
+
const { login, logoutGetPath, magicLinksRoute, loginWithProvider } = AUTH_ROUTES_AND_PARAMS;
|
|
109
106
|
const pubRoutes = [
|
|
110
107
|
...(this.opts?.expressConfig?.publicRoutes || []),
|
|
111
108
|
login,
|
|
@@ -121,7 +118,7 @@ export class AuthHandler {
|
|
|
121
118
|
|
|
122
119
|
setCookieAndGoToReturnURLIFSet = (
|
|
123
120
|
cookie: { sid: string; expires: number },
|
|
124
|
-
r: { req: ExpressReq; res: ExpressRes }
|
|
121
|
+
r: { req: ExpressReq; res: ExpressRes }
|
|
125
122
|
) => {
|
|
126
123
|
const { sid, expires } = cookie;
|
|
127
124
|
const { res, req } = r;
|
|
@@ -136,9 +133,7 @@ export class AuthHandler {
|
|
|
136
133
|
cookieDuration = { expires: new Date(expires) };
|
|
137
134
|
const days = (+cookieDuration.expires - Date.now()) / (24 * 60 * 60e3);
|
|
138
135
|
if (days >= 400) {
|
|
139
|
-
console.warn(
|
|
140
|
-
`Cookie expiration is higher than the Chrome 400 day limit: ${days}days`,
|
|
141
|
-
);
|
|
136
|
+
console.warn(`Cookie expiration is higher than the Chrome 400 day limit: ${days}days`);
|
|
142
137
|
}
|
|
143
138
|
}
|
|
144
139
|
|
|
@@ -172,7 +167,7 @@ export class AuthHandler {
|
|
|
172
167
|
this.validateSid(sid),
|
|
173
168
|
this.dbo as any,
|
|
174
169
|
this.db,
|
|
175
|
-
getLoginClientInfo(clientReq)
|
|
170
|
+
getLoginClientInfo(clientReq)
|
|
176
171
|
);
|
|
177
172
|
}, 50);
|
|
178
173
|
} catch (err) {
|
|
@@ -186,9 +181,7 @@ export class AuthHandler {
|
|
|
186
181
|
getReturnUrl = (req: ExpressReq) => {
|
|
187
182
|
const { returnUrlParamName } = AUTH_ROUTES_AND_PARAMS;
|
|
188
183
|
if (returnUrlParamName && req?.query?.[returnUrlParamName]) {
|
|
189
|
-
const returnURL = decodeURIComponent(
|
|
190
|
-
req?.query?.[returnUrlParamName] as string,
|
|
191
|
-
);
|
|
184
|
+
const returnURL = decodeURIComponent(req?.query?.[returnUrlParamName] as string);
|
|
192
185
|
|
|
193
186
|
return getSafeReturnURL(returnURL, returnUrlParamName);
|
|
194
187
|
}
|
|
@@ -254,20 +247,12 @@ export class AuthHandler {
|
|
|
254
247
|
});
|
|
255
248
|
};
|
|
256
249
|
|
|
257
|
-
loginThrottled = async (
|
|
258
|
-
params: LoginParams,
|
|
259
|
-
client: LoginClientInfo,
|
|
260
|
-
): Promise<BasicSession> => {
|
|
250
|
+
loginThrottled = async (params: LoginParams, client: LoginClientInfo): Promise<BasicSession> => {
|
|
261
251
|
if (!this.opts?.login) throw "Auth login config missing";
|
|
262
252
|
const { responseThrottle = 500 } = this.opts;
|
|
263
253
|
|
|
264
254
|
return this.throttledFunc(async () => {
|
|
265
|
-
const result = await this.opts?.login?.(
|
|
266
|
-
params,
|
|
267
|
-
this.dbo as DBOFullyTyped,
|
|
268
|
-
this.db,
|
|
269
|
-
client,
|
|
270
|
-
);
|
|
255
|
+
const result = await this.opts?.login?.(params, this.dbo as DBOFullyTyped, this.db, client);
|
|
271
256
|
const err = {
|
|
272
257
|
msg:
|
|
273
258
|
"Bad login result type. \nExpecting: undefined | null | { sid: string; expires: number } but got: " +
|
|
@@ -276,9 +261,7 @@ export class AuthHandler {
|
|
|
276
261
|
|
|
277
262
|
if (!result) throw err;
|
|
278
263
|
if (
|
|
279
|
-
(result &&
|
|
280
|
-
(typeof result.sid !== "string" ||
|
|
281
|
-
typeof result.expires !== "number")) ||
|
|
264
|
+
(result && (typeof result.sid !== "string" || typeof result.expires !== "number")) ||
|
|
282
265
|
(!result && ![undefined, null].includes(result))
|
|
283
266
|
) {
|
|
284
267
|
throw err;
|
|
@@ -296,14 +279,11 @@ export class AuthHandler {
|
|
|
296
279
|
loginThrottledAndSetCookie = async (
|
|
297
280
|
req: ExpressReq,
|
|
298
281
|
res: ExpressRes,
|
|
299
|
-
loginParams: LoginParams
|
|
282
|
+
loginParams: LoginParams
|
|
300
283
|
) => {
|
|
301
284
|
const start = Date.now();
|
|
302
285
|
const { sid, expires } =
|
|
303
|
-
(await this.loginThrottled(
|
|
304
|
-
loginParams,
|
|
305
|
-
getLoginClientInfo({ httpReq: req }),
|
|
306
|
-
)) || {};
|
|
286
|
+
(await this.loginThrottled(loginParams, getLoginClientInfo({ httpReq: req }))) || {};
|
|
307
287
|
await this.prostgles.opts.onLog?.({
|
|
308
288
|
type: "auth",
|
|
309
289
|
command: "login",
|
|
@@ -333,8 +313,7 @@ export class AuthHandler {
|
|
|
333
313
|
const { sidKeyName } = this;
|
|
334
314
|
if (localParams.socket) {
|
|
335
315
|
const { handshake } = localParams.socket;
|
|
336
|
-
const querySid =
|
|
337
|
-
handshake?.auth?.[sidKeyName] || handshake?.query?.[sidKeyName];
|
|
316
|
+
const querySid = handshake?.auth?.[sidKeyName] || handshake?.query?.[sidKeyName];
|
|
338
317
|
let rawSid = querySid;
|
|
339
318
|
if (!rawSid) {
|
|
340
319
|
const cookie_str = localParams.socket?.handshake?.headers?.cookie;
|
|
@@ -343,8 +322,7 @@ export class AuthHandler {
|
|
|
343
322
|
}
|
|
344
323
|
return this.validateSid(rawSid);
|
|
345
324
|
} else if (localParams.httpReq) {
|
|
346
|
-
const [tokenType, base64Token] =
|
|
347
|
-
localParams.httpReq.headers.authorization?.split(" ") ?? [];
|
|
325
|
+
const [tokenType, base64Token] = localParams.httpReq.headers.authorization?.split(" ") ?? [];
|
|
348
326
|
let bearerSid: string | undefined;
|
|
349
327
|
if (tokenType && base64Token) {
|
|
350
328
|
if (tokenType.trim() !== "Bearer") {
|
|
@@ -352,9 +330,7 @@ export class AuthHandler {
|
|
|
352
330
|
}
|
|
353
331
|
bearerSid = Buffer.from(base64Token, "base64").toString();
|
|
354
332
|
}
|
|
355
|
-
return this.validateSid(
|
|
356
|
-
bearerSid ?? localParams.httpReq?.cookies?.[sidKeyName],
|
|
357
|
-
);
|
|
333
|
+
return this.validateSid(bearerSid ?? localParams.httpReq?.cookies?.[sidKeyName]);
|
|
358
334
|
} else throw "socket OR httpReq missing from localParams";
|
|
359
335
|
|
|
360
336
|
function parseCookieStr(cookie_str: string | undefined): any {
|
|
@@ -376,9 +352,7 @@ export class AuthHandler {
|
|
|
376
352
|
/**
|
|
377
353
|
* Used for logging
|
|
378
354
|
*/
|
|
379
|
-
getSIDNoError = (
|
|
380
|
-
localParams: LocalParams | undefined,
|
|
381
|
-
): string | undefined => {
|
|
355
|
+
getSIDNoError = (localParams: LocalParams | undefined): string | undefined => {
|
|
382
356
|
if (!localParams) return undefined;
|
|
383
357
|
try {
|
|
384
358
|
return this.getSID(localParams);
|
|
@@ -387,9 +361,7 @@ export class AuthHandler {
|
|
|
387
361
|
}
|
|
388
362
|
};
|
|
389
363
|
|
|
390
|
-
async getClientInfo(
|
|
391
|
-
localParams: Pick<LocalParams, "socket" | "httpReq">,
|
|
392
|
-
): Promise<AuthResult> {
|
|
364
|
+
async getClientInfo(localParams: Pick<LocalParams, "socket" | "httpReq">): Promise<AuthResult> {
|
|
393
365
|
if (!this.opts) return {};
|
|
394
366
|
|
|
395
367
|
const getSession = this.opts.cacheSession?.getSession;
|
|
@@ -415,22 +387,17 @@ export class AuthHandler {
|
|
|
415
387
|
const res = await this.throttledFunc(async () => {
|
|
416
388
|
const { getUser } = this.opts ?? {};
|
|
417
389
|
|
|
418
|
-
if (
|
|
419
|
-
getUser &&
|
|
420
|
-
localParams &&
|
|
421
|
-
(localParams.httpReq || localParams.socket)
|
|
422
|
-
) {
|
|
390
|
+
if (getUser && localParams && (localParams.httpReq || localParams.socket)) {
|
|
423
391
|
const sid = this.getSID(localParams);
|
|
424
|
-
const clientReq =
|
|
425
|
-
? { httpReq: localParams.httpReq }
|
|
426
|
-
: { socket: localParams.socket! };
|
|
392
|
+
const clientReq =
|
|
393
|
+
localParams.httpReq ? { httpReq: localParams.httpReq } : { socket: localParams.socket! };
|
|
427
394
|
let user, clientUser;
|
|
428
395
|
if (sid) {
|
|
429
396
|
const res = (await getUser(
|
|
430
397
|
sid,
|
|
431
398
|
this.dbo as any,
|
|
432
399
|
this.db,
|
|
433
|
-
getLoginClientInfo(clientReq)
|
|
400
|
+
getLoginClientInfo(clientReq)
|
|
434
401
|
)) as any;
|
|
435
402
|
user = res?.user;
|
|
436
403
|
clientUser = res?.clientUser;
|
|
@@ -463,10 +430,7 @@ export class AuthHandler {
|
|
|
463
430
|
return res;
|
|
464
431
|
}
|
|
465
432
|
|
|
466
|
-
isValidSocketSession = (
|
|
467
|
-
socket: PRGLIOSocket,
|
|
468
|
-
session: BasicSession,
|
|
469
|
-
): boolean => {
|
|
433
|
+
isValidSocketSession = (socket: PRGLIOSocket, session: BasicSession): boolean => {
|
|
470
434
|
const hasExpired = Boolean(session && session.expires <= Date.now());
|
|
471
435
|
if (
|
|
472
436
|
this.opts?.expressConfig?.publicRoutes &&
|
|
@@ -486,7 +450,7 @@ export class AuthHandler {
|
|
|
486
450
|
};
|
|
487
451
|
|
|
488
452
|
getClientAuth = async (
|
|
489
|
-
clientReq: Pick<LocalParams, "socket" | "httpReq"
|
|
453
|
+
clientReq: Pick<LocalParams, "socket" | "httpReq">
|
|
490
454
|
): Promise<{ auth: AuthSocketSchema; userData: AuthResult }> => {
|
|
491
455
|
let pathGuard = false;
|
|
492
456
|
if (
|
|
@@ -504,16 +468,13 @@ export class AuthHandler {
|
|
|
504
468
|
params: AuthGuardLocation,
|
|
505
469
|
cb = (_err: any, _res?: AuthGuardLocationResponse) => {
|
|
506
470
|
/** EMPTY */
|
|
507
|
-
}
|
|
471
|
+
}
|
|
508
472
|
) => {
|
|
509
473
|
try {
|
|
510
474
|
const { pathname, origin } =
|
|
511
475
|
typeof params === "string" ? JSON.parse(params) : params || {};
|
|
512
476
|
if (pathname && typeof pathname !== "string") {
|
|
513
|
-
console.warn(
|
|
514
|
-
"Invalid pathname provided for AuthGuardLocation: ",
|
|
515
|
-
pathname,
|
|
516
|
-
);
|
|
477
|
+
console.warn("Invalid pathname provided for AuthGuardLocation: ", pathname);
|
|
517
478
|
}
|
|
518
479
|
|
|
519
480
|
/** These origins */
|
|
@@ -533,7 +494,7 @@ export class AuthHandler {
|
|
|
533
494
|
console.error("AUTHGUARD err: ", err);
|
|
534
495
|
cb(err);
|
|
535
496
|
}
|
|
536
|
-
}
|
|
497
|
+
}
|
|
537
498
|
);
|
|
538
499
|
}
|
|
539
500
|
}
|
package/lib/Auth/AuthTypes.ts
CHANGED
|
@@ -1,10 +1,5 @@
|
|
|
1
1
|
import { Express, NextFunction, Request, Response } from "express";
|
|
2
|
-
import {
|
|
3
|
-
AnyObject,
|
|
4
|
-
FieldFilter,
|
|
5
|
-
IdentityProvider,
|
|
6
|
-
UserLike,
|
|
7
|
-
} from "prostgles-types";
|
|
2
|
+
import { AnyObject, FieldFilter, IdentityProvider, UserLike } from "prostgles-types";
|
|
8
3
|
import { DB } from "../Prostgles";
|
|
9
4
|
import { DBOFullyTyped } from "../DBSchemaBuilder";
|
|
10
5
|
import { PRGLIOSocket } from "../DboBuilder/DboBuilderTypes";
|
|
@@ -13,10 +8,7 @@ import type {
|
|
|
13
8
|
StrategyOptions as GoogleStrategy,
|
|
14
9
|
Profile as GoogleProfile,
|
|
15
10
|
} from "passport-google-oauth20";
|
|
16
|
-
import type {
|
|
17
|
-
StrategyOptions as GitHubStrategy,
|
|
18
|
-
Profile as GitHubProfile,
|
|
19
|
-
} from "passport-github2";
|
|
11
|
+
import type { StrategyOptions as GitHubStrategy, Profile as GitHubProfile } from "passport-github2";
|
|
20
12
|
import type { MicrosoftStrategyOptions } from "passport-microsoft";
|
|
21
13
|
import type {
|
|
22
14
|
StrategyOptions as FacebookStrategy,
|
|
@@ -47,8 +39,8 @@ export type BasicSession = {
|
|
|
47
39
|
onExpiration: "redirect" | "show_error";
|
|
48
40
|
};
|
|
49
41
|
export type AuthClientRequest =
|
|
50
|
-
| { socket: PRGLIOSocket }
|
|
51
|
-
| { httpReq: ExpressReq };
|
|
42
|
+
| { socket: PRGLIOSocket; httpReq?: undefined }
|
|
43
|
+
| { httpReq: ExpressReq; socket?: undefined };
|
|
52
44
|
|
|
53
45
|
type ThirdPartyProviders = {
|
|
54
46
|
facebook?: Pick<FacebookStrategy, "clientID" | "clientSecret"> & {
|
|
@@ -105,16 +97,18 @@ type EmailProvider =
|
|
|
105
97
|
onSend: (data: {
|
|
106
98
|
email: string;
|
|
107
99
|
magicLinkPath: string;
|
|
100
|
+
clientInfo: LoginClientInfo;
|
|
101
|
+
req: ExpressReq;
|
|
108
102
|
}) => EmailWithoutTo | Promise<EmailWithoutTo>;
|
|
109
103
|
smtp: SMTPConfig;
|
|
110
104
|
};
|
|
111
105
|
}
|
|
112
106
|
| {
|
|
113
107
|
signupType: "withPassword";
|
|
114
|
-
onRegistered: (
|
|
115
|
-
username: string;
|
|
116
|
-
|
|
117
|
-
|
|
108
|
+
onRegistered: (
|
|
109
|
+
data: { username: string; password: string },
|
|
110
|
+
clientInfo: LoginClientInfo
|
|
111
|
+
) => void | Promise<void>;
|
|
118
112
|
/**
|
|
119
113
|
* Defaults to 8
|
|
120
114
|
*/
|
|
@@ -123,13 +117,24 @@ type EmailProvider =
|
|
|
123
117
|
* If provided, the user will be required to confirm their email address
|
|
124
118
|
*/
|
|
125
119
|
emailConfirmation?: {
|
|
120
|
+
/**
|
|
121
|
+
* Called when the user has registered
|
|
122
|
+
*/
|
|
126
123
|
onSend: (data: {
|
|
127
124
|
email: string;
|
|
125
|
+
password: string;
|
|
128
126
|
confirmationUrlPath: string;
|
|
127
|
+
clientInfo: LoginClientInfo;
|
|
128
|
+
req: ExpressReq;
|
|
129
129
|
}) => EmailWithoutTo | Promise<EmailWithoutTo>;
|
|
130
130
|
smtp: SMTPConfig;
|
|
131
|
+
/**
|
|
132
|
+
* Called after the user has clicked the URL to confirm their email address
|
|
133
|
+
*/
|
|
131
134
|
onConfirmed: (data: {
|
|
132
135
|
confirmationCode: string;
|
|
136
|
+
clientInfo: LoginClientInfo;
|
|
137
|
+
req: ExpressReq;
|
|
133
138
|
}) => void | Promise<void>;
|
|
134
139
|
};
|
|
135
140
|
};
|
|
@@ -267,30 +272,22 @@ export type Auth<S = void, SUser extends SessionUser = SessionUser> = {
|
|
|
267
272
|
sid: string | undefined,
|
|
268
273
|
dbo: DBOFullyTyped<S>,
|
|
269
274
|
db: DB,
|
|
270
|
-
client: AuthClientRequest & LoginClientInfo
|
|
275
|
+
client: AuthClientRequest & LoginClientInfo
|
|
271
276
|
) => Awaitable<AuthResult<SUser>>;
|
|
272
277
|
|
|
273
278
|
login?: (
|
|
274
279
|
params: LoginParams,
|
|
275
280
|
dbo: DBOFullyTyped<S>,
|
|
276
281
|
db: DB,
|
|
277
|
-
client: LoginClientInfo
|
|
282
|
+
client: LoginClientInfo
|
|
278
283
|
) => Awaitable<BasicSession> | BasicSession;
|
|
279
|
-
logout?: (
|
|
280
|
-
sid: string | undefined,
|
|
281
|
-
dbo: DBOFullyTyped<S>,
|
|
282
|
-
db: DB,
|
|
283
|
-
) => Awaitable<any>;
|
|
284
|
+
logout?: (sid: string | undefined, dbo: DBOFullyTyped<S>, db: DB) => Awaitable<any>;
|
|
284
285
|
|
|
285
286
|
/**
|
|
286
287
|
* If provided then session info will be saved on socket.__prglCache and reused from there
|
|
287
288
|
*/
|
|
288
289
|
cacheSession?: {
|
|
289
|
-
getSession: (
|
|
290
|
-
sid: string | undefined,
|
|
291
|
-
dbo: DBOFullyTyped<S>,
|
|
292
|
-
db: DB,
|
|
293
|
-
) => Awaitable<BasicSession>;
|
|
290
|
+
getSession: (sid: string | undefined, dbo: DBOFullyTyped<S>, db: DB) => Awaitable<BasicSession>;
|
|
294
291
|
};
|
|
295
292
|
};
|
|
296
293
|
|
|
@@ -330,11 +327,7 @@ type ExpressConfig<S, SUser extends SessionUser> = {
|
|
|
330
327
|
* Will be called after a GET request is authorised
|
|
331
328
|
* This means that
|
|
332
329
|
*/
|
|
333
|
-
onGetRequestOK?: (
|
|
334
|
-
req: ExpressReq,
|
|
335
|
-
res: ExpressRes,
|
|
336
|
-
params: AuthRequestParams<S, SUser>,
|
|
337
|
-
) => any;
|
|
330
|
+
onGetRequestOK?: (req: ExpressReq, res: ExpressRes, params: AuthRequestParams<S, SUser>) => any;
|
|
338
331
|
|
|
339
332
|
/**
|
|
340
333
|
* If defined, will check the magic link id and log in the user and redirect to the returnUrl if set
|
|
@@ -347,7 +340,7 @@ type ExpressConfig<S, SUser extends SessionUser> = {
|
|
|
347
340
|
magicId: string,
|
|
348
341
|
dbo: DBOFullyTyped<S>,
|
|
349
342
|
db: DB,
|
|
350
|
-
client: LoginClientInfo
|
|
343
|
+
client: LoginClientInfo
|
|
351
344
|
) => Awaitable<BasicSession | undefined>;
|
|
352
345
|
};
|
|
353
346
|
|
|
@@ -359,5 +352,5 @@ type ExpressMiddleware<S, SUser extends SessionUser> = (
|
|
|
359
352
|
req: ExpressReq;
|
|
360
353
|
res: ExpressRes;
|
|
361
354
|
next: NextFunction;
|
|
362
|
-
} & AuthRequestParams<S, SUser
|
|
355
|
+
} & AuthRequestParams<S, SUser>
|
|
363
356
|
) => void | Promise<void>;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import e from "express";
|
|
2
|
-
import { AUTH_ROUTES_AND_PARAMS, AuthHandler, HTTPCODES } from "./AuthHandler";
|
|
2
|
+
import { AUTH_ROUTES_AND_PARAMS, AuthHandler, getLoginClientInfo, HTTPCODES } from "./AuthHandler";
|
|
3
3
|
import { Email, SMTPConfig } from "./AuthTypes";
|
|
4
4
|
import { getOrSetTransporter, sendEmail } from "./sendEmail";
|
|
5
5
|
import { promises } from "node:dns";
|
|
@@ -37,19 +37,21 @@ export async function setEmailProvider(this: AuthHandler, app: e.Express) {
|
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
39
|
if (validationError) {
|
|
40
|
-
res
|
|
41
|
-
.status(HTTPCODES.AUTH_ERROR)
|
|
42
|
-
.json({ success: false, error: validationError });
|
|
40
|
+
res.status(HTTPCODES.AUTH_ERROR).json({ success: false, error: validationError });
|
|
43
41
|
return;
|
|
44
42
|
}
|
|
45
43
|
try {
|
|
44
|
+
const { httpReq, ...clientInfo } = getLoginClientInfo({ httpReq: req });
|
|
46
45
|
let emailMessage: undefined | { message: Email; smtp: SMTPConfig };
|
|
47
46
|
if (email.signupType === "withPassword") {
|
|
48
47
|
if (email.emailConfirmation) {
|
|
49
48
|
const { onSend, smtp } = email.emailConfirmation;
|
|
50
49
|
const message = await onSend({
|
|
51
50
|
email: username,
|
|
51
|
+
password,
|
|
52
52
|
confirmationUrlPath: `${websiteUrl}${AUTH_ROUTES_AND_PARAMS.confirmEmail}`,
|
|
53
|
+
clientInfo,
|
|
54
|
+
req: httpReq,
|
|
53
55
|
});
|
|
54
56
|
emailMessage = { message: { ...message, to: username }, smtp };
|
|
55
57
|
}
|
|
@@ -58,6 +60,8 @@ export async function setEmailProvider(this: AuthHandler, app: e.Express) {
|
|
|
58
60
|
const message = await emailMagicLink.onSend({
|
|
59
61
|
email: username,
|
|
60
62
|
magicLinkPath: `${websiteUrl}${AUTH_ROUTES_AND_PARAMS.magicLinksRoute}`,
|
|
63
|
+
clientInfo,
|
|
64
|
+
req: httpReq,
|
|
61
65
|
});
|
|
62
66
|
emailMessage = {
|
|
63
67
|
message: { ...message, to: username },
|
|
@@ -70,27 +74,25 @@ export async function setEmailProvider(this: AuthHandler, app: e.Express) {
|
|
|
70
74
|
res.json({ success: true, message: "Email sent" });
|
|
71
75
|
}
|
|
72
76
|
} catch {
|
|
73
|
-
res
|
|
74
|
-
.status(HTTPCODES.AUTH_ERROR)
|
|
75
|
-
.json({ success: false, error: "Failed to send email" });
|
|
77
|
+
res.status(HTTPCODES.AUTH_ERROR).json({ success: false, error: "Failed to send email" });
|
|
76
78
|
}
|
|
77
79
|
});
|
|
78
80
|
|
|
79
81
|
if (email.signupType === "withPassword" && email.emailConfirmation) {
|
|
80
|
-
app.get(
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
const {
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
}
|
|
92
|
-
}
|
|
93
|
-
);
|
|
82
|
+
app.get(AUTH_ROUTES_AND_PARAMS.confirmEmailExpressRoute, async (req, res) => {
|
|
83
|
+
const { id } = req.params ?? {};
|
|
84
|
+
try {
|
|
85
|
+
const { httpReq, ...clientInfo } = getLoginClientInfo({ httpReq: req });
|
|
86
|
+
await email.emailConfirmation?.onConfirmed({
|
|
87
|
+
confirmationCode: id,
|
|
88
|
+
clientInfo,
|
|
89
|
+
req: httpReq,
|
|
90
|
+
});
|
|
91
|
+
res.json({ success: true, message: "Email confirmed" });
|
|
92
|
+
} catch (_e) {
|
|
93
|
+
res.status(HTTPCODES.AUTH_ERROR).json({ success: false, error: "Failed to confirm email" });
|
|
94
|
+
}
|
|
95
|
+
});
|
|
94
96
|
}
|
|
95
97
|
}
|
|
96
98
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Method, getObjectEntries, isObject } from "prostgles-types";
|
|
2
2
|
import { AuthResult, SessionUser } from "../Auth/AuthTypes";
|
|
3
3
|
import { LocalParams } from "../DboBuilder/DboBuilder";
|
|
4
4
|
import { DB, DBHandlerServer, Prostgles } from "../Prostgles";
|