prostgles-server 4.2.270 → 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 +15 -8
- package/dist/Auth/AuthHandler.d.ts.map +1 -1
- package/dist/Auth/AuthHandler.js +34 -58
- package/dist/Auth/AuthHandler.js.map +1 -1
- package/dist/Auth/AuthTypes.d.ts +12 -2
- 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 +26 -19
- 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 +12 -4
- 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 +4 -2
- package/dist/Auth/utils/getSidAndUserFromRequest.d.ts.map +1 -1
- package/dist/Auth/utils/getSidAndUserFromRequest.js +40 -25
- package/dist/Auth/utils/getSidAndUserFromRequest.js.map +1 -1
- package/dist/Auth/utils/getUserOrError.d.ts +10 -0
- package/dist/Auth/utils/getUserOrError.d.ts.map +1 -0
- package/dist/Auth/utils/getUserOrError.js +48 -0
- package/dist/Auth/utils/getUserOrError.js.map +1 -0
- package/dist/Auth/utils/handleGetUser.d.ts +7 -0
- package/dist/Auth/utils/handleGetUser.d.ts.map +1 -0
- package/dist/Auth/utils/handleGetUser.js +47 -0
- package/dist/Auth/utils/handleGetUser.js.map +1 -0
- package/dist/DboBuilder/DboBuilderTypes.d.ts +2 -1
- package/dist/DboBuilder/DboBuilderTypes.d.ts.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 +11 -5
- package/dist/PublishParser/PublishParser.js.map +1 -1
- package/dist/PublishParser/getSchemaFromPublish.d.ts.map +1 -1
- package/dist/PublishParser/getSchemaFromPublish.js +70 -69
- package/dist/PublishParser/getSchemaFromPublish.js.map +1 -1
- package/dist/onSocketConnected.d.ts.map +1 -1
- package/dist/onSocketConnected.js +15 -14
- 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 +42 -83
- package/lib/Auth/AuthTypes.ts +13 -3
- package/lib/Auth/endpoints/setCatchAllRequestHandler.ts +29 -24
- package/lib/Auth/getClientAuth.ts +28 -14
- package/lib/Auth/login.ts +24 -17
- package/lib/Auth/setupAuthRoutes.ts +12 -3
- package/lib/Auth/utils/getSidAndUserFromRequest.ts +42 -33
- package/lib/Auth/utils/getUserOrError.ts +56 -0
- package/lib/Auth/utils/handleGetUser.ts +63 -0
- package/lib/DboBuilder/DboBuilderTypes.ts +2 -1
- package/lib/Prostgles.ts +7 -0
- package/lib/PublishParser/PublishParser.ts +14 -6
- package/lib/PublishParser/getSchemaFromPublish.ts +97 -94
- package/lib/onSocketConnected.ts +15 -12
- package/lib/runClientRequest.ts +3 -0
- package/package.json +2 -2
|
@@ -4,6 +4,7 @@ exports.getSchemaFromPublish = void 0;
|
|
|
4
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
5
|
const DboBuilder_1 = require("../DboBuilder/DboBuilder");
|
|
6
6
|
const Prostgles_1 = require("../Prostgles");
|
|
7
|
+
const SUBSCRIBE_METHODS = ["subscribe", "subscribeOne", "sync", "unsubscribe", "unsync"];
|
|
7
8
|
async function getSchemaFromPublish({ userData, ...clientReq }) {
|
|
8
9
|
const schema = {};
|
|
9
10
|
const tableSchemaErrors = {};
|
|
@@ -11,6 +12,9 @@ async function getSchemaFromPublish({ userData, ...clientReq }) {
|
|
|
11
12
|
try {
|
|
12
13
|
/* Publish tables and views based on socket */
|
|
13
14
|
const clientInfo = userData ?? (await this.prostgles.authHandler?.getSidAndUserFromRequest(clientReq));
|
|
15
|
+
if (clientInfo === "new-session-redirect") {
|
|
16
|
+
throw "new-session-redirect";
|
|
17
|
+
}
|
|
14
18
|
let _publish;
|
|
15
19
|
try {
|
|
16
20
|
_publish = await this.getPublishAsObject(clientReq, clientInfo);
|
|
@@ -36,87 +40,84 @@ async function getSchemaFromPublish({ userData, ...clientReq }) {
|
|
|
36
40
|
}
|
|
37
41
|
}
|
|
38
42
|
await Promise.all(tableNames.map(async (tableName) => {
|
|
43
|
+
const { canSubscribe, tablesOrViews } = this.prostgles.dboBuilder;
|
|
39
44
|
if (!this.dbo[tableName]) {
|
|
40
45
|
const errMsg = [
|
|
41
46
|
`Table ${tableName} does not exist`,
|
|
42
|
-
`Expecting one of: ${JSON.stringify(
|
|
43
|
-
`DBO tables: ${JSON.stringify(Object.keys(this.dbo).filter((k) => this.dbo[k].find))}`,
|
|
47
|
+
`Expecting one of: ${JSON.stringify(tablesOrViews?.map((tov) => tov.name))}`,
|
|
44
48
|
].join("\n");
|
|
45
49
|
throw errMsg;
|
|
46
50
|
}
|
|
47
|
-
const
|
|
48
|
-
if (
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
51
|
+
const tableRules = await this.getTableRules({ clientReq, tableName }, clientInfo);
|
|
52
|
+
if (!tableRules || (0, prostgles_types_1.isEmpty)(tableRules))
|
|
53
|
+
return;
|
|
54
|
+
if (!(0, prostgles_types_1.isObject)(tableRules)) {
|
|
55
|
+
throw `Invalid tableRules for table ${tableName}. Expecting an object`;
|
|
56
|
+
}
|
|
57
|
+
schema[tableName] = {};
|
|
58
|
+
const tableSchema = schema[tableName];
|
|
59
|
+
const methods = (0, prostgles_types_1.getKeys)(tableRules).filter((m) => canSubscribe || !(0, prostgles_types_1.includes)(SUBSCRIBE_METHODS, m));
|
|
60
|
+
let tableInfo;
|
|
61
|
+
let tableColumns;
|
|
62
|
+
await Promise.all(methods
|
|
63
|
+
.filter((m) => m !== "select")
|
|
64
|
+
.map(async (method) => {
|
|
65
|
+
if (method === "sync") {
|
|
66
|
+
/* Pass sync info */
|
|
67
|
+
tableSchema[method] = tableRules[method];
|
|
59
68
|
}
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
:
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
}
|
|
80
|
-
if (this.prostgles.opts.testRulesOnConnect) {
|
|
81
|
-
await this.dbo[tableName][method]({}, {}, {}, valid_table_command_rules, {
|
|
82
|
-
...clientReq,
|
|
83
|
-
isRemoteRequest: true,
|
|
84
|
-
testRule: true,
|
|
85
|
-
});
|
|
86
|
-
}
|
|
87
|
-
}
|
|
88
|
-
catch (e) {
|
|
89
|
-
console.error(`${tableName}.${method}`, e);
|
|
90
|
-
tableSchemaErrors[tableName] ??= {};
|
|
91
|
-
tableSchemaErrors[tableName][method] = {
|
|
92
|
-
error: "Internal publish error. Check server logs",
|
|
93
|
-
};
|
|
94
|
-
throw {
|
|
95
|
-
...(0, DboBuilder_1.getErrorAsObject)(e),
|
|
96
|
-
publish_path: `publish.${tableName}.${method}: \n -> ${e}`,
|
|
97
|
-
};
|
|
69
|
+
else if ((0, prostgles_types_1.includes)((0, prostgles_types_1.getKeys)(tableRules), method) && tableRules[method]) {
|
|
70
|
+
//@ts-ignore
|
|
71
|
+
tableSchema[method] =
|
|
72
|
+
method === "insert" ?
|
|
73
|
+
(0, prostgles_types_1.pickKeys)(tableRules[method], ["allowedNestedInserts"])
|
|
74
|
+
: {};
|
|
75
|
+
/* Test for issues with the common table CRUD methods () */
|
|
76
|
+
if ((0, prostgles_types_1.includes)(Prostgles_1.TABLE_METHODS, method)) {
|
|
77
|
+
try {
|
|
78
|
+
const parsedTableRule = await this.getValidatedRequestRule({
|
|
79
|
+
tableName,
|
|
80
|
+
command: method,
|
|
81
|
+
clientReq,
|
|
82
|
+
}, clientInfo);
|
|
83
|
+
if (this.prostgles.opts.testRulesOnConnect) {
|
|
84
|
+
await this.dbo[tableName][method]({}, {}, undefined, parsedTableRule, {
|
|
85
|
+
...clientReq,
|
|
86
|
+
isRemoteRequest: {},
|
|
87
|
+
testRule: true,
|
|
88
|
+
});
|
|
98
89
|
}
|
|
99
90
|
}
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
}
|
|
91
|
+
catch (e) {
|
|
92
|
+
console.error(`${tableName}.${method}`, e);
|
|
93
|
+
tableSchemaErrors[tableName] ??= {};
|
|
94
|
+
tableSchemaErrors[tableName][method] = {
|
|
95
|
+
error: "Internal publish error. Check server logs",
|
|
96
|
+
};
|
|
97
|
+
throw {
|
|
98
|
+
...(0, DboBuilder_1.getErrorAsObject)(e),
|
|
99
|
+
publish_path: `publish.${tableName}.${method}: \n -> ${e}`,
|
|
100
|
+
};
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
if (method === "getInfo" || method === "getColumns") {
|
|
104
|
+
const tableRules = await this.getValidatedRequestRule({ tableName, command: method, clientReq }, clientInfo);
|
|
105
|
+
const res = await this.dbo[tableName][method](undefined, undefined, undefined, tableRules, { ...clientReq, isRemoteRequest: {} });
|
|
106
|
+
if (method === "getInfo") {
|
|
107
|
+
tableInfo = res;
|
|
108
|
+
}
|
|
109
|
+
else {
|
|
110
|
+
tableColumns = res;
|
|
110
111
|
}
|
|
111
112
|
}
|
|
112
|
-
}));
|
|
113
|
-
if (tableInfo && tableColumns) {
|
|
114
|
-
tables.push({
|
|
115
|
-
name: tableName,
|
|
116
|
-
info: tableInfo,
|
|
117
|
-
columns: tableColumns,
|
|
118
|
-
});
|
|
119
113
|
}
|
|
114
|
+
}));
|
|
115
|
+
if (tableInfo && tableColumns) {
|
|
116
|
+
tables.push({
|
|
117
|
+
name: tableName,
|
|
118
|
+
info: tableInfo,
|
|
119
|
+
columns: tableColumns,
|
|
120
|
+
});
|
|
120
121
|
}
|
|
121
122
|
}));
|
|
122
123
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSchemaFromPublish.js","sourceRoot":"","sources":["../../lib/PublishParser/getSchemaFromPublish.ts"],"names":[],"mappings":";;;AAAA,
|
|
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;QACtF,IAAI,UAAU,KAAK,sBAAsB,EAAE,CAAC;YAC1C,MAAM,sBAAsB,CAAC;QAC/B,CAAC;QACD,IAAI,QAAmC,CAAC;QACxC,IAAI,CAAC;YACH,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QAClE,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,qCAAqC,EAAE,GAAG,CAAC,CAAC;YAC1D,MAAM,GAAG,CAAC;QACZ,CAAC;QAED,IAAI,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAC;YAC7C,IAAI,KAAK,GAAG,IAAI,CAAC;YACjB,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY;gBAAE,KAAK,GAAG,EAAE,CAAC;YAClD,IAAI,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,KAAK,QAAQ;gBACtD,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC;YAE3C,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC;YAE9E,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,SAAS,CAAC;YAC5D,IACE,aAAa;gBACb,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,QAAQ;gBACjC,CAAC,UAAU,CAAC,QAAQ,CAAC,aAAa,CAAC,EACnC,CAAC;gBACD,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CACvE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,aAAa,CAAC,CAAC,CAC7E,CAAC;gBACF,IAAI,YAAY,EAAE,CAAC;oBACjB,UAAU,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;gBACpC,CAAC;YACH,CAAC;YACD,MAAM,OAAO,CAAC,GAAG,CACf,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE;gBACjC,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC;gBAClE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;oBACzB,MAAM,MAAM,GAAG;wBACb,SAAS,SAAS,iBAAiB;wBACnC,qBAAqB,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,EAAE;qBAC7E,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBACb,MAAM,MAAM,CAAC;gBACf,CAAC;gBAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,UAAU,CAAC,CAAC;gBAElF,IAAI,CAAC,UAAU,IAAI,IAAA,yBAAO,EAAC,UAAU,CAAC;oBAAE,OAAO;gBAC/C,IAAI,CAAC,IAAA,0BAAQ,EAAC,UAAU,CAAC,EAAE,CAAC;oBAC1B,MAAM,gCAAgC,SAAS,uBAAuB,CAAC;gBACzE,CAAC;gBAED,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;gBACvB,MAAM,WAAW,GAAG,MAAM,CAAC,SAAS,CAAE,CAAC;gBACvC,MAAM,OAAO,GAAG,IAAA,yBAAO,EAAC,UAAU,CAAC,CAAC,MAAM,CACxC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,IAAI,CAAC,IAAA,0BAAQ,EAAC,iBAAiB,EAAE,CAAC,CAAC,CACvD,CAAC;gBACF,IAAI,SAAgC,CAAC;gBACrC,IAAI,YAAkD,CAAC;gBAEvD,MAAM,OAAO,CAAC,GAAG,CACf,OAAO;qBACJ,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,QAAQ,CAAC;qBAC7B,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;oBACpB,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;wBACtB,oBAAoB;wBACpB,WAAW,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;oBAC3C,CAAC;yBAAM,IAAI,IAAA,0BAAQ,EAAC,IAAA,yBAAO,EAAC,UAAU,CAAC,EAAE,MAAM,CAAC,IAAI,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;wBACvE,YAAY;wBACZ,WAAW,CAAC,MAAM,CAAC;4BACjB,MAAM,KAAK,QAAQ,CAAC,CAAC;gCACnB,IAAA,0BAAQ,EAAC,UAAU,CAAC,MAAM,CAAE,EAAE,CAAC,sBAAsB,CAAC,CAAC;gCACzD,CAAC,CAAE,EAAgB,CAAC;wBAEtB,2DAA2D;wBAC3D,IAAI,IAAA,0BAAQ,EAAC,yBAAa,EAAE,MAAM,CAAC,EAAE,CAAC;4BACpC,IAAI,CAAC;gCACH,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,uBAAuB,CACxD;oCACE,SAAS;oCACT,OAAO,EAAE,MAAM;oCACf,SAAS;iCACV,EACD,UAAU,CACX,CAAC;gCACF,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;oCAC3C,MAAO,IAAI,CAAC,GAAG,CAAC,SAAS,CAAkB,CAAC,MAAM,CAAC,CACjD,EAAE,EACF,EAAE,EACF,SAAS,EACT,eAAe,EACf;wCACE,GAAG,SAAS;wCACZ,eAAe,EAAE,EAAE;wCACnB,QAAQ,EAAE,IAAI;qCACf,CACF,CAAC;gCACJ,CAAC;4BACH,CAAC;4BAAC,OAAO,CAAC,EAAE,CAAC;gCACX,OAAO,CAAC,KAAK,CAAC,GAAG,SAAS,IAAI,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;gCAC3C,iBAAiB,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;gCACpC,iBAAiB,CAAC,SAAS,CAAE,CAAC,MAAM,CAAC,GAAG;oCACtC,KAAK,EAAE,2CAA2C;iCACnD,CAAC;gCAEF,MAAM;oCACJ,GAAG,IAAA,6BAAgB,EAAC,CAAC,CAAC;oCACtB,YAAY,EAAE,WAAW,SAAS,IAAI,MAAM,aAAa,CAAC,EAAE;iCAC7D,CAAC;4BACJ,CAAC;wBACH,CAAC;wBAED,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,YAAY,EAAE,CAAC;4BACpD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,uBAAuB,CACnD,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,EACzC,UAAU,CACX,CAAC;4BACF,MAAM,GAAG,GAAG,MAAO,IAAI,CAAC,GAAG,CAAC,SAAS,CAAkB,CAAC,MAAM,CAAC,CAC7D,SAAS,EACT,SAAS,EACT,SAAS,EACT,UAAU,EACV,EAAE,GAAG,SAAS,EAAE,eAAe,EAAE,EAAE,EAAE,CACtC,CAAC;4BACF,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gCACzB,SAAS,GAAG,GAAgB,CAAC;4BAC/B,CAAC;iCAAM,CAAC;gCACN,YAAY,GAAG,GAA+B,CAAC;4BACjD,CAAC;wBACH,CAAC;oBACH,CAAC;gBACH,CAAC,CAAC,CACL,CAAC;gBAEF,IAAI,SAAS,IAAI,YAAY,EAAE,CAAC;oBAC9B,MAAM,CAAC,IAAI,CAAC;wBACV,IAAI,EAAE,SAAS;wBACf,IAAI,EAAE,SAAS;wBACf,OAAO,EAAE,YAAY;qBACtB,CAAC,CAAC;gBACL,CAAC;YACH,CAAC,CAAC,CACH,CAAC;QACJ,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,KAAK,CAAC,iCAAiC,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;QACpE,MAAM,CAAC,CAAC;IACV,CAAC;IAED,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC;AAC/C,CAAC;AArKD,oDAqKC"}
|
|
@@ -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,9 +13,18 @@ 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
|
-
sid: this.authHandler?.
|
|
27
|
+
sid: this.authHandler?.getValidatedSid({ socket }),
|
|
19
28
|
socketId: socket.id,
|
|
20
29
|
connectedSocketIds: this.connectedSockets.map((s) => s.id),
|
|
21
30
|
});
|
|
@@ -27,20 +36,17 @@ async function onSocketConnected(socket) {
|
|
|
27
36
|
if (onUseOrSocketConnected) {
|
|
28
37
|
if (!authHandler)
|
|
29
38
|
throw "authHandler missing";
|
|
30
|
-
const errorInfo = await onUseOrSocketConnected(authHandler.
|
|
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,
|
|
@@ -77,16 +83,11 @@ async function onSocketConnected(socket) {
|
|
|
77
83
|
this.dboBuilder.queryStreamer.onDisconnect(socket.id);
|
|
78
84
|
void this.opts.onLog?.({
|
|
79
85
|
type: "disconnect",
|
|
80
|
-
sid: this.authHandler?.
|
|
86
|
+
sid: this.authHandler?.getValidatedSid({ socket }),
|
|
81
87
|
socketId: socket.id,
|
|
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,
|
|
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
|
@@ -1,24 +1,17 @@
|
|
|
1
|
-
import { AnyObject,
|
|
1
|
+
import { AnyObject, CHANNELS } from "prostgles-types";
|
|
2
2
|
import { PRGLIOSocket } from "../DboBuilder/DboBuilder";
|
|
3
|
-
import { DBOFullyTyped } from "../DBSchemaBuilder";
|
|
4
3
|
import { removeExpressRoute } from "../FileManager/FileManager";
|
|
5
4
|
import { DB, DBHandlerServer, Prostgles } from "../Prostgles";
|
|
6
|
-
import {
|
|
7
|
-
AuthClientRequest,
|
|
8
|
-
AuthConfig,
|
|
9
|
-
AuthResult,
|
|
10
|
-
AuthResultWithSID,
|
|
11
|
-
BasicSession,
|
|
12
|
-
ExpressReq,
|
|
13
|
-
} from "./AuthTypes";
|
|
5
|
+
import { AuthClientRequest, AuthConfig, AuthResult, BasicSession, ExpressReq } from "./AuthTypes";
|
|
14
6
|
import { LoginResponseHandler } from "./endpoints/setLoginRequestHandler";
|
|
15
7
|
import { getClientAuth } from "./getClientAuth";
|
|
16
|
-
import { login } from "./login";
|
|
8
|
+
import { getBasicSessionErrorCode, login } from "./login";
|
|
17
9
|
import { setupAuthRoutes } from "./setupAuthRoutes";
|
|
18
10
|
import { getClientRequestIPsInfo } from "./utils/getClientRequestIPsInfo";
|
|
19
11
|
import { getReturnUrl } from "./utils/getReturnUrl";
|
|
20
12
|
import { getSidAndUserFromRequest } from "./utils/getSidAndUserFromRequest";
|
|
21
|
-
import {
|
|
13
|
+
import { getUserOrError } from "./utils/getUserOrError";
|
|
14
|
+
import { handleGetUserThrottled } from "./utils/handleGetUser";
|
|
22
15
|
|
|
23
16
|
export { getClientRequestIPsInfo };
|
|
24
17
|
export const HTTP_FAIL_CODES = {
|
|
@@ -92,6 +85,22 @@ export class AuthHandler {
|
|
|
92
85
|
});
|
|
93
86
|
};
|
|
94
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
|
+
|
|
95
104
|
setCookieAndGoToReturnURLIFSet = (
|
|
96
105
|
cookie: { sid: string; expires: number },
|
|
97
106
|
requestHandler: { req: ExpressReq; res: LoginResponseHandler }
|
|
@@ -130,51 +139,8 @@ export class AuthHandler {
|
|
|
130
139
|
const successURL = getReturnUrl(req) || "/";
|
|
131
140
|
res.redirect(successURL);
|
|
132
141
|
};
|
|
133
|
-
|
|
134
|
-
getUserOrError =
|
|
135
|
-
const sid = this.getSID(localParams);
|
|
136
|
-
if (!sid) return { sid };
|
|
137
|
-
|
|
138
|
-
const isError = (
|
|
139
|
-
dataOrError: any
|
|
140
|
-
): dataOrError is AuthResponse.AuthFailure["code"] | AuthResponse.AuthFailure => {
|
|
141
|
-
return Boolean(typeof dataOrError === "string" || (dataOrError && "success" in dataOrError));
|
|
142
|
-
};
|
|
143
|
-
try {
|
|
144
|
-
const userOrErrorCode = await throttledAuthCall(async () => {
|
|
145
|
-
return this.opts.getUser(
|
|
146
|
-
this.validateSid(sid),
|
|
147
|
-
this.dbo as DBOFullyTyped,
|
|
148
|
-
this.db,
|
|
149
|
-
getClientRequestIPsInfo(localParams),
|
|
150
|
-
localParams
|
|
151
|
-
);
|
|
152
|
-
}, 50);
|
|
153
|
-
|
|
154
|
-
if (isError(userOrErrorCode)) {
|
|
155
|
-
const error: AuthResponse.AuthFailure | undefined =
|
|
156
|
-
typeof userOrErrorCode === "string" ?
|
|
157
|
-
{ success: false, code: userOrErrorCode }
|
|
158
|
-
: userOrErrorCode;
|
|
159
|
-
|
|
160
|
-
return {
|
|
161
|
-
sid,
|
|
162
|
-
error,
|
|
163
|
-
};
|
|
164
|
-
}
|
|
165
|
-
if (sid && userOrErrorCode?.user) {
|
|
166
|
-
return { sid, ...userOrErrorCode };
|
|
167
|
-
}
|
|
168
|
-
return {
|
|
169
|
-
sid,
|
|
170
|
-
};
|
|
171
|
-
} catch (_err) {
|
|
172
|
-
return {
|
|
173
|
-
sid,
|
|
174
|
-
error: { success: false, code: "server-error" },
|
|
175
|
-
};
|
|
176
|
-
}
|
|
177
|
-
};
|
|
142
|
+
handleGetUser = handleGetUserThrottled.bind(this);
|
|
143
|
+
getUserOrError = getUserOrError.bind(this);
|
|
178
144
|
|
|
179
145
|
init = setupAuthRoutes.bind(this);
|
|
180
146
|
|
|
@@ -210,7 +176,7 @@ export class AuthHandler {
|
|
|
210
176
|
* - query params
|
|
211
177
|
* Based on sidKeyName from auth
|
|
212
178
|
*/
|
|
213
|
-
|
|
179
|
+
getValidatedSid(maybeClientReq: AuthClientRequest | undefined): string | undefined {
|
|
214
180
|
if (!maybeClientReq) return undefined;
|
|
215
181
|
const { sidKeyName } = this;
|
|
216
182
|
if (maybeClientReq.socket) {
|
|
@@ -225,18 +191,20 @@ export class AuthHandler {
|
|
|
225
191
|
rawSid = cookie[sidKeyName];
|
|
226
192
|
}
|
|
227
193
|
return this.validateSid(rawSid);
|
|
228
|
-
}
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
}
|
|
236
|
-
bearerSid = Buffer.from(base64Token, "base64").toString();
|
|
194
|
+
}
|
|
195
|
+
|
|
196
|
+
const [tokenType, base64Token] = maybeClientReq.httpReq.headers.authorization?.split(" ") ?? [];
|
|
197
|
+
let bearerSid: string | undefined;
|
|
198
|
+
if (tokenType && base64Token) {
|
|
199
|
+
if (tokenType.trim() !== "Bearer") {
|
|
200
|
+
throw "Only Bearer Authorization header allowed";
|
|
237
201
|
}
|
|
238
|
-
|
|
202
|
+
bearerSid = Buffer.from(base64Token, "base64").toString();
|
|
239
203
|
}
|
|
204
|
+
return this.validateSid(
|
|
205
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
|
|
206
|
+
bearerSid ?? (maybeClientReq.httpReq.cookies?.[sidKeyName] as string | undefined)
|
|
207
|
+
);
|
|
240
208
|
}
|
|
241
209
|
|
|
242
210
|
/**
|
|
@@ -245,18 +213,12 @@ export class AuthHandler {
|
|
|
245
213
|
getSIDNoError = (clientReq: AuthClientRequest | undefined): string | undefined => {
|
|
246
214
|
if (!clientReq) return undefined;
|
|
247
215
|
try {
|
|
248
|
-
return this.
|
|
216
|
+
return this.getValidatedSid(clientReq);
|
|
249
217
|
} catch {
|
|
250
218
|
return undefined;
|
|
251
219
|
}
|
|
252
220
|
};
|
|
253
221
|
|
|
254
|
-
getUserFromRequest = async (clientReq: AuthClientRequest): Promise<AuthResult> => {
|
|
255
|
-
const sidAndUser = await this.getSidAndUserFromRequest(clientReq);
|
|
256
|
-
if (sidAndUser.sid && sidAndUser.user) {
|
|
257
|
-
return sidAndUser;
|
|
258
|
-
}
|
|
259
|
-
};
|
|
260
222
|
getSidAndUserFromRequest = getSidAndUserFromRequest.bind(this);
|
|
261
223
|
|
|
262
224
|
isNonExpiredSocketSession = (
|
|
@@ -284,14 +246,11 @@ export class AuthHandler {
|
|
|
284
246
|
getClientAuth = getClientAuth.bind(this);
|
|
285
247
|
}
|
|
286
248
|
|
|
287
|
-
export const matchesRoute = (
|
|
288
|
-
return
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
(longerRoute.startsWith(shorterRoute) &&
|
|
293
|
-
["/", "?", "#"].includes(longerRoute[shorterRoute.length] ?? "")))
|
|
294
|
-
);
|
|
249
|
+
export const matchesRoute = (baseRoute: string | undefined, fullRoute: string) => {
|
|
250
|
+
if (!baseRoute || !fullRoute) return false;
|
|
251
|
+
if (baseRoute === fullRoute) return true;
|
|
252
|
+
const nextChar = fullRoute[baseRoute.length] ?? "";
|
|
253
|
+
return fullRoute.startsWith(baseRoute) && ["/", "?", "#"].includes(nextChar);
|
|
295
254
|
};
|
|
296
255
|
|
|
297
256
|
const parseCookieStr = (cookie_str: string | undefined): Record<string, string> => {
|
package/lib/Auth/AuthTypes.ts
CHANGED
|
@@ -273,7 +273,15 @@ export type AuthResult<SU = SessionUser> =
|
|
|
273
273
|
export type AuthResultOrError<SU = SessionUser> =
|
|
274
274
|
| AuthResponse.AuthFailure
|
|
275
275
|
| AuthResponse.AuthFailure["code"]
|
|
276
|
-
| AuthResult<SU
|
|
276
|
+
| AuthResult<SU>
|
|
277
|
+
| {
|
|
278
|
+
type: "new-session";
|
|
279
|
+
|
|
280
|
+
/**
|
|
281
|
+
* If provided must login the user. Used for passwordless admin and public users
|
|
282
|
+
*/
|
|
283
|
+
session: BasicSession;
|
|
284
|
+
};
|
|
277
285
|
|
|
278
286
|
export type AuthRequestParams<S, SUser extends SessionUser> = {
|
|
279
287
|
db: DB;
|
|
@@ -289,13 +297,15 @@ export type AuthConfig<S = void, SUser extends SessionUser = SessionUser> = {
|
|
|
289
297
|
sidKeyName?: string;
|
|
290
298
|
|
|
291
299
|
/**
|
|
292
|
-
* 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
|
|
293
303
|
*/
|
|
294
304
|
onUseOrSocketConnected?: (
|
|
295
305
|
sid: string | undefined,
|
|
296
306
|
client: LoginClientInfo,
|
|
297
307
|
reqInfo: AuthClientRequest
|
|
298
|
-
) => Awaitable<void | { error: string; httpCode: 400 | 401 | 403 }>;
|
|
308
|
+
) => Awaitable<void | { error: string; httpCode: 400 | 401 | 403 } | { session: BasicSession }>;
|
|
299
309
|
|
|
300
310
|
/**
|
|
301
311
|
* Required to allow self-managed or managed (by setting up loginSignupConfig) authentication.
|
|
@@ -7,39 +7,43 @@ 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
|
*/
|
|
39
43
|
if (this.isUserRoute(req.path)) {
|
|
40
44
|
/* Check auth. Redirect to login if unauthorized */
|
|
41
|
-
const
|
|
42
|
-
if (!
|
|
45
|
+
const isLoggedIn = await isLoggedInUser();
|
|
46
|
+
if (!isLoggedIn) {
|
|
43
47
|
res.redirect(
|
|
44
48
|
`${AUTH_ROUTES_AND_PARAMS.login}?returnURL=${encodeURIComponent(req.originalUrl)}`
|
|
45
49
|
);
|
|
@@ -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" +
|