prostgles-server 4.2.589 → 4.2.591

package/lib/ProstglesTypes.ts

@@ -181,7 +181,7 @@ export type ProstglesInitOptions<S = void, SUser extends SessionUser = SessionUs
   /**
    * Server-side functions that can be invoked by the client
    */
-  functions?: ServerFunctionDefinitions<S>;
+  functions?: ServerFunctionDefinitions<S, SUser>;
 
   /**
    * If true then will test all table methods on each socket connect.

package/lib/PublishParser/PublishParser.ts

@@ -71,9 +71,13 @@ export class PublishParser {
     if (!functionGroups || !publishParams.user) {
       return;
     }
+    const { findUser } = this.prostgles.opts.auth ?? {};
+    if (!findUser) {
+      throw new Error(
+        "findUser function is missing in auth config. It is required for functions to work.",
+      );
+    }
     const user = publishParams.user;
-    const users = publishParams.dbo.users;
-    if (!users?.findOne) return;
     const userId = user.id;
     if (!userId || typeof userId !== "string") {
       throw "User ID is missing or invalid";
@@ -81,9 +85,12 @@ export class PublishParser {
     const allowedFunctionsMap = new Map<string, ServerFunctionDefinition>();
 
     for (const group of Object.values(functionGroups)) {
-      const matchingUser = await users.findOne({
-        $and: [group.userFilter, { id: userId }],
-      });
+      const matchingUser = await findUser(
+        {
+          $and: [group.userFilter, { id: userId }],
+        },
+        publishParams.dbo,
+      );
       if (!matchingUser) continue;
 
       for (const [name, method] of Object.entries(group.functions)) {

package/lib/PublishParser/defineServerFunction.ts

@@ -47,6 +47,11 @@ export type ServerFunctionDefinition = {
   run: (...args: any[]) => MaybePromise<unknown>;
 };
 
+declare const serverFunctionContext: unique symbol;
+type ServerFunctionContextMarker<S, SUser extends SessionUser> = {
+  [serverFunctionContext]?: [S, SUser];
+};
+
 type DefineFunctionArgs<
   TInput extends Record<string, JSONB.FieldType> | undefined,
   Context,
@@ -66,7 +71,7 @@ export function defineFunction<
   args: DefineFunctionArgs<TInput, UnrestrictedFunctionContext<S, SUser>, Return> & {
     unrestrictedDbAccess: true;
   },
-): typeof args;
+): typeof args & ServerFunctionContextMarker<S, SUser>;
 
 export function defineFunction<
   TInput extends Record<string, JSONB.FieldType> | undefined = undefined,
@@ -77,7 +82,7 @@ export function defineFunction<
   args: DefineFunctionArgs<TInput, RestrictedFunctionContext<S, SUser>, Return> & {
     unrestrictedDbAccess?: undefined;
   },
-): typeof args;
+): typeof args & ServerFunctionContextMarker<S, SUser>;
 export function defineFunction(args: unknown) {
   return args;
 }
@@ -91,10 +96,16 @@ type UsersTableRow<S> =
 
 type ValidDbSchema<S> = S extends DBSchema ? S : void;
 
-export type ServerFunctionDefinitions<S = void> = Record<
+export type ServerFunctionDefinitions<
+  S = void,
+  SUser extends SessionUser = SessionUser,
+> = Record<
   string,
   {
     userFilter: FullFilter<UsersTableRow<S>, ValidDbSchema<S>>;
-    functions: Record<string, ServerFunctionDefinition>;
+    functions: Record<
+      string,
+      ServerFunctionDefinition & ServerFunctionContextMarker<S, SUser>
+    >;
   }
 >;

package/package.json

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

package/dist/Auth/utils/setCookieAndGoToReturnURLIFSet.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"setCookieAndGoToReturnURLIFSet.js","sourceRoot":"","sources":["../../../lib/Auth/utils/setCookieAndGoToReturnURLIFSet.ts"],"names":[],"mappings":";;AAQA,kEAcC;AAED,wEA8CC;AAtED,gDAA+F;AAG/F,oCAAoD;AACpD,2EAAwE;AACxE,yDAAsD;AACtD,iDAA8C;AAE9C,SAAgB,2BAA2B,CAEzC,MAAwC,EACxC,cAA8D;IAE9D,MAAM,gBAAgB,GAAG,IAAA,gCAAwB,EAAC,MAAM,CAAC,CAAC;IAC1D,IAAI,gBAAgB,EAAE,CAAC;QACrB,MAAM,EAAE,GAAG,EAAE,GAAG,cAAc,CAAC;QAC/B,OAAO,GAAG,CAAC,MAAM,CAAC,6BAAe,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC;YACnD,OAAO,EAAE,KAAK;YACd,IAAI,EAAE,gBAAgB;SACvB,CAAC,CAAC;IACL,CAAC;IACD,OAAO,IAAI,CAAC,8BAA8B,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;AACrE,CAAC;AAED,SAAgB,8BAA8B,CAE5C,MAAwC,EACxC,cAA8D;IAE9D,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAChC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,cAAc,CAAC;IACpC,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;IACjC,CAAC;IAED,MAAM,YAAY,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,YAAY;IAE/C,IAAI,cAAc,GAA4B;QAC5C,MAAM,EAAE,YAAY;KACrB,CAAC;IAEF,IAAI,OAAO,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;QACtE,cAAc,GAAG,EAAE,OAAO,EAAE,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QAChD,MAAM,IAAI,GAAG,CAAC,CAAC,cAAc,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;QACvE,IAAI,IAAI,IAAI,GAAG,EAAE,CAAC;YAChB,OAAO,CAAC,IAAI,CAAC,8DAA8D,IAAI,MAAM,CAAC,CAAC;QACzF,CAAC;IACH,CAAC;IAED,MAAM,UAAU,GAAG;QACjB,GAAG,cAAc;QACjB,+CAA+C;QAC/C,QAAQ,EAAE,IAAI;QACd,cAAc;QACd,MAAM,EAAE,IAAI;QACZ,QAAQ,EAAE,QAAQ;QAClB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,aAAa,IAAI,EAAE,CAAC;KAC7C,CAAC;IACX,MAAM,UAAU,GAAG,GAAG,CAAC;IAEvB,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IACpD,MAAM,aAAa,GAAG,IAAA,qDAAyB,EAAC,GAAG,CAAC,CAAC;IACrD,IAAI,aAAa,EAAE,CAAC;QAClB,OAAO,GAAG,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;IACrC,CAAC;IACD,MAAM,eAAe,GAAG,IAAA,mCAAgB,EAAC,GAAG,CAAC,WAAW,EAAE,wCAA0B,CAAC,CAAC;IACtF,IAAI,eAAe,IAAI,CAAC,IAAA,2BAAY,EAAC,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,eAAe,CAAC,EAAE,CAAC;QAClF,OAAO,GAAG,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IACvC,CAAC;IACD,OAAO,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;AAC3B,CAAC"}