prostgles-server 4.2.222 → 4.2.223
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/endpoints/setLoginRequestHandler.d.ts +1 -3
- package/dist/Auth/endpoints/setLoginRequestHandler.d.ts.map +1 -1
- package/dist/Auth/endpoints/setLoginRequestHandler.js +5 -5
- package/dist/Auth/endpoints/setLoginRequestHandler.js.map +1 -1
- package/dist/Auth/endpoints/setRegisterRequestHandler.d.ts.map +1 -1
- package/dist/Auth/endpoints/setRegisterRequestHandler.js +6 -5
- package/dist/Auth/endpoints/setRegisterRequestHandler.js.map +1 -1
- package/lib/Auth/endpoints/setLoginRequestHandler.ts +8 -6
- package/lib/Auth/endpoints/setRegisterRequestHandler.ts +6 -5
- package/package.json +1 -1
|
@@ -3,7 +3,5 @@ import { AuthRequest, AuthResponse } from "prostgles-types";
|
|
|
3
3
|
import { AuthHandler } from "../AuthHandler";
|
|
4
4
|
export type LoginResponseHandler = Response<AuthResponse.OAuthRegisterSuccess | AuthResponse.OAuthRegisterFailure | AuthResponse.PasswordLoginSuccess | AuthResponse.PasswordLoginFailure | AuthResponse.MagicLinkAuthFailure | AuthResponse.MagicLinkAuthSuccess>;
|
|
5
5
|
export declare function setLoginRequestHandler(this: AuthHandler, app: e.Express): void;
|
|
6
|
-
export declare const parseLoginData: (bodyData: any) => AuthRequest.LoginData
|
|
7
|
-
error: string;
|
|
8
|
-
};
|
|
6
|
+
export declare const parseLoginData: (bodyData: any) => [string, undefined] | [undefined, AuthRequest.LoginData];
|
|
9
7
|
//# sourceMappingURL=setLoginRequestHandler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setLoginRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setLoginRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,YAAY,EAAuB,MAAM,iBAAiB,CAAC;AACjF,OAAO,EAA0B,WAAW,EAAmB,MAAM,gBAAgB,CAAC;AAGtF,MAAM,MAAM,oBAAoB,GAAG,QAAQ,CACvC,YAAY,CAAC,oBAAoB,GACjC,YAAY,CAAC,oBAAoB,GACjC,YAAY,CAAC,oBAAoB,GACjC,YAAY,CAAC,oBAAoB,GACjC,YAAY,CAAC,oBAAoB,GACjC,YAAY,CAAC,oBAAoB,CACpC,CAAC;AAEF,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO,QAmBvE;AAED,eAAO,MAAM,cAAc,
|
|
1
|
+
{"version":3,"file":"setLoginRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setLoginRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,YAAY,EAAuB,MAAM,iBAAiB,CAAC;AACjF,OAAO,EAA0B,WAAW,EAAmB,MAAM,gBAAgB,CAAC;AAGtF,MAAM,MAAM,oBAAoB,GAAG,QAAQ,CACvC,YAAY,CAAC,oBAAoB,GACjC,YAAY,CAAC,oBAAoB,GACjC,YAAY,CAAC,oBAAoB,GACjC,YAAY,CAAC,oBAAoB,GACjC,YAAY,CAAC,oBAAoB,GACjC,YAAY,CAAC,oBAAoB,CACpC,CAAC;AAEF,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"}
|
|
@@ -5,11 +5,11 @@ const prostgles_types_1 = require("prostgles-types");
|
|
|
5
5
|
const AuthHandler_1 = require("../AuthHandler");
|
|
6
6
|
function setLoginRequestHandler(app) {
|
|
7
7
|
app.post(AuthHandler_1.AUTH_ROUTES_AND_PARAMS.login, async (req, res) => {
|
|
8
|
-
const loginData = (0, exports.parseLoginData)(req.body);
|
|
9
|
-
if (
|
|
8
|
+
const [error, loginData] = (0, exports.parseLoginData)(req.body);
|
|
9
|
+
if (error || !loginData) {
|
|
10
10
|
return res
|
|
11
11
|
.status(AuthHandler_1.HTTP_FAIL_CODES.BAD_REQUEST)
|
|
12
|
-
.json({ success: false, code: "something-went-wrong", message:
|
|
12
|
+
.json({ success: false, code: "something-went-wrong", message: error });
|
|
13
13
|
}
|
|
14
14
|
try {
|
|
15
15
|
const loginParams = {
|
|
@@ -36,7 +36,7 @@ const parseLoginData = (bodyData) => {
|
|
|
36
36
|
}
|
|
37
37
|
if (prop === "username") {
|
|
38
38
|
if (!(0, prostgles_types_1.isDefined)(valOrError)) {
|
|
39
|
-
return
|
|
39
|
+
return ["username error: Expected non-empty string"];
|
|
40
40
|
}
|
|
41
41
|
loginData[prop] = valOrError;
|
|
42
42
|
}
|
|
@@ -44,7 +44,7 @@ const parseLoginData = (bodyData) => {
|
|
|
44
44
|
loginData[prop] = valOrError;
|
|
45
45
|
}
|
|
46
46
|
});
|
|
47
|
-
return loginData;
|
|
47
|
+
return [undefined, loginData];
|
|
48
48
|
};
|
|
49
49
|
exports.parseLoginData = parseLoginData;
|
|
50
50
|
const getStringOrUndefined = (val, propName) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setLoginRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setLoginRequestHandler.ts"],"names":[],"mappings":";;;AACA,qDAAiF;AACjF,gDAAsF;AAYtF,SAAgB,sBAAsB,CAAoB,GAAc;IACtE,GAAG,CAAC,IAAI,CAAC,oCAAsB,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,GAAyB,EAAE,EAAE;QAC9E,MAAM,SAAS,GAAG,IAAA,sBAAc,EAAC,GAAG,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"setLoginRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setLoginRequestHandler.ts"],"names":[],"mappings":";;;AACA,qDAAiF;AACjF,gDAAsF;AAYtF,SAAgB,sBAAsB,CAAoB,GAAc;IACtE,GAAG,CAAC,IAAI,CAAC,oCAAsB,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,GAAyB,EAAE,EAAE;QAC9E,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,EAAE,CAAC;gBAC3B,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":"setRegisterRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setRegisterRequestHandler.ts"],"names":[],"mappings":";;AAAA,OAAO,CAAwB,MAAM,SAAS,CAAC;AAG/C,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAY/D,eAAO,MAAM,yBAAyB,sCACG,0BAA0B,OAC5D,SAAS,
|
|
1
|
+
{"version":3,"file":"setRegisterRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setRegisterRequestHandler.ts"],"names":[],"mappings":";;AAAA,OAAO,CAAwB,MAAM,SAAS,CAAC;AAG/C,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAY/D,eAAO,MAAM,yBAAyB,sCACG,0BAA0B,OAC5D,SAAS,kBAuDf,CAAC"}
|
|
@@ -6,13 +6,13 @@ const getClientRequestIPsInfo_1 = require("../utils/getClientRequestIPsInfo");
|
|
|
6
6
|
const setLoginRequestHandler_1 = require("./setLoginRequestHandler");
|
|
7
7
|
const setRegisterRequestHandler = async ({ onRegister, minPasswordLength = 8 }, app) => {
|
|
8
8
|
const registerRequestHandler = async (req, res) => {
|
|
9
|
-
const
|
|
10
|
-
if (
|
|
9
|
+
const [error, data] = (0, setLoginRequestHandler_1.parseLoginData)(req.body);
|
|
10
|
+
if (error || !data) {
|
|
11
11
|
return res
|
|
12
12
|
.status(AuthHandler_1.HTTP_FAIL_CODES.BAD_REQUEST)
|
|
13
|
-
.json({ success: false, code: "something-went-wrong", message:
|
|
13
|
+
.json({ success: false, code: "something-went-wrong", message: error });
|
|
14
14
|
}
|
|
15
|
-
const { username, password } =
|
|
15
|
+
const { username, password } = data;
|
|
16
16
|
const sendResponse = (response) => {
|
|
17
17
|
if (response.success) {
|
|
18
18
|
res.json(response);
|
|
@@ -50,7 +50,8 @@ const setRegisterRequestHandler = async ({ onRegister, minPasswordLength = 8 },
|
|
|
50
50
|
});
|
|
51
51
|
return sendResponse(result);
|
|
52
52
|
}
|
|
53
|
-
catch {
|
|
53
|
+
catch (error) {
|
|
54
|
+
console.error("Failed to send email", error);
|
|
54
55
|
return sendResponse({
|
|
55
56
|
success: false,
|
|
56
57
|
code: "server-error",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setRegisterRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setRegisterRequestHandler.ts"],"names":[],"mappings":";;;AAEA,gDAAyE;AAEzE,8EAA2E;AAC3E,qEAA0D;AAUnD,MAAM,yBAAyB,GAAG,KAAK,EAC5C,EAAE,UAAU,EAAE,iBAAiB,GAAG,CAAC,EAA8B,EACjE,GAAc,EACd,EAAE;IACF,MAAM,sBAAsB,GAAG,KAAK,EAAE,GAAY,EAAE,GAA4B,EAAE,EAAE;QAClF,MAAM,
|
|
1
|
+
{"version":3,"file":"setRegisterRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setRegisterRequestHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,11 +14,11 @@ export type LoginResponseHandler = Response<
|
|
|
14
14
|
|
|
15
15
|
export function setLoginRequestHandler(this: AuthHandler, app: e.Express) {
|
|
16
16
|
app.post(AUTH_ROUTES_AND_PARAMS.login, async (req, res: LoginResponseHandler) => {
|
|
17
|
-
const loginData = parseLoginData(req.body);
|
|
18
|
-
if (
|
|
17
|
+
const [error, loginData] = parseLoginData(req.body);
|
|
18
|
+
if (error || !loginData) {
|
|
19
19
|
return res
|
|
20
20
|
.status(HTTP_FAIL_CODES.BAD_REQUEST)
|
|
21
|
-
.json({ success: false, code: "something-went-wrong", message:
|
|
21
|
+
.json({ success: false, code: "something-went-wrong", message: error });
|
|
22
22
|
}
|
|
23
23
|
try {
|
|
24
24
|
const loginParams: LoginParams = {
|
|
@@ -33,7 +33,9 @@ export function setLoginRequestHandler(this: AuthHandler, app: e.Express) {
|
|
|
33
33
|
});
|
|
34
34
|
}
|
|
35
35
|
|
|
36
|
-
export const parseLoginData = (
|
|
36
|
+
export const parseLoginData = (
|
|
37
|
+
bodyData: any
|
|
38
|
+
): [string, undefined] | [undefined, AuthRequest.LoginData] => {
|
|
37
39
|
const loginData: AuthRequest.LoginData = {
|
|
38
40
|
username: "",
|
|
39
41
|
remember_me: !!bodyData?.remember_me,
|
|
@@ -46,7 +48,7 @@ export const parseLoginData = (bodyData: any): AuthRequest.LoginData | { error:
|
|
|
46
48
|
}
|
|
47
49
|
if (prop === "username") {
|
|
48
50
|
if (!isDefined(valOrError)) {
|
|
49
|
-
return
|
|
51
|
+
return ["username error: Expected non-empty string"];
|
|
50
52
|
}
|
|
51
53
|
loginData[prop] = valOrError;
|
|
52
54
|
} else {
|
|
@@ -54,7 +56,7 @@ export const parseLoginData = (bodyData: any): AuthRequest.LoginData | { error:
|
|
|
54
56
|
}
|
|
55
57
|
});
|
|
56
58
|
|
|
57
|
-
return loginData;
|
|
59
|
+
return [undefined, loginData];
|
|
58
60
|
};
|
|
59
61
|
|
|
60
62
|
const getStringOrUndefined = (
|
|
@@ -18,13 +18,13 @@ export const setRegisterRequestHandler = async (
|
|
|
18
18
|
app: e.Express
|
|
19
19
|
) => {
|
|
20
20
|
const registerRequestHandler = async (req: Request, res: RegisterResponseHandler) => {
|
|
21
|
-
const
|
|
22
|
-
if (
|
|
21
|
+
const [error, data] = parseLoginData(req.body);
|
|
22
|
+
if (error || !data) {
|
|
23
23
|
return res
|
|
24
24
|
.status(HTTP_FAIL_CODES.BAD_REQUEST)
|
|
25
|
-
.json({ success: false, code: "something-went-wrong", message:
|
|
25
|
+
.json({ success: false, code: "something-went-wrong", message: error });
|
|
26
26
|
}
|
|
27
|
-
const { username, password } =
|
|
27
|
+
const { username, password } = data;
|
|
28
28
|
const sendResponse = (response: ReturnType) => {
|
|
29
29
|
if (response.success) {
|
|
30
30
|
res.json(response);
|
|
@@ -59,7 +59,8 @@ export const setRegisterRequestHandler = async (
|
|
|
59
59
|
req,
|
|
60
60
|
});
|
|
61
61
|
return sendResponse(result);
|
|
62
|
-
} catch {
|
|
62
|
+
} catch (error) {
|
|
63
|
+
console.error("Failed to send email", error);
|
|
63
64
|
return sendResponse({
|
|
64
65
|
success: false,
|
|
65
66
|
code: "server-error",
|