prostgles-server 4.2.158 → 4.2.160
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/AuthTypes.d.ts +4 -8
- package/dist/Auth/AuthTypes.d.ts.map +1 -1
- package/dist/Auth/setAuthProviders.d.ts.map +1 -1
- package/dist/Auth/setAuthProviders.js +4 -5
- package/dist/Auth/setAuthProviders.js.map +1 -1
- package/dist/Auth/setEmailProvider.js +3 -3
- package/dist/Auth/setEmailProvider.js.map +1 -1
- package/package.json +1 -1
- package/lib/Auth/AuthHandler.ts +0 -436
- package/lib/Auth/AuthTypes.ts +0 -285
- package/lib/Auth/getSafeReturnURL.ts +0 -35
- package/lib/Auth/sendEmail.ts +0 -83
- package/lib/Auth/setAuthProviders.ts +0 -129
- package/lib/Auth/setEmailProvider.ts +0 -85
- package/lib/Auth/setupAuthRoutes.ts +0 -161
- package/lib/DBEventsManager.ts +0 -178
- package/lib/DBSchemaBuilder.ts +0 -225
- package/lib/DboBuilder/DboBuilder.ts +0 -319
- package/lib/DboBuilder/DboBuilderTypes.ts +0 -361
- package/lib/DboBuilder/QueryBuilder/Functions.ts +0 -1153
- package/lib/DboBuilder/QueryBuilder/QueryBuilder.ts +0 -288
- package/lib/DboBuilder/QueryBuilder/getJoinQuery.ts +0 -263
- package/lib/DboBuilder/QueryBuilder/getNewQuery.ts +0 -271
- package/lib/DboBuilder/QueryBuilder/getSelectQuery.ts +0 -136
- package/lib/DboBuilder/QueryBuilder/prepareHaving.ts +0 -22
- package/lib/DboBuilder/QueryStreamer.ts +0 -250
- package/lib/DboBuilder/TableHandler/DataValidator.ts +0 -428
- package/lib/DboBuilder/TableHandler/TableHandler.ts +0 -205
- package/lib/DboBuilder/TableHandler/delete.ts +0 -115
- package/lib/DboBuilder/TableHandler/insert.ts +0 -183
- package/lib/DboBuilder/TableHandler/insertTest.ts +0 -78
- package/lib/DboBuilder/TableHandler/onDeleteFromFileTable.ts +0 -62
- package/lib/DboBuilder/TableHandler/runInsertUpdateQuery.ts +0 -134
- package/lib/DboBuilder/TableHandler/update.ts +0 -126
- package/lib/DboBuilder/TableHandler/updateBatch.ts +0 -49
- package/lib/DboBuilder/TableHandler/updateFile.ts +0 -48
- package/lib/DboBuilder/TableHandler/upsert.ts +0 -34
- package/lib/DboBuilder/ViewHandler/ViewHandler.ts +0 -393
- package/lib/DboBuilder/ViewHandler/count.ts +0 -38
- package/lib/DboBuilder/ViewHandler/find.ts +0 -153
- package/lib/DboBuilder/ViewHandler/getExistsCondition.ts +0 -73
- package/lib/DboBuilder/ViewHandler/getExistsFilters.ts +0 -74
- package/lib/DboBuilder/ViewHandler/getInfo.ts +0 -32
- package/lib/DboBuilder/ViewHandler/getTableJoinQuery.ts +0 -84
- package/lib/DboBuilder/ViewHandler/parseComplexFilter.ts +0 -96
- package/lib/DboBuilder/ViewHandler/parseFieldFilter.ts +0 -105
- package/lib/DboBuilder/ViewHandler/parseJoinPath.ts +0 -208
- package/lib/DboBuilder/ViewHandler/prepareSortItems.ts +0 -163
- package/lib/DboBuilder/ViewHandler/prepareWhere.ts +0 -90
- package/lib/DboBuilder/ViewHandler/size.ts +0 -37
- package/lib/DboBuilder/ViewHandler/subscribe.ts +0 -118
- package/lib/DboBuilder/ViewHandler/validateViewRules.ts +0 -70
- package/lib/DboBuilder/dboBuilderUtils.ts +0 -222
- package/lib/DboBuilder/getColumns.ts +0 -114
- package/lib/DboBuilder/getCondition.ts +0 -201
- package/lib/DboBuilder/getSubscribeRelatedTables.ts +0 -190
- package/lib/DboBuilder/getTablesForSchemaPostgresSQL.ts +0 -426
- package/lib/DboBuilder/insertNestedRecords.ts +0 -355
- package/lib/DboBuilder/parseUpdateRules.ts +0 -187
- package/lib/DboBuilder/prepareShortestJoinPaths.ts +0 -186
- package/lib/DboBuilder/runSQL.ts +0 -182
- package/lib/DboBuilder/runTransaction.ts +0 -50
- package/lib/DboBuilder/sqlErrCodeToMsg.ts +0 -254
- package/lib/DboBuilder/uploadFile.ts +0 -69
- package/lib/Event_Trigger_Tags.ts +0 -118
- package/lib/FileManager/FileManager.ts +0 -358
- package/lib/FileManager/getValidatedFileType.ts +0 -69
- package/lib/FileManager/initFileManager.ts +0 -187
- package/lib/FileManager/upload.ts +0 -62
- package/lib/FileManager/uploadStream.ts +0 -79
- package/lib/Filtering.ts +0 -463
- package/lib/JSONBValidation/validate_jsonb_schema_sql.ts +0 -502
- package/lib/JSONBValidation/validation.ts +0 -143
- package/lib/Logging.ts +0 -127
- package/lib/PostgresNotifListenManager.ts +0 -143
- package/lib/Prostgles.ts +0 -485
- package/lib/ProstglesTypes.ts +0 -196
- package/lib/PubSubManager/PubSubManager.ts +0 -609
- package/lib/PubSubManager/addSub.ts +0 -138
- package/lib/PubSubManager/addSync.ts +0 -141
- package/lib/PubSubManager/getCreatePubSubManagerError.ts +0 -72
- package/lib/PubSubManager/getPubSubManagerInitQuery.ts +0 -662
- package/lib/PubSubManager/initPubSubManager.ts +0 -79
- package/lib/PubSubManager/notifListener.ts +0 -173
- package/lib/PubSubManager/orphanTriggerCheck.ts +0 -70
- package/lib/PubSubManager/pushSubData.ts +0 -55
- package/lib/PublishParser/PublishParser.ts +0 -162
- package/lib/PublishParser/getFileTableRules.ts +0 -124
- package/lib/PublishParser/getSchemaFromPublish.ts +0 -141
- package/lib/PublishParser/getTableRulesWithoutFileTable.ts +0 -177
- package/lib/PublishParser/publishTypesAndUtils.ts +0 -399
- package/lib/RestApi.ts +0 -127
- package/lib/SchemaWatch/SchemaWatch.ts +0 -90
- package/lib/SchemaWatch/createSchemaWatchEventTrigger.ts +0 -3
- package/lib/SchemaWatch/getValidatedWatchSchemaType.ts +0 -45
- package/lib/SchemaWatch/getWatchSchemaTagList.ts +0 -27
- package/lib/SyncReplication.ts +0 -557
- package/lib/TableConfig/TableConfig.ts +0 -468
- package/lib/TableConfig/getColumnDefinitionQuery.ts +0 -111
- package/lib/TableConfig/getConstraintDefinitionQueries.ts +0 -95
- package/lib/TableConfig/getFutureTableSchema.ts +0 -64
- package/lib/TableConfig/getPGIndexes.ts +0 -53
- package/lib/TableConfig/getTableColumnQueries.ts +0 -129
- package/lib/TableConfig/initTableConfig.ts +0 -326
- package/lib/index.ts +0 -13
- package/lib/initProstgles.ts +0 -319
- package/lib/onSocketConnected.ts +0 -102
- package/lib/runClientRequest.ts +0 -129
- package/lib/shortestPath.ts +0 -122
- package/lib/typeTests/DBoGenerated.d.ts +0 -320
- package/lib/typeTests/dboTypeCheck.ts +0 -81
- package/lib/utils.ts +0 -15
- package/tests/client/hooks.spec.ts +0 -205
- package/tests/client/index.ts +0 -139
- package/tests/client/package-lock.json +0 -637
- package/tests/client/package.json +0 -26
- package/tests/client/renderReactHook.ts +0 -177
- package/tests/client/tsconfig.json +0 -15
- package/tests/client/useProstgles.spec.ts +0 -120
- package/tests/clientFileTests.spec.ts +0 -102
- package/tests/clientOnlyQueries.spec.ts +0 -667
- package/tests/clientRestApi.spec.ts +0 -82
- package/tests/config_test/DBoGenerated.d.ts +0 -407
- package/tests/config_test/index.html +0 -109
- package/tests/config_test/index.js +0 -86
- package/tests/config_test/index.js.map +0 -1
- package/tests/config_test/index.ts +0 -91
- package/tests/config_test/init.sql +0 -48
- package/tests/config_test/package.json +0 -29
- package/tests/config_test/tsconfig.json +0 -23
- package/tests/config_testDBoGenerated.d.ts +0 -407
- package/tests/isomorphicQueries.spec.ts +0 -1493
- package/tests/server/DBoGenerated.d.ts +0 -537
- package/tests/server/index.html +0 -73
- package/tests/server/index.ts +0 -289
- package/tests/server/init.sql +0 -224
- package/tests/server/package-lock.json +0 -2164
- package/tests/server/package.json +0 -25
- package/tests/server/publishTypeCheck.ts +0 -136
- package/tests/server/server.ts +0 -35
- package/tests/server/testPublish.ts +0 -147
- package/tests/server/testTableConfig.ts +0 -156
- package/tests/server/tsconfig.json +0 -22
- package/tests/serverOnlyQueries.spec.ts +0 -32
- package/tests/test.sh +0 -20
package/dist/Auth/AuthTypes.d.ts
CHANGED
|
@@ -96,7 +96,7 @@ type EmailProvider = {
|
|
|
96
96
|
/**
|
|
97
97
|
* Defaults to 8
|
|
98
98
|
*/
|
|
99
|
-
minPasswordLength
|
|
99
|
+
minPasswordLength?: number;
|
|
100
100
|
/**
|
|
101
101
|
* If provided, the user will be required to confirm their email address
|
|
102
102
|
*/
|
|
@@ -107,7 +107,7 @@ type EmailProvider = {
|
|
|
107
107
|
}) => EmailWithoutTo | Promise<EmailWithoutTo>;
|
|
108
108
|
smtp: SMTPConfig;
|
|
109
109
|
onConfirmed: (data: {
|
|
110
|
-
|
|
110
|
+
confirmationCode: string;
|
|
111
111
|
}) => void | Promise<void>;
|
|
112
112
|
};
|
|
113
113
|
};
|
|
@@ -146,14 +146,10 @@ export type AuthRegistrationConfig<S> = {
|
|
|
146
146
|
* Required for social login callback
|
|
147
147
|
*/
|
|
148
148
|
websiteUrl: string;
|
|
149
|
-
/**
|
|
150
|
-
* Do something with the registered user
|
|
151
|
-
*/
|
|
152
|
-
onRegister: (data: RegistrationData) => void | Promise<any>;
|
|
153
149
|
/**
|
|
154
150
|
* Used to stop abuse
|
|
155
151
|
*/
|
|
156
|
-
onProviderLoginStart
|
|
152
|
+
onProviderLoginStart?: (data: {
|
|
157
153
|
provider: IdentityProvider;
|
|
158
154
|
dbo: DBOFullyTyped<S>;
|
|
159
155
|
db: DB;
|
|
@@ -168,7 +164,7 @@ export type AuthRegistrationConfig<S> = {
|
|
|
168
164
|
/**
|
|
169
165
|
* Used to identify abuse
|
|
170
166
|
*/
|
|
171
|
-
onProviderLoginFail
|
|
167
|
+
onProviderLoginFail?: (data: {
|
|
172
168
|
provider: IdentityProvider;
|
|
173
169
|
error: any;
|
|
174
170
|
dbo: DBOFullyTyped<S>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthTypes.d.ts","sourceRoot":"","sources":["../../lib/Auth/AuthTypes.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"AuthTypes.d.ts","sourceRoot":"","sources":["../../lib/Auth/AuthTypes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setAuthProviders.d.ts","sourceRoot":"","sources":["../../lib/Auth/setAuthProviders.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAKzC,OAAO,EAAE,gBAAgB,EAA6B,MAAM,iBAAiB,CAAC;AAG9E,OAAO,EAA0B,WAAW,EAAsB,MAAM,eAAe,CAAC;AACxF,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAKnC,eAAO,MAAM,4BAA4B,QAAS,SAAS,WAAW,cAAc,QAAQ,MAAM,SAKjG,CAAA;AAED,wBAAsB,gBAAgB,CAAE,IAAI,EAAE,WAAW,EAAE,EAAE,aAAa,EAAE,GAAG,EAAE,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,eAAe,CAAC,
|
|
1
|
+
{"version":3,"file":"setAuthProviders.d.ts","sourceRoot":"","sources":["../../lib/Auth/setAuthProviders.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAKzC,OAAO,EAAE,gBAAgB,EAA6B,MAAM,iBAAiB,CAAC;AAG9E,OAAO,EAA0B,WAAW,EAAsB,MAAM,eAAe,CAAC;AACxF,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAKnC,eAAO,MAAM,4BAA4B,QAAS,SAAS,WAAW,cAAc,QAAQ,MAAM,SAKjG,CAAA;AAED,wBAAsB,gBAAgB,CAAE,IAAI,EAAE,WAAW,EAAE,EAAE,aAAa,EAAE,GAAG,EAAE,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,eAAe,CAAC,iBAuFjH;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,WAAW,GAAG,gBAAgB,CAAC,WAAW,CAAC,GAAG,SAAS,CAgBzF"}
|
|
@@ -22,7 +22,7 @@ exports.upsertNamedExpressMiddleware = upsertNamedExpressMiddleware;
|
|
|
22
22
|
async function setAuthProviders({ registrations, app }) {
|
|
23
23
|
if (!registrations)
|
|
24
24
|
return;
|
|
25
|
-
const {
|
|
25
|
+
const { onProviderLoginFail, onProviderLoginStart, websiteUrl, OAuthProviders } = registrations;
|
|
26
26
|
await setEmailProvider_1.setEmailProvider.bind(this)(app);
|
|
27
27
|
if (!OAuthProviders || (0, prostgles_types_1.isEmpty)(OAuthProviders)) {
|
|
28
28
|
return;
|
|
@@ -44,7 +44,6 @@ async function setAuthProviders({ registrations, app }) {
|
|
|
44
44
|
callbackURL: `${websiteUrl}${callbackPath}`,
|
|
45
45
|
}, async (accessToken, refreshToken, profile, done) => {
|
|
46
46
|
// This callback is where you would normally store or retrieve user info from the database
|
|
47
|
-
await onRegister({ provider: providerName, accessToken, refreshToken, profile });
|
|
48
47
|
return done(null, profile, { accessToken, refreshToken, profile });
|
|
49
48
|
}));
|
|
50
49
|
app.get(`${AuthHandler_1.AUTH_ROUTES_AND_PARAMS.loginWithProvider}/${providerName}`, passport.authenticate(providerName, authOpts ?? {}));
|
|
@@ -54,8 +53,8 @@ async function setAuthProviders({ registrations, app }) {
|
|
|
54
53
|
const db = this.db;
|
|
55
54
|
const dbo = this.dbo;
|
|
56
55
|
const args = { provider: providerName, req, res, clientInfo, db, dbo };
|
|
57
|
-
const startCheck = await onProviderLoginStart(args);
|
|
58
|
-
if ("error" in startCheck) {
|
|
56
|
+
const startCheck = await onProviderLoginStart?.(args);
|
|
57
|
+
if (startCheck && "error" in startCheck) {
|
|
59
58
|
res.status(500).json({ error: startCheck.error });
|
|
60
59
|
return;
|
|
61
60
|
}
|
|
@@ -65,7 +64,7 @@ async function setAuthProviders({ registrations, app }) {
|
|
|
65
64
|
failWithError: true,
|
|
66
65
|
}, async (error, _profile, authInfo) => {
|
|
67
66
|
if (error) {
|
|
68
|
-
await onProviderLoginFail({ ...args, error });
|
|
67
|
+
await onProviderLoginFail?.({ ...args, error });
|
|
69
68
|
res.status(500).json({
|
|
70
69
|
error: "Failed to login with provider",
|
|
71
70
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setAuthProviders.js","sourceRoot":"","sources":["../../lib/Auth/setAuthProviders.ts"],"names":[],"mappings":";;;AAEA,yDAAiE;AACjE,uDAA8D;AAC9D,qEAAqE;AACrE,2DAAmE;AACnE,qDAA8E;AAC9E,mEAAiE;AACjE,4DAAsE;AACtE,+CAAwF;AAExF,yDAAsD;AACtD,iDAAiD;AACjD,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAA8B,CAAC;AAE3D,MAAM,4BAA4B,GAAG,CAAC,GAAc,EAAE,OAAuB,EAAE,IAAY,EAAE,EAAE;IACpG,MAAM,QAAQ,GAAG,IAAI,CAAC;IACtB,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC5D,IAAA,sCAAwB,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACpC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACnB,CAAC,CAAA;AALY,QAAA,4BAA4B,gCAKxC;AAEM,KAAK,UAAU,gBAAgB,CAAqB,EAAE,aAAa,EAAE,GAAG,EAAmC;IAChH,IAAG,CAAC,aAAa;QAAE,OAAO;IAC1B,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"setAuthProviders.js","sourceRoot":"","sources":["../../lib/Auth/setAuthProviders.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,7 +57,7 @@ async function setEmailProvider(app) {
|
|
|
57
57
|
app.get(AuthHandler_1.AUTH_ROUTES_AND_PARAMS.confirmEmailExpressRoute, async (req, res) => {
|
|
58
58
|
const { id } = req.params ?? {};
|
|
59
59
|
try {
|
|
60
|
-
await email.emailConfirmation?.onConfirmed({
|
|
60
|
+
await email.emailConfirmation?.onConfirmed({ confirmationCode: id });
|
|
61
61
|
res.json({ msg: "Email confirmed" });
|
|
62
62
|
}
|
|
63
63
|
catch (_e) {
|
|
@@ -68,9 +68,9 @@ async function setEmailProvider(app) {
|
|
|
68
68
|
}
|
|
69
69
|
exports.setEmailProvider = setEmailProvider;
|
|
70
70
|
const checkDmarc = async (websiteUrl) => {
|
|
71
|
-
const { host } = new URL(websiteUrl);
|
|
71
|
+
const { host, hostname } = new URL(websiteUrl);
|
|
72
72
|
const ignoredHosts = ["localhost", "127.0.0.1"];
|
|
73
|
-
if (!
|
|
73
|
+
if (!hostname || ignoredHosts.includes(hostname)) {
|
|
74
74
|
return;
|
|
75
75
|
}
|
|
76
76
|
const dmarc = await node_dns_1.promises.resolveTxt(`_dmarc.${host}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setEmailProvider.js","sourceRoot":"","sources":["../../lib/Auth/setEmailProvider.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"setEmailProvider.js","sourceRoot":"","sources":["../../lib/Auth/setEmailProvider.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/lib/Auth/AuthHandler.ts
DELETED
|
@@ -1,436 +0,0 @@
|
|
|
1
|
-
import { AnyObject, AuthGuardLocation, AuthGuardLocationResponse, CHANNELS, AuthSocketSchema } from "prostgles-types";
|
|
2
|
-
import { LocalParams, PRGLIOSocket } from "../DboBuilder/DboBuilder";
|
|
3
|
-
import { DBOFullyTyped } from "../DBSchemaBuilder";
|
|
4
|
-
import { removeExpressRoute } from "../FileManager/FileManager";
|
|
5
|
-
import { DB, DBHandlerServer, Prostgles } from "../Prostgles";
|
|
6
|
-
import { Auth, AuthClientRequest, AuthResult, BasicSession, ExpressReq, ExpressRes, LoginClientInfo, LoginParams } from "./AuthTypes"
|
|
7
|
-
import { getSafeReturnURL } from "./getSafeReturnURL";
|
|
8
|
-
import { setupAuthRoutes } from "./setupAuthRoutes";
|
|
9
|
-
import { getProviders } from "./setAuthProviders";
|
|
10
|
-
|
|
11
|
-
export const HTTPCODES = {
|
|
12
|
-
AUTH_ERROR: 401,
|
|
13
|
-
NOT_FOUND: 404,
|
|
14
|
-
BAD_REQUEST: 400,
|
|
15
|
-
INTERNAL_SERVER_ERROR: 500,
|
|
16
|
-
};
|
|
17
|
-
|
|
18
|
-
export const getLoginClientInfo = (req: AuthClientRequest): AuthClientRequest & LoginClientInfo => {
|
|
19
|
-
if("httpReq" in req){
|
|
20
|
-
const ip_address = req.httpReq.ip;
|
|
21
|
-
if(!ip_address) throw new Error("ip_address missing from req.httpReq");
|
|
22
|
-
const user_agent = req.httpReq.headers["user-agent"];
|
|
23
|
-
return {
|
|
24
|
-
...req,
|
|
25
|
-
ip_address,
|
|
26
|
-
ip_address_remote: req.httpReq.connection.remoteAddress,
|
|
27
|
-
x_real_ip: req.httpReq.headers['x-real-ip'] as any,
|
|
28
|
-
user_agent,
|
|
29
|
-
};
|
|
30
|
-
} else {
|
|
31
|
-
return {
|
|
32
|
-
...req,
|
|
33
|
-
ip_address: req.socket.handshake.address,
|
|
34
|
-
ip_address_remote: req.socket.request.connection.remoteAddress,
|
|
35
|
-
x_real_ip: req.socket.handshake.headers?.["x-real-ip"],
|
|
36
|
-
user_agent: req.socket.handshake.headers?.['user-agent'],
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
|
-
}
|
|
40
|
-
|
|
41
|
-
export const AUTH_ROUTES_AND_PARAMS = {
|
|
42
|
-
login: "/login",
|
|
43
|
-
loginWithProvider: "/auth",
|
|
44
|
-
emailSignup: "/register",
|
|
45
|
-
returnUrlParamName: "returnURL",
|
|
46
|
-
sidKeyName: "session_id",
|
|
47
|
-
logoutGetPath: "/logout",
|
|
48
|
-
magicLinksRoute: "/magic-link",
|
|
49
|
-
magicLinksExpressRoute: "/magic-link/:id",
|
|
50
|
-
confirmEmail: "/confirm-email",
|
|
51
|
-
confirmEmailExpressRoute: "/confirm-email/:id",
|
|
52
|
-
catchAll: "*",
|
|
53
|
-
} as const;
|
|
54
|
-
|
|
55
|
-
export class AuthHandler {
|
|
56
|
-
protected prostgles: Prostgles;
|
|
57
|
-
protected opts?: Auth;
|
|
58
|
-
dbo: DBHandlerServer;
|
|
59
|
-
db: DB;
|
|
60
|
-
|
|
61
|
-
constructor(prostgles: Prostgles) {
|
|
62
|
-
this.prostgles = prostgles;
|
|
63
|
-
this.opts = prostgles.opts.auth as any;
|
|
64
|
-
if(!prostgles.dbo || !prostgles.db) throw "dbo or db missing";
|
|
65
|
-
this.dbo = prostgles.dbo;
|
|
66
|
-
this.db = prostgles.db;
|
|
67
|
-
}
|
|
68
|
-
|
|
69
|
-
get sidKeyName() {
|
|
70
|
-
return this.opts?.sidKeyName ?? AUTH_ROUTES_AND_PARAMS.sidKeyName;
|
|
71
|
-
}
|
|
72
|
-
|
|
73
|
-
validateSid = (sid: string | undefined) => {
|
|
74
|
-
if (!sid) return undefined;
|
|
75
|
-
if (typeof sid !== "string") throw "sid missing or not a string";
|
|
76
|
-
return sid;
|
|
77
|
-
}
|
|
78
|
-
|
|
79
|
-
matchesRoute = (route: string | undefined, clientFullRoute: string) => {
|
|
80
|
-
return route && clientFullRoute && (
|
|
81
|
-
route === clientFullRoute ||
|
|
82
|
-
clientFullRoute.startsWith(route) && ["/", "?", "#"].includes(clientFullRoute[route.length] ?? "")
|
|
83
|
-
)
|
|
84
|
-
}
|
|
85
|
-
|
|
86
|
-
isUserRoute = (pathname: string) => {
|
|
87
|
-
const { login, logoutGetPath, magicLinksRoute, loginWithProvider } = AUTH_ROUTES_AND_PARAMS;
|
|
88
|
-
const pubRoutes = [
|
|
89
|
-
...this.opts?.expressConfig?.publicRoutes || [],
|
|
90
|
-
login, logoutGetPath, magicLinksRoute, loginWithProvider,
|
|
91
|
-
].filter(publicRoute => publicRoute);
|
|
92
|
-
|
|
93
|
-
return !pubRoutes.some(publicRoute => {
|
|
94
|
-
return this.matchesRoute(publicRoute, pathname);
|
|
95
|
-
});
|
|
96
|
-
}
|
|
97
|
-
|
|
98
|
-
setCookieAndGoToReturnURLIFSet = (cookie: { sid: string; expires: number; }, r: { req: ExpressReq; res: ExpressRes }) => {
|
|
99
|
-
const { sid, expires } = cookie;
|
|
100
|
-
const { res, req } = r;
|
|
101
|
-
if (sid) {
|
|
102
|
-
const maxAgeOneDay = 60 * 60 * 24; // 24 hours;
|
|
103
|
-
type CD = { maxAge: number } | { expires: Date }
|
|
104
|
-
let cookieDuration: CD = {
|
|
105
|
-
maxAge: maxAgeOneDay
|
|
106
|
-
}
|
|
107
|
-
if(expires && Number.isFinite(expires) && !isNaN(+ new Date(expires))){
|
|
108
|
-
// const maxAge = (+new Date(expires)) - Date.now();
|
|
109
|
-
cookieDuration = { expires: new Date(expires) };
|
|
110
|
-
const days = (+cookieDuration.expires - Date.now())/(24 * 60 * 60e3);
|
|
111
|
-
if(days >= 400){
|
|
112
|
-
console.warn(`Cookie expiration is higher than the Chrome 400 day limit: ${days}days`)
|
|
113
|
-
}
|
|
114
|
-
}
|
|
115
|
-
|
|
116
|
-
const cookieOpts = {
|
|
117
|
-
...cookieDuration,
|
|
118
|
-
httpOnly: true, // The cookie only accessible by the web server
|
|
119
|
-
//signed: true // Indicates if the cookie should be signed
|
|
120
|
-
secure: true,
|
|
121
|
-
sameSite: "strict" as const,
|
|
122
|
-
...(this.opts?.expressConfig?.cookieOptions || {})
|
|
123
|
-
};
|
|
124
|
-
const cookieData = sid;
|
|
125
|
-
res.cookie(this.sidKeyName, cookieData, cookieOpts);
|
|
126
|
-
const successURL = this.getReturnUrl(req) || "/";
|
|
127
|
-
res.redirect(successURL);
|
|
128
|
-
|
|
129
|
-
} else {
|
|
130
|
-
throw ("no user or session")
|
|
131
|
-
}
|
|
132
|
-
}
|
|
133
|
-
|
|
134
|
-
getUser = async (clientReq: { httpReq: ExpressReq; }): Promise<AuthResult> => {
|
|
135
|
-
if(!this.opts?.getUser) {
|
|
136
|
-
throw "this.opts.getUser missing";
|
|
137
|
-
}
|
|
138
|
-
const sid = clientReq.httpReq?.cookies?.[this.sidKeyName];
|
|
139
|
-
if (!sid) return undefined;
|
|
140
|
-
|
|
141
|
-
try {
|
|
142
|
-
return this.throttledFunc(async () => {
|
|
143
|
-
return this.opts!.getUser(this.validateSid(sid), this.dbo as any, this.db, getLoginClientInfo(clientReq));
|
|
144
|
-
}, 50)
|
|
145
|
-
} catch (err) {
|
|
146
|
-
console.error(err);
|
|
147
|
-
}
|
|
148
|
-
return undefined;
|
|
149
|
-
}
|
|
150
|
-
|
|
151
|
-
init = setupAuthRoutes.bind(this);
|
|
152
|
-
|
|
153
|
-
getReturnUrl = (req: ExpressReq) => {
|
|
154
|
-
const { returnUrlParamName } = AUTH_ROUTES_AND_PARAMS;
|
|
155
|
-
if (returnUrlParamName && req?.query?.[returnUrlParamName]) {
|
|
156
|
-
const returnURL = decodeURIComponent(req?.query?.[returnUrlParamName] as string);
|
|
157
|
-
|
|
158
|
-
return getSafeReturnURL(returnURL, returnUrlParamName);
|
|
159
|
-
}
|
|
160
|
-
return null;
|
|
161
|
-
}
|
|
162
|
-
|
|
163
|
-
destroy = () => {
|
|
164
|
-
const app = this.opts?.expressConfig?.app;
|
|
165
|
-
const { login, logoutGetPath, magicLinksExpressRoute, catchAll, loginWithProvider, emailSignup, magicLinksRoute, confirmEmail, confirmEmailExpressRoute } = AUTH_ROUTES_AND_PARAMS;
|
|
166
|
-
removeExpressRoute(app, [login, logoutGetPath, magicLinksExpressRoute, catchAll, loginWithProvider, emailSignup, magicLinksRoute, confirmEmail, confirmEmailExpressRoute]);
|
|
167
|
-
}
|
|
168
|
-
|
|
169
|
-
throttledFunc = <T>(func: () => Promise<T>, throttle = 500): Promise<T> => {
|
|
170
|
-
|
|
171
|
-
return new Promise(async (resolve, reject) => {
|
|
172
|
-
|
|
173
|
-
let result: any, error: any, finished = false;
|
|
174
|
-
|
|
175
|
-
/**
|
|
176
|
-
* Throttle reject response times to prevent timing attacks
|
|
177
|
-
*/
|
|
178
|
-
const interval = setInterval(() => {
|
|
179
|
-
if (finished) {
|
|
180
|
-
clearInterval(interval);
|
|
181
|
-
if (error) {
|
|
182
|
-
reject(error);
|
|
183
|
-
} else {
|
|
184
|
-
resolve(result)
|
|
185
|
-
}
|
|
186
|
-
}
|
|
187
|
-
}, throttle);
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
try {
|
|
191
|
-
result = await func();
|
|
192
|
-
resolve(result);
|
|
193
|
-
clearInterval(interval);
|
|
194
|
-
} catch (err) {
|
|
195
|
-
console.log(err)
|
|
196
|
-
error = err;
|
|
197
|
-
}
|
|
198
|
-
|
|
199
|
-
finished = true;
|
|
200
|
-
})
|
|
201
|
-
}
|
|
202
|
-
|
|
203
|
-
loginThrottled = async (params: LoginParams, client: LoginClientInfo): Promise<BasicSession> => {
|
|
204
|
-
if (!this.opts?.login) throw "Auth login config missing";
|
|
205
|
-
const { responseThrottle = 500 } = this.opts;
|
|
206
|
-
|
|
207
|
-
return this.throttledFunc(async () => {
|
|
208
|
-
const result = await this.opts?.login?.(params, this.dbo as DBOFullyTyped, this.db, client);
|
|
209
|
-
const err = {
|
|
210
|
-
msg: "Bad login result type. \nExpecting: undefined | null | { sid: string; expires: number } but got: " + JSON.stringify(result)
|
|
211
|
-
}
|
|
212
|
-
|
|
213
|
-
if(!result) throw err;
|
|
214
|
-
if(result && (typeof result.sid !== "string" || typeof result.expires !== "number") || !result && ![undefined, null].includes(result)) {
|
|
215
|
-
throw err
|
|
216
|
-
}
|
|
217
|
-
if(result && result.expires < Date.now()){
|
|
218
|
-
throw { msg: "auth.login() is returning an expired session. Can only login with a session.expires greater than Date.now()" }
|
|
219
|
-
}
|
|
220
|
-
|
|
221
|
-
return result;
|
|
222
|
-
}, responseThrottle);
|
|
223
|
-
|
|
224
|
-
};
|
|
225
|
-
|
|
226
|
-
loginThrottledAndSetCookie = async (req: ExpressReq, res: ExpressRes, loginParams: LoginParams) => {
|
|
227
|
-
const start = Date.now();
|
|
228
|
-
const { sid, expires } = await this.loginThrottled(loginParams, getLoginClientInfo({ httpReq: req })) || {};
|
|
229
|
-
await this.prostgles.opts.onLog?.({
|
|
230
|
-
type: "auth",
|
|
231
|
-
command: "login",
|
|
232
|
-
duration: Date.now() - start,
|
|
233
|
-
sid,
|
|
234
|
-
socketId: undefined,
|
|
235
|
-
});
|
|
236
|
-
|
|
237
|
-
if (sid) {
|
|
238
|
-
|
|
239
|
-
this.setCookieAndGoToReturnURLIFSet({ sid, expires }, { req, res });
|
|
240
|
-
|
|
241
|
-
} else {
|
|
242
|
-
throw ("Internal error: no user or session")
|
|
243
|
-
}
|
|
244
|
-
}
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
/**
|
|
248
|
-
* Will return first sid value found in:
|
|
249
|
-
* Bearer header
|
|
250
|
-
* http cookie
|
|
251
|
-
* query params
|
|
252
|
-
* Based on sid names in auth
|
|
253
|
-
*/
|
|
254
|
-
getSID(localParams: LocalParams): string | undefined {
|
|
255
|
-
if (!this.opts) return undefined;
|
|
256
|
-
|
|
257
|
-
if (!localParams) return undefined;
|
|
258
|
-
const { sidKeyName } = this;
|
|
259
|
-
if (localParams.socket) {
|
|
260
|
-
const { handshake } = localParams.socket;
|
|
261
|
-
const querySid = handshake?.auth?.[sidKeyName] || handshake?.query?.[sidKeyName];
|
|
262
|
-
let rawSid = querySid;
|
|
263
|
-
if (!rawSid) {
|
|
264
|
-
const cookie_str = localParams.socket?.handshake?.headers?.cookie;
|
|
265
|
-
const cookie = parseCookieStr(cookie_str);
|
|
266
|
-
rawSid = cookie[sidKeyName];
|
|
267
|
-
}
|
|
268
|
-
return this.validateSid(rawSid);
|
|
269
|
-
|
|
270
|
-
} else if (localParams.httpReq) {
|
|
271
|
-
const [tokenType, base64Token] = localParams.httpReq.headers.authorization?.split(' ') ?? [];
|
|
272
|
-
let bearerSid: string | undefined;
|
|
273
|
-
if(tokenType && base64Token){
|
|
274
|
-
if(tokenType.trim() !== "Bearer"){
|
|
275
|
-
throw "Only Bearer Authorization header allowed";
|
|
276
|
-
}
|
|
277
|
-
bearerSid = Buffer.from(base64Token, 'base64').toString();
|
|
278
|
-
}
|
|
279
|
-
return this.validateSid(bearerSid ?? localParams.httpReq?.cookies?.[sidKeyName]);
|
|
280
|
-
|
|
281
|
-
} else throw "socket OR httpReq missing from localParams";
|
|
282
|
-
|
|
283
|
-
function parseCookieStr(cookie_str: string | undefined): any {
|
|
284
|
-
if (!cookie_str || typeof cookie_str !== "string") {
|
|
285
|
-
return {}
|
|
286
|
-
}
|
|
287
|
-
|
|
288
|
-
return cookie_str.replace(/\s/g, '')
|
|
289
|
-
.split(";")
|
|
290
|
-
.reduce<AnyObject>((prev, current) => {
|
|
291
|
-
const [name, value] = current.split('=');
|
|
292
|
-
prev[name!] = value;
|
|
293
|
-
return prev;
|
|
294
|
-
}, {});
|
|
295
|
-
}
|
|
296
|
-
}
|
|
297
|
-
|
|
298
|
-
/**
|
|
299
|
-
* Used for logging
|
|
300
|
-
*/
|
|
301
|
-
getSIDNoError = (localParams: LocalParams | undefined): string | undefined => {
|
|
302
|
-
if(!localParams) return undefined;
|
|
303
|
-
try {
|
|
304
|
-
return this.getSID(localParams);
|
|
305
|
-
} catch {
|
|
306
|
-
return undefined;
|
|
307
|
-
}
|
|
308
|
-
}
|
|
309
|
-
|
|
310
|
-
async getClientInfo(localParams: Pick<LocalParams, "socket" | "httpReq">): Promise<AuthResult> {
|
|
311
|
-
if (!this.opts) return {};
|
|
312
|
-
|
|
313
|
-
const getSession = this.opts.cacheSession?.getSession;
|
|
314
|
-
const isSocket = "socket" in localParams;
|
|
315
|
-
if(isSocket){
|
|
316
|
-
if(getSession && localParams.socket?.__prglCache){
|
|
317
|
-
const { session, user, clientUser } = localParams.socket.__prglCache;
|
|
318
|
-
const isValid = this.isValidSocketSession(localParams.socket, session)
|
|
319
|
-
if(isValid){
|
|
320
|
-
|
|
321
|
-
return {
|
|
322
|
-
sid: session.sid,
|
|
323
|
-
user,
|
|
324
|
-
clientUser,
|
|
325
|
-
}
|
|
326
|
-
} else return {
|
|
327
|
-
sid: session.sid
|
|
328
|
-
};
|
|
329
|
-
}
|
|
330
|
-
}
|
|
331
|
-
|
|
332
|
-
const authStart = Date.now();
|
|
333
|
-
const res = await this.throttledFunc(async () => {
|
|
334
|
-
|
|
335
|
-
const { getUser } = this.opts ?? {};
|
|
336
|
-
|
|
337
|
-
if (getUser && localParams && (localParams.httpReq || localParams.socket)) {
|
|
338
|
-
const sid = this.getSID(localParams);
|
|
339
|
-
const clientReq = localParams.httpReq? { httpReq: localParams.httpReq } : { socket: localParams.socket! };
|
|
340
|
-
let user, clientUser;
|
|
341
|
-
if(sid){
|
|
342
|
-
const res = await getUser(sid, this.dbo as any, this.db, getLoginClientInfo(clientReq)) as any;
|
|
343
|
-
user = res?.user;
|
|
344
|
-
clientUser = res?.clientUser;
|
|
345
|
-
}
|
|
346
|
-
if(getSession && isSocket){
|
|
347
|
-
const session = await getSession(sid, this.dbo as any, this.db)
|
|
348
|
-
if(session?.expires && user && clientUser && localParams.socket){
|
|
349
|
-
localParams.socket.__prglCache = {
|
|
350
|
-
session,
|
|
351
|
-
user,
|
|
352
|
-
clientUser,
|
|
353
|
-
}
|
|
354
|
-
}
|
|
355
|
-
}
|
|
356
|
-
if(sid) {
|
|
357
|
-
return { sid, user, clientUser }
|
|
358
|
-
}
|
|
359
|
-
}
|
|
360
|
-
|
|
361
|
-
return {};
|
|
362
|
-
}, 5);
|
|
363
|
-
|
|
364
|
-
await this.prostgles.opts.onLog?.({
|
|
365
|
-
type: "auth",
|
|
366
|
-
command: "getClientInfo",
|
|
367
|
-
duration: Date.now() - authStart,
|
|
368
|
-
sid: res.sid,
|
|
369
|
-
socketId: localParams.socket?.id,
|
|
370
|
-
});
|
|
371
|
-
return res;
|
|
372
|
-
}
|
|
373
|
-
|
|
374
|
-
isValidSocketSession = (socket: PRGLIOSocket, session: BasicSession): boolean => {
|
|
375
|
-
const hasExpired = Boolean(session && session.expires <= Date.now())
|
|
376
|
-
if(this.opts?.expressConfig?.publicRoutes && !this.opts.expressConfig?.disableSocketAuthGuard){
|
|
377
|
-
const error = "Session has expired";
|
|
378
|
-
if(hasExpired){
|
|
379
|
-
if(session.onExpiration === "redirect")
|
|
380
|
-
socket.emit(CHANNELS.AUTHGUARD, {
|
|
381
|
-
shouldReload: session.onExpiration === "redirect",
|
|
382
|
-
error
|
|
383
|
-
});
|
|
384
|
-
throw error;
|
|
385
|
-
}
|
|
386
|
-
}
|
|
387
|
-
return Boolean(session && !hasExpired);
|
|
388
|
-
}
|
|
389
|
-
|
|
390
|
-
getClientAuth = async (clientReq: Pick<LocalParams, "socket" | "httpReq">): Promise<{ auth: AuthSocketSchema; userData: AuthResult; }> => {
|
|
391
|
-
|
|
392
|
-
let pathGuard = false;
|
|
393
|
-
if (this.opts?.expressConfig?.publicRoutes && !this.opts.expressConfig?.disableSocketAuthGuard) {
|
|
394
|
-
|
|
395
|
-
pathGuard = true;
|
|
396
|
-
|
|
397
|
-
if("socket" in clientReq && clientReq.socket){
|
|
398
|
-
const { socket } = clientReq;
|
|
399
|
-
socket.removeAllListeners(CHANNELS.AUTHGUARD)
|
|
400
|
-
socket.on(CHANNELS.AUTHGUARD, async (params: AuthGuardLocation, cb = (_err: any, _res?: AuthGuardLocationResponse) => { /** EMPTY */ }) => {
|
|
401
|
-
|
|
402
|
-
try {
|
|
403
|
-
|
|
404
|
-
const { pathname, origin } = typeof params === "string" ? JSON.parse(params) : (params || {});
|
|
405
|
-
if (pathname && typeof pathname !== "string") {
|
|
406
|
-
console.warn("Invalid pathname provided for AuthGuardLocation: ", pathname);
|
|
407
|
-
}
|
|
408
|
-
|
|
409
|
-
/** These origins */
|
|
410
|
-
const IGNORED_API_ORIGINS = ["file://"]
|
|
411
|
-
if (!IGNORED_API_ORIGINS.includes(origin) && pathname && typeof pathname === "string" && this.isUserRoute(pathname) && !(await this.getClientInfo({ socket }))?.user) {
|
|
412
|
-
cb(null, { shouldReload: true });
|
|
413
|
-
} else {
|
|
414
|
-
cb(null, { shouldReload: false });
|
|
415
|
-
}
|
|
416
|
-
|
|
417
|
-
} catch (err) {
|
|
418
|
-
console.error("AUTHGUARD err: ", err);
|
|
419
|
-
cb(err)
|
|
420
|
-
}
|
|
421
|
-
});
|
|
422
|
-
|
|
423
|
-
}
|
|
424
|
-
}
|
|
425
|
-
|
|
426
|
-
const userData = await this.getClientInfo(clientReq);
|
|
427
|
-
const auth: AuthSocketSchema = {
|
|
428
|
-
providers: getProviders.bind(this)(),
|
|
429
|
-
register: this.opts?.expressConfig?.registrations?.email && { type: this.opts?.expressConfig?.registrations?.email.signupType, url: AUTH_ROUTES_AND_PARAMS.emailSignup },
|
|
430
|
-
user: userData?.clientUser,
|
|
431
|
-
loginType: this.opts?.expressConfig?.registrations?.email?.signupType,
|
|
432
|
-
pathGuard,
|
|
433
|
-
};
|
|
434
|
-
return { auth, userData };
|
|
435
|
-
}
|
|
436
|
-
}
|