prostgles-server 4.2.271 → 4.2.272
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 +12 -6
- package/dist/Auth/AuthHandler.d.ts.map +1 -1
- package/dist/Auth/AuthHandler.js +12 -6
- package/dist/Auth/AuthHandler.js.map +1 -1
- package/dist/Auth/AuthTypes.d.ts +5 -1
- package/dist/Auth/AuthTypes.d.ts.map +1 -1
- package/dist/Auth/AuthTypes.js.map +1 -1
- package/dist/Auth/endpoints/setCatchAllRequestHandler.d.ts.map +1 -1
- package/dist/Auth/endpoints/setCatchAllRequestHandler.js +24 -17
- package/dist/Auth/endpoints/setCatchAllRequestHandler.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 +10 -1
- package/dist/Auth/getClientAuth.js.map +1 -1
- package/dist/Auth/login.d.ts +2 -1
- package/dist/Auth/login.d.ts.map +1 -1
- package/dist/Auth/login.js +20 -13
- package/dist/Auth/login.js.map +1 -1
- package/dist/Auth/setupAuthRoutes.d.ts.map +1 -1
- package/dist/Auth/setupAuthRoutes.js +11 -3
- package/dist/Auth/setupAuthRoutes.js.map +1 -1
- package/dist/Auth/utils/getSidAndUserFromRequest.d.ts +3 -2
- package/dist/Auth/utils/getSidAndUserFromRequest.d.ts.map +1 -1
- package/dist/Auth/utils/getSidAndUserFromRequest.js +3 -2
- package/dist/Auth/utils/getSidAndUserFromRequest.js.map +1 -1
- package/dist/Auth/utils/getUserOrError.d.ts +3 -2
- package/dist/Auth/utils/getUserOrError.d.ts.map +1 -1
- package/dist/Auth/utils/handleGetUser.d.ts +3 -2
- package/dist/Auth/utils/handleGetUser.d.ts.map +1 -1
- package/dist/Auth/utils/handleGetUser.js +3 -9
- package/dist/Auth/utils/handleGetUser.js.map +1 -1
- package/dist/Prostgles.d.ts.map +1 -1
- package/dist/Prostgles.js +6 -0
- package/dist/Prostgles.js.map +1 -1
- package/dist/PublishParser/PublishParser.d.ts +2 -2
- package/dist/PublishParser/PublishParser.d.ts.map +1 -1
- package/dist/PublishParser/PublishParser.js +8 -1
- package/dist/PublishParser/PublishParser.js.map +1 -1
- package/dist/PublishParser/getSchemaFromPublish.d.ts.map +1 -1
- package/dist/PublishParser/getSchemaFromPublish.js +3 -0
- package/dist/PublishParser/getSchemaFromPublish.js.map +1 -1
- package/dist/onSocketConnected.d.ts.map +1 -1
- package/dist/onSocketConnected.js +12 -11
- package/dist/onSocketConnected.js.map +1 -1
- package/dist/runClientRequest.d.ts.map +1 -1
- package/dist/runClientRequest.js +3 -0
- package/dist/runClientRequest.js.map +1 -1
- package/lib/Auth/AuthHandler.ts +17 -7
- package/lib/Auth/AuthTypes.ts +4 -2
- package/lib/Auth/endpoints/setCatchAllRequestHandler.ts +27 -22
- package/lib/Auth/getClientAuth.ts +18 -4
- package/lib/Auth/login.ts +24 -17
- package/lib/Auth/setupAuthRoutes.ts +12 -3
- package/lib/Auth/utils/getSidAndUserFromRequest.ts +5 -3
- package/lib/Auth/utils/getUserOrError.ts +2 -2
- package/lib/Auth/utils/handleGetUser.ts +6 -10
- package/lib/Prostgles.ts +6 -0
- package/lib/PublishParser/PublishParser.ts +10 -3
- package/lib/PublishParser/getSchemaFromPublish.ts +3 -1
- package/lib/onSocketConnected.ts +12 -9
- package/lib/runClientRequest.ts +3 -0
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleGetUser.js","sourceRoot":"","sources":["../../../lib/Auth/utils/handleGetUser.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"handleGetUser.js","sourceRoot":"","sources":["../../../lib/Auth/utils/handleGetUser.ts"],"names":[],"mappings":";;;AAAA,qDAAyD;AAEzD,gDAA2E;AAE3E,uDAAsD;AAI/C,KAAK,UAAU,sBAAsB,CAE1C,SAA4B;IAE5B,MAAM,oBAAoB,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,UAAU,CAAC;IAChE,MAAM,MAAM,GAAG,MAAM,IAAA,mCAAiB,EAAC,KAAK,IAAI,EAAE;QAChD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAC7C,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,EAC/B,IAAI,CAAC,GAAoB,EACzB,IAAI,CAAC,EAAE,EACP,IAAA,qCAAuB,EAAC,SAAS,CAAC,EAClC,SAAS,CACV,CAAC;QACF,IAAI,IAAA,mBAAW,EAAC,eAAe,CAAC,EAAE,CAAC;YACjC,OAAO;gBACL,KAAK,EACH,IAAA,0BAAQ,EAAC,eAAe,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,eAAe,EAAE;gBACzF,GAAG,EAAE,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC;aACT,CAAC;QAChC,CAAC;QACD,MAAM,UAAU,GAAG,eAAe,CAAC;QAEnC,IAAI,UAAU,IAAI,MAAM,IAAI,UAAU,EAAE,CAAC;YACvC,IAAI,CAAC,CAAC,SAAS,IAAI,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO;gBACjD,MAAM,2DAA2D,CAAC;YACpE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;YACnC,IAAI,CAAC,2BAA2B,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;YAC5E,OAAO,sBAA+B,CAAC;QACzC,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAC5C,IAAI,oBAAoB,IAAI,SAAS,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;YACpD,MAAM,OAAO,GAAG,MAAM,oBAAoB,CAAC,GAAG,EAAE,IAAI,CAAC,GAAoB,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;YACpF,IAAI,OAAO,IAAI,OAAO,CAAC,OAAO,IAAI,UAAU,EAAE,IAAI,EAAE,CAAC;gBACnD,SAAS,CAAC,MAAM,CAAC,WAAW,GAAG;oBAC7B,QAAQ,EAAE,UAAU;oBACpB,OAAO;iBACR,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,UAAU,EAAE,IAAI,IAAI,GAAG,EAAE,CAAC;YAC5B,OAAO,EAAE,GAAG,EAAE,GAAG,UAAU,EAAE,CAAC;QAChC,CAAC;QAED,OAAO,EAAE,GAAG,EAAE,cAAc,EAAE,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;IAC7F,CAAC,EAAE,GAAG,CAAC,CAAC;IACR,OAAO,MAAM,CAAC;AAChB,CAAC;AAhDD,wDAgDC;AAEM,MAAM,WAAW,GAAG,CACzB,WAA8B,EAC8C,EAAE;IAC9E,OAAO,OAAO,CAAC,OAAO,WAAW,KAAK,QAAQ,IAAI,CAAC,WAAW,IAAI,SAAS,IAAI,WAAW,CAAC,CAAC,CAAC;AAC/F,CAAC,CAAC;AAJW,QAAA,WAAW,eAItB"}
|
package/dist/Prostgles.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Prostgles.d.ts","sourceRoot":"","sources":["../lib/Prostgles.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Prostgles.d.ts","sourceRoot":"","sources":["../lib/Prostgles.ts"],"names":[],"mappings":"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"}
|
package/dist/Prostgles.js
CHANGED
|
@@ -303,6 +303,9 @@ class Prostgles {
|
|
|
303
303
|
{ type: "socket", ...clientReq }
|
|
304
304
|
: { type: "http", ...clientReq };
|
|
305
305
|
const userData = await this.authHandler?.getSidAndUserFromRequest(clientInfo);
|
|
306
|
+
if (userData === "new-session-redirect") {
|
|
307
|
+
throw "new-session-redirect";
|
|
308
|
+
}
|
|
306
309
|
const { publishParser } = this;
|
|
307
310
|
let fullSchema;
|
|
308
311
|
let publishValidationError;
|
|
@@ -359,6 +362,9 @@ class Prostgles {
|
|
|
359
362
|
return aName.localeCompare(bName);
|
|
360
363
|
});
|
|
361
364
|
const authInfo = await this.authHandler?.getClientAuth(clientReq);
|
|
365
|
+
if (authInfo === "new-session-redirect") {
|
|
366
|
+
throw "new-session-redirect";
|
|
367
|
+
}
|
|
362
368
|
const clientSchema = {
|
|
363
369
|
schema,
|
|
364
370
|
methods: methodSchema,
|
package/dist/Prostgles.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Prostgles.js","sourceRoot":"","sources":["../lib/Prostgles.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Prostgles.js","sourceRoot":"","sources":["../lib/Prostgles.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { Method } from "prostgles-types";
|
|
|
2
2
|
import { AuthClientRequest, AuthResultWithSID, SessionUser } from "../Auth/AuthTypes";
|
|
3
3
|
import { DB, DBHandlerServer, Prostgles } from "../Prostgles";
|
|
4
4
|
import { ProstglesInitOptions } from "../ProstglesTypes";
|
|
5
|
-
import { DboTable, DboTableCommand,
|
|
5
|
+
import { DboTable, DboTableCommand, ParsedTableRule, PublishMethods, type PublishObject, PublishParams } from "./publishTypesAndUtils";
|
|
6
6
|
export declare class PublishParser {
|
|
7
7
|
publish: ProstglesInitOptions["publish"];
|
|
8
8
|
publishMethods?: PublishMethods<void, SessionUser> | undefined;
|
|
@@ -22,7 +22,7 @@ export declare class PublishParser {
|
|
|
22
22
|
getValidatedRequestRuleWusr({ tableName, command, clientReq, }: DboTableCommand): Promise<ParsedTableRule>;
|
|
23
23
|
getValidatedRequestRule({ tableName, command, clientReq }: DboTableCommand, clientInfo: AuthResultWithSID | undefined): Promise<ParsedTableRule>;
|
|
24
24
|
getTableRules(args: DboTable, clientInfo: AuthResultWithSID | undefined): Promise<ParsedTableRule | undefined>;
|
|
25
|
-
getTableRulesWithoutFileTable: (args_0: DboTable, clientInfo: AuthResultWithSID | undefined, overridenPublish?: PublishObject | undefined) => Promise<ParsedPublishTable | undefined>;
|
|
25
|
+
getTableRulesWithoutFileTable: (args_0: DboTable, clientInfo: AuthResultWithSID | undefined, overridenPublish?: PublishObject | undefined) => Promise<import("./publishTypesAndUtils").ParsedPublishTable | undefined>;
|
|
26
26
|
getSchemaFromPublish: (args_0: AuthClientRequest & {
|
|
27
27
|
userData: AuthResultWithSID | undefined;
|
|
28
28
|
}) => Promise<{
|
|
@@ -1 +1 @@
|
|
|
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,iBAAiB,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEtF,OAAO,EAAE,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAKzD,OAAO,EACL,QAAQ,EACR,eAAe,EACf,
|
|
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,iBAAiB,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEtF,OAAO,EAAE,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAKzD,OAAO,EACL,QAAQ,EACR,eAAe,EACf,eAAe,EACf,cAAc,EACd,KAAK,aAAa,EAClB,aAAa,EAGd,MAAM,wBAAwB,CAAC;AAEhC,qBAAa,aAAa;IACxB,OAAO,EAAE,oBAAoB,CAAC,SAAS,CAAC,CAAC;IACzC,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;gBAET,SAAS,EAAE,SAAS;IAY1B,gBAAgB,CACpB,SAAS,EAAE,iBAAiB,EAC5B,UAAU,EAAE,iBAAiB,GAAG,SAAS,GACxC,OAAO,CAAC,aAAa,CAAC;IAgBnB,iBAAiB,CACrB,SAAS,EAAE,iBAAiB,EAC5B,QAAQ,EAAE,iBAAiB,GAAG,SAAS,GACtC,OAAO,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAyBrC;;OAEG;IACG,kBAAkB,CACtB,SAAS,EAAE,iBAAiB,EAC5B,UAAU,EAAE,iBAAiB,GAAG,SAAS,GACxC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAe/B,2BAA2B,CAAC,EAChC,SAAS,EACT,OAAO,EACP,SAAS,GACV,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;IAUvC,uBAAuB,CAC3B,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,eAAe,EAClD,UAAU,EAAE,iBAAiB,GAAG,SAAS,GACxC,OAAO,CAAC,eAAe,CAAC;IAqDrB,aAAa,CACjB,IAAI,EAAE,QAAQ,EACd,UAAU,EAAE,iBAAiB,GAAG,SAAS,GACxC,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAevC,6BAA6B,0LAA4C;IAGzE,oBAAoB;;;;;;OAAmC;CACxD;AAED,cAAc,wBAAwB,CAAC"}
|
|
@@ -40,9 +40,13 @@ class PublishParser {
|
|
|
40
40
|
this.db = db;
|
|
41
41
|
}
|
|
42
42
|
async getPublishParams(clientReq, clientInfo) {
|
|
43
|
+
const _clientInfo = clientInfo ?? (await this.prostgles.authHandler?.getSidAndUserFromRequest(clientReq));
|
|
44
|
+
if (_clientInfo === "new-session-redirect") {
|
|
45
|
+
throw "new-session-redirect";
|
|
46
|
+
}
|
|
43
47
|
return {
|
|
44
48
|
sid: undefined,
|
|
45
|
-
...
|
|
49
|
+
..._clientInfo,
|
|
46
50
|
dbo: this.dbo,
|
|
47
51
|
db: this.db,
|
|
48
52
|
clientReq,
|
|
@@ -85,6 +89,9 @@ class PublishParser {
|
|
|
85
89
|
}
|
|
86
90
|
async getValidatedRequestRuleWusr({ tableName, command, clientReq, }) {
|
|
87
91
|
const clientInfo = clientReq && (await this.prostgles.authHandler?.getSidAndUserFromRequest(clientReq));
|
|
92
|
+
if (clientInfo === "new-session-redirect") {
|
|
93
|
+
throw "new-session-redirect";
|
|
94
|
+
}
|
|
88
95
|
const rules = await this.getValidatedRequestRule({ tableName, command, clientReq }, clientInfo);
|
|
89
96
|
return rules;
|
|
90
97
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PublishParser.js","sourceRoot":"","sources":["../../lib/PublishParser/PublishParser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qDAAqE;AAMrE,2DAAwD;AACxD,iEAA8D;AAC9D,mFAAgF;AAChF,
|
|
1
|
+
{"version":3,"file":"PublishParser.js","sourceRoot":"","sources":["../../lib/PublishParser/PublishParser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qDAAqE;AAMrE,2DAAwD;AACxD,iEAA8D;AAC9D,mFAAgF;AAChF,iEASgC;AAEhC,MAAa,aAAa;IACxB,OAAO,CAAkC;IACzC,cAAc,CAAiD;IAC/D,aAAa,CAAO;IACpB,GAAG,CAAkB;IACrB,EAAE,CAAK;IACP,SAAS,CAAY;IAErB,YAAY,SAAoB;QAC9B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC;QACtC,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC;QACpD,6DAA6D;QAC7D,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC;QAClD,MAAM,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,SAAS,CAAC;QAC9B,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE;YAAE,MAAM,uCAAuC,CAAC;QAC/D,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACf,CAAC;IAED,KAAK,CAAC,gBAAgB,CACpB,SAA4B,EAC5B,UAAyC;QAEzC,MAAM,WAAW,GACf,UAAU,IAAI,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,wBAAwB,CAAC,SAAS,CAAC,CAAC,CAAC;QACxF,IAAI,WAAW,KAAK,sBAAsB,EAAE,CAAC;YAC3C,MAAM,sBAAsB,CAAC;QAC/B,CAAC;QACD,OAAO;YACL,GAAG,EAAE,SAAS;YACd,GAAG,WAAW;YACd,GAAG,EAAE,IAAI,CAAC,GAAoB;YAC9B,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,SAAS;YACT,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM;SACzC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,iBAAiB,CACrB,SAA4B,EAC5B,QAAuC;QAEvC,MAAM,OAAO,GAA8B,EAAE,CAAC;QAE9C,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QACvE,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;QAE7E,IAAI,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAC;YAC7C,IAAA,kCAAgB,EAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,EAAE;gBAC/C,MAAM,UAAU,GAAG,CAAC,SAAsD,EAAE,EAAE,CAC5E,OAAO,SAAS,KAAK,UAAU,IAAI,OAAO,SAAS,CAAC,IAAI,KAAK,UAAU,CAAC;gBAC1E,IACE,UAAU,CAAC,MAAuC,CAAC;oBACnD,aAAa;oBACb,CAAC,IAAA,0BAAQ,EAAC,MAAM,CAAC,IAAI,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAC5C,CAAC;oBACD,OAAO,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAE,CAAC;gBAChC,CAAC;qBAAM,CAAC;oBACN,MAAM,kCAAkC,GAAG,qCAAqC,CAAC;gBACnF,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,kBAAkB,CACtB,SAA4B,EAC5B,UAAyC;QAEzC,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QACzE,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAEtE,IAAI,QAAQ,KAAK,GAAG,EAAE,CAAC;YACrB,MAAM,OAAO,GAAkB,EAAE,CAAC;YAClC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;gBACnD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;YAC1B,CAAC,CAAC,CAAC;YACH,OAAO,OAAO,CAAC;QACjB,CAAC;QAED,OAAO,QAAQ,IAAI,SAAS,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,2BAA2B,CAAC,EAChC,SAAS,EACT,OAAO,EACP,SAAS,GACO;QAChB,MAAM,UAAU,GACd,SAAS,IAAI,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,wBAAwB,CAAC,SAAS,CAAC,CAAC,CAAC;QACvF,IAAI,UAAU,KAAK,sBAAsB,EAAE,CAAC;YAC1C,MAAM,sBAAsB,CAAC;QAC/B,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,UAAU,CAAC,CAAC;QAChG,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,CAAC,uBAAuB,CAC3B,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAmB,EAClD,UAAyC;QAEzC,IAAI,CAAC,OAAO,IAAI,CAAC,SAAS;YAAE,MAAM,kCAAkC,CAAC;QAErE,MAAM,GAAG,GAAG,sCAAe,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC;QACpF,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,MAAM,mBAAmB,GAAG,OAAO,CAAC;QACtC,CAAC;QAED,+CAA+C;QAC/C,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO,sCAAe,CAAC,MAAM,CAC3B,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;gBACT,GAAG,CAAC;gBACJ,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,SAAS;aACtB,CAAC,EACF,EAAE,CACH,CAAC;QACJ,CAAC;QAED,8CAA8C;QAC9C,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,MAAM,oBAAoB,CAAC;QAE9C,uCAAuC;QACvC,MAAM,SAAS,GAAG,SAAS,CAAC,MAAM,EAAE,SAAS,EAAE,iBAAiB,CAAC,SAAS,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;QAEvF,IAAI,SAAS;YAAE,MAAM,SAAS,CAAC,KAAK,CAAC;QAErC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,UAAU,CAAC,CAAC;QACjF,IAAI,CAAC,SAAS;YACZ,MAAM;gBACJ,KAAK,EAAE,CAAC,2BAA2B,CAAC;gBACpC,OAAO,EAAE,+BAA+B,GAAG,SAAS;aACrD,CAAC;QAEJ,IAAI,OAAO,KAAK,QAAQ,EAAE,CAAC;YACzB,IAAI,CAAC,SAAS,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;gBAC3C,MAAM;oBACJ,KAAK,EAAE,CAAC,2BAA2B,CAAC;oBACpC,OAAO,EAAE,uCAAuC;iBACjD,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACzB,MAAM;gBACJ,KAAK,EAAE,CAAC,2BAA2B,CAAC;gBACpC,OAAO,EAAE,kCAAkC,SAAS,IAAI,OAAO,EAAE;aAClE,CAAC;QACJ,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,IAAc,EACd,UAAyC;QAEzC,MAAM,qBAAqB,GAAG,MAAM,IAAI,CAAC,6BAA6B,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACzF,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;YACvC,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,GAAG,MAAM,qCAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAClE,IAAI,CAAC,SAAS,EACd,qBAAqB,EACrB,IAAI,CAAC,SAAS,EACd,UAAU,CACX,CAAC;YACF,OAAO,IAAA,4CAAqB,EAAC,cAAc,CAAC,CAAC;QAC/C,CAAC;QAED,OAAO,IAAA,4CAAqB,EAAC,qBAAqB,CAAC,CAAC;IACtD,CAAC;IAED,6BAA6B,GAAG,6DAA6B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEzE,iFAAiF;IACjF,oBAAoB,GAAG,2CAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;CACxD;AApLD,sCAoLC;AAED,yDAAuC;AAGvC,SAAS,iBAAiB,CACxB,SAAY,EACZ,GAAG,MAAW;IAEd,IACE,SAAS,KAAK,IAAI;QAClB,SAAS,KAAK,SAAS;QACvB,YAAY;QACZ,CAAC,OAAO,SAAS,KAAK,UAAU,IAAI,OAAO,SAAS,CAAC,IAAI,KAAK,UAAU,CAAC,EACzE,CAAC;QACD,OAAQ,SAAmC,CAAC,GAAG,MAAM,CAAC,CAAC;IACzD,CAAC;IAED,YAAY;IACZ,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSchemaFromPublish.d.ts","sourceRoot":"","sources":["../../lib/PublishParser/getSchemaFromPublish.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAQb,iBAAiB,EACjB,oBAAoB,EAErB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAIzE,OAAO,EAAsB,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEpE,KAAK,IAAI,GAAG,iBAAiB,GAAG;IAC9B,QAAQ,EAAE,iBAAiB,GAAG,SAAS,CAAC;CACzC,CAAC;AAGF,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,aAAa,EACnB,EAAE,QAAQ,EAAE,GAAG,SAAS,EAAE,EAAE,IAAI,GAC/B,OAAO,CAAC;IACT,MAAM,EAAE,oBAAoB,CAAC;IAC7B,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,iBAAiB,EAAE,iBAAiB,CAAC;CACtC,CAAC,
|
|
1
|
+
{"version":3,"file":"getSchemaFromPublish.d.ts","sourceRoot":"","sources":["../../lib/PublishParser/getSchemaFromPublish.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAQb,iBAAiB,EACjB,oBAAoB,EAErB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAIzE,OAAO,EAAsB,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEpE,KAAK,IAAI,GAAG,iBAAiB,GAAG;IAC9B,QAAQ,EAAE,iBAAiB,GAAG,SAAS,CAAC;CACzC,CAAC;AAGF,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,aAAa,EACnB,EAAE,QAAQ,EAAE,GAAG,SAAS,EAAE,EAAE,IAAI,GAC/B,OAAO,CAAC;IACT,MAAM,EAAE,oBAAoB,CAAC;IAC7B,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,iBAAiB,EAAE,iBAAiB,CAAC;CACtC,CAAC,CA8JD"}
|
|
@@ -12,6 +12,9 @@ async function getSchemaFromPublish({ userData, ...clientReq }) {
|
|
|
12
12
|
try {
|
|
13
13
|
/* Publish tables and views based on socket */
|
|
14
14
|
const clientInfo = userData ?? (await this.prostgles.authHandler?.getSidAndUserFromRequest(clientReq));
|
|
15
|
+
if (clientInfo === "new-session-redirect") {
|
|
16
|
+
throw "new-session-redirect";
|
|
17
|
+
}
|
|
15
18
|
let _publish;
|
|
16
19
|
try {
|
|
17
20
|
_publish = await this.getPublishAsObject(clientReq, clientInfo);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSchemaFromPublish.js","sourceRoot":"","sources":["../../lib/PublishParser/getSchemaFromPublish.ts"],"names":[],"mappings":";;;AAAA,qDAYyB;AAEzB,yDAA4D;AAE5D,4CAA6C;AAM7C,MAAM,iBAAiB,GAAG,CAAC,WAAW,EAAE,cAAc,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,CAAU,CAAC;AAE3F,KAAK,UAAU,oBAAoB,CAExC,EAAE,QAAQ,EAAE,GAAG,SAAS,EAAQ;IAMhC,MAAM,MAAM,GAAyB,EAAE,CAAC;IACxC,MAAM,iBAAiB,GAAsB,EAAE,CAAC;IAChD,IAAI,MAAM,GAAoB,EAAE,CAAC;IAEjC,IAAI,CAAC;QACH,8CAA8C;QAC9C,MAAM,UAAU,GACd,QAAQ,IAAI,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,wBAAwB,CAAC,SAAS,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"getSchemaFromPublish.js","sourceRoot":"","sources":["../../lib/PublishParser/getSchemaFromPublish.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onSocketConnected.d.ts","sourceRoot":"","sources":["../lib/onSocketConnected.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAY,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,SAAS,EAAiB,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAM5D,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"onSocketConnected.d.ts","sourceRoot":"","sources":["../lib/onSocketConnected.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAY,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,SAAS,EAAiB,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAM5D,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,iBAsI5E;AAED,wBAAgB,eAAe,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,SAAS,KAAK,IAAI,EAAE,GAAG,EAAE,GAAG,QAErE"}
|
|
@@ -13,6 +13,15 @@ async function onSocketConnected(socket) {
|
|
|
13
13
|
}
|
|
14
14
|
this.connectedSockets.push(socket);
|
|
15
15
|
try {
|
|
16
|
+
const getUser = async () => {
|
|
17
|
+
if (!this.authHandler)
|
|
18
|
+
throw "authHandler missing";
|
|
19
|
+
const res = await this.authHandler.getSidAndUserFromRequest({ socket });
|
|
20
|
+
if (res === "new-session-redirect") {
|
|
21
|
+
throw "new-session-redirect";
|
|
22
|
+
}
|
|
23
|
+
return res;
|
|
24
|
+
};
|
|
16
25
|
await this.opts.onLog?.({
|
|
17
26
|
type: "connect",
|
|
18
27
|
sid: this.authHandler?.getValidatedSid({ socket }),
|
|
@@ -29,18 +38,15 @@ async function onSocketConnected(socket) {
|
|
|
29
38
|
throw "authHandler missing";
|
|
30
39
|
const errorInfo = await onUseOrSocketConnected(authHandler.getValidatedSid({ socket }), (0, AuthHandler_1.getClientRequestIPsInfo)({ socket }), { socket });
|
|
31
40
|
if (errorInfo) {
|
|
32
|
-
socket.emit(prostgles_types_1.CHANNELS.CONNECTION, {
|
|
41
|
+
socket.emit(prostgles_types_1.CHANNELS.CONNECTION, {
|
|
42
|
+
error: "error" in errorInfo ? errorInfo.error : "New session setup",
|
|
43
|
+
});
|
|
33
44
|
socket.disconnect();
|
|
34
45
|
return;
|
|
35
46
|
}
|
|
36
47
|
}
|
|
37
48
|
if (this.opts.onSocketConnect) {
|
|
38
49
|
try {
|
|
39
|
-
const getUser = async () => {
|
|
40
|
-
if (!this.authHandler)
|
|
41
|
-
throw "authHandler missing";
|
|
42
|
-
return await this.authHandler.getSidAndUserFromRequest({ socket });
|
|
43
|
-
};
|
|
44
50
|
await this.opts.onSocketConnect({
|
|
45
51
|
socket,
|
|
46
52
|
dbo: dbo,
|
|
@@ -82,11 +88,6 @@ async function onSocketConnected(socket) {
|
|
|
82
88
|
connectedSocketIds: this.connectedSockets.map((s) => s.id),
|
|
83
89
|
});
|
|
84
90
|
if (this.opts.onSocketDisconnect) {
|
|
85
|
-
const getUser = async () => {
|
|
86
|
-
if (!this.authHandler)
|
|
87
|
-
throw "authHandler missing";
|
|
88
|
-
return await this.authHandler.getSidAndUserFromRequest({ socket });
|
|
89
|
-
};
|
|
90
91
|
void this.opts.onSocketDisconnect({ socket, dbo: dbo, db, getUser });
|
|
91
92
|
}
|
|
92
93
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onSocketConnected.js","sourceRoot":"","sources":["../lib/onSocketConnected.ts"],"names":[],"mappings":";;;AAAA,qDAAsD;AAGtD,yDAAuE;AACvE,kEAAgE;AAEhE,oDAA6D;AAEtD,KAAK,UAAU,iBAAiB,CAAkB,MAAoB;IAC3E,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;QACnB,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC;QACtD,MAAM,CAAC,UAAU,EAAE,CAAC;QACpB,OAAO;IACT,CAAC;IACD,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEnC,IAAI,CAAC;QACH,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YACtB,IAAI,EAAE,SAAS;YACf,GAAG,EAAE,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;YAClD,QAAQ,EAAE,MAAM,CAAC,EAAE;YACnB,kBAAkB,EAAE,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC3D,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG;YAAE,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;QAC7D,MAAM,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC;QAEzB,MAAM,EAAE,sBAAsB,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;QACxD,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;QAC7B,IAAI,sBAAsB,EAAE,CAAC;YAC3B,IAAI,CAAC,WAAW;gBAAE,MAAM,qBAAqB,CAAC;YAC9C,MAAM,SAAS,GAAG,MAAM,sBAAsB,CAC5C,WAAW,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC,EACvC,IAAA,qCAAuB,EAAC,EAAE,MAAM,EAAE,CAAC,EACnC,EAAE,MAAM,EAAE,CACX,CAAC;YACF,IAAI,SAAS,EAAE,CAAC;gBACd,MAAM,CAAC,IAAI,CAAC,0BAAQ,CAAC,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"onSocketConnected.js","sourceRoot":"","sources":["../lib/onSocketConnected.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runClientRequest.d.ts","sourceRoot":"","sources":["../lib/runClientRequest.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAKV,KAAK,SAAS,EACf,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAKrD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AA2BxC,KAAK,IAAI,GAAG;IACV,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,GAAG,CAAC;IACZ,MAAM,EAAE,GAAG,CAAC;IACZ,MAAM,EAAE,GAAG,CAAC;CACb,CAAC;AAUF,eAAO,MAAM,gBAAgB,SACrB,SAAS,QACT,IAAI,aACC,iBAAiB,
|
|
1
|
+
{"version":3,"file":"runClientRequest.d.ts","sourceRoot":"","sources":["../lib/runClientRequest.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAKV,KAAK,SAAS,EACf,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAKrD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AA2BxC,KAAK,IAAI,GAAG;IACV,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,GAAG,CAAC;IACZ,MAAM,EAAE,GAAG,CAAC;IACZ,MAAM,EAAE,GAAG,CAAC;CACb,CAAC;AAUF,eAAO,MAAM,gBAAgB,SACrB,SAAS,QACT,IAAI,aACC,iBAAiB,mCA4E7B,CAAC;AAKF,eAAO,MAAM,sBAAsB,SAC3B,SAAS,aACJ,iBAAiB;;;;;;;;EAgB7B,CAAC;AAEF,eAAO,MAAM,mBAAmB,SACxB,SAAS,WACN,UAAU,aACR,iBAAiB,mOAS7B,CAAC;AAEF,KAAK,UAAU,GAAG;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;CAChB,CAAC;AACF,eAAO,MAAM,eAAe,SACpB,SAAS,WACN,UAAU,aACR,iBAAiB,iBAmB7B,CAAC"}
|
package/dist/runClientRequest.js
CHANGED
|
@@ -41,6 +41,9 @@ const runClientRequest = async function (args, clientReq) {
|
|
|
41
41
|
SOCKET_ONLY_COMMANDS.join(", "));
|
|
42
42
|
}
|
|
43
43
|
const clientInfo = await this.authHandler?.getSidAndUserFromRequest(clientReq);
|
|
44
|
+
if (clientInfo === "new-session-redirect") {
|
|
45
|
+
throw clientInfo;
|
|
46
|
+
}
|
|
44
47
|
const validRules = await this.publishParser.getValidatedRequestRule({ tableName, command, clientReq }, clientInfo);
|
|
45
48
|
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
|
46
49
|
if (!validRules) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runClientRequest.js","sourceRoot":"","sources":["../lib/runClientRequest.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"runClientRequest.js","sourceRoot":"","sources":["../lib/runClientRequest.ts"],"names":[],"mappings":"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"}
|
package/lib/Auth/AuthHandler.ts
CHANGED
|
@@ -5,7 +5,7 @@ import { DB, DBHandlerServer, Prostgles } from "../Prostgles";
|
|
|
5
5
|
import { AuthClientRequest, AuthConfig, AuthResult, BasicSession, ExpressReq } from "./AuthTypes";
|
|
6
6
|
import { LoginResponseHandler } from "./endpoints/setLoginRequestHandler";
|
|
7
7
|
import { getClientAuth } from "./getClientAuth";
|
|
8
|
-
import { login } from "./login";
|
|
8
|
+
import { getBasicSessionErrorCode, login } from "./login";
|
|
9
9
|
import { setupAuthRoutes } from "./setupAuthRoutes";
|
|
10
10
|
import { getClientRequestIPsInfo } from "./utils/getClientRequestIPsInfo";
|
|
11
11
|
import { getReturnUrl } from "./utils/getReturnUrl";
|
|
@@ -85,6 +85,22 @@ export class AuthHandler {
|
|
|
85
85
|
});
|
|
86
86
|
};
|
|
87
87
|
|
|
88
|
+
validateSessionAndSetCookie = (
|
|
89
|
+
cookie: { sid: string; expires: number },
|
|
90
|
+
requestHandler: { req: ExpressReq; res: LoginResponseHandler }
|
|
91
|
+
) => {
|
|
92
|
+
const sessionErrorCode = getBasicSessionErrorCode(cookie);
|
|
93
|
+
if (sessionErrorCode) {
|
|
94
|
+
const { res } = requestHandler;
|
|
95
|
+
res.status(HTTP_FAIL_CODES.UNAUTHORIZED).json({
|
|
96
|
+
success: false,
|
|
97
|
+
code: sessionErrorCode,
|
|
98
|
+
});
|
|
99
|
+
return;
|
|
100
|
+
}
|
|
101
|
+
return this.setCookieAndGoToReturnURLIFSet(cookie, requestHandler);
|
|
102
|
+
};
|
|
103
|
+
|
|
88
104
|
setCookieAndGoToReturnURLIFSet = (
|
|
89
105
|
cookie: { sid: string; expires: number },
|
|
90
106
|
requestHandler: { req: ExpressReq; res: LoginResponseHandler }
|
|
@@ -203,12 +219,6 @@ export class AuthHandler {
|
|
|
203
219
|
}
|
|
204
220
|
};
|
|
205
221
|
|
|
206
|
-
getUserFromRequest = async (clientReq: AuthClientRequest): Promise<AuthResult> => {
|
|
207
|
-
const sidAndUser = await this.getSidAndUserFromRequest(clientReq);
|
|
208
|
-
if (sidAndUser.sid && sidAndUser.user) {
|
|
209
|
-
return sidAndUser;
|
|
210
|
-
}
|
|
211
|
-
};
|
|
212
222
|
getSidAndUserFromRequest = getSidAndUserFromRequest.bind(this);
|
|
213
223
|
|
|
214
224
|
isNonExpiredSocketSession = (
|
package/lib/Auth/AuthTypes.ts
CHANGED
|
@@ -297,13 +297,15 @@ export type AuthConfig<S = void, SUser extends SessionUser = SessionUser> = {
|
|
|
297
297
|
sidKeyName?: string;
|
|
298
298
|
|
|
299
299
|
/**
|
|
300
|
-
* Awaited before any auth actions.
|
|
300
|
+
* Awaited before any auth actions.
|
|
301
|
+
* If session is returned then will set cookie and redirect
|
|
302
|
+
* Failure will stop the auth process
|
|
301
303
|
*/
|
|
302
304
|
onUseOrSocketConnected?: (
|
|
303
305
|
sid: string | undefined,
|
|
304
306
|
client: LoginClientInfo,
|
|
305
307
|
reqInfo: AuthClientRequest
|
|
306
|
-
) => Awaitable<void | { error: string; httpCode: 400 | 401 | 403 }>;
|
|
308
|
+
) => Awaitable<void | { error: string; httpCode: 400 | 401 | 403 } | { session: BasicSession }>;
|
|
307
309
|
|
|
308
310
|
/**
|
|
309
311
|
* Required to allow self-managed or managed (by setting up loginSignupConfig) authentication.
|
|
@@ -7,32 +7,36 @@ import { getReturnUrl } from "../utils/getReturnUrl";
|
|
|
7
7
|
export function setCatchAllRequestHandler(this: AuthHandler, app: e.Express) {
|
|
8
8
|
const requestHandlerCatchAll: RequestHandler = async (req, res, next) => {
|
|
9
9
|
const { onGetRequestOK } = this.opts.loginSignupConfig ?? {};
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
if (this.prostgles.restApi) {
|
|
19
|
-
if (
|
|
20
|
-
Object.values(this.prostgles.restApi.routes).some((restRoute) =>
|
|
21
|
-
matchesRoute(restRoute.split("/:")[0], req.path)
|
|
22
|
-
)
|
|
23
|
-
) {
|
|
24
|
-
next();
|
|
25
|
-
return;
|
|
26
|
-
}
|
|
10
|
+
if (
|
|
11
|
+
this.prostgles.restApi &&
|
|
12
|
+
Object.values(this.prostgles.restApi.routes).some((restRoute) =>
|
|
13
|
+
matchesRoute(restRoute.split("/:")[0], req.path)
|
|
14
|
+
)
|
|
15
|
+
) {
|
|
16
|
+
next();
|
|
17
|
+
return;
|
|
27
18
|
}
|
|
19
|
+
if (matchesRoute(AUTH_ROUTES_AND_PARAMS.loginWithProvider, req.path)) {
|
|
20
|
+
next();
|
|
21
|
+
return;
|
|
22
|
+
}
|
|
23
|
+
let newSessionRedirect = false as boolean;
|
|
28
24
|
try {
|
|
25
|
+
const clientReq: AuthClientRequest = { httpReq: req, res };
|
|
26
|
+
const getUser = async () => {
|
|
27
|
+
const res = await this.getUserOrError(clientReq);
|
|
28
|
+
if (res === "new-session-redirect") {
|
|
29
|
+
newSessionRedirect = true;
|
|
30
|
+
throw "new-session-redirect";
|
|
31
|
+
}
|
|
32
|
+
return res;
|
|
33
|
+
};
|
|
34
|
+
const isLoggedInUser = async () => {
|
|
35
|
+
const userInfo = await getUser();
|
|
36
|
+
return !!userInfo.user;
|
|
37
|
+
};
|
|
29
38
|
const returnURL = getReturnUrl(req);
|
|
30
39
|
|
|
31
|
-
if (matchesRoute(AUTH_ROUTES_AND_PARAMS.loginWithProvider, req.path)) {
|
|
32
|
-
next();
|
|
33
|
-
return;
|
|
34
|
-
}
|
|
35
|
-
|
|
36
40
|
/**
|
|
37
41
|
* Requesting a User route
|
|
38
42
|
*/
|
|
@@ -75,6 +79,7 @@ export function setCatchAllRequestHandler(this: AuthHandler, app: e.Express) {
|
|
|
75
79
|
typeof error === "string" ? error
|
|
76
80
|
: error instanceof Error ? error.message
|
|
77
81
|
: "";
|
|
82
|
+
if (newSessionRedirect) return;
|
|
78
83
|
res.status(HTTP_FAIL_CODES.BAD_REQUEST).json({
|
|
79
84
|
error:
|
|
80
85
|
"Something went wrong when processing your request" +
|
|
@@ -5,14 +5,20 @@ import {
|
|
|
5
5
|
CHANNELS,
|
|
6
6
|
getObjectEntries,
|
|
7
7
|
isEmpty,
|
|
8
|
+
isObject,
|
|
8
9
|
} from "prostgles-types";
|
|
9
|
-
import {
|
|
10
|
+
import {
|
|
11
|
+
AuthClientRequest,
|
|
12
|
+
LoginWithOAuthConfig,
|
|
13
|
+
AuthResultWithSID,
|
|
14
|
+
type AuthResult,
|
|
15
|
+
} from "./AuthTypes";
|
|
10
16
|
import { AUTH_ROUTES_AND_PARAMS, AuthHandler } from "./AuthHandler";
|
|
11
17
|
|
|
12
18
|
export async function getClientAuth(
|
|
13
19
|
this: AuthHandler,
|
|
14
20
|
clientReq: AuthClientRequest
|
|
15
|
-
): Promise<{ auth: AuthSocketSchema; userData: AuthResultWithSID }> {
|
|
21
|
+
): Promise<{ auth: AuthSocketSchema; userData: AuthResultWithSID } | "new-session-redirect"> {
|
|
16
22
|
let pathGuard = false;
|
|
17
23
|
const {
|
|
18
24
|
loginWithOAuth,
|
|
@@ -30,6 +36,12 @@ export async function getClientAuth(
|
|
|
30
36
|
* Due to SPA nature of some clients, we need to check if the connected client ends up on a protected route
|
|
31
37
|
*/
|
|
32
38
|
if (clientReq.socket) {
|
|
39
|
+
const getUserFromRequest = async (clientReq: AuthClientRequest): Promise<AuthResult> => {
|
|
40
|
+
const sidAndUser = await this.getSidAndUserFromRequest(clientReq);
|
|
41
|
+
if (isObject(sidAndUser) && sidAndUser.sid && sidAndUser.user) {
|
|
42
|
+
return sidAndUser;
|
|
43
|
+
}
|
|
44
|
+
};
|
|
33
45
|
const { socket } = clientReq;
|
|
34
46
|
socket.removeAllListeners(CHANNELS.AUTHGUARD);
|
|
35
47
|
socket.on(
|
|
@@ -54,7 +66,7 @@ export async function getClientAuth(
|
|
|
54
66
|
pathname &&
|
|
55
67
|
typeof pathname === "string" &&
|
|
56
68
|
this.isUserRoute(pathname) &&
|
|
57
|
-
!(await
|
|
69
|
+
!(await getUserFromRequest({ socket }))
|
|
58
70
|
) {
|
|
59
71
|
cb(null, { shouldReload: true });
|
|
60
72
|
} else {
|
|
@@ -70,7 +82,9 @@ export async function getClientAuth(
|
|
|
70
82
|
}
|
|
71
83
|
|
|
72
84
|
const userData = await this.getSidAndUserFromRequest(clientReq);
|
|
73
|
-
|
|
85
|
+
if (userData === "new-session-redirect") {
|
|
86
|
+
return userData;
|
|
87
|
+
}
|
|
74
88
|
const auth: AuthSocketSchema = {
|
|
75
89
|
providers: getOAuthProviders(loginWithOAuth),
|
|
76
90
|
signupWithEmailAndPassword: signupWithEmailAndPassword && {
|
package/lib/Auth/login.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { DBOFullyTyped } from "../DBSchemaBuilder";
|
|
2
2
|
import { AuthHandler, getClientRequestIPsInfo, HTTP_FAIL_CODES } from "./AuthHandler";
|
|
3
|
-
import { ExpressReq, LoginParams } from "./AuthTypes";
|
|
3
|
+
import { ExpressReq, LoginParams, type BasicSession } from "./AuthTypes";
|
|
4
4
|
import { LoginResponseHandler } from "./endpoints/setLoginRequestHandler";
|
|
5
5
|
import { throttledAuthCall } from "./utils/throttledReject";
|
|
6
6
|
|
|
@@ -30,22 +30,9 @@ export async function login(
|
|
|
30
30
|
return result;
|
|
31
31
|
}
|
|
32
32
|
|
|
33
|
-
const
|
|
34
|
-
if (
|
|
35
|
-
|
|
36
|
-
return "server-error";
|
|
37
|
-
}
|
|
38
|
-
if (sid && (typeof sid !== "string" || typeof expires !== "number")) {
|
|
39
|
-
console.error(
|
|
40
|
-
"Bad login result type. \nExpecting: undefined | null | { sid: string; expires: number }"
|
|
41
|
-
);
|
|
42
|
-
return "server-error";
|
|
43
|
-
}
|
|
44
|
-
if (expires < Date.now()) {
|
|
45
|
-
console.error(
|
|
46
|
-
"auth.login() is returning an expired session. Can only login with a session.expires greater than Date.now()"
|
|
47
|
-
);
|
|
48
|
-
return "server-error";
|
|
33
|
+
const sessionErrorCode = getBasicSessionErrorCode(result.session);
|
|
34
|
+
if (sessionErrorCode) {
|
|
35
|
+
return sessionErrorCode;
|
|
49
36
|
}
|
|
50
37
|
|
|
51
38
|
return result;
|
|
@@ -76,3 +63,23 @@ export async function login(
|
|
|
76
63
|
}
|
|
77
64
|
this.setCookieAndGoToReturnURLIFSet(loginResponse.session, { req, res });
|
|
78
65
|
}
|
|
66
|
+
|
|
67
|
+
export const getBasicSessionErrorCode = (session: Pick<BasicSession, "expires" | "sid">) => {
|
|
68
|
+
const { sid, expires } = session;
|
|
69
|
+
if (!sid) {
|
|
70
|
+
console.error("Invalid sid");
|
|
71
|
+
return "server-error";
|
|
72
|
+
}
|
|
73
|
+
if (sid && (typeof sid !== "string" || typeof expires !== "number")) {
|
|
74
|
+
console.error(
|
|
75
|
+
"Bad login result type. \nExpecting: undefined | null | { sid: string; expires: number }"
|
|
76
|
+
);
|
|
77
|
+
return "server-error";
|
|
78
|
+
}
|
|
79
|
+
if (expires < Date.now()) {
|
|
80
|
+
console.error(
|
|
81
|
+
"auth.login() is returning an expired session. Can only login with a session.expires greater than Date.now()"
|
|
82
|
+
);
|
|
83
|
+
return "server-error";
|
|
84
|
+
}
|
|
85
|
+
};
|