npm - prostgles-server - Versions diffs - 4.2.196 → 4.2.197 - Mend

prostgles-server 4.2.196 → 4.2.197

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.

Files changed (93) hide show

package/dist/Auth/setupAuthRoutes.js CHANGED Viewed

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupAuthRoutes = void 0;
-const AuthHandler_1 = require("./AuthHandler");
+const setCatchAllRequestHandler_1 = require("./endpoints/setCatchAllRequestHandler");
+const setLoginRequestHandler_1 = require("./endpoints/setLoginRequestHandler");
+const setMagicLinkRequestHandler_1 = require("./endpoints/setMagicLinkRequestHandler");
 const setAuthProviders_1 = require("./setAuthProviders");
-const getClientRequestIPsInfo_1 = require("./utils/getClientRequestIPsInfo");
-const getReturnUrl_1 = require("./utils/getReturnUrl");
 async function setupAuthRoutes() {
     const { login, expressConfig } = this.opts;
     if (!login) {
@@ -16,7 +16,7 @@ async function setupAuthRoutes() {
     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 ";
     }
@@ -35,129 +35,11 @@ async function setupAuthRoutes() {
         (0, setAuthProviders_1.upsertNamedExpressMiddleware)(app, prostglesUseMiddleware, "prostglesUseMiddleware");
     }
     if (onMagicLink) {
-        app.get(AuthHandler_1.AUTH_ROUTES_AND_PARAMS.magicLinksExpressRoute, async (req, res) => {
-            const { id } = req.params;
-            if (typeof id !== "string" || !id) {
-                res
-                    .status(AuthHandler_1.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, this.db, (0, getClientRequestIPsInfo_1.getClientRequestIPsInfo)({ httpReq: req, res }));
-                    });
-                    if (!response.session) {
-                        res.status(AuthHandler_1.HTTP_FAIL_CODES.UNAUTHORIZED).json(response.response);
-                    }
-                    else {
-                        this.setCookieAndGoToReturnURLIFSet(response.session, { req, res });
-                    }
-                }
-                catch (e) {
-                    res
-                        .status(AuthHandler_1.HTTP_FAIL_CODES.UNAUTHORIZED)
-                        .json({ success: false, code: "something-went-wrong" });
-                }
-            }
-        });
+        setMagicLinkRequestHandler_1.setMagicLinkRequestHandler.bind(this)(onMagicLink, app);
     }
-    app.post(AuthHandler_1.AUTH_ROUTES_AND_PARAMS.login, async (req, res) => {
-        try {
-            const loginParams = {
-                type: "username",
-                ...req.body,
-            };
-            await this.loginThrottledAndSetCookie(req, res, loginParams);
-        }
-        catch (error) {
-            res.status(AuthHandler_1.HTTP_FAIL_CODES.BAD_REQUEST).json({ error });
-        }
-    });
-    const onLogout = async (req, res) => {
-        const sid = this.validateSid(req.cookies?.[this.sidKeyName]);
-        if (sid) {
-            try {
-                await this.throttledFunc(() => {
-                    return this.opts.logout?.(req.cookies?.[this.sidKeyName], this.dbo, this.db);
-                });
-            }
-            catch (err) {
-                console.error(err);
-            }
-        }
-        res.redirect("/");
-    };
+    setLoginRequestHandler_1.setLoginRequestHandler.bind(this)(app);
     /* Redirect if not logged in and requesting non public content */
-    app.get(AuthHandler_1.AUTH_ROUTES_AND_PARAMS.catchAll, async (req, res, next) => {
-        const clientReq = { httpReq: req, res };
-        const getUser = async () => {
-            const userOrCode = await this.getUserAndHandleError(clientReq);
-            if (typeof userOrCode === "string") {
-                res.status(AuthHandler_1.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 = (0, getReturnUrl_1.getReturnUrl)(req);
-            if (this.matchesRoute(AuthHandler_1.AUTH_ROUTES_AND_PARAMS.logoutGetPath, req.path)) {
-                await onLogout(req, res);
-                return;
-            }
-            if (this.matchesRoute(AuthHandler_1.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(`${AuthHandler_1.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(AuthHandler_1.AUTH_ROUTES_AND_PARAMS.login, req.path) &&
-                (await isLoggedInUser())) {
-                res.redirect("/");
-                return;
-            }
-            onGetRequestOK?.(req, res, {
-                getUser,
-                dbo: this.dbo,
-                db: this.db,
-            });
-        }
-        catch (error) {
-            console.error(error);
-            const errorMessage = typeof error === "string" ? error
-                : error instanceof Error ? error.message
-                    : "";
-            res.status(AuthHandler_1.HTTP_FAIL_CODES.BAD_REQUEST).json({
-                error: "Something went wrong when processing your request" +
-                    (errorMessage ? ": " + errorMessage : ""),
-            });
-        }
-    });
+    setCatchAllRequestHandler_1.setCatchAllRequestHandler.bind(this)(app);
 }
 exports.setupAuthRoutes = setupAuthRoutes;
 //# sourceMappingURL=setupAuthRoutes.js.map

package/dist/Auth/setupAuthRoutes.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"setupAuthRoutes.js","sourceRoot":"","sources":["../../lib/Auth/setupAuthRoutes.ts"],"names":[],"mappings":";;;AAGA,+~~CAAqF~~;~~AAErF~~,~~yDAAoF~~;AACpF,~~6EAA0E~~;~~AAC1E~~,~~uDAAoD;AAC7C,~~KAAK,UAAU,eAAe;IACnC,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;IAE3C,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,+CAA+C,CAAC;IACxD,CAAC;IAED,IAAI,IAAI,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;QAC9B,MAAM,4DAA4D,CAAC;IACrE,CAAC;IAED,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO;IACT,CAAC;IACD,MAAM,EAAE,GAAG,EAAE,YAAY,GAAG,EAAE,EAAE,~~cAAc,EAAE,~~WAAW,EAAE,GAAG,EAAE,GAAG,aAAa,CAAC;~~IACnF~~,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1D,MAAM,uDAAuD,CAAC;IAChE,CAAC;IAED,MAAM,mCAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,aAAa,CAAC,CAAC;IAEjD,IAAI,GAAG,EAAE,CAAC;QACR,MAAM,sBAAsB,GAAmB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YAChE,GAAG,CAAC;gBACF,GAAG;gBACH,GAAG;gBACH,IAAI;gBACJ,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;gBAChE,GAAG,EAAE,IAAI,CAAC,GAAoB;gBAC9B,EAAE,EAAE,IAAI,CAAC,EAAE;aACZ,CAAC,CAAC;QACL,CAAC,CAAC;QACF,IAAA,+CAA4B,EAAC,GAAG,EAAE,sBAAsB,EAAE,wBAAwB,CAAC,CAAC;IACtF,CAAC;IAED,IAAI,WAAW,EAAE,CAAC;QAChB,~~GAAG~~,CAAC,~~GAAG,CACL,oCAAsB,CAAC,sBAAsB,EAC7C,KAAK,EACH,GAAe,EACf,GAAoF,EACpF,EAAE;YACF,MAAM,EAAE,EAAE,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;YAE1B,~~IAAI,~~OAAO,EAAE,KAAK,QAAQ,IAAI,~~CAAC,~~EAAE,EAAE,CAAC;gBAClC,GAAG;qBACA,MAAM,CAAC,6BAAe,CAAC,WAAW,CAAC;qBACnC,~~IAAI,CAAC,~~EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,sBAAsB,EAAE,OAAO,EAAE,oBAAoB,EAAE,~~CAAC,~~CAAC;YAC3F,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC;oBACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,IAAI,EAAE;wBACnD,OAAO,~~WAAW,~~CAChB,~~EAAE,~~EACF,IAAI,CAAC,GAAU,EACf,IAAI,CAAC,EAAE,EACP,IAAA,iDAAuB,EAAC,EAAE,OAAO,EAAE,~~GAAG,~~EAAE,GAAG,EAAE,~~CAAC,~~CAC/C,~~CAAC;~~oBACJ~~,CAAC~~,CAAC,CAAC~~;oBACH,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;wBACtB,GAAG,CAAC,MAAM,CAAC,6BAAe,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;oBACnE,CAAC;yBAAM,CAAC;wBACN,IAAI,CAAC,8BAA8B,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;oBACtE,CAAC;gBACH,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,GAAG;yBACA,MAAM,CAAC,6BAAe,CAAC,YAAY,CAAC;yBACpC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,sBAAsB,EAAE,CAAC,CAAC;gBAC5D,CAAC;YACH,CAAC;QACH,CAAC,CACF,CAAC;IACJ,CAAC;IAED,~~GAAG,~~CAAC,IAAI,CAAC,~~oCAAsB,CAAC,KAAK,EAAE,KAAK,EAAE,GAAe,EAAE,GAAe,EAAE,EAAE;QAChF,~~IAAI,CAAC~~;YACH~~,~~MAAM,WAAW,GAAgB;gBAC/B,IAAI,EAAE,UAAU;gBAChB,GAAG,GAAG,~~CAAC,~~IAAI;aACZ,CAAC;YAEF,MAAM,IAAI,CAAC,0BAA0B,CAAC,~~GAAG,~~EAAE,GAAG,EAAE,WAAW,~~CAAC,CAAC;~~QAC/D~~,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,GAAG,CAAC,MAAM,CAAC,6BAAe,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,KAAK,EAAE,GAAe,EAAE,GAAe,EAAE,EAAE;QAC1D,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;QAC7D,IAAI,GAAG,EAAE,CAAC;YACR,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE;oBAC5B,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,GAAU,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;gBACtF,CAAC,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACrB,CAAC;QACH,CAAC;QACD,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACpB,CAAC,CAAC;IAEF,iEAAiE;IACjE,~~GAAG~~,CAAC,~~GAAG,CAAC,oCAAsB,CAAC,QAAQ,EAAE,KAAK,EAAE,GAAe,EAAE,GAAe,EAAE,~~IAAI,~~EAAE,EAAE;QACxF,MAAM,SAAS,GAAsB,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,~~CAAC~~;QAC3D~~,~~MAAM,OAAO,GAAG,KAAK,~~IAAI,~~EAAE;YACzB,MAAM,UAAU,GAAG,MAAM,IAAI,~~CAAC,~~qBAAqB,~~CAAC,~~SAAS,CAAC,CAAC;YAC/D,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;gBACnC,~~GAAG,CAAC,~~MAAM,~~CAAC~~,6BAAe,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC~~;~~gBACnF~~,~~MAAM,UAAU,~~CAAC;~~YACnB~~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"}
1	+ {"version":3,"file":"setupAuthRoutes.js","sourceRoot":"","sources":["../../lib/Auth/setupAuthRoutes.ts"],"names":[],"mappings":";;;AAGA,qFAAkF;AAClF,+EAA4E;AAC5E,uFAAoF;AACpF,yDAAoF;AAE7E,KAAK,UAAU,eAAe;IACnC,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;IAE3C,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,+CAA+C,CAAC;IACxD,CAAC;IAED,IAAI,IAAI,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;QAC9B,MAAM,4DAA4D,CAAC;IACrE,CAAC;IAED,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO;IACT,CAAC;IACD,MAAM,EAAE,GAAG,EAAE,YAAY,GAAG,EAAE,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,aAAa,CAAC;IACnE,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1D,MAAM,uDAAuD,CAAC;IAChE,CAAC;IAED,MAAM,mCAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,aAAa,CAAC,CAAC;IAEjD,IAAI,GAAG,EAAE,CAAC;QACR,MAAM,sBAAsB,GAAmB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YAChE,GAAG,CAAC;gBACF,GAAG;gBACH,GAAG;gBACH,IAAI;gBACJ,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;gBAChE,GAAG,EAAE,IAAI,CAAC,GAAoB;gBAC9B,EAAE,EAAE,IAAI,CAAC,EAAE;aACZ,CAAC,CAAC;QACL,CAAC,CAAC;QACF,IAAA,+CAA4B,EAAC,GAAG,EAAE,sBAAsB,EAAE,wBAAwB,CAAC,CAAC;IACtF,CAAC;IAED,IAAI,WAAW,EAAE,CAAC;QAChB,uDAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;IAC1D,CAAC;IAED,+CAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IAEvC,iEAAiE;IACjE,qDAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;AAC5C,CAAC;AA3CD,0CA2CC"}

package/dist/Auth/utils/getSidAndUserFromRequest.d.ts ADDED Viewed

@@ -0,0 +1,8 @@
+import { AuthHandler } from "../AuthHandler";
+import { AuthClientRequest, AuthResultWithSID } from "../AuthTypes";
+/**
+ * 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 declare function getSidAndUserFromRequest(this: AuthHandler, clientReq: AuthClientRequest): Promise<AuthResultWithSID>;
+//# sourceMappingURL=getSidAndUserFromRequest.d.ts.map

package/dist/Auth/utils/getSidAndUserFromRequest.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"getSidAndUserFromRequest.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/getSidAndUserFromRequest.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAA2B,MAAM,gBAAgB,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEpE;;;GAGG;AACH,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,WAAW,EACjB,SAAS,EAAE,iBAAiB,GAC3B,OAAO,CAAC,iBAAiB,CAAC,CA4D5B"}

package/dist/Auth/utils/{getUserFromRequest.js → getSidAndUserFromRequest.js} RENAMED Viewed

@@ -1,20 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserFromRequest = void 0;
+exports.getSidAndUserFromRequest = void 0;
 const AuthHandler_1 = require("../AuthHandler");
 /**
- * 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
  */
-async function getUserFromRequest(maybeClientReq) {
-    if (!maybeClientReq)
-        return undefined;
+async function getSidAndUserFromRequest(clientReq) {
     /**
      * 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,
@@ -33,15 +32,15 @@ async function getUserFromRequest(maybeClientReq) {
     const authStart = Date.now();
     const result = await this.throttledFunc(async () => {
         const { getUser } = this.opts;
-        const sid = this.getSID(maybeClientReq);
-        const clientInfoOrErr = !sid ? undefined : (await getUser(sid, this.dbo, this.db, (0, AuthHandler_1.getClientRequestIPsInfo)(maybeClientReq)));
+        const sid = this.getSID(clientReq);
+        const clientInfoOrErr = !sid ? undefined : (await getUser(sid, this.dbo, this.db, (0, AuthHandler_1.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, this.db);
             if (session && session.expires && clientInfo?.user) {
-                maybeClientReq.socket.__prglCache = {
+                clientReq.socket.__prglCache = {
                     session,
                     user: clientInfo.user,
                     clientUser: clientInfo.clientUser,
@@ -52,15 +51,15 @@ async function getUserFromRequest(maybeClientReq) {
             return { sid, ...clientInfo };
         }
         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;
 }
-exports.getUserFromRequest = getUserFromRequest;
-//# sourceMappingURL=getUserFromRequest.js.map
+exports.getSidAndUserFromRequest = getSidAndUserFromRequest;
+//# sourceMappingURL=getSidAndUserFromRequest.js.map

package/dist/Auth/utils/getSidAndUserFromRequest.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"getSidAndUserFromRequest.js","sourceRoot":"","sources":["../../../lib/Auth/utils/getSidAndUserFromRequest.ts"],"names":[],"mappings":";;;AACA,gDAAsE;AAGtE;;;GAGG;AACI,KAAK,UAAU,wBAAwB,CAE5C,SAA4B;IAE5B;;OAEG;IACH,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,UAAU,CAAC;IACtD,IAAI,SAAS,CAAC,MAAM,IAAI,UAAU,IAAI,SAAS,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;QACnE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC;QACnE,MAAM,OAAO,GAAG,IAAI,CAAC,yBAAyB,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC1E,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO;gBACL,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,IAAI;gBACJ,UAAU;aACX,CAAC;QACJ,CAAC;;YACC,OAAO;gBACL,GAAG,EAAE,OAAO,CAAC,GAAG;aACjB,CAAC;IACN,CAAC;IAED;;OAEG;IACH,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC7B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,IAAI,EAAE;QACjD,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAE9B,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACnC,MAAM,eAAe,GACnB,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CACjB,MAAM,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,GAAoB,EAAE,IAAI,CAAC,EAAE,EAAE,IAAA,qCAAuB,EAAC,SAAS,CAAC,CAAC,CAC3F,CAAC;QACJ,IAAI,OAAO,eAAe,KAAK,QAAQ;YAAE,MAAM,eAAe,CAAC;QAC/D,MAAM,UAAU,GAAG,eAAe,CAAC;QACnC,IAAI,UAAU,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;YACnC,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,GAAU,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;YAChE,IAAI,OAAO,IAAI,OAAO,CAAC,OAAO,IAAI,UAAU,EAAE,IAAI,EAAE,CAAC;gBACnD,SAAS,CAAC,MAAM,CAAC,WAAW,GAAG;oBAC7B,OAAO;oBACP,IAAI,EAAE,UAAU,CAAC,IAAI;oBACrB,UAAU,EAAE,UAAU,CAAC,UAAU;iBAClC,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,UAAU,EAAE,IAAI,IAAI,GAAG,EAAE,CAAC;YAC5B,OAAO,EAAE,GAAG,EAAE,GAAG,UAAU,EAAE,CAAC;QAChC,CAAC;QAED,OAAO,EAAE,GAAG,EAAE,CAAC;IACjB,CAAC,EAAE,GAAG,CAAC,CAAC;IAER,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QAChC,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,eAAe;QACxB,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS;QAChC,GAAG,EAAE,MAAM,CAAC,GAAG;QACf,QAAQ,EAAE,SAAS,CAAC,MAAM,EAAE,EAAE;KAC/B,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC;AA/DD,4DA+DC"}

package/dist/DboBuilder/runSQL.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"runSQL.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/runSQL.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,iCAAiC,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,UAAU,EAA4B,MAAM,iBAAiB,CAAC;AAClF,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,WAAW,EAAyB,MAAM,cAAc,CAAC;AAC9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,wBAAsB,MAAM,CAC1B,IAAI,EAAE,UAAU,EAChB,eAAe,EAAE,MAAM,EACvB,IAAI,EAAE,SAAS,GAAG,SAAS,GAAG,GAAG,EAAE,EACnC,OAAO,EAAE,UAAU,GAAG,SAAS,EAC/B,WAAW,EAAE,WAAW,GAAG,SAAS,gBAmGrC;AAyBD,wBAAsB,YAAY,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,UAAQ,iBA8BjE;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,CAAC,OAAO,EAAE;;;;;;;;;;;;;;;IAmB1E;AAED,eAAO,MAAM,SAAS,cACT,SAAS,aACT,iBAAiB,GAAG,SAAS,KACvC,QAAQ,OAAO,~~CAOjB~~,CAAC;AAEF,eAAO,MAAM,eAAe,cAAmB,QAAQ,OAAO,CAI7D,CAAC"}
1	+ {"version":3,"file":"runSQL.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/runSQL.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,iCAAiC,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,UAAU,EAA4B,MAAM,iBAAiB,CAAC;AAClF,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,WAAW,EAAyB,MAAM,cAAc,CAAC;AAC9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,wBAAsB,MAAM,CAC1B,IAAI,EAAE,UAAU,EAChB,eAAe,EAAE,MAAM,EACvB,IAAI,EAAE,SAAS,GAAG,SAAS,GAAG,GAAG,EAAE,EACnC,OAAO,EAAE,UAAU,GAAG,SAAS,EAC/B,WAAW,EAAE,WAAW,GAAG,SAAS,gBAmGrC;AAyBD,wBAAsB,YAAY,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,UAAQ,iBA8BjE;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,CAAC,OAAO,EAAE;;;;;;;;;;;;;;;IAmB1E;AAED,eAAO,MAAM,SAAS,cACT,SAAS,aACT,iBAAiB,GAAG,SAAS,KACvC,QAAQ,OAAO,CAMjB,CAAC;AAEF,eAAO,MAAM,eAAe,cAAmB,QAAQ,OAAO,CAI7D,CAAC"}

package/dist/DboBuilder/runSQL.js CHANGED Viewed

@@ -160,10 +160,10 @@ exports.getDetailedFieldInfo = getDetailedFieldInfo;
 const canRunSQL = async (prostgles, clientReq) => {
     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 === "*");
 };
 exports.canRunSQL = canRunSQL;
 const canCreateTables = async (db) => {

package/dist/DboBuilder/runSQL.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"runSQL.js","sourceRoot":"","sources":["../../lib/DboBuilder/runSQL.ts"],"names":[],"mappings":"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~~IAE5B~~,MAAM,aAAa,GAAG,MAAM,SAAS,CAAC,~~aAAc~~,~~CAAC~~,gBAAgB,CAAC,SAAS,CAAC,CAAC;~~IACjF~~,~~YAAY~~;~~IACZ~~,MAAM,~~GAAG~~,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,aAAa,CAAC,CAAC;~~IAChE~~,OAAO,OAAO,CAAC,CAAC,~~GAAG~~,IAAI,OAAO,~~GAAG~~,KAAK,SAAS,CAAC,IAAI,~~GAAG~~,KAAK,GAAG,CAAC,CAAC;~~AACnE~~,CAAC,CAAC;~~AAVW~~,QAAA,SAAS,~~aAUpB~~;AAEK,MAAM,eAAe,GAAG,KAAK,EAAE,EAAM,EAAoB,EAAE;IAChE,OAAO,EAAE;SACN,GAAG,CAAC,oEAAoE,CAAC;SACzE,IAAI,CAAC,CAAC,IAAwB,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC,CAAC;AAC/D,CAAC,CAAC;AAJW,QAAA,eAAe,mBAI1B"}
1	+ {"version":3,"file":"runSQL.js","sourceRoot":"","sources":["../../lib/DboBuilder/runSQL.ts"],"names":[],"mappings":";;;AAAA,2CAAqF;AAIrF,6CAA8E;AAGvE,KAAK,UAAU,MAAM,CAE1B,eAAuB,EACvB,IAAmC,EACnC,OAA+B,EAC/B,WAAoC;IAEpC,MAAM,YAAY,GAAG,eAAe,CAAC;IACrC,IACE,YAAY;SACT,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC;SACtB,WAAW,EAAE;SACb,QAAQ,CAAC,qCAAqC,CAAC,EAClD,CAAC;QACD,MAAM,EAAE,wBAAwB,EAAE,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,+BAA+B,CAAC,CAAC;QAC9F,IAAI,CAAC,CAAC,wBAAwB,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC;YACrE,MAAM,CACJ,oLAAoL;gBACpL,gHAAgH,CACjH,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;IAE1B,IAAI,CAAC,CAAC,MAAM,IAAA,iBAAS,EAAC,IAAI,CAAC,SAAS,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC,EAAE,CAAC;QAC/D,MAAM,wBAAwB,CAAC;IACjC,CAAC;IAED,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,GAAG,IAAI,EAAE,GAAe,OAAO,IAAK,EAAiB,CAAC;IAChG,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW,EAAE,SAAS,IAAI,EAAE,CAAC;IAEhD,MAAM,EAAE,GAAG,WAAW,EAAE,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC;IACzC,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;QAC5B,IAAI,WAAW,EAAE,EAAE;YAAE,MAAM,gDAAgD,CAAC;QAC5E,IAAI,CAAC,MAAM;YAAE,MAAM,wCAAwC,CAAC;QAC5D,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;YACjD,MAAM;YACN,KAAK,EAAE,gBAAG,CAAC,EAAE,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC;YACxC,OAAO;SACR,CAAC,CAAC;QACH,OAAO,UAAU,CAAC;IACpB,CAAC;SAAM,IAAI,UAAU,KAAK,oBAAoB,EAAE,CAAC;QAC/C,IAAI,CAAC,MAAM;YAAE,MAAM,oDAAoD,CAAC;QACxE,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;IACjE,CAAC;SAAM,IAAI,UAAU,KAAK,WAAW,EAAE,CAAC;QACtC,IAAI,CAAC;YACH,OAAO,gBAAG,CAAC,EAAE,CAAC,MAAM,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QAC9C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAO,GAAW,CAAC,QAAQ,EAAE,CAAC;QAChC,CAAC;IACH,CAAC;IAED,IAAI,UAAU,GAAgC,YAAY,GAAG,EAAE,CAAC;IAChE,MAAM,mBAAmB,GACvB,UAAU,KAAK,WAAW;QAC1B,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1F,IAAI,mBAAmB,EAAE,CAAC;QACxB,UAAU,GAAG,IAAI,+BAAE,CAAC;YAClB,OAAO,EAAE,OAAO;YAChB,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,gBAAG,CAAC,EAAE,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,YAAY;SACnE,CAAC,CAAC;IACL,CAAC;IAED,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5C,IAAI,WAAwD,CAAC;IAE7D,IAAI,UAAU,KAAK,uBAAuB,EAAE,CAAC;QAC3C,MAAM,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;YACtB,WAAW,GAAG,MAAM,CAAC,CAAC,MAAM,CAAY,UAAU,EAAE,MAAM,CAAC,CAAC;YAC5D,MAAM,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,WAAW,GAAG,MAAM,EAAE,CAAC,MAAM,CAAY,UAAU,EAAE,MAAM,CAAC,CAAC;IAC/D,CAAC;IACD,IAAI,CAAC,WAAW;QAAE,MAAM,iBAAiB,CAAC;IAC1C,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,WAAW,CAAC;IAErC,MAAM,cAAc,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CACjD,eAAe,EACf,WAAW,EACX,WAAW,EACX,WAAW,EAAE,SAAS,CACvB,CAAC;IACF,IAAI,cAAc,EAAE,CAAC;QACnB,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,IAAI,UAAU,KAAK,MAAM,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC;SAAM,IAAI,UAAU,KAAK,KAAK,EAAE,CAAC;QAChC,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC;IACjB,CAAC;SAAM,IAAI,UAAU,KAAK,OAAO,EAAE,CAAC;QAClC,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IACzC,CAAC;SAAM,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;QACnC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9C,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,GAAiC;YACzC,QAAQ,EAAE,CAAC;YACX,GAAG,WAAW;YACd,MAAM,EAAE,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;SAChD,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAxGD,wBAwGC;AAED,MAAM,WAAW,GAAG,KAAK,WAEvB,eAAuB,EACvB,EAAE,OAAO,EAAmC,EAC5C,WAAgC,EAChC,SAAwC;IAExC,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,sBAAsB,EAAE,CAAC;QACnD,OAAO;QACP,KAAK,EAAE,eAAe;KACvB,CAAC,CAAC;IAEH,IAAI,OAAO,KAAK,QAAQ,EAAE,CAAC;QACzB,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,IAAI,EAAE,CAAC;QACnC,IAAI,CAAC,WAAW;YACd,MAAM,IAAI,KAAK,CACb,mHAAmH,CACpH,CAAC;QACJ,IAAI,CAAC,MAAM;YAAE,MAAM,wCAAwC,CAAC;QAC5D,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,SAAS,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;IAClF,CAAC;AACH,CAAC,CAAC;AAEK,KAAK,UAAU,YAAY,CAAmB,KAAK,GAAG,KAAK;IAChE,IAAI,KAAK,EAAE,CAAC;QACV,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC;QAC7B,IAAI,CAAC,kBAAkB,GAAG,SAAS,CAAC;IACtC,CAAC;IACD,IAAI,CAAC,UAAU,KAAK,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;IAC1E,IAAI,CAAC,WAAW,KAAK,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC;;;;;;;;;;;;;;;;GAgBtC,CAAC,CAAC;IACH,IAAI,CAAC,kBAAkB,KAAK,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC;;;;;GAK7C,CAAC,CAAC;AACL,CAAC;AA9BD,oCA8BC;AAED,SAAgB,oBAAoB,CAAmB,MAAoB;IACzE,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACtB,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAW,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,OAAO,IAAI,MAAM,EAC1F,KAAK,GAAG,IAAI,CAAC,WAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,EAC9D,MAAM,GAAG,IAAI,CAAC,kBAAmB,CAAC,IAAI,CACpC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,gBAAgB,KAAK,CAAC,CAAC,QAAQ,CACpE,EACD,UAAU,GAAG,IAAA,6BAAgB,EAAC,QAAQ,CAAC,CAAC;QAE1C,OAAO;YACL,GAAG,CAAC;YACJ,UAAU;YACV,QAAQ;YACR,QAAQ,EAAE,QAAQ;YAClB,SAAS,EAAE,KAAK,EAAE,OAAO;YACzB,WAAW,EAAE,KAAK,EAAE,UAAU;YAC9B,UAAU,EAAE,MAAM,EAAE,WAAW;SAChC,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAnBD,oDAmBC;AAEM,MAAM,SAAS,GAAG,KAAK,EAC5B,SAAoB,EACpB,SAAwC,EACtB,EAAE;IACpB,IAAI,CAAC,SAAS;QAAE,OAAO,IAAI,CAAC;IAC5B,MAAM,aAAa,GAAG,MAAM,SAAS,CAAC,aAAa,EAAE,gBAAgB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAC5F,yDAAyD;IACzD,MAAM,aAAa,GAAG,aAAa,IAAI,CAAC,MAAM,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;IAC7F,OAAO,OAAO,CAAC,CAAC,aAAa,IAAI,OAAO,aAAa,KAAK,SAAS,CAAC,IAAI,aAAa,KAAK,GAAG,CAAC,CAAC;AACjG,CAAC,CAAC;AATW,QAAA,SAAS,aASpB;AAEK,MAAM,eAAe,GAAG,KAAK,EAAE,EAAM,EAAoB,EAAE;IAChE,OAAO,EAAE;SACN,GAAG,CAAC,oEAAoE,CAAC;SACzE,IAAI,CAAC,CAAC,IAAwB,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC,CAAC;AAC/D,CAAC,CAAC;AAJW,QAAA,eAAe,mBAI1B"}

package/dist/Prostgles.js CHANGED Viewed

@@ -339,7 +339,7 @@ class Prostgles {
             const clientInfo = clientReq.socket ?
                 { type: "socket", ...clientReq }
                 : { type: "http", ...clientReq };
-            const userData = await this.authHandler?.getUserFromRequest(clientInfo);
+            const userData = await this.authHandler?.getSidAndUserFromRequest(clientInfo);
             const { publishParser } = this;
             let fullSchema;
             let publishValidationError;

package/dist/Prostgles.js.map CHANGED Viewed

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

package/dist/PublishParser/PublishParser.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { Method } from "prostgles-types";
-import { AuthClientRequest, AuthResult, SessionUser } from "../Auth/AuthTypes";
+import { AuthClientRequest, AuthResultWithSID, SessionUser } from "../Auth/AuthTypes";
 import { PublishFullyTyped } from "../DBSchemaBuilder";
 import { DB, DBHandlerServer, Prostgles } from "../Prostgles";
 import { ProstglesInitOptions } from "../ProstglesTypes";
@@ -12,20 +12,20 @@ export declare class PublishParser {
     db: DB;
     prostgles: Prostgles;
     constructor(prostgles: Prostgles);
-    getPublishParams(clientReq: AuthClientRequest, clientInfo?: AuthResult): Promise<PublishParams>;
-    getAllowedMethods(clientReq: AuthClientRequest, userData: AuthResult | undefined): Promise<{
+    getPublishParams(clientReq: AuthClientRequest, clientInfo: AuthResultWithSID | undefined): Promise<PublishParams>;
+    getAllowedMethods(clientReq: AuthClientRequest, userData: AuthResultWithSID | undefined): Promise<{
         [key: string]: Method;
     }>;
     /**
      * Parses the first level of publish. (If false then nothing if * then all tables and views)
      */
-    getPublish(clientReq: AuthClientRequest, clientInfo: AuthResult): Promise<PublishFullyTyped | undefined>;
+    getPublishAsObject(clientReq: AuthClientRequest, clientInfo: AuthResultWithSID | undefined): Promise<PublishFullyTyped | undefined>;
     getValidatedRequestRuleWusr({ tableName, command, clientReq, }: DboTableCommand): Promise<TableRule>;
-    getValidatedRequestRule({ tableName, command, clientReq }: DboTableCommand, clientInfo: AuthResult | undefined): Promise<TableRule>;
-    getTableRules(args: DboTable, clientInfo: AuthResult | undefined): Promise<ParsedPublishTable | undefined>;
-    getTableRulesWithoutFileTable: (args_0: DboTable, clientInfo?: AuthResult, overridenPublish?: PublishObject | undefined) => Promise<ParsedPublishTable | undefined>;
+    getValidatedRequestRule({ tableName, command, clientReq }: DboTableCommand, clientInfo: AuthResultWithSID | undefined): Promise<TableRule>;
+    getTableRules(args: DboTable, clientInfo: AuthResultWithSID | undefined): Promise<ParsedPublishTable | undefined>;
+    getTableRulesWithoutFileTable: (args_0: DboTable, clientInfo: AuthResultWithSID | undefined, overridenPublish?: PublishObject | undefined) => Promise<ParsedPublishTable | undefined>;
     getSchemaFromPublish: (args_0: AuthClientRequest & {
-        userData: AuthResult;
+        userData: AuthResultWithSID | undefined;
     }) => Promise<{
         schema: import("prostgles-types").TableSchemaForClient;
         tables: import("prostgles-types").DBSchemaTable[];

package/dist/PublishParser/PublishParser.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"PublishParser.d.ts","sourceRoot":"","sources":["../../lib/PublishParser/PublishParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAA8B,MAAM,iBAAiB,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,~~UAAU~~,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;~~AAC/E~~,OAAO,~~EAAE~~,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;~~AACvD~~,OAAO,EAAE,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAKzD,OAAO,EACL,QAAQ,EACR,eAAe,EACf,kBAAkB,EAClB,cAAc,EACd,aAAa,EACb,aAAa,EAEb,SAAS,EACV,MAAM,wBAAwB,CAAC;AAEhC,qBAAa,aAAa;IACxB,OAAO,EAAE,oBAAoB,CAAC,SAAS,CAAC,CAAC;IACzC,cAAc,CAAC,EAAE,cAAc,CAAC,IAAI,EAAE,WAAW,CAAC,GAAG,SAAS,CAAC;IAC/D,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,GAAG,EAAE,eAAe,CAAC;IACrB,EAAE,EAAE,EAAE,CAAC;IACP,SAAS,EAAE,SAAS,CAAC;gBAET,SAAS,EAAE,SAAS;IAW1B,gBAAgB,CACpB,SAAS,EAAE,iBAAiB,EAC5B,UAAU,~~CAAC,~~EAAE,~~UAAU~~,~~GACtB~~,OAAO,CAAC,aAAa,CAAC;~~IAUnB~~,iBAAiB,CACrB,SAAS,EAAE,iBAAiB,EAC5B,QAAQ,EAAE,~~UAAU~~,GAAG,SAAS,~~GAC/B~~,OAAO,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAyBrC;;OAEG;IACG,~~UAAU~~,~~CACd~~,SAAS,EAAE,iBAAiB,EAC5B,UAAU,EAAE,~~UAAU~~,~~GACrB~~,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAenC,2BAA2B,CAAC,EAChC,SAAS,EACT,OAAO,EACP,SAAS,GACV,EAAE,eAAe,GAAG,OAAO,CAAC,SAAS,CAAC;~~IAMjC~~,uBAAuB,CAC3B,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,eAAe,EAClD,UAAU,EAAE,~~UAAU~~,GAAG,SAAS,~~GACjC~~,OAAO,CAAC,SAAS,CAAC;IAoDf,aAAa,CACjB,IAAI,EAAE,QAAQ,EACd,UAAU,EAAE,~~UAAU~~,GAAG,SAAS,~~GACjC~~,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC;IAe1C,6BAA6B,~~uIAA4C~~;IAGzE,oBAAoB;;;;;;OAAmC;CACxD;AAED,cAAc,wBAAwB,CAAC"}
1	+ {"version":3,"file":"PublishParser.d.ts","sourceRoot":"","sources":["../../lib/PublishParser/PublishParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAA8B,MAAM,iBAAiB,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACtF,OAAO,EAAiB,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,EAAE,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAKzD,OAAO,EACL,QAAQ,EACR,eAAe,EACf,kBAAkB,EAClB,cAAc,EACd,aAAa,EACb,aAAa,EAEb,SAAS,EACV,MAAM,wBAAwB,CAAC;AAEhC,qBAAa,aAAa;IACxB,OAAO,EAAE,oBAAoB,CAAC,SAAS,CAAC,CAAC;IACzC,cAAc,CAAC,EAAE,cAAc,CAAC,IAAI,EAAE,WAAW,CAAC,GAAG,SAAS,CAAC;IAC/D,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,GAAG,EAAE,eAAe,CAAC;IACrB,EAAE,EAAE,EAAE,CAAC;IACP,SAAS,EAAE,SAAS,CAAC;gBAET,SAAS,EAAE,SAAS;IAW1B,gBAAgB,CACpB,SAAS,EAAE,iBAAiB,EAC5B,UAAU,EAAE,iBAAiB,GAAG,SAAS,GACxC,OAAO,CAAC,aAAa,CAAC;IAWnB,iBAAiB,CACrB,SAAS,EAAE,iBAAiB,EAC5B,QAAQ,EAAE,iBAAiB,GAAG,SAAS,GACtC,OAAO,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAyBrC;;OAEG;IACG,kBAAkB,CACtB,SAAS,EAAE,iBAAiB,EAC5B,UAAU,EAAE,iBAAiB,GAAG,SAAS,GACxC,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAenC,2BAA2B,CAAC,EAChC,SAAS,EACT,OAAO,EACP,SAAS,GACV,EAAE,eAAe,GAAG,OAAO,CAAC,SAAS,CAAC;IAOjC,uBAAuB,CAC3B,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,eAAe,EAClD,UAAU,EAAE,iBAAiB,GAAG,SAAS,GACxC,OAAO,CAAC,SAAS,CAAC;IAoDf,aAAa,CACjB,IAAI,EAAE,QAAQ,EACd,UAAU,EAAE,iBAAiB,GAAG,SAAS,GACxC,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC;IAe1C,6BAA6B,yJAA4C;IAGzE,oBAAoB;;;;;;OAAmC;CACxD;AAED,cAAc,wBAAwB,CAAC"}

package/dist/PublishParser/PublishParser.js CHANGED Viewed

@@ -40,7 +40,8 @@ class PublishParser {
     }
     async getPublishParams(clientReq, clientInfo) {
         return {
-            ...(clientInfo || (await this.prostgles.authHandler?.getUserFromRequest(clientReq))),
+            sid: undefined,
+            ...(clientInfo ?? (await this.prostgles.authHandler?.getSidAndUserFromRequest(clientReq))),
             dbo: this.dbo,
             db: this.db,
             clientReq,
@@ -69,7 +70,7 @@ class PublishParser {
     /**
      * Parses the first level of publish. (If false then nothing if * then all tables and views)
      */
-    async getPublish(clientReq, clientInfo) {
+    async getPublishAsObject(clientReq, clientInfo) {
         const publishParams = await this.getPublishParams(clientReq, clientInfo);
         const _publish = await applyParamsIfFunc(this.publish, publishParams);
         if (_publish === "*") {
@@ -82,7 +83,7 @@ class PublishParser {
         return _publish || undefined;
     }
     async getValidatedRequestRuleWusr({ tableName, command, clientReq, }) {
-        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;
     }
@@ -131,12 +132,12 @@ class PublishParser {
             };
     }
     async getTableRules(args, clientInfo) {
+        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_1.getFileTableRules.bind(this)(args.tableName, fileTablePublishRules, args.clientReq, clientInfo);
             return rules;
         }
-        return await this.getTableRulesWithoutFileTable(args, clientInfo);
+        return fileTablePublishRules;
     }
     getTableRulesWithoutFileTable = getTableRulesWithoutFileTable_1.getTableRulesWithoutFileTable.bind(this);
     /* Prepares schema for client. Only allowed views and commands will be present */

package/dist/PublishParser/PublishParser.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"PublishParser.js","sourceRoot":"","sources":["../../lib/PublishParser/PublishParser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qDAAqE;AAMrE,2DAAwD;AACxD,iEAA8D;AAC9D,mFAAgF;AAChF,iEASgC;AAEhC,MAAa,aAAa;IACxB,OAAO,CAAkC;IACzC,cAAc,CAAiD;IAC/D,aAAa,CAAO;IACpB,GAAG,CAAkB;IACrB,EAAE,CAAK;IACP,SAAS,CAAY;IAErB,YAAY,SAAoB;QAC9B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC;QACtC,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC;QACpD,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC;QAClD,MAAM,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,SAAS,CAAC;QAC9B,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE;YAAE,MAAM,uCAAuC,CAAC;QAC/D,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACf,CAAC;IAED,KAAK,CAAC,gBAAgB,CACpB,SAA4B,EAC5B,~~UAAuB~~;~~QAEvB~~,OAAO;YACL,GAAG,CAAC,UAAU,IAAI,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,~~kBAAkB~~,CAAC,SAAS,CAAC,CAAC,CAAC;~~YACpF~~,GAAG,EAAE,IAAI,CAAC,~~GAAU~~;~~YACpB~~,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,SAAS;YACT,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM;SACzC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,iBAAiB,CACrB,SAA4B,EAC5B,~~QAAgC~~;~~QAEhC~~,MAAM,OAAO,GAA8B,EAAE,CAAC;QAE9C,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QACvE,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;QAE7E,IAAI,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAC;YAC7C,IAAA,kCAAgB,EAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,EAAE;gBAC/C,MAAM,UAAU,GAAG,CAAC,SAAsD,EAAE,EAAE,CAC5E,OAAO,SAAS,KAAK,UAAU,IAAI,OAAO,SAAS,CAAC,IAAI,KAAK,UAAU,CAAC;gBAC1E,IACE,UAAU,CAAC,MAAuC,CAAC;oBACnD,aAAa;oBACb,CAAC,IAAA,0BAAQ,EAAC,MAAM,CAAC,IAAI,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAC5C,CAAC;oBACD,OAAO,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAE,CAAC;gBAChC,CAAC;qBAAM,CAAC;oBACN,MAAM,kCAAkC,GAAG,qCAAqC,CAAC;gBACnF,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,~~UAAU~~,~~CACd~~,SAA4B,EAC5B,~~UAAsB~~;~~QAEtB~~,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QACzE,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAEtE,IAAI,QAAQ,KAAK,GAAG,EAAE,CAAC;YACrB,MAAM,OAAO,GAAkB,EAAE,CAAC;YAClC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;gBACnD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;YAC1B,CAAC,CAAC,CAAC;YACH,OAAO,OAAO,CAAC;QACjB,CAAC;QAED,OAAO,QAAQ,IAAI,SAAS,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,2BAA2B,CAAC,EAChC,SAAS,EACT,OAAO,EACP,SAAS,GACO;QAChB,MAAM,UAAU,~~GAAG~~,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,~~kBAAkB~~,CAAC,SAAS,CAAC,CAAC;~~QACnF~~,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,UAAU,CAAC,CAAC;QAChG,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,CAAC,uBAAuB,CAC3B,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAmB,EAClD,~~UAAkC~~;~~QAElC~~,IAAI,CAAC,OAAO,IAAI,CAAC,SAAS;YAAE,MAAM,kCAAkC,CAAC;QAErE,MAAM,GAAG,GAAG,sCAAe,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC;QACpF,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,MAAM,mBAAmB,GAAG,OAAO,CAAC;QACtC,CAAC;QAED,+CAA+C;QAC/C,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO,sCAAe,CAAC,MAAM,CAC3B,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;gBACT,GAAG,CAAC;gBACJ,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,SAAS;aACtB,CAAC,EACF,EAAE,CACH,CAAC;QACJ,CAAC;QAED,8CAA8C;QAC9C,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,MAAM,oBAAoB,CAAC;QAE9C,uCAAuC;QACvC,MAAM,SAAS,GAAG,SAAS,CAAC,MAAM,EAAE,SAAS,EAAE,iBAAiB,CAAC,SAAS,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;QAEvF,IAAI,SAAS;YAAE,MAAM,SAAS,CAAC,KAAK,CAAC;QAErC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,UAAU,CAAC,CAAC;QACjF,IAAI,CAAC,SAAS;YACZ,MAAM;gBACJ,KAAK,EAAE,CAAC,2BAA2B,CAAC;gBACpC,OAAO,EAAE,+BAA+B,GAAG,SAAS;aACrD,CAAC;QAEJ,IAAI,OAAO,KAAK,QAAQ,EAAE,CAAC;YACzB,IAAI,CAAC,SAAS,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;gBAC3C,MAAM;oBACJ,KAAK,EAAE,CAAC,2BAA2B,CAAC;oBACpC,OAAO,EAAE,uCAAuC;iBACjD,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACxB,OAAO,SAAS,CAAC;QACnB,CAAC;;YACC,MAAM;gBACJ,KAAK,EAAE,CAAC,2BAA2B,CAAC;gBACpC,OAAO,EAAE,kCAAkC,SAAS,IAAI,OAAO,EAAE;aAClE,CAAC;IACN,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,IAAc,EACd,~~UAAkC~~;~~QAElC~~,~~IAAI~~,~~IAAI~~,~~CAAC,~~GAAG,~~CAAC~~,IAAI,CAAC,~~SAAS~~,CAAC,EAAE,~~QAAQ~~,~~EAAE~~,CAAC;~~YACvC~~,~~MAAM~~,~~qBAAqB~~,GAAG,~~MAAM~~,IAAI,CAAC,~~6BAA6B~~,CAAC,~~IAAI,~~EAAE,~~UAAU~~,~~CAAC~~,CAAC;~~YACzF~~,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,qCAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAClD,IAAI,CAAC,SAAS,EACd,qBAAqB,EACrB,IAAI,CAAC,SAAS,EACd,UAAU,CACX,CAAC;YACF,OAAO,KAAK,CAAC;QACf,CAAC;QAED,OAAO,~~MAAM~~,~~IAAI,~~CAAC~~,6BAA6B,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC~~;~~IACpE~~,CAAC;IAED,6BAA6B,GAAG,6DAA6B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEzE,iFAAiF;IACjF,oBAAoB,GAAG,2CAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;CACxD;~~AAxKD~~,~~sCAwKC~~;AAED,yDAAuC;AAGvC,SAAS,iBAAiB,CACxB,SAAY,EACZ,GAAG,MAAW;IAEd,IACE,SAAS,KAAK,IAAI;QAClB,SAAS,KAAK,SAAS;QACvB,YAAY;QACZ,CAAC,OAAO,SAAS,KAAK,UAAU,IAAI,OAAO,SAAS,CAAC,IAAI,KAAK,UAAU,CAAC,EACzE,CAAC;QACD,OAAQ,SAAmC,CAAC,GAAG,MAAM,CAAC,CAAC;IACzD,CAAC;IAED,YAAY;IACZ,OAAO,SAAS,CAAC;AACnB,CAAC"}
1	+ {"version":3,"file":"PublishParser.js","sourceRoot":"","sources":["../../lib/PublishParser/PublishParser.ts"],"names":[],"mappings":"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"}

package/dist/PublishParser/getFileTableRules.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { AuthClientRequest, AuthResult } from "../Auth/AuthTypes";
+import { AuthClientRequest, AuthResultWithSID } from "../Auth/AuthTypes";
 import { PublishParser } from "./PublishParser";
 import { ParsedPublishTable } from "./publishTypesAndUtils";
 /**
@@ -9,7 +9,7 @@ import { ParsedPublishTable } from "./publishTypesAndUtils";
  * Update on a referenced column allows updating a file (delete and insert) only if it is a nested update from that table
  * Delete on a referenced column table allows deleting any referenced file
  */
-export declare function getFileTableRules(this: PublishParser, fileTableName: string, fileTablePublishRules: ParsedPublishTable | undefined, clientReq: AuthClientRequest | undefined, clientInfo: AuthResult | undefined): Promise<{
+export declare function getFileTableRules(this: PublishParser, fileTableName: string, fileTablePublishRules: ParsedPublishTable | undefined, clientReq: AuthClientRequest | undefined, clientInfo: AuthResultWithSID | undefined): Promise<{
     rules: ParsedPublishTable | undefined;
     allowedInserts: {
         table: string;

package/dist/PublishParser/getFileTableRules.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getFileTableRules.d.ts","sourceRoot":"","sources":["../../lib/PublishParser/getFileTableRules.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,~~UAAU~~,EAAE,MAAM,mBAAmB,CAAC;~~AAElE~~,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAc,MAAM,wBAAwB,CAAC;AAExE;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,aAAa,EACnB,aAAa,EAAE,MAAM,EACrB,qBAAqB,EAAE,kBAAkB,GAAG,SAAS,EACrD,SAAS,EAAE,iBAAiB,GAAG,SAAS,EACxC,UAAU,EAAE,~~UAAU~~,GAAG,SAAS;;;~~eAKG~~,MAAM;gBAAU,MAAM;;GAsH5D"}
1	+ {"version":3,"file":"getFileTableRules.d.ts","sourceRoot":"","sources":["../../lib/PublishParser/getFileTableRules.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEzE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAc,MAAM,wBAAwB,CAAC;AAExE;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,aAAa,EACnB,aAAa,EAAE,MAAM,EACrB,qBAAqB,EAAE,kBAAkB,GAAG,SAAS,EACrD,SAAS,EAAE,iBAAiB,GAAG,SAAS,EACxC,UAAU,EAAE,iBAAiB,GAAG,SAAS;;;eAKJ,MAAM;gBAAU,MAAM;;GAsH5D"}

package/dist/PublishParser/getFileTableRules.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getFileTableRules.js","sourceRoot":"","sources":["../../lib/PublishParser/getFileTableRules.ts"],"names":[],"mappings":";;;AAAA,qDAAmE;AAEnE,iFAA8E;AAI9E;;;;;;;GAOG;AACI,KAAK,UAAU,iBAAiB,CAErC,aAAqB,EACrB,qBAAqD,EACrD,SAAwC,EACxC,~~UAAkC~~;~~IAElC~~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"}
1	+ {"version":3,"file":"getFileTableRules.js","sourceRoot":"","sources":["../../lib/PublishParser/getFileTableRules.ts"],"names":[],"mappings":"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"}

package/dist/PublishParser/getSchemaFromPublish.d.ts CHANGED Viewed

@@ -1,8 +1,8 @@
 import { DBSchemaTable, TableSchemaErrors, TableSchemaForClient } from "prostgles-types";
-import { AuthClientRequest, AuthResult } from "../Auth/AuthTypes";
+import { AuthClientRequest, AuthResultWithSID } from "../Auth/AuthTypes";
 import { PublishParser } from "./PublishParser";
 type Args = AuthClientRequest & {
-    userData: AuthResult | undefined;
+    userData: AuthResultWithSID | undefined;
 };
 export declare function getSchemaFromPublish(this: PublishParser, { userData, ...clientReq }: Args): Promise<{
     schema: TableSchemaForClient;

package/dist/PublishParser/getSchemaFromPublish.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getSchemaFromPublish.d.ts","sourceRoot":"","sources":["../../lib/PublishParser/getSchemaFromPublish.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAKb,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,iBAAiB,EAAE,~~UAAU~~,EAAE,MAAM,mBAAmB,CAAC;~~AAGlE~~,OAAO,EAAiB,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAE/D,KAAK,IAAI,GAAG,iBAAiB,GAAG;IAC9B,QAAQ,EAAE,~~UAAU~~,GAAG,SAAS,CAAC;~~CAClC~~,CAAC;AAEF,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,aAAa,EACnB,EAAE,QAAQ,EAAE,GAAG,SAAS,EAAE,EAAE,IAAI,GAC/B,OAAO,CAAC;IACT,MAAM,EAAE,oBAAoB,CAAC;IAC7B,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,iBAAiB,EAAE,iBAAiB,CAAC;CACtC,CAAC,CAiKD"}
1	+ {"version":3,"file":"getSchemaFromPublish.d.ts","sourceRoot":"","sources":["../../lib/PublishParser/getSchemaFromPublish.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAKb,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAGzE,OAAO,EAAiB,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAE/D,KAAK,IAAI,GAAG,iBAAiB,GAAG;IAC9B,QAAQ,EAAE,iBAAiB,GAAG,SAAS,CAAC;CACzC,CAAC;AAEF,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,aAAa,EACnB,EAAE,QAAQ,EAAE,GAAG,SAAS,EAAE,EAAE,IAAI,GAC/B,OAAO,CAAC;IACT,MAAM,EAAE,oBAAoB,CAAC;IAC7B,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,iBAAiB,EAAE,iBAAiB,CAAC;CACtC,CAAC,CAiKD"}

package/dist/PublishParser/getSchemaFromPublish.js CHANGED Viewed

@@ -10,10 +10,10 @@ async function getSchemaFromPublish({ userData, ...clientReq }) {
     let tables = [];
     try {
         /* Publish tables and views based on socket */
-        const clientInfo = userData ?? (await this.prostgles.authHandler?.getUserFromRequest(clientReq));
+        const clientInfo = userData ?? (await this.prostgles.authHandler?.getSidAndUserFromRequest(clientReq));
         let _publish;
         try {
-            _publish = await this.getPublish(clientReq, clientInfo);
+            _publish = await this.getPublishAsObject(clientReq, clientInfo);
         }
         catch (err) {
             console.error("Error within then Publish function ", err);