prostgles-server 4.2.187 → 4.2.188

package/lib/runClientRequest.ts

@@ -1,10 +1,4 @@
-import {
-  AnyObject,
-  TableHandler,
-  UserLike,
-  getKeys,
-  pickKeys,
-} from "prostgles-types";
+import { AnyObject, TableHandler, UserLike, getKeys, pickKeys } from "prostgles-types";
 import { ExpressReq } from "./Auth/AuthTypes";
 import { LocalParams, PRGLIOSocket } from "./DboBuilder/DboBuilder";
 import { parseFieldFilter } from "./DboBuilder/ViewHandler/parseFieldFilter";
@@ -47,10 +41,7 @@ const TABLE_METHODS = {
   getColumns: 1,
   getInfo: 1,
   sync: 1,
-} as const satisfies Record<
-  keyof (TableHandler & Pick<TableHandlerServer, "sync">),
-  1
->;
+} as const satisfies Record<keyof (TableHandler & Pick<TableHandlerServer, "sync">), 1>;
 
 const TABLE_METHODS_KEYS = getKeys(TABLE_METHODS);
 const SOCKET_ONLY_COMMANDS = [
@@ -79,36 +70,29 @@ type TableMethodFunctionWithRulesAndLocalParams = (
   arg2: any,
   arg3: any,
   tableRule: TableRule,
-  localParams: LocalParams,
+  localParams: LocalParams
 ) => any;
 
 export const runClientRequest = async function (this: Prostgles, args: Args) {
   /* Channel name will only include client-sent params so we ignore table_rules enforced params */
   if (
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
     (args.type === "socket" && !args.socket) ||
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
     (args.type === "http" && !args.httpReq) ||
-    !this.authHandler ||
+    // !this.authHandler ||
     !this.publishParser ||
     !this.dbo
   ) {
     throw "socket/httpReq or authhandler missing";
   }
 
-  const {
-    tableName,
-    command: nonValidatedCommand,
-    param1,
-    param2,
-    param3,
-  } = args;
+  const { tableName, command: nonValidatedCommand, param1, param2, param3 } = args;
   if (!TABLE_METHODS_KEYS.some((v) => v === nonValidatedCommand)) {
     throw `Invalid command: ${nonValidatedCommand}. Expecting one of: ${TABLE_METHODS_KEYS};`;
   }
   const command = nonValidatedCommand as keyof TableHandler;
-  if (
-    args.type !== "socket" &&
-    SOCKET_ONLY_COMMANDS.some((v) => v === command)
-  ) {
+  if (args.type !== "socket" && SOCKET_ONLY_COMMANDS.some((v) => v === command)) {
     throw (
       "The following commands cannot be completed over a non-websocket connection: " +
       SOCKET_ONLY_COMMANDS
@@ -116,22 +100,25 @@ export const runClientRequest = async function (this: Prostgles, args: Args) {
   }
 
   const reqInfo = getReqInfoClient(args);
-  const clientInfo = await this.authHandler.getClientInfo(args);
+  const clientInfo = await this.authHandler?.getClientInfo(args);
   const validRules = await this.publishParser.getValidatedRequestRule(
     { tableName, command, localParams: reqInfo },
-    clientInfo,
+    clientInfo
   );
+
+  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
   if (!validRules) {
     throw `Invalid OR disallowed request: ${tableName}.${command} `;
   }
 
-  const sessionUser: UserLike | undefined = !clientInfo?.user
-    ? undefined
+  const sessionUser: UserLike | undefined =
+    !clientInfo?.user ?
+      undefined
     : {
         ...parseFieldFilter(
           clientInfo.sessionFields ?? ([] as any),
           false,
-          Object.keys(clientInfo.user),
+          Object.keys(clientInfo.user)
         ),
         ...(pickKeys(clientInfo.user, ["id", "type"]) as UserLike),
       };
@@ -148,8 +135,7 @@ export const runClientRequest = async function (this: Prostgles, args: Args) {
     }
   }
   const tableHandler = this.dbo[tableName];
-  if (!tableHandler || !tableHandler.column_names)
-    throw `Invalid tableName ${tableName} provided`;
+  if (!tableHandler || !tableHandler.column_names) throw `Invalid tableName ${tableName} provided`;
 
   /**
    * satisfies check is used to ensure rules arguments are correctly passed to each method
@@ -158,23 +144,21 @@ export const runClientRequest = async function (this: Prostgles, args: Args) {
     | undefined
     | TableMethodFunctionWithRulesAndLocalParams;
   if (!tableCommand) throw `Invalid or disallowed command provided: ${command}`;
-  return (
-    this.dbo[tableName]![command] as TableMethodFunctionWithRulesAndLocalParams
-  )(param1, param2, param3, validRules, localParams);
+  return (this.dbo[tableName]![command] as TableMethodFunctionWithRulesAndLocalParams)(
+    param1,
+    param2,
+    param3,
+    validRules,
+    localParams
+  );
   // This approach is breaking context
   // const result = await (tableCommand as TableMethodFunctionWithRulesAndLocalParams)(param1, param2, param3, validRules, localParams);
   // return result;
 };
 
-export const clientCanRunSqlRequest = async function (
-  this: Prostgles,
-  args: ReqInfo,
-) {
+export const clientCanRunSqlRequest = async function (this: Prostgles, args: ReqInfo) {
   const reqInfo = getReqInfoClient(args);
-  if (
-    !this.opts.publishRawSQL ||
-    typeof this.opts.publishRawSQL !== "function"
-  ) {
+  if (!this.opts.publishRawSQL || typeof this.opts.publishRawSQL !== "function") {
     return { allowed: false, reqInfo };
   }
   const canRunSQL = async () => {
@@ -195,10 +179,7 @@ type ArgsSql = ReqInfo & {
   args?: AnyObject | any[];
   options?: any;
 };
-export const runClientSqlRequest = async function (
-  this: Prostgles,
-  params: ArgsSql,
-) {
+export const runClientSqlRequest = async function (this: Prostgles, params: ArgsSql) {
   const { allowed, reqInfo } = await clientCanRunSqlRequest.bind(this)(params);
   if (!allowed) {
     throw "Not allowed to execute sql";
@@ -212,10 +193,7 @@ type ArgsMethod = ReqInfo & {
   method: string;
   params?: any[];
 };
-export const runClientMethod = async function (
-  this: Prostgles,
-  reqArgs: ArgsMethod,
-) {
+export const runClientMethod = async function (this: Prostgles, reqArgs: ArgsMethod) {
   const reqInfo = getReqInfoClient(reqArgs);
   const { method, params = [] } = reqArgs;
   const methods = await this.publishParser?.getAllowedMethods(reqInfo);
@@ -226,10 +204,9 @@ export const runClientMethod = async function (
 
   const methodDef = methods[method]!;
   const onRun =
-    typeof methodDef === "function" ||
-    typeof (methodDef as any).then === "function"
-      ? (methodDef as (...args: any) => Promise<void>)
-      : methodDef.run;
+    typeof methodDef === "function" || typeof (methodDef as any).then === "function" ?
+      (methodDef as (...args: any) => Promise<void>)
+    : methodDef.run;
   const res = await onRun(...params);
   return res;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "4.2.187",
+  "version": "4.2.188",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -55,7 +55,7 @@
     "pg": "^8.11.5",
     "pg-cursor": "^2.11.0",
     "pg-promise": "^11.9.1",
-    "prostgles-types": "^4.0.123"
+    "prostgles-types": "^4.0.129"
   },
   "devDependencies": {
     "@types/express": "^4.17.21",

package/dist/Auth/getSafeReturnURL.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getSafeReturnURL.d.ts","sourceRoot":"","sources":["../../lib/Auth/getSafeReturnURL.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,gBAAgB,cAChB,MAAM,sBACG,MAAM,wCAuB3B,CAAC"}

package/dist/Auth/getSafeReturnURL.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getSafeReturnURL.js","sourceRoot":"","sources":["../../lib/Auth/getSafeReturnURL.ts"],"names":[],"mappings":";;;AAAO,MAAM,gBAAgB,GAAG,CAC9B,SAAiB,EACjB,kBAA0B,EAC1B,KAAK,GAAG,KAAK,EACb,EAAE;IACF,yCAAyC;IACzC,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,aAAa,GAAG,mBAAmB,CAAC;QAC1C,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,GAAG,CACxD,SAAS,EACT,aAAa,CACd,CAAC;QACF,IACE,MAAM,KAAK,aAAa;YACxB,SAAS,KAAK,GAAG,QAAQ,GAAG,MAAM,EAAE;YACpC,YAAY,CAAC,GAAG,CAAC,kBAAkB,CAAC,EACpC,CAAC;YACD,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,OAAO,CAAC,KAAK,CAAC,qBAAqB,SAAS,oBAAoB,CAAC,CAAC;YACpE,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC,CAAC;AAzBW,QAAA,gBAAgB,oBAyB3B;AAEF,MAAM,KAAK,GACT;IACE,CAAC,mBAAmB,EAAE,GAAG,CAAC;IAC1B,CAAC,qBAAqB,EAAE,GAAG,CAAC;IAC5B,CAAC,iBAAiB,EAAE,GAAG,CAAC;IACxB,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IACpC,CAAC,2BAA2B,EAAE,2BAA2B,CAAC;IAC1D,CAAC,gCAAgC,EAAE,GAAG,CAAC;IACvC,CAAC,wBAAwB,EAAE,GAAG,CAAC;IAC/B,CAAC,WAAW,EAAE,GAAG,CAAC;IAClB,CAAC,YAAY,EAAE,GAAG,CAAC;CAEtB,CAAC,IAAI,CACJ,CAAC,CAAC,SAAS,EAAE,QAAQ,CAAC,EAAE,EAAE,CACxB,IAAA,wBAAgB,EAAC,SAAS,EAAE,WAAW,EAAE,IAAI,CAAC,KAAK,QAAQ,CAC9D,CAAC;AAEF,IAAI,KAAK,EAAE,CAAC;IACV,MAAM,IAAI,KAAK,CACb,+BAA+B,KAAK,CAAC,CAAC,CAAC,eAAe,KAAK,CAAC,CAAC,CAAC,EAAE,CACjE,CAAC;AACJ,CAAC"}

package/dist/Auth/setEmailProvider.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"setEmailProvider.d.ts","sourceRoot":"","sources":["../../lib/Auth/setEmailProvider.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,SAAS,CAAC;AACxB,OAAO,EAA0B,WAAW,EAAiC,MAAM,eAAe,CAAC;AAKnG,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO,iBAmGvE"}

package/dist/Auth/setEmailProvider.js

@@ -1,133 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.setEmailProvider = void 0;
-const AuthHandler_1 = require("./AuthHandler");
-const sendEmail_1 = require("./sendEmail");
-const node_dns_1 = require("node:dns");
-async function setEmailProvider(app) {
-    const { email, websiteUrl } = this.opts?.expressConfig?.registrations ?? {};
-    if (!email)
-        return;
-    if (websiteUrl) {
-        await checkDmarc(websiteUrl);
-    }
-    /**
-     * Setup nodemailer transporters
-     */
-    if (email.signupType === "withPassword") {
-        if (email.emailConfirmation) {
-            tryGetTransporter(email.emailConfirmation.smtp);
-        }
-    }
-    else {
-        tryGetTransporter(email.emailMagicLink.smtp);
-    }
-    app.post(AuthHandler_1.AUTH_ROUTES_AND_PARAMS.emailSignup, async (req, res) => {
-        const { username, password } = req.body;
-        let validationError = "";
-        if (typeof username !== "string") {
-            validationError = "Invalid username";
-        }
-        if (email.signupType === "withPassword") {
-            const { minPasswordLength = 8 } = email;
-            if (typeof password !== "string") {
-                validationError = "Invalid password";
-            }
-            else if (password.length < minPasswordLength) {
-                validationError = `Password must be at least ${minPasswordLength} characters long`;
-            }
-        }
-        if (validationError) {
-            res.status(AuthHandler_1.HTTPCODES.AUTH_ERROR).json({ success: false, error: validationError });
-            return;
-        }
-        try {
-            const { httpReq, ...clientInfo } = (0, AuthHandler_1.getLoginClientInfo)({ httpReq: req });
-            let emailMessage;
-            if (email.signupType === "withPassword") {
-                if (email.emailConfirmation) {
-                    const { onSend, smtp } = email.emailConfirmation;
-                    const message = await onSend({
-                        email: username,
-                        password,
-                        confirmationUrlPath: `${websiteUrl}${AuthHandler_1.AUTH_ROUTES_AND_PARAMS.confirmEmail}`,
-                        clientInfo,
-                        req: httpReq,
-                    });
-                    emailMessage = { message: { ...message, to: username }, smtp };
-                }
-            }
-            else {
-                const { emailMagicLink } = email;
-                const message = await emailMagicLink.onSend({
-                    email: username,
-                    magicLinkPath: `${websiteUrl}${AuthHandler_1.AUTH_ROUTES_AND_PARAMS.magicLinksRoute}`,
-                    clientInfo,
-                    req: httpReq,
-                });
-                emailMessage = {
-                    message: { ...message, to: username },
-                    smtp: emailMagicLink.smtp,
-                };
-            }
-            if (emailMessage) {
-                await (0, sendEmail_1.sendEmail)(emailMessage.smtp, emailMessage.message);
-                res.json({
-                    success: true,
-                    message: email.signupType === "withPassword" ?
-                        `We've sent a confirmation email to ${emailMessage.message.to}. Please check your inbox (and your spam folder) for a message from us.`
-                        : "Email sent",
-                });
-            }
-        }
-        catch {
-            res.status(AuthHandler_1.HTTPCODES.AUTH_ERROR).json({ success: false, error: "Failed to send email" });
-        }
-    });
-    if (email.signupType === "withPassword" && email.emailConfirmation) {
-        app.get(AuthHandler_1.AUTH_ROUTES_AND_PARAMS.confirmEmailExpressRoute, async (req, res) => {
-            const { id } = req.params ?? {};
-            try {
-                if (!id || typeof id !== "string") {
-                    throw new Error("Invalid confirmation code");
-                }
-                const { httpReq, ...clientInfo } = (0, AuthHandler_1.getLoginClientInfo)({ httpReq: req });
-                await email.emailConfirmation?.onConfirmed({
-                    confirmationCode: id,
-                    clientInfo,
-                    req: httpReq,
-                });
-                res.json({ success: true, message: "Email confirmed" });
-            }
-            catch (_e) {
-                res.status(AuthHandler_1.HTTPCODES.AUTH_ERROR).json({ success: false, error: "Failed to confirm email" });
-            }
-        });
-    }
-}
-exports.setEmailProvider = setEmailProvider;
-const checkDmarc = async (websiteUrl) => {
-    const { host, hostname } = new URL(websiteUrl);
-    const ignoredHosts = ["localhost", "127.0.0.1"];
-    if (!hostname || ignoredHosts.includes(hostname)) {
-        return;
-    }
-    const dmarc = await node_dns_1.promises.resolveTxt(`_dmarc.${host}`);
-    const dmarkTxt = dmarc[0]?.[0];
-    if (!dmarkTxt?.includes("v=DMARC1") ||
-        (!dmarkTxt?.includes("p=reject") && !dmarkTxt?.includes("p=quarantine"))) {
-        throw new Error("DMARC not set to reject/quarantine");
-    }
-    else {
-        console.log("DMARC set to reject");
-    }
-};
-const tryGetTransporter = (smtp) => {
-    try {
-        (0, sendEmail_1.getOrSetTransporter)(smtp);
-    }
-    catch (err) {
-        console.error("Failed to set email transporter", err);
-    }
-};
-//# sourceMappingURL=setEmailProvider.js.map

package/dist/Auth/setEmailProvider.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"setEmailProvider.js","sourceRoot":"","sources":["../../lib/Auth/setEmailProvider.ts"],"names":[],"mappings":"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"}

package/dist/DboBuilder/runTransaction.d.ts

@@ -1,9 +0,0 @@
-import * as pg from "pg";
-export type PGTX = (query: pg.Client["query"]) => Promise<void>;
-export type RunTransactionOpts = {
-    begin?: boolean;
-    onSuccess: "COMMIT" | "ROLLBACK" | undefined;
-};
-export declare const runClientTransaction: (handler: PGTX, { onSuccess, begin }: RunTransactionOpts, dbConn: pg.ClientConfig) => Promise<void>;
-export declare const runClientTransactionStatement: (statement: string, dbConn: pg.ClientConfig) => Promise<void>;
-//# sourceMappingURL=runTransaction.d.ts.map

package/dist/DboBuilder/runTransaction.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"runTransaction.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/runTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AAGzB,MAAM,MAAM,IAAI,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAChE,MAAM,MAAM,kBAAkB,GAAG;IAC/B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,QAAQ,GAAG,UAAU,GAAG,SAAS,CAAC;CAC9C,CAAC;AACF,eAAO,MAAM,oBAAoB,YACtB,IAAI,wBACgB,kBAAkB,UACvC,GAAG,YAAY,kBAiBxB,CAAC;AAEF,eAAO,MAAM,6BAA6B,cAC7B,MAAM,UACT,GAAG,YAAY,kBASxB,CAAC"}

package/dist/DboBuilder/runTransaction.js

@@ -1,49 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.runClientTransactionStatement = exports.runClientTransaction = void 0;
-const pg = require("pg");
-const { Client } = pg;
-const runClientTransaction = async (handler, { onSuccess, begin = true }, dbConn) => {
-    const client = new Client(dbConn);
-    try {
-        if (begin) {
-            await client.query("BEGIN");
-        }
-        await handler(client.query);
-        if (onSuccess) {
-            await client.query(onSuccess);
-        }
-    }
-    catch (e) {
-        await client.query("ROLLBACK");
-        throw e;
-    }
-    finally {
-        client.end();
-    }
-};
-exports.runClientTransaction = runClientTransaction;
-const runClientTransactionStatement = async (statement, dbConn) => {
-    return (0, exports.runClientTransaction)(async (query) => {
-        await query(statement);
-    }, { onSuccess: undefined, begin: false }, dbConn);
-};
-exports.runClientTransactionStatement = runClientTransactionStatement;
-// let pool: pg.Pool | undefined;
-// export const runPoolTransaction = async (handler: PGTX, { onSuccess, begin = true }: RunTransactionOpts, dbConn: pg.ClientConfig) => {
-//   pool ??= new Pool(dbConn);
-//   const client = await pool.connect()
-//   try {
-//     await client.query('BEGIN')
-//     await handler(client.query);
-//     if(onSuccess){
-//       await client.query(onSuccess);
-//     }
-//   } catch (e) {
-//     await client.query('ROLLBACK');
-//     throw e
-//   } finally {
-//     client.release();
-//   }
-// }
-//# sourceMappingURL=runTransaction.js.map

package/dist/DboBuilder/runTransaction.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"runTransaction.js","sourceRoot":"","sources":["../../lib/DboBuilder/runTransaction.ts"],"names":[],"mappings":";;;AAAA,yBAAyB;AACzB,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;AAOf,MAAM,oBAAoB,GAAG,KAAK,EACvC,OAAa,EACb,EAAE,SAAS,EAAE,KAAK,GAAG,IAAI,EAAsB,EAC/C,MAAuB,EACvB,EAAE;IACF,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC;IAClC,IAAI,CAAC;QACH,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC9B,CAAC;QACD,MAAM,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC5B,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAC/B,MAAM,CAAC,CAAC;IACV,CAAC;YAAS,CAAC;QACT,MAAM,CAAC,GAAG,EAAE,CAAC;IACf,CAAC;AACH,CAAC,CAAC;AApBW,QAAA,oBAAoB,wBAoB/B;AAEK,MAAM,6BAA6B,GAAG,KAAK,EAChD,SAAiB,EACjB,MAAuB,EACvB,EAAE;IACF,OAAO,IAAA,4BAAoB,EACzB,KAAK,EAAE,KAAK,EAAE,EAAE;QACd,MAAM,KAAK,CAAC,SAAS,CAAC,CAAC;IACzB,CAAC,EACD,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,EACtC,MAAM,CACP,CAAC;AACJ,CAAC,CAAC;AAXW,QAAA,6BAA6B,iCAWxC;AAEF,iCAAiC;AACjC,yIAAyI;AACzI,+BAA+B;AAC/B,wCAAwC;AAExC,UAAU;AACV,kCAAkC;AAClC,mCAAmC;AACnC,qBAAqB;AACrB,uCAAuC;AACvC,QAAQ;AACR,kBAAkB;AAClB,sCAAsC;AACtC,cAAc;AACd,gBAAgB;AAChB,wBAAwB;AACxB,MAAM;AACN,IAAI"}

package/lib/Auth/setEmailProvider.ts

@@ -1,132 +0,0 @@
-import e from "express";
-import { AUTH_ROUTES_AND_PARAMS, AuthHandler, getLoginClientInfo, HTTPCODES } from "./AuthHandler";
-import { Email, SMTPConfig } from "./AuthTypes";
-import { getOrSetTransporter, sendEmail } from "./sendEmail";
-import { promises } from "node:dns";
-
-export async function setEmailProvider(this: AuthHandler, app: e.Express) {
-  const { email, websiteUrl } = this.opts?.expressConfig?.registrations ?? {};
-  if (!email) return;
-  if (websiteUrl) {
-    await checkDmarc(websiteUrl);
-  }
-
-  /**
-   * Setup nodemailer transporters
-   */
-  if (email.signupType === "withPassword") {
-    if (email.emailConfirmation) {
-      tryGetTransporter(email.emailConfirmation.smtp);
-    }
-  } else {
-    tryGetTransporter(email.emailMagicLink.smtp);
-  }
-
-  app.post(AUTH_ROUTES_AND_PARAMS.emailSignup, async (req, res) => {
-    const { username, password } = req.body;
-    let validationError = "";
-    if (typeof username !== "string") {
-      validationError = "Invalid username";
-    }
-    if (email.signupType === "withPassword") {
-      const { minPasswordLength = 8 } = email;
-      if (typeof password !== "string") {
-        validationError = "Invalid password";
-      } else if (password.length < minPasswordLength) {
-        validationError = `Password must be at least ${minPasswordLength} characters long`;
-      }
-    }
-    if (validationError) {
-      res.status(HTTPCODES.AUTH_ERROR).json({ success: false, error: validationError });
-      return;
-    }
-    try {
-      const { httpReq, ...clientInfo } = getLoginClientInfo({ httpReq: req });
-      let emailMessage: undefined | { message: Email; smtp: SMTPConfig };
-      if (email.signupType === "withPassword") {
-        if (email.emailConfirmation) {
-          const { onSend, smtp } = email.emailConfirmation;
-          const message = await onSend({
-            email: username,
-            password,
-            confirmationUrlPath: `${websiteUrl}${AUTH_ROUTES_AND_PARAMS.confirmEmail}`,
-            clientInfo,
-            req: httpReq,
-          });
-          emailMessage = { message: { ...message, to: username }, smtp };
-        }
-      } else {
-        const { emailMagicLink } = email;
-        const message = await emailMagicLink.onSend({
-          email: username,
-          magicLinkPath: `${websiteUrl}${AUTH_ROUTES_AND_PARAMS.magicLinksRoute}`,
-          clientInfo,
-          req: httpReq,
-        });
-        emailMessage = {
-          message: { ...message, to: username },
-          smtp: emailMagicLink.smtp,
-        };
-      }
-
-      if (emailMessage) {
-        await sendEmail(emailMessage.smtp, emailMessage.message);
-        res.json({
-          success: true,
-          message:
-            email.signupType === "withPassword" ?
-              `We've sent a confirmation email to ${emailMessage.message.to}. Please check your inbox (and your spam folder) for a message from us.`
-            : "Email sent",
-        });
-      }
-    } catch {
-      res.status(HTTPCODES.AUTH_ERROR).json({ success: false, error: "Failed to send email" });
-    }
-  });
-
-  if (email.signupType === "withPassword" && email.emailConfirmation) {
-    app.get(AUTH_ROUTES_AND_PARAMS.confirmEmailExpressRoute, async (req, res) => {
-      const { id } = req.params ?? {};
-      try {
-        if (!id || typeof id !== "string") {
-          throw new Error("Invalid confirmation code");
-        }
-        const { httpReq, ...clientInfo } = getLoginClientInfo({ httpReq: req });
-        await email.emailConfirmation?.onConfirmed({
-          confirmationCode: id,
-          clientInfo,
-          req: httpReq,
-        });
-        res.json({ success: true, message: "Email confirmed" });
-      } catch (_e) {
-        res.status(HTTPCODES.AUTH_ERROR).json({ success: false, error: "Failed to confirm email" });
-      }
-    });
-  }
-}
-
-const checkDmarc = async (websiteUrl: string) => {
-  const { host, hostname } = new URL(websiteUrl);
-  const ignoredHosts = ["localhost", "127.0.0.1"];
-  if (!hostname || ignoredHosts.includes(hostname)) {
-    return;
-  }
-  const dmarc = await promises.resolveTxt(`_dmarc.${host}`);
-  const dmarkTxt = dmarc[0]?.[0];
-  if (
-    !dmarkTxt?.includes("v=DMARC1") ||
-    (!dmarkTxt?.includes("p=reject") && !dmarkTxt?.includes("p=quarantine"))
-  ) {
-    throw new Error("DMARC not set to reject/quarantine");
-  } else {
-    console.log("DMARC set to reject");
-  }
-};
-
-const tryGetTransporter = (smtp: SMTPConfig) => {
-  try {
-    getOrSetTransporter(smtp);
-  } catch (err) {
-    console.error("Failed to set email transporter", err);
-  }
-};

package/lib/DboBuilder/QueryBuilder/prepareHaving.ts

@@ -1,27 +0,0 @@
-import { isEmpty } from "prostgles-types";
-import type { Filter } from "../DboBuilderTypes";
-import type { SelectItemValidated } from "./QueryBuilder";
-import { parseFilterItem } from "../../Filtering";
-
-type Args = {
-  having: Filter | undefined;
-  select: SelectItemValidated[];
-  tableAlias: string | undefined;
-  filterFieldNames: string[];
-};
-export const prepareHaving = ({
-  having,
-  select,
-  tableAlias,
-  filterFieldNames,
-}: Args) => {
-  if (!having || isEmpty(having)) return "";
-
-  const havingStr = parseFilterItem({
-    filter: having,
-    select,
-    tableAlias,
-    allowedColumnNames: filterFieldNames,
-  });
-  return havingStr;
-};

package/lib/DboBuilder/runTransaction.ts

@@ -1,61 +0,0 @@
-import * as pg from "pg";
-const { Client } = pg;
-
-export type PGTX = (query: pg.Client["query"]) => Promise<void>;
-export type RunTransactionOpts = {
-  begin?: boolean;
-  onSuccess: "COMMIT" | "ROLLBACK" | undefined;
-};
-export const runClientTransaction = async (
-  handler: PGTX,
-  { onSuccess, begin = true }: RunTransactionOpts,
-  dbConn: pg.ClientConfig,
-) => {
-  const client = new Client(dbConn);
-  try {
-    if (begin) {
-      await client.query("BEGIN");
-    }
-    await handler(client.query);
-    if (onSuccess) {
-      await client.query(onSuccess);
-    }
-  } catch (e) {
-    await client.query("ROLLBACK");
-    throw e;
-  } finally {
-    client.end();
-  }
-};
-
-export const runClientTransactionStatement = async (
-  statement: string,
-  dbConn: pg.ClientConfig,
-) => {
-  return runClientTransaction(
-    async (query) => {
-      await query(statement);
-    },
-    { onSuccess: undefined, begin: false },
-    dbConn,
-  );
-};
-
-// let pool: pg.Pool | undefined;
-// export const runPoolTransaction = async (handler: PGTX, { onSuccess, begin = true }: RunTransactionOpts, dbConn: pg.ClientConfig) => {
-//   pool ??= new Pool(dbConn);
-//   const client = await pool.connect()
-
-//   try {
-//     await client.query('BEGIN')
-//     await handler(client.query);
-//     if(onSuccess){
-//       await client.query(onSuccess);
-//     }
-//   } catch (e) {
-//     await client.query('ROLLBACK');
-//     throw e
-//   } finally {
-//     client.release();
-//   }
-// }

package/lib/SchemaWatch/createSchemaWatchEventTrigger.ts

@@ -1,3 +0,0 @@
-// export const createSchemaWatchEventTrigger = () => {
-
-// }