prostgles-server 4.2.417 → 4.2.419
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.map +1 -1
- package/dist/Auth/AuthHandler.js +13 -10
- package/dist/Auth/AuthHandler.js.map +1 -1
- package/dist/Auth/endpoints/setLoginRequestHandler.d.ts.map +1 -1
- package/dist/Auth/endpoints/setLoginRequestHandler.js +13 -25
- package/dist/Auth/endpoints/setLoginRequestHandler.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/DboBuilder/runSQL.d.ts +1 -1
- package/lib/Auth/AuthHandler.ts +19 -10
- package/lib/Auth/endpoints/setLoginRequestHandler.ts +18 -29
- package/lib/Auth/login.ts +11 -5
- package/package.json +2 -2
|
@@ -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,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,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;AAEzF,OAAO,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAMzF,OAAO,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,CAAC;AAChF,eAAO,MAAM,eAAe;;;;;;;CAOlB,CAAC;AAEX,eAAO,MAAM,kBAAkB;;;CAGrB,CAAC;AAGX,eAAO,MAAM,uBAAuB,WAAW,CAAC;AAChD,eAAO,MAAM,0BAA0B,cAAc,CAAC;AACtD,eAAO,MAAM,WAAW;;;;;;;CAOd,CAAC;AACX,eAAO,MAAM,cAAc,GACzB,MAAM,UAAU,CAAC,mBAAmB,CAAC,EACrC,OAAO,MAAM,OAAO,WAAW,WAIhC,CAAC;AACF,eAAO,MAAM,mBAAmB,GAAI,MAAM,UAAU,CAAC,mBAAmB,CAAC,KAMlE,GACF,CAAC,IAAI,MAAM,OAAO,WAAW,GAAG,MAAM,GAE1C,CAAC;AAEF,qBAAa,WAAW;IACtB,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IACxC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,GAAG;QACrD,OAAO,CAAC,EAAE,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC;KAC7C,CAAC;IAEF,IAAI,SAAS;aAKU,aAAa;;MACnC;gBAGW,SAAS,EAAE,SAAS;IAQhC,IAAI,UAAU,WAEb;IAED,IAAI,UAAU;;;;;;;MAEb;IAED,IAAI,aAA8B;IAElC,WAAW,GAAI,KAAK,MAAM,GAAG,SAAS,wBAIpC;IAEF,WAAW,GAAI,UAAU,MAAM,aAkB7B;IAEF,8BAA8B;;;;;;eAA6C;IAC3E,2BAA2B;;;;;;mFAA0C;IACrE,aAAa,iEAAqC;IAElD;;;;OAIG;IACH,cAAc,GAAU,WAAW,iBAAiB,KAAG,OAAO,CAAC,mBAAmB,CAAC,CASjF;IAEF,OAAO,aAoBL;IAEF,KAAK,4PAAoB;IAEzB;;;;;;OAMG;IACH,eAAe,CAAC,cAAc,EAAE,iBAAiB,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS;
|
|
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,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,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;AAEzF,OAAO,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAMzF,OAAO,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,CAAC;AAChF,eAAO,MAAM,eAAe;;;;;;;CAOlB,CAAC;AAEX,eAAO,MAAM,kBAAkB;;;CAGrB,CAAC;AAGX,eAAO,MAAM,uBAAuB,WAAW,CAAC;AAChD,eAAO,MAAM,0BAA0B,cAAc,CAAC;AACtD,eAAO,MAAM,WAAW;;;;;;;CAOd,CAAC;AACX,eAAO,MAAM,cAAc,GACzB,MAAM,UAAU,CAAC,mBAAmB,CAAC,EACrC,OAAO,MAAM,OAAO,WAAW,WAIhC,CAAC;AACF,eAAO,MAAM,mBAAmB,GAAI,MAAM,UAAU,CAAC,mBAAmB,CAAC,KAMlE,GACF,CAAC,IAAI,MAAM,OAAO,WAAW,GAAG,MAAM,GAE1C,CAAC;AAEF,qBAAa,WAAW;IACtB,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IACxC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,GAAG;QACrD,OAAO,CAAC,EAAE,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC;KAC7C,CAAC;IAEF,IAAI,SAAS;aAKU,aAAa;;MACnC;gBAGW,SAAS,EAAE,SAAS;IAQhC,IAAI,UAAU,WAEb;IAED,IAAI,UAAU;;;;;;;MAEb;IAED,IAAI,aAA8B;IAElC,WAAW,GAAI,KAAK,MAAM,GAAG,SAAS,wBAIpC;IAEF,WAAW,GAAI,UAAU,MAAM,aAkB7B;IAEF,8BAA8B;;;;;;eAA6C;IAC3E,2BAA2B;;;;;;mFAA0C;IACrE,aAAa,iEAAqC;IAElD;;;;OAIG;IACH,cAAc,GAAU,WAAW,iBAAiB,KAAG,OAAO,CAAC,mBAAmB,CAAC,CASjF;IAEF,OAAO,aAoBL;IAEF,KAAK,4PAAoB;IAEzB;;;;;;OAMG;IACH,eAAe,CAAC,cAAc,EAAE,iBAAiB,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS;IAyClF;;OAEG;IACH,aAAa,GAAI,WAAW,iBAAiB,GAAG,SAAS,KAAG,MAAM,GAAG,SAAS,CAO5E;IAEF,wBAAwB,iEAAuC;IAE/D,yBAAyB,GACvB,QAAQ,YAAY,EACpB,SAAS,YAAY,GAAG,SAAS,KAChC,OAAO,CAiBR;IAEF,aAAa;;;gCAA4B;CAC1C"}
|
package/dist/Auth/AuthHandler.js
CHANGED
|
@@ -152,17 +152,20 @@ class AuthHandler {
|
|
|
152
152
|
}
|
|
153
153
|
return this.validateSid(rawSid);
|
|
154
154
|
}
|
|
155
|
-
const
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
155
|
+
const authorizationHeader = maybeClientReq.httpReq.headers.authorization;
|
|
156
|
+
const authToken = ["Bearer", "Basic"]
|
|
157
|
+
.map((type) => authorizationHeader?.startsWith(type) ?
|
|
158
|
+
{ type, token: authorizationHeader.slice(type.length + 1) }
|
|
159
|
+
: undefined)
|
|
160
|
+
.find(prostgles_types_1.isDefined);
|
|
161
|
+
if (authorizationHeader && !authToken) {
|
|
162
|
+
throw "Invalid Authorization header format";
|
|
163
|
+
}
|
|
164
|
+
if (authToken && authToken.type !== "Bearer") {
|
|
165
|
+
throw "Only Bearer Authorization header allowed";
|
|
162
166
|
}
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
bearerSid ?? maybeClientReq.httpReq.cookies?.[sidKeyName]);
|
|
167
|
+
const bearerSid = authToken && Buffer.from(authToken.token, "base64").toString();
|
|
168
|
+
return this.validateSid(bearerSid ?? (0, prostgles_types_1.getProperty)(maybeClientReq.httpReq.cookies, sidKeyName));
|
|
166
169
|
}
|
|
167
170
|
/**
|
|
168
171
|
* Used for logging
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthHandler.js","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"AuthHandler.js","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
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,GACzB,UAAU,GAAG,KACZ,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,SAAS,
|
|
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,GACzB,UAAU,GAAG,KACZ,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,SAAS,CAoBzD,CAAC"}
|
|
@@ -25,32 +25,20 @@ function setLoginRequestHandler(app) {
|
|
|
25
25
|
});
|
|
26
26
|
}
|
|
27
27
|
const parseLoginData = (bodyData) => {
|
|
28
|
-
const
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
loginData[prop] = valOrError;
|
|
42
|
-
}
|
|
43
|
-
else {
|
|
44
|
-
loginData[prop] = valOrError;
|
|
45
|
-
}
|
|
46
|
-
});
|
|
28
|
+
const loginDataValidation = (0, prostgles_types_1.getJSONBSchemaValidationError)({
|
|
29
|
+
type: {
|
|
30
|
+
username: "string",
|
|
31
|
+
password: { type: "string", optional: true },
|
|
32
|
+
remember_me: { type: "boolean", optional: true },
|
|
33
|
+
totp_token: { type: "string", optional: true },
|
|
34
|
+
totp_recovery_code: { type: "string", optional: true },
|
|
35
|
+
},
|
|
36
|
+
}, bodyData);
|
|
37
|
+
if (loginDataValidation.error !== undefined) {
|
|
38
|
+
return [loginDataValidation.error, undefined];
|
|
39
|
+
}
|
|
40
|
+
const loginData = loginDataValidation.data;
|
|
47
41
|
return [undefined, loginData];
|
|
48
42
|
};
|
|
49
43
|
exports.parseLoginData = parseLoginData;
|
|
50
|
-
const getStringOrUndefined = (val, propName) => {
|
|
51
|
-
const isStringOrUndefined = typeof val === "string" || val === undefined;
|
|
52
|
-
if (!isStringOrUndefined)
|
|
53
|
-
return { error: `${propName} error: Expected string or undefined` };
|
|
54
|
-
return val;
|
|
55
|
-
};
|
|
56
44
|
//# sourceMappingURL=setLoginRequestHandler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setLoginRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setLoginRequestHandler.ts"],"names":[],"mappings":";;;AAiBA,wDAmBC;AAjCD,
|
|
1
|
+
{"version":3,"file":"setLoginRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setLoginRequestHandler.ts"],"names":[],"mappings":";;;AAiBA,wDAmBC;AAjCD,qDAAgE;AAEhE,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;AAEM,MAAM,cAAc,GAAG,CAC5B,QAAa,EAC6C,EAAE;IAC5D,MAAM,mBAAmB,GAAG,IAAA,+CAA6B,EACvD;QACE,IAAI,EAAE;YACJ,QAAQ,EAAE,QAAQ;YAClB,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;YAC5C,WAAW,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE;YAChD,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;YAC9C,kBAAkB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;SACvD;KACF,EACD,QAAQ,CACT,CAAC;IAEF,IAAI,mBAAmB,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAC5C,OAAO,CAAC,mBAAmB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAChD,CAAC;IACD,MAAM,SAAS,GAAG,mBAAmB,CAAC,IAAI,CAAC;IAE3C,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;AAChC,CAAC,CAAC;AAtBW,QAAA,cAAc,kBAsBzB"}
|
package/dist/Auth/login.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../lib/Auth/login.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAmB,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAG/E,wBAAsB,KAAK,CACzB,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,UAAU,EACf,GAAG,EAAE,oBAAoB,EACzB,WAAW,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../lib/Auth/login.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAmB,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAG/E,wBAAsB,KAAK,CACzB,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,UAAU,EACf,GAAG,EAAE,oBAAoB,EACzB,WAAW,EAAE,WAAW,6CAoEzB;AAED,eAAO,MAAM,wBAAwB,GAAI,SAAS,IAAI,CAAC,YAAY,EAAE,SAAS,GAAG,KAAK,CAAC,+BAkBtF,CAAC"}
|
package/dist/Auth/login.js
CHANGED
|
@@ -45,7 +45,12 @@ async function login(req, res, loginParams) {
|
|
|
45
45
|
});
|
|
46
46
|
if (!loginResponse.session) {
|
|
47
47
|
if (!loginResponse.response.success) {
|
|
48
|
-
|
|
48
|
+
const errorCode = loginResponse.response.code;
|
|
49
|
+
const statusCode = errorCode === "server-error" ? AuthHandler_1.HTTP_FAIL_CODES.INTERNAL_SERVER_ERROR
|
|
50
|
+
: errorCode === "password-missing" ? AuthHandler_1.HTTP_FAIL_CODES.UNAUTHORIZED
|
|
51
|
+
: errorCode === "totp-token-missing" ? AuthHandler_1.HTTP_FAIL_CODES.UNAUTHORIZED
|
|
52
|
+
: AuthHandler_1.HTTP_FAIL_CODES.BAD_REQUEST;
|
|
53
|
+
return res.status(statusCode).json(loginResponse.response);
|
|
49
54
|
}
|
|
50
55
|
return res.json(loginResponse.response);
|
|
51
56
|
}
|
package/dist/Auth/login.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../lib/Auth/login.ts"],"names":[],"mappings":";;;AAOA,
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../lib/Auth/login.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ import type { AuthClientRequest } from "../Auth/AuthTypes";
|
|
|
6
6
|
export declare function runSQL(this: DboBuilder, queryWithoutRLS: string, args: unknown, options: SQLOptions | undefined, localParams: LocalParams | undefined): Promise<any>;
|
|
7
7
|
export declare function cacheDBTypes(this: DboBuilder, force?: boolean): Promise<void>;
|
|
8
8
|
export declare function getDetailedFieldInfo(this: DboBuilder, fields: pg.IColumn[]): {
|
|
9
|
-
tsDataType: "string" | "number" | "boolean" | "number[]" | "boolean[]" | "string[]" | "any[]"
|
|
9
|
+
tsDataType: "string" | "number" | "boolean" | "any" | "number[]" | "boolean[]" | "string[]" | "any[]";
|
|
10
10
|
dataType: import("prostgles-types").PG_COLUMN_UDT_DATA_TYPE;
|
|
11
11
|
udt_name: import("prostgles-types").PG_COLUMN_UDT_DATA_TYPE;
|
|
12
12
|
tableName: string | undefined;
|
package/lib/Auth/AuthHandler.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { AnyObject } from "prostgles-types";
|
|
2
|
-
import { CHANNELS } from "prostgles-types";
|
|
2
|
+
import { CHANNELS, getProperty, isDefined } from "prostgles-types";
|
|
3
3
|
import type { PRGLIOSocket } from "../DboBuilder/DboBuilder";
|
|
4
4
|
import type { DBOFullyTyped } from "../DBSchemaBuilder/DBSchemaBuilder";
|
|
5
5
|
import type { Prostgles } from "../Prostgles";
|
|
@@ -189,17 +189,26 @@ export class AuthHandler {
|
|
|
189
189
|
return this.validateSid(rawSid);
|
|
190
190
|
}
|
|
191
191
|
|
|
192
|
-
const
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
192
|
+
const authorizationHeader = maybeClientReq.httpReq.headers.authorization;
|
|
193
|
+
const authToken = (["Bearer", "Basic"] as const)
|
|
194
|
+
.map((type) =>
|
|
195
|
+
authorizationHeader?.startsWith(type) ?
|
|
196
|
+
{ type, token: authorizationHeader.slice(type.length + 1) }
|
|
197
|
+
: undefined,
|
|
198
|
+
)
|
|
199
|
+
.find(isDefined);
|
|
200
|
+
|
|
201
|
+
if (authorizationHeader && !authToken) {
|
|
202
|
+
throw "Invalid Authorization header format";
|
|
203
|
+
}
|
|
204
|
+
if (authToken && authToken.type !== "Bearer") {
|
|
205
|
+
throw "Only Bearer Authorization header allowed";
|
|
199
206
|
}
|
|
207
|
+
|
|
208
|
+
const bearerSid = authToken && Buffer.from(authToken.token, "base64").toString();
|
|
209
|
+
|
|
200
210
|
return this.validateSid(
|
|
201
|
-
|
|
202
|
-
bearerSid ?? (maybeClientReq.httpReq.cookies?.[sidKeyName] as string | undefined),
|
|
211
|
+
bearerSid ?? (getProperty(maybeClientReq.httpReq.cookies, sidKeyName) as string | undefined),
|
|
203
212
|
);
|
|
204
213
|
}
|
|
205
214
|
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type e from "express";
|
|
2
2
|
import type { Response } from "express";
|
|
3
3
|
import type { AuthRequest, AuthResponse } from "prostgles-types";
|
|
4
|
-
import {
|
|
4
|
+
import { getJSONBSchemaValidationError } from "prostgles-types";
|
|
5
5
|
import type { AuthHandler } from "../AuthHandler";
|
|
6
6
|
import { HTTP_FAIL_CODES } from "../AuthHandler";
|
|
7
7
|
import type { LoginParams } from "../AuthTypes";
|
|
@@ -37,36 +37,25 @@ export function setLoginRequestHandler(this: AuthHandler, app: e.Express) {
|
|
|
37
37
|
}
|
|
38
38
|
|
|
39
39
|
export const parseLoginData = (
|
|
40
|
-
bodyData: any
|
|
40
|
+
bodyData: any,
|
|
41
41
|
): [string, undefined] | [undefined, AuthRequest.LoginData] => {
|
|
42
|
-
const
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
42
|
+
const loginDataValidation = getJSONBSchemaValidationError(
|
|
43
|
+
{
|
|
44
|
+
type: {
|
|
45
|
+
username: "string",
|
|
46
|
+
password: { type: "string", optional: true },
|
|
47
|
+
remember_me: { type: "boolean", optional: true },
|
|
48
|
+
totp_token: { type: "string", optional: true },
|
|
49
|
+
totp_recovery_code: { type: "string", optional: true },
|
|
50
|
+
},
|
|
51
|
+
},
|
|
52
|
+
bodyData,
|
|
53
|
+
);
|
|
46
54
|
|
|
47
|
-
(
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
}
|
|
52
|
-
if (prop === "username") {
|
|
53
|
-
if (!isDefined(valOrError) || !valOrError) {
|
|
54
|
-
return ["username error: Expected non-empty string"];
|
|
55
|
-
}
|
|
56
|
-
loginData[prop] = valOrError;
|
|
57
|
-
} else {
|
|
58
|
-
loginData[prop] = valOrError;
|
|
59
|
-
}
|
|
60
|
-
});
|
|
55
|
+
if (loginDataValidation.error !== undefined) {
|
|
56
|
+
return [loginDataValidation.error, undefined];
|
|
57
|
+
}
|
|
58
|
+
const loginData = loginDataValidation.data;
|
|
61
59
|
|
|
62
60
|
return [undefined, loginData];
|
|
63
61
|
};
|
|
64
|
-
|
|
65
|
-
const getStringOrUndefined = (
|
|
66
|
-
val: any,
|
|
67
|
-
propName: string
|
|
68
|
-
): string | undefined | { error: string } => {
|
|
69
|
-
const isStringOrUndefined = typeof val === "string" || val === undefined;
|
|
70
|
-
if (!isStringOrUndefined) return { error: `${propName} error: Expected string or undefined` };
|
|
71
|
-
return val;
|
|
72
|
-
};
|
package/lib/Auth/login.ts
CHANGED
|
@@ -9,7 +9,7 @@ export async function login(
|
|
|
9
9
|
this: AuthHandler,
|
|
10
10
|
req: ExpressReq,
|
|
11
11
|
res: LoginResponseHandler,
|
|
12
|
-
loginParams: LoginParams
|
|
12
|
+
loginParams: LoginParams,
|
|
13
13
|
) {
|
|
14
14
|
const start = Date.now();
|
|
15
15
|
const { responseThrottle = 500 } = this.opts;
|
|
@@ -32,7 +32,7 @@ export async function login(
|
|
|
32
32
|
loginSignupConfig: this.opts.loginSignupConfig,
|
|
33
33
|
websiteUrl,
|
|
34
34
|
data,
|
|
35
|
-
})
|
|
35
|
+
}),
|
|
36
36
|
);
|
|
37
37
|
|
|
38
38
|
if (typeof result === "string" || !result.session) {
|
|
@@ -66,7 +66,13 @@ export async function login(
|
|
|
66
66
|
|
|
67
67
|
if (!loginResponse.session) {
|
|
68
68
|
if (!loginResponse.response.success) {
|
|
69
|
-
|
|
69
|
+
const errorCode = loginResponse.response.code;
|
|
70
|
+
const statusCode =
|
|
71
|
+
errorCode === "server-error" ? HTTP_FAIL_CODES.INTERNAL_SERVER_ERROR
|
|
72
|
+
: errorCode === "password-missing" ? HTTP_FAIL_CODES.UNAUTHORIZED
|
|
73
|
+
: errorCode === "totp-token-missing" ? HTTP_FAIL_CODES.UNAUTHORIZED
|
|
74
|
+
: HTTP_FAIL_CODES.BAD_REQUEST;
|
|
75
|
+
return res.status(statusCode).json(loginResponse.response);
|
|
70
76
|
}
|
|
71
77
|
return res.json(loginResponse.response);
|
|
72
78
|
}
|
|
@@ -81,13 +87,13 @@ export const getBasicSessionErrorCode = (session: Pick<BasicSession, "expires" |
|
|
|
81
87
|
}
|
|
82
88
|
if (sid && (typeof sid !== "string" || typeof expires !== "number")) {
|
|
83
89
|
console.error(
|
|
84
|
-
"Bad login result type. \nExpecting: undefined | null | { sid: string; expires: number }"
|
|
90
|
+
"Bad login result type. \nExpecting: undefined | null | { sid: string; expires: number }",
|
|
85
91
|
);
|
|
86
92
|
return "server-error";
|
|
87
93
|
}
|
|
88
94
|
if (expires < Date.now()) {
|
|
89
95
|
console.error(
|
|
90
|
-
"auth.login() is returning an expired session. Can only login with a session.expires greater than Date.now()"
|
|
96
|
+
"auth.login() is returning an expired session. Can only login with a session.expires greater than Date.now()",
|
|
91
97
|
);
|
|
92
98
|
return "server-error";
|
|
93
99
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "prostgles-server",
|
|
3
|
-
"version": "4.2.
|
|
3
|
+
"version": "4.2.419",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -57,7 +57,7 @@
|
|
|
57
57
|
"pg": "^8.15.6",
|
|
58
58
|
"pg-cursor": "^2.14.6",
|
|
59
59
|
"pg-promise": "^11.13.0",
|
|
60
|
-
"prostgles-types": "^4.0.
|
|
60
|
+
"prostgles-types": "^4.0.207"
|
|
61
61
|
},
|
|
62
62
|
"devDependencies": {
|
|
63
63
|
"@eslint/js": "^9.22.0",
|