prostgles-server 4.2.196 → 4.2.198

package/lib/Auth/endpoints/setLoginRequestHandler.ts

@@ -0,0 +1,18 @@
+import e from "express";
+import { AUTH_ROUTES_AND_PARAMS, AuthHandler, HTTP_FAIL_CODES } from "../AuthHandler";
+import { LoginParams } from "../AuthTypes";
+
+export function setLoginRequestHandler(this: AuthHandler, app: e.Express) {
+  app.post(AUTH_ROUTES_AND_PARAMS.login, async (req, res) => {
+    try {
+      const loginParams: LoginParams = {
+        type: "username",
+        ...req.body,
+      };
+
+      await this.loginThrottledAndSetCookie(req, res, loginParams);
+    } catch (error) {
+      res.status(HTTP_FAIL_CODES.BAD_REQUEST).json({ error });
+    }
+  });
+}

package/lib/Auth/endpoints/setMagicLinkRequestHandler.ts

@@ -0,0 +1,51 @@
+import e, { Response } from "express";
+import { ExpressConfig, ExpressReq, SessionUser } from "../AuthTypes";
+import { AuthResponse } from "prostgles-types";
+import {
+  AUTH_ROUTES_AND_PARAMS,
+  AuthHandler,
+  getClientRequestIPsInfo,
+  HTTP_FAIL_CODES,
+} from "../AuthHandler";
+import { DBOFullyTyped } from "../../DBSchemaBuilder";
+
+export function setMagicLinkRequestHandler(
+  this: AuthHandler,
+  onMagicLink: Required<ExpressConfig<void, SessionUser>>["onMagicLink"],
+  app: e.Express
+) {
+  const result = async (
+    req: ExpressReq,
+    res: Response<AuthResponse.MagicLinkAuthFailure | AuthResponse.MagicLinkAuthSuccess>
+  ) => {
+    const { id } = req.params;
+
+    if (typeof id !== "string" || !id) {
+      res
+        .status(HTTP_FAIL_CODES.BAD_REQUEST)
+        .json({ success: false, code: "something-went-wrong", message: "Invalid magic link" });
+    } else {
+      try {
+        const response = await this.throttledFunc(async () => {
+          return onMagicLink(
+            id,
+            this.dbo as DBOFullyTyped,
+            this.db,
+            getClientRequestIPsInfo({ httpReq: req, res })
+          );
+        });
+        if (!response.session) {
+          res.status(HTTP_FAIL_CODES.UNAUTHORIZED).json(response.response);
+        } else {
+          this.setCookieAndGoToReturnURLIFSet(response.session, { req, res });
+        }
+      } catch (_e) {
+        res
+          .status(HTTP_FAIL_CODES.UNAUTHORIZED)
+          .json({ success: false, code: "something-went-wrong" });
+      }
+    }
+  };
+  app.get(AUTH_ROUTES_AND_PARAMS.magicLinksExpressRoute, result);
+  return result;
+}

package/lib/Auth/endpoints/{getRegisterRequestHandler.ts → setRegisterRequestHandler.ts}

@@ -1,4 +1,4 @@
-import { Request, Response } from "express";
+import e, { Request, Response } from "express";
 import { AuthResponse } from "prostgles-types";
 import { AUTH_ROUTES_AND_PARAMS, HTTP_FAIL_CODES } from "../AuthHandler";
 import type { AuthRegistrationConfig } from "../AuthTypes";
@@ -11,10 +11,13 @@ type ReturnType =
   | AuthResponse.PasswordRegisterFailure
   | AuthResponse.PasswordRegisterSuccess;
 
-export const getRegisterRequestHandler = ({
-  email: emailAuthConfig,
-  websiteUrl,
-}: Required<Pick<AuthRegistrationConfig<void>, "email" | "websiteUrl">>) => {
+export const setRegisterRequestHandler = (
+  {
+    email: emailAuthConfig,
+    websiteUrl,
+  }: Required<Pick<AuthRegistrationConfig<void>, "email" | "websiteUrl">>,
+  app: e.Express
+) => {
   const registerRequestHandler = async (req: Request, res: Response<ReturnType>) => {
     const { username, password } = req.body;
     const sendResponse = (response: ReturnType) => {
@@ -84,5 +87,5 @@ export const getRegisterRequestHandler = ({
     }
   };
 
-  return registerRequestHandler;
+  app.post(AUTH_ROUTES_AND_PARAMS.emailRegistration, registerRequestHandler);
 };

package/lib/Auth/setupAuthRoutes.ts

@@ -1,11 +1,11 @@
-import { RequestHandler, Response } from "express";
-import { AuthResponse } from "prostgles-types";
+import { RequestHandler } from "express";
 import { DBOFullyTyped } from "../DBSchemaBuilder";
-import { AUTH_ROUTES_AND_PARAMS, AuthHandler, HTTP_FAIL_CODES } from "./AuthHandler";
-import { Auth, AuthClientRequest, ExpressReq, ExpressRes, LoginParams } from "./AuthTypes";
+import { AuthHandler } from "./AuthHandler";
+import { setCatchAllRequestHandler } from "./endpoints/setCatchAllRequestHandler";
+import { setLoginRequestHandler } from "./endpoints/setLoginRequestHandler";
+import { setMagicLinkRequestHandler } from "./endpoints/setMagicLinkRequestHandler";
 import { setAuthProviders, upsertNamedExpressMiddleware } from "./setAuthProviders";
-import { getClientRequestIPsInfo } from "./utils/getClientRequestIPsInfo";
-import { getReturnUrl } from "./utils/getReturnUrl";
+
 export async function setupAuthRoutes(this: AuthHandler) {
   const { login, expressConfig } = this.opts;
 
@@ -20,7 +20,7 @@ export async function setupAuthRoutes(this: AuthHandler) {
   if (!expressConfig) {
     return;
   }
-  const { app, publicRoutes = [], onGetRequestOK, onMagicLink, use } = expressConfig;
+  const { app, publicRoutes = [], onMagicLink, use } = expressConfig;
   if (publicRoutes.find((r) => typeof r !== "string" || !r)) {
     throw "Invalid or empty string provided within publicRoutes ";
   }
@@ -42,150 +42,11 @@ export async function setupAuthRoutes(this: AuthHandler) {
   }
 
   if (onMagicLink) {
-    app.get(
-      AUTH_ROUTES_AND_PARAMS.magicLinksExpressRoute,
-      async (
-        req: ExpressReq,
-        res: Response<AuthResponse.MagicLinkAuthFailure | AuthResponse.MagicLinkAuthSuccess>
-      ) => {
-        const { id } = req.params;
-
-        if (typeof id !== "string" || !id) {
-          res
-            .status(HTTP_FAIL_CODES.BAD_REQUEST)
-            .json({ success: false, code: "something-went-wrong", message: "Invalid magic link" });
-        } else {
-          try {
-            const response = await this.throttledFunc(async () => {
-              return onMagicLink(
-                id,
-                this.dbo as any,
-                this.db,
-                getClientRequestIPsInfo({ httpReq: req, res })
-              );
-            });
-            if (!response.session) {
-              res.status(HTTP_FAIL_CODES.UNAUTHORIZED).json(response.response);
-            } else {
-              this.setCookieAndGoToReturnURLIFSet(response.session, { req, res });
-            }
-          } catch (e) {
-            res
-              .status(HTTP_FAIL_CODES.UNAUTHORIZED)
-              .json({ success: false, code: "something-went-wrong" });
-          }
-        }
-      }
-    );
+    setMagicLinkRequestHandler.bind(this)(onMagicLink, app);
   }
 
-  app.post(AUTH_ROUTES_AND_PARAMS.login, async (req: ExpressReq, res: ExpressRes) => {
-    try {
-      const loginParams: LoginParams = {
-        type: "username",
-        ...req.body,
-      };
-
-      await this.loginThrottledAndSetCookie(req, res, loginParams);
-    } catch (error) {
-      res.status(HTTP_FAIL_CODES.BAD_REQUEST).json({ error });
-    }
-  });
-
-  const onLogout = async (req: ExpressReq, res: ExpressRes) => {
-    const sid = this.validateSid(req.cookies?.[this.sidKeyName]);
-    if (sid) {
-      try {
-        await this.throttledFunc(() => {
-          return this.opts.logout?.(req.cookies?.[this.sidKeyName], this.dbo as any, this.db);
-        });
-      } catch (err) {
-        console.error(err);
-      }
-    }
-    res.redirect("/");
-  };
+  setLoginRequestHandler.bind(this)(app);
 
   /* Redirect if not logged in and requesting non public content */
-  app.get(AUTH_ROUTES_AND_PARAMS.catchAll, async (req: ExpressReq, res: ExpressRes, next) => {
-    const clientReq: AuthClientRequest = { httpReq: req, res };
-    const getUser = async () => {
-      const userOrCode = await this.getUserAndHandleError(clientReq);
-      if (typeof userOrCode === "string") {
-        res.status(HTTP_FAIL_CODES.BAD_REQUEST).json({ success: false, code: userOrCode });
-        throw userOrCode;
-      }
-      return userOrCode;
-    };
-    const isLoggedInUser = async () => {
-      const userInfo = await getUser();
-      return !!userInfo?.user;
-    };
-    if (this.prostgles.restApi) {
-      if (
-        Object.values(this.prostgles.restApi.routes).some((restRoute) =>
-          this.matchesRoute(restRoute.split("/:")[0], req.path)
-        )
-      ) {
-        next();
-        return;
-      }
-    }
-    try {
-      const returnURL = getReturnUrl(req);
-
-      if (this.matchesRoute(AUTH_ROUTES_AND_PARAMS.logoutGetPath, req.path)) {
-        await onLogout(req, res);
-        return;
-      }
-
-      if (this.matchesRoute(AUTH_ROUTES_AND_PARAMS.loginWithProvider, req.path)) {
-        next();
-        return;
-      }
-      /**
-       * Requesting a User route
-       */
-      if (this.isUserRoute(req.path)) {
-        /* Check auth. Redirect to login if unauthorized */
-        const u = await isLoggedInUser();
-        if (!u) {
-          res.redirect(
-            `${AUTH_ROUTES_AND_PARAMS.login}?returnURL=${encodeURIComponent(req.originalUrl)}`
-          );
-          return;
-        }
-
-        /* If authorized and going to returnUrl then redirect. Otherwise serve file */
-      } else if (returnURL && (await isLoggedInUser())) {
-        res.redirect(returnURL);
-        return;
-
-        /** If Logged in and requesting login then redirect to main page */
-      } else if (
-        this.matchesRoute(AUTH_ROUTES_AND_PARAMS.login, req.path) &&
-        (await isLoggedInUser())
-      ) {
-        res.redirect("/");
-        return;
-      }
-
-      onGetRequestOK?.(req, res, {
-        getUser,
-        dbo: this.dbo as DBOFullyTyped,
-        db: this.db,
-      });
-    } catch (error) {
-      console.error(error);
-      const errorMessage =
-        typeof error === "string" ? error
-        : error instanceof Error ? error.message
-        : "";
-      res.status(HTTP_FAIL_CODES.BAD_REQUEST).json({
-        error:
-          "Something went wrong when processing your request" +
-          (errorMessage ? ": " + errorMessage : ""),
-      });
-    }
-  });
+  setCatchAllRequestHandler.bind(this)(app);
 }

package/lib/Auth/utils/{getUserFromRequest.ts → getSidAndUserFromRequest.ts}

@@ -1,21 +1,22 @@
+import { DBOFullyTyped } from "../../DBSchemaBuilder";
 import { AuthHandler, getClientRequestIPsInfo } from "../AuthHandler";
 import { AuthClientRequest, AuthResultWithSID } from "../AuthTypes";
 
 /**
- * For a given sid return the user data if available
+ * For a given sid return the user data if available using the auth handler's getUser method.
+ * Use socket session cache if configured in Auth
  */
-export async function getUserFromRequest(
+export async function getSidAndUserFromRequest(
   this: AuthHandler,
-  maybeClientReq: AuthClientRequest | undefined
+  clientReq: AuthClientRequest
 ): Promise<AuthResultWithSID> {
-  if (!maybeClientReq) return undefined;
   /**
    * Get cached session if available
    */
   const getSession = this.opts.cacheSession?.getSession;
-  if (maybeClientReq.socket && getSession && maybeClientReq.socket.__prglCache) {
-    const { session, user, clientUser } = maybeClientReq.socket.__prglCache;
-    const isValid = this.isNonExpiredSocketSession(maybeClientReq.socket, session);
+  if (clientReq.socket && getSession && clientReq.socket.__prglCache) {
+    const { session, user, clientUser } = clientReq.socket.__prglCache;
+    const isValid = this.isNonExpiredSocketSession(clientReq.socket, session);
     if (isValid) {
       return {
         sid: session.sid,
@@ -35,17 +36,17 @@ export async function getUserFromRequest(
   const result = await this.throttledFunc(async () => {
     const { getUser } = this.opts;
 
-    const sid = this.getSID(maybeClientReq);
+    const sid = this.getSID(clientReq);
     const clientInfoOrErr =
       !sid ? undefined : (
-        await getUser(sid, this.dbo as any, this.db, getClientRequestIPsInfo(maybeClientReq))
+        await getUser(sid, this.dbo as DBOFullyTyped, this.db, getClientRequestIPsInfo(clientReq))
       );
     if (typeof clientInfoOrErr === "string") throw clientInfoOrErr;
     const clientInfo = clientInfoOrErr;
-    if (getSession && maybeClientReq.socket) {
+    if (getSession && clientReq.socket) {
       const session = await getSession(sid, this.dbo as any, this.db);
       if (session && session.expires && clientInfo?.user) {
-        maybeClientReq.socket.__prglCache = {
+        clientReq.socket.__prglCache = {
           session,
           user: clientInfo.user,
           clientUser: clientInfo.clientUser,
@@ -58,14 +59,14 @@ export async function getUserFromRequest(
     }
 
     return { sid };
-  }, 5);
+  }, 100);
 
   await this.prostgles.opts.onLog?.({
     type: "auth",
     command: "getClientInfo",
     duration: Date.now() - authStart,
     sid: result.sid,
-    socketId: maybeClientReq.socket?.id,
+    socketId: clientReq.socket?.id,
   });
   return result;
 }

package/lib/DboBuilder/runSQL.ts

@@ -192,11 +192,10 @@ export const canRunSQL = async (
   clientReq: AuthClientRequest | undefined
 ): Promise<boolean> => {
   if (!clientReq) return true;
-
-  const publishParams = await prostgles.publishParser!.getPublishParams(clientReq);
-  //@ts-ignore
-  const res = await prostgles.opts.publishRawSQL?.(publishParams);
-  return Boolean((res && typeof res === "boolean") || res === "*");
+  const publishParams = await prostgles.publishParser?.getPublishParams(clientReq, undefined);
+  //@ts-ignore union type that is too complex to represent.
+  const publishResult = publishParams && (await prostgles.opts.publishRawSQL?.(publishParams));
+  return Boolean((publishResult && typeof publishResult === "boolean") || publishResult === "*");
 };
 
 export const canCreateTables = async (db: DB): Promise<boolean> => {

package/lib/Prostgles.ts

@@ -413,7 +413,7 @@ export class Prostgles {
           { type: "socket" as const, ...clientReq }
         : { type: "http" as const, ...clientReq };
 
-      const userData = await this.authHandler?.getUserFromRequest(clientInfo);
+      const userData = await this.authHandler?.getSidAndUserFromRequest(clientInfo);
       const { publishParser } = this;
       let fullSchema: Awaited<ReturnType<PublishParser["getSchemaFromPublish"]>> | undefined;
       let publishValidationError;

package/lib/PublishParser/PublishParser.ts

@@ -1,6 +1,6 @@
 import { Method, getObjectEntries, isObject } from "prostgles-types";
-import { AuthClientRequest, AuthResult, SessionUser } from "../Auth/AuthTypes";
-import { PublishFullyTyped } from "../DBSchemaBuilder";
+import { AuthClientRequest, AuthResultWithSID, SessionUser } from "../Auth/AuthTypes";
+import { DBOFullyTyped, PublishFullyTyped } from "../DBSchemaBuilder";
 import { DB, DBHandlerServer, Prostgles } from "../Prostgles";
 import { ProstglesInitOptions } from "../ProstglesTypes";
 import { VoidFunction } from "../SchemaWatch/SchemaWatch";
@@ -39,11 +39,12 @@ export class PublishParser {
 
   async getPublishParams(
     clientReq: AuthClientRequest,
-    clientInfo?: AuthResult
+    clientInfo: AuthResultWithSID | undefined
   ): Promise<PublishParams> {
     return {
-      ...(clientInfo || (await this.prostgles.authHandler?.getUserFromRequest(clientReq))),
-      dbo: this.dbo as any,
+      sid: undefined,
+      ...(clientInfo ?? (await this.prostgles.authHandler?.getSidAndUserFromRequest(clientReq))),
+      dbo: this.dbo as DBOFullyTyped,
       db: this.db,
       clientReq,
       tables: this.prostgles.dboBuilder.tables,
@@ -52,7 +53,7 @@ export class PublishParser {
 
   async getAllowedMethods(
     clientReq: AuthClientRequest,
-    userData: AuthResult | undefined
+    userData: AuthResultWithSID | undefined
   ): Promise<{ [key: string]: Method }> {
     const methods: { [key: string]: Method } = {};
 
@@ -81,9 +82,9 @@ export class PublishParser {
   /**
    * Parses the first level of publish. (If false then nothing if * then all tables and views)
    */
-  async getPublish(
+  async getPublishAsObject(
     clientReq: AuthClientRequest,
-    clientInfo: AuthResult
+    clientInfo: AuthResultWithSID | undefined
   ): Promise<PublishFullyTyped | undefined> {
     const publishParams = await this.getPublishParams(clientReq, clientInfo);
     const _publish = await applyParamsIfFunc(this.publish, publishParams);
@@ -104,14 +105,15 @@ export class PublishParser {
     command,
     clientReq,
   }: DboTableCommand): Promise<TableRule> {
-    const clientInfo = await this.prostgles.authHandler?.getUserFromRequest(clientReq);
+    const clientInfo =
+      clientReq && (await this.prostgles.authHandler?.getSidAndUserFromRequest(clientReq));
     const rules = await this.getValidatedRequestRule({ tableName, command, clientReq }, clientInfo);
     return rules;
   }
 
   async getValidatedRequestRule(
     { tableName, command, clientReq }: DboTableCommand,
-    clientInfo: AuthResult | undefined
+    clientInfo: AuthResultWithSID | undefined
   ): Promise<TableRule> {
     if (!command || !tableName) throw "command OR tableName are missing";
 
@@ -166,10 +168,10 @@ export class PublishParser {
 
   async getTableRules(
     args: DboTable,
-    clientInfo: AuthResult | undefined
+    clientInfo: AuthResultWithSID | undefined
   ): Promise<ParsedPublishTable | undefined> {
+    const fileTablePublishRules = await this.getTableRulesWithoutFileTable(args, clientInfo);
     if (this.dbo[args.tableName]?.is_media) {
-      const fileTablePublishRules = await this.getTableRulesWithoutFileTable(args, clientInfo);
       const { rules } = await getFileTableRules.bind(this)(
         args.tableName,
         fileTablePublishRules,
@@ -179,7 +181,7 @@ export class PublishParser {
       return rules;
     }
 
-    return await this.getTableRulesWithoutFileTable(args, clientInfo);
+    return fileTablePublishRules;
   }
 
   getTableRulesWithoutFileTable = getTableRulesWithoutFileTable.bind(this);

package/lib/PublishParser/getFileTableRules.ts

@@ -1,5 +1,5 @@
 import { AnyObject, FullFilter, isDefined } from "prostgles-types";
-import { AuthClientRequest, AuthResult } from "../Auth/AuthTypes";
+import { AuthClientRequest, AuthResultWithSID } from "../Auth/AuthTypes";
 import { parseFieldFilter } from "../DboBuilder/ViewHandler/parseFieldFilter";
 import { PublishParser } from "./PublishParser";
 import { ParsedPublishTable, UpdateRule } from "./publishTypesAndUtils";
@@ -17,7 +17,7 @@ export async function getFileTableRules(
   fileTableName: string,
   fileTablePublishRules: ParsedPublishTable | undefined,
   clientReq: AuthClientRequest | undefined,
-  clientInfo: AuthResult | undefined
+  clientInfo: AuthResultWithSID | undefined
 ) {
   const forcedDeleteFilters: FullFilter<AnyObject, void>[] = [];
   const forcedSelectFilters: FullFilter<AnyObject, void>[] = [];

package/lib/PublishParser/getSchemaFromPublish.ts

@@ -7,13 +7,13 @@ import {
   TableSchemaErrors,
   TableSchemaForClient,
 } from "prostgles-types";
-import { AuthClientRequest, AuthResult } from "../Auth/AuthTypes";
+import { AuthClientRequest, AuthResultWithSID } from "../Auth/AuthTypes";
 import { getErrorAsObject } from "../DboBuilder/DboBuilder";
 import { TABLE_METHODS } from "../Prostgles";
 import { PublishObject, PublishParser } from "./PublishParser";
 
 type Args = AuthClientRequest & {
-  userData: AuthResult | undefined;
+  userData: AuthResultWithSID | undefined;
 };
 
 export async function getSchemaFromPublish(
@@ -31,11 +31,11 @@ export async function getSchemaFromPublish(
   try {
     /* Publish tables and views based on socket */
     const clientInfo =
-      userData ?? (await this.prostgles.authHandler?.getUserFromRequest(clientReq));
+      userData ?? (await this.prostgles.authHandler?.getSidAndUserFromRequest(clientReq));
 
     let _publish: PublishObject | undefined;
     try {
-      _publish = await this.getPublish(clientReq, clientInfo);
+      _publish = await this.getPublishAsObject(clientReq, clientInfo);
     } catch (err) {
       console.error("Error within then Publish function ", err);
       throw err;

package/lib/PublishParser/getTableRulesWithoutFileTable.ts

@@ -1,5 +1,5 @@
 import { getKeys, isObject } from "prostgles-types";
-import { AuthResult } from "../Auth/AuthTypes";
+import { AuthResult, AuthResultWithSID } from "../Auth/AuthTypes";
 import { TableHandler } from "../DboBuilder/TableHandler/TableHandler";
 import { ViewHandler } from "../DboBuilder/ViewHandler/ViewHandler";
 import { DEFAULT_SYNC_BATCH_SIZE } from "../PubSubManager/PubSubManager";
@@ -17,12 +17,13 @@ import {
 export async function getTableRulesWithoutFileTable(
   this: PublishParser,
   { tableName, clientReq }: DboTable,
-  clientInfo?: AuthResult,
+  clientInfo: AuthResultWithSID | undefined,
   overridenPublish?: PublishObject
 ): Promise<ParsedPublishTable | undefined> {
   if (!tableName) throw new Error("publish OR socket OR dbo OR tableName are missing");
 
-  const publish = overridenPublish ?? (clientReq && (await this.getPublish(clientReq, clientInfo)));
+  const publish =
+    overridenPublish ?? (clientReq && (await this.getPublishAsObject(clientReq, clientInfo)));
 
   const rawTableRule = publish?.[tableName];
   if (!rawTableRule || (isObject(rawTableRule) && Object.values(rawTableRule).every((v) => !v))) {

package/lib/PublishParser/publishTypesAndUtils.ts

@@ -432,7 +432,7 @@ export type DbTableInfo = {
   columns: TableSchemaColumn[];
 };
 export type PublishParams<S = void, SUser extends SessionUser = SessionUser> = {
-  sid?: string;
+  sid: string | undefined;
   dbo: DBOFullyTyped<S>;
   db: DB;
   user?: SUser["user"];

package/lib/onSocketConnected.ts

@@ -3,6 +3,7 @@ import type { Prostgles, TABLE_METHODS } from "./Prostgles";
 import { PRGLIOSocket } from "./DboBuilder/DboBuilderTypes";
 import { runClientMethod, runClientRequest } from "./runClientRequest";
 import { getErrorAsObject } from "./DboBuilder/dboBuilderUtils";
+import { DBOFullyTyped } from "./DBSchemaBuilder";
 
 export async function onSocketConnected(this: Prostgles, socket: PRGLIOSocket) {
   if (this.destroyed) {
@@ -26,11 +27,12 @@ export async function onSocketConnected(this: Prostgles, socket: PRGLIOSocket) {
     if (this.opts.onSocketConnect) {
       try {
         const getUser = async () => {
-          return await this.authHandler?.getUserFromRequest({ socket });
+          if (!this.authHandler) throw "authHandler missing";
+          return await this.authHandler.getSidAndUserFromRequest({ socket });
         };
         await this.opts.onSocketConnect({
           socket,
-          dbo: dbo as any,
+          dbo: dbo as DBOFullyTyped,
           db,
           getUser,
         });
@@ -79,9 +81,10 @@ export async function onSocketConnected(this: Prostgles, socket: PRGLIOSocket) {
 
       if (this.opts.onSocketDisconnect) {
         const getUser = async () => {
-          return await this.authHandler?.getUserFromRequest({ socket });
+          if (!this.authHandler) throw "authHandler missing";
+          return await this.authHandler.getSidAndUserFromRequest({ socket });
         };
-        this.opts.onSocketDisconnect({ socket, dbo: dbo as any, db, getUser });
+        this.opts.onSocketDisconnect({ socket, dbo: dbo as DBOFullyTyped, db, getUser });
       }
     });
 

package/lib/runClientRequest.ts

@@ -1,12 +1,4 @@
-import {
-  AnyObject,
-  SQLOptions,
-  SQLRequest,
-  TableHandler,
-  UserLike,
-  getKeys,
-  pickKeys,
-} from "prostgles-types";
+import { SQLRequest, TableHandler, UserLike, getKeys, pickKeys } from "prostgles-types";
 import { AuthClientRequest } from "./Auth/AuthTypes";
 import { LocalParams } from "./DboBuilder/DboBuilder";
 import { TableHandler as TableHandlerServer } from "./DboBuilder/TableHandler/TableHandler";
@@ -77,7 +69,7 @@ export const runClientRequest = async function (
     );
   }
 
-  const clientInfo = await this.authHandler?.getUserFromRequest(clientReq);
+  const clientInfo = await this.authHandler?.getSidAndUserFromRequest(clientReq);
   const validRules = await this.publishParser.getValidatedRequestRule(
     { tableName, command, clientReq },
     clientInfo
@@ -147,7 +139,7 @@ export const clientCanRunSqlRequest = async function (
     if (!this.authHandler) {
       throw "authHandler missing";
     }
-    const publishParams = await this.publishParser?.getPublishParams(clientReq);
+    const publishParams = await this.publishParser?.getPublishParams(clientReq, undefined);
     const res = publishParams && (await this.opts.publishRawSQL?.(publishParams));
     return Boolean((res && typeof res === "boolean") || res === "*");
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "4.2.196",
+  "version": "4.2.198",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/dist/Auth/endpoints/getConfirmEmailRequestHandler.d.ts

@@ -1,7 +0,0 @@
-import type { Request, Response } from "express";
-import { AuthResponse } from "prostgles-types";
-import { AuthRegistrationConfig } from "../AuthTypes";
-export declare const getConfirmEmailRequestHandler: (emailAuthConfig: Extract<Required<AuthRegistrationConfig<void>>["email"], {
-    signupType: "withPassword";
-}>) => (req: Request, res: Response<AuthResponse.PasswordRegisterSuccess | AuthResponse.PasswordRegisterFailure | AuthResponse.AuthSuccess>) => Promise<Response<AuthResponse.PasswordRegisterSuccess | AuthResponse.PasswordRegisterFailure | AuthResponse.AuthSuccess, Record<string, any>> | undefined>;
-//# sourceMappingURL=getConfirmEmailRequestHandler.d.ts.map

package/dist/Auth/endpoints/getConfirmEmailRequestHandler.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getConfirmEmailRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/getConfirmEmailRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAGtD,eAAO,MAAM,6BAA6B,oBACvB,QACf,SAAS,uBAAuB,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,EAC/C;IAAE,UAAU,EAAE,cAAc,CAAA;CAAE,CAC/B,WAGM,OAAO,OACP,SACD,aAAa,uBAAuB,GACpC,aAAa,uBAAuB,GACpC,aAAa,WAAW,CAC3B,+JAoBJ,CAAC"}

package/dist/Auth/endpoints/getConfirmEmailRequestHandler.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getConfirmEmailRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/getConfirmEmailRequestHandler.ts"],"names":[],"mappings":";;;AAEA,gDAAiD;AAEjD,8EAA2E;AAEpE,MAAM,6BAA6B,GAAG,CAC3C,eAGC,EACD,EAAE;IACF,OAAO,KAAK,EACV,GAAY,EACZ,GAIC,EACD,EAAE;QACF,MAAM,EAAE,EAAE,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAC1B,IAAI,CAAC;YACH,IAAI,CAAC,EAAE,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE,CAAC;gBAClC,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,sBAAsB,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC;YAC7F,CAAC;YACD,MAAM,EAAE,OAAO,EAAE,GAAG,UAAU,EAAE,GAAG,IAAA,iDAAuB,EAAC,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;YAClF,MAAM,eAAe,CAAC,mBAAmB,CAAC;gBACxC,gBAAgB,EAAE,EAAE;gBACpB,UAAU;gBACV,GAAG,EAAE,OAAO;aACb,CAAC,CAAC;YACH,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAC,CAAC;QAC1D,CAAC;QAAC,OAAO,EAAE,EAAE,CAAC;YACZ,GAAG;iBACA,MAAM,CAAC,6BAAe,CAAC,WAAW,CAAC;iBACnC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,yBAAyB,EAAE,CAAC,CAAC;QACxF,CAAC;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAhCW,QAAA,6BAA6B,iCAgCxC"}

package/dist/Auth/endpoints/getRegisterRequestHandler.d.ts

@@ -1,7 +0,0 @@
-import { Request, Response } from "express";
-import { AuthResponse } from "prostgles-types";
-import type { AuthRegistrationConfig } from "../AuthTypes";
-type ReturnType = AuthResponse.MagicLinkAuthFailure | AuthResponse.MagicLinkAuthSuccess | AuthResponse.PasswordRegisterFailure | AuthResponse.PasswordRegisterSuccess;
-export declare const getRegisterRequestHandler: ({ email: emailAuthConfig, websiteUrl, }: Required<Pick<AuthRegistrationConfig<void>, "email" | "websiteUrl">>) => (req: Request, res: Response<ReturnType>) => Promise<void>;
-export {};
-//# sourceMappingURL=getRegisterRequestHandler.d.ts.map

package/dist/Auth/endpoints/getRegisterRequestHandler.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getRegisterRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/getRegisterRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAI3D,KAAK,UAAU,GACX,YAAY,CAAC,oBAAoB,GACjC,YAAY,CAAC,oBAAoB,GACjC,YAAY,CAAC,uBAAuB,GACpC,YAAY,CAAC,uBAAuB,CAAC;AAEzC,eAAO,MAAM,yBAAyB,4CAGnC,SAAS,KAAK,uBAAuB,IAAI,CAAC,EAAE,OAAO,GAAG,YAAY,CAAC,CAAC,WAC1B,OAAO,OAAO,SAAS,UAAU,CAAC,kBAsE9E,CAAC"}