prostgles-server 2.0.270 → 2.0.273

package/lib/AuthHandler.js

@@ -1,8 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const prostgles_types_1 = require("prostgles-types");
+const FileManager_1 = require("./FileManager");
 class AuthHandler {
     constructor(prostgles) {
+        this.routes = {
+            catchAll: "*"
+        };
         this.validateSid = (sid) => {
             if (!sid)
                 return undefined;
@@ -18,10 +22,10 @@ class AuthHandler {
             const pubRoutes = [
                 ...this.opts?.expressConfig?.publicRoutes || [],
             ];
-            if (this.loginRoute)
-                pubRoutes.push(this.loginRoute);
-            if (this.logoutGetPath)
-                pubRoutes.push(this.logoutGetPath);
+            if (this.routes?.login)
+                pubRoutes.push(this.routes?.login);
+            if (this.routes?.logoutGetPath)
+                pubRoutes.push(this.routes?.logoutGetPath);
             return Boolean(!pubRoutes.find(publicRoute => {
                 return this.matchesRoute(publicRoute, pathname); // publicRoute === pathname || pathname.startsWith(publicRoute) && ["/", "?", "#"].includes(pathname.slice(-1));
             }));
@@ -41,10 +45,10 @@ class AuthHandler {
                 };
                 const cookieOpts = { ...options, secure: true, sameSite: "strict", ...(this.opts?.expressConfig?.cookieOptions || {}) };
                 const cookieData = sid;
-                if (!this.sidKeyName || !this.returnURL)
+                if (!this.sidKeyName || !this.routes?.returnURL)
                     throw "sidKeyName or returnURL missing";
                 res.cookie(this.sidKeyName, cookieData, cookieOpts);
-                const successURL = getReturnUrl(req, this.returnURL) || "/";
+                const successURL = getReturnUrl(req, this.routes.returnURL) || "/";
                 res.redirect(successURL);
             }
             else {
@@ -67,6 +71,11 @@ class AuthHandler {
             }
             return undefined;
         };
+        this.destroy = () => {
+            const app = this.opts?.expressConfig?.app;
+            const { login, logoutGetPath, magicLinks } = this.routes;
+            (0, FileManager_1.removeExpressRoute)(app, [login, logoutGetPath, magicLinks?.expressRoute]);
+        };
         this.throttledFunc = (func, throttle = 500) => {
             return new Promise(async (resolve, reject) => {
                 let interval, result, error, finished = false;
@@ -184,9 +193,17 @@ class AuthHandler {
         };
         this.opts = prostgles.opts.auth;
         if (prostgles.opts.auth?.expressConfig) {
-            this.returnURL = prostgles.opts.auth?.expressConfig?.returnURL || "returnURL";
-            this.loginRoute = prostgles.opts.auth?.expressConfig?.loginRoute || "/login";
-            this.logoutGetPath = prostgles.opts.auth?.expressConfig?.logoutGetPath || "/logout";
+            const { magicLinks, returnURL, loginRoute, logoutGetPath } = prostgles.opts.auth.expressConfig;
+            this.routes = {
+                magicLinks: magicLinks ? {
+                    expressRoute: `${magicLinks.route}/:id`,
+                    route: magicLinks.route || "/magic-link"
+                } : undefined,
+                returnURL: returnURL || "returnURL",
+                login: loginRoute || "/login",
+                logoutGetPath: logoutGetPath || "/logout",
+                catchAll: "*"
+            };
         }
         if (!prostgles.dbo || !prostgles.db)
             throw "dbo or db missing";
@@ -214,11 +231,11 @@ class AuthHandler {
             if (publicRoutes.find(r => typeof r !== "string" || !r)) {
                 throw "Invalid or empty string provided within publicRoutes ";
             }
-            if (app && magicLinks) {
-                const { route = "/magic-link", check } = magicLinks;
+            if (app && magicLinks && this.routes.magicLinks) {
+                const { check } = magicLinks;
                 if (!check)
                     throw "Check must be defined for magicLinks";
-                app.get(`${route}/:id`, async (req, res) => {
+                app.get(this.routes.magicLinks?.expressRoute, async (req, res) => {
                     const { id } = req.params ?? {};
                     if (typeof id !== "string" || !id) {
                         res.status(404).json({ msg: "Invalid magic-link id. Expecting a string" });
@@ -241,8 +258,9 @@ class AuthHandler {
                     }
                 });
             }
-            if (app && this.loginRoute) {
-                app.post(this.loginRoute, async (req, res) => {
+            const loginRoute = this.routes?.login;
+            if (app && loginRoute) {
+                app.post(loginRoute, async (req, res) => {
                     try {
                         const { sid, expires } = await this.loginThrottled(req.body || {}) || {};
                         if (sid) {
@@ -257,8 +275,8 @@ class AuthHandler {
                         res.status(404).json({ err });
                     }
                 });
-                if (app && this.logoutGetPath && this.opts.logout) {
-                    app.get(this.logoutGetPath, async (req, res) => {
+                if (app && this.routes.logoutGetPath && this.opts.logout) {
+                    app.get(this.routes.logoutGetPath, async (req, res) => {
                         const sid = this.validateSid(req?.cookies?.[sidKeyName]);
                         if (sid) {
                             try {
@@ -275,11 +293,11 @@ class AuthHandler {
                 }
                 if (app && Array.isArray(publicRoutes)) {
                     /* Redirect if not logged in and requesting non public content */
-                    app.get('*', async (req, res) => {
+                    app.get(this.routes.catchAll, async (req, res) => {
                         const clientReq = { httpReq: req };
                         const getUser = this.getUser;
                         try {
-                            const returnURL = getReturnUrl(req, this.returnURL);
+                            const returnURL = getReturnUrl(req, this.routes.returnURL);
                             /**
                              * Requesting a User route
                              */
@@ -287,7 +305,7 @@ class AuthHandler {
                                 /* Check auth. Redirect if unauthorized */
                                 const u = await getUser(clientReq);
                                 if (!u) {
-                                    res.redirect(`${this.loginRoute}?returnURL=${encodeURIComponent(req.originalUrl)}`);
+                                    res.redirect(`${loginRoute}?returnURL=${encodeURIComponent(req.originalUrl)}`);
                                     return;
                                 }
                                 /* If authorized and going to returnUrl then redirect. Otherwise serve file */
@@ -297,7 +315,7 @@ class AuthHandler {
                                 return;
                                 /** If Logged in and requesting login then redirect */
                             }
-                            else if (this.matchesRoute(this.loginRoute, req.path) && (await getUser(clientReq))) {
+                            else if (this.matchesRoute(loginRoute, req.path) && (await getUser(clientReq))) {
                                 res.redirect("/");
                                 return;
                             }

package/lib/AuthHandler.ts

@@ -2,6 +2,7 @@ import { Request, Response } from "express";
 import { AnyObject, AuthGuardLocation, AuthGuardLocationResponse, CHANNELS, DBSchema } from "prostgles-types";
 import { LocalParams, PRGLIOSocket } from "./DboBuilder";
 import { DBOFullyTyped } from "./DBSchemaBuilder";
+import { removeExpressRoute } from "./FileManager";
 import { DB, DBHandlerServer, Prostgles } from "./Prostgles";
 type Awaitable<T> = T | Promise<T>;
 type AuthSocketSchema = {
@@ -148,17 +149,35 @@ export default class AuthHandler {
   dbo: DBHandlerServer;
   db: DB;
   sidKeyName?: string;
-  returnURL?: string;
 
-  loginRoute?: string;
-  logoutGetPath?: string;
+  routes: {
+    login?: string;
+    returnURL?: string;
+    logoutGetPath?: string;
+    magicLinks?: {
+      route: string;
+      expressRoute: string;
+    }
+    readonly catchAll: '*';
+  } = {
+    catchAll: "*"
+  }
 
   constructor(prostgles: Prostgles) {
     this.opts = prostgles.opts.auth as any;
     if (prostgles.opts.auth?.expressConfig) {
-      this.returnURL = prostgles.opts.auth?.expressConfig?.returnURL || "returnURL";
-      this.loginRoute = prostgles.opts.auth?.expressConfig?.loginRoute || "/login";
-      this.logoutGetPath = prostgles.opts.auth?.expressConfig?.logoutGetPath || "/logout";
+      const { magicLinks, returnURL, loginRoute, logoutGetPath } = prostgles.opts.auth.expressConfig;
+      this.routes = {
+        magicLinks: magicLinks? {
+          expressRoute: `${magicLinks.route}/:id`,
+          route: magicLinks.route || "/magic-link"
+        } : undefined,
+        returnURL: returnURL || "returnURL",
+        login: loginRoute || "/login",
+        logoutGetPath: logoutGetPath || "/logout",
+        catchAll: "*"
+      }
+      
     }
     if(!prostgles.dbo || !prostgles.db) throw "dbo or db missing";
     this.dbo = prostgles.dbo;
@@ -182,8 +201,8 @@ export default class AuthHandler {
     const pubRoutes = [
       ...this.opts?.expressConfig?.publicRoutes || [],
     ];
-    if (this.loginRoute) pubRoutes.push(this.loginRoute);
-    if (this.logoutGetPath) pubRoutes.push(this.logoutGetPath);
+    if (this.routes?.login) pubRoutes.push(this.routes?.login);
+    if (this.routes?.logoutGetPath) pubRoutes.push(this.routes?.logoutGetPath);
 
     return Boolean(!pubRoutes.find(publicRoute => {
       return this.matchesRoute(publicRoute, pathname); // publicRoute === pathname || pathname.startsWith(publicRoute) && ["/", "?", "#"].includes(pathname.slice(-1));
@@ -205,9 +224,9 @@ export default class AuthHandler {
       }
       const cookieOpts = { ...options, secure: true, sameSite: "strict" as "strict", ...(this.opts?.expressConfig?.cookieOptions || {}) };
       const cookieData = sid;
-      if(!this.sidKeyName || !this.returnURL) throw "sidKeyName or returnURL missing"
+      if(!this.sidKeyName || !this.routes?.returnURL) throw "sidKeyName or returnURL missing"
       res.cookie(this.sidKeyName, cookieData, cookieOpts);
-      const successURL = getReturnUrl(req, this.returnURL) || "/";
+      const successURL = getReturnUrl(req, this.routes.returnURL) || "/";
       res.redirect(successURL);
 
     } else {
@@ -254,10 +273,10 @@ export default class AuthHandler {
         throw "Invalid or empty string provided within publicRoutes "
       }
 
-      if (app && magicLinks) {
-        const { route = "/magic-link", check } = magicLinks;
+      if (app && magicLinks && this.routes.magicLinks) {
+        const { check } = magicLinks;
         if (!check) throw "Check must be defined for magicLinks";
-        app.get(`${route}/:id`, async (req: ExpressReq, res: ExpressRes) => {
+        app.get(this.routes.magicLinks?.expressRoute, async (req: ExpressReq, res: ExpressRes) => {
           const { id } = req.params ?? {};
 
           if (typeof id !== "string" || !id) {
@@ -280,10 +299,11 @@ export default class AuthHandler {
         });
       }
 
-      if (app && this.loginRoute) {
+      const loginRoute = this.routes?.login;
+      if (app && loginRoute) {
         
 
-        app.post(this.loginRoute, async (req: ExpressReq, res: ExpressRes) => {
+        app.post(loginRoute, async (req: ExpressReq, res: ExpressRes) => {
           try {
             const { sid, expires } = await this.loginThrottled(req.body || {}) || {};
 
@@ -302,8 +322,8 @@ export default class AuthHandler {
 
         });
 
-        if (app && this.logoutGetPath && this.opts.logout) {
-          app.get(this.logoutGetPath, async (req: ExpressReq, res: ExpressRes) => {
+        if (app && this.routes.logoutGetPath && this.opts.logout) {
+          app.get(this.routes.logoutGetPath, async (req: ExpressReq, res: ExpressRes) => {
             const sid = this.validateSid(req?.cookies?.[sidKeyName]);
             if (sid) {
               try {
@@ -322,11 +342,11 @@ export default class AuthHandler {
         if (app && Array.isArray(publicRoutes)) {
 
           /* Redirect if not logged in and requesting non public content */
-          app.get('*', async (req: ExpressReq, res: ExpressRes) => {
+          app.get(this.routes.catchAll, async (req: ExpressReq, res: ExpressRes) => {
             const clientReq: AuthClientRequest = { httpReq: req }
             const getUser = this.getUser;
             try {
-              const returnURL = getReturnUrl(req, this.returnURL)
+              const returnURL = getReturnUrl(req, this.routes.returnURL)
 
 
               /**
@@ -336,7 +356,7 @@ export default class AuthHandler {
                 /* Check auth. Redirect if unauthorized */
                 const u = await getUser(clientReq);
                 if (!u) {
-                  res.redirect(`${this.loginRoute}?returnURL=${encodeURIComponent(req.originalUrl)}`);
+                  res.redirect(`${loginRoute}?returnURL=${encodeURIComponent(req.originalUrl)}`);
                   return;
                 }
 
@@ -347,7 +367,7 @@ export default class AuthHandler {
                 return;
 
                 /** If Logged in and requesting login then redirect */
-              } else if (this.matchesRoute(this.loginRoute, req.path) && (await getUser(clientReq))) {
+              } else if (this.matchesRoute(loginRoute, req.path) && (await getUser(clientReq))) {
 
                 res.redirect("/");
                 return;
@@ -366,6 +386,12 @@ export default class AuthHandler {
     }
   }
 
+  destroy = () => {
+    const app = this.opts?.expressConfig?.app;
+    const { login, logoutGetPath, magicLinks } = this.routes;
+    removeExpressRoute(app, [login, logoutGetPath, magicLinks?.expressRoute]);
+  }
+
   throttledFunc = <T>(func: () => Promise<T>, throttle = 500): Promise<T> => {
 
     return new Promise(async (resolve, reject) => {

package/lib/DBSchemaBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DBSchemaBuilder.d.ts","sourceRoot":"","sources":["DBSchemaBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAGtE,OAAO,EAAE,eAAe,EAAE,UAAU,EAAkD,MAAM,cAAc,CAAC;AAC3G,OAAO,EAAE,mBAAmB,EAAiB,gBAAgB,EAAE,eAAe,EAAI,MAAM,iBAAiB,CAAC;AAI1G,eAAO,MAAM,WAAW,eAAgB,UAAU,KAAG,MAuCpD,CAAA;AAED,aAAK,yBAAyB,CAAC,MAAM,GAAG,IAAI,IAAI,MAAM,SAAS,QAAQ,GAAE;KACtE,QAAQ,IAAI,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,SAAS,IAAI,GAClE,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,CAAC,GACxC,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,CAAC;CAC5C,GAAG,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;AAEjC,oBAAY,aAAa,CAAC,MAAM,GAAG,IAAI,IAAI,MAAM,SAAS,QAAQ,GAAE,CAChE,yBAAyB,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,GAAG,KAAK,CAAC,CAC3G,GACD,eAAe,CAAC;AAKlB,oBAAY,iBAAiB,CAAC,MAAM,GAAG,IAAI,IAAI,MAAM,SAAS,QAAQ,GAAE,CACpE,mBAAmB,GACnB;KACC,QAAQ,IAAI,MAAM,OAAO,CAAC,MAAM,CAAC,GAC9B,mBAAmB,GACnB,CACA,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,SAAS,IAAI,GACtC,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,GACpD,gBAAgB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,CACxD;CACJ,CACF,GAAG,CACA,mBAAmB,GACnB,MAAM,CAAC,MAAM,EAAE,eAAe,GAAG,gBAAgB,GAAG,mBAAmB,CAAC,CAC3E,CAAC"}
+{"version":3,"file":"DBSchemaBuilder.d.ts","sourceRoot":"","sources":["DBSchemaBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAGtE,OAAO,EAAE,eAAe,EAAE,UAAU,EAAkD,MAAM,cAAc,CAAC;AAC3G,OAAO,EAAE,mBAAmB,EAAiB,gBAAgB,EAAE,eAAe,EAAI,MAAM,iBAAiB,CAAC;AAI1G,eAAO,MAAM,WAAW,eAAgB,UAAU,KAAG,MAyCpD,CAAA;AAED,aAAK,yBAAyB,CAAC,MAAM,GAAG,IAAI,IAAI,MAAM,SAAS,QAAQ,GAAE;KACtE,QAAQ,IAAI,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,SAAS,IAAI,GAClE,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,CAAC,GACxC,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,CAAC;CAC5C,GAAG,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;AAEjC,oBAAY,aAAa,CAAC,MAAM,GAAG,IAAI,IAAI,MAAM,SAAS,QAAQ,GAAE,CAChE,yBAAyB,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,GAAG,KAAK,CAAC,CAC3G,GACD,eAAe,CAAC;AAKlB,oBAAY,iBAAiB,CAAC,MAAM,GAAG,IAAI,IAAI,MAAM,SAAS,QAAQ,GAAE,CACpE,mBAAmB,GACnB;KACC,QAAQ,IAAI,MAAM,OAAO,CAAC,MAAM,CAAC,GAC9B,mBAAmB,GACnB,CACA,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,SAAS,IAAI,GACtC,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,GACpD,gBAAgB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,CACxD;CACJ,CACF,GAAG,CACA,mBAAmB,GACnB,MAAM,CAAC,MAAM,EAAE,eAAe,GAAG,gBAAgB,GAAG,mBAAmB,CAAC,CAC3E,CAAC"}

package/lib/DBSchemaBuilder.js

@@ -17,9 +17,13 @@ const getDBSchema = (dboBuilder) => {
             const colConf = dboBuilder.prostgles.tableConfigurator?.getColumnConfig(tov.name, c.name);
             if (colConf) {
                 if ("jsonbSchema" in colConf) {
+                    if (!colConf.jsonbSchema)
+                        throw "colConf.jsonbSchema missing";
                     type = (0, validation_1.getJSONBSchemaTSTypes)(colConf.jsonbSchema, { nullable: colConf.nullable }, "      ");
                 }
                 else if ("oneOf" in colConf) {
+                    if (!colConf.oneOf)
+                        throw "colConf.oneOf missing";
                     const types = colConf.oneOf.map(t => typeof t === "number" ? t : JSON.stringify(t));
                     if (colConf.nullable) {
                         types.unshift("null");

package/lib/DBSchemaBuilder.ts

@@ -18,8 +18,10 @@ export const getDBSchema = (dboBuilder: DboBuilder): string => {
       const colConf = dboBuilder.prostgles.tableConfigurator?.getColumnConfig(tov.name, c.name);
       if(colConf){
         if("jsonbSchema" in colConf){
+          if(!colConf.jsonbSchema) throw "colConf.jsonbSchema missing"
           type = getJSONBSchemaTSTypes(colConf.jsonbSchema, { nullable: colConf.nullable }, "      ");
         } else if("oneOf" in colConf){
+          if(!colConf.oneOf) throw "colConf.oneOf missing"
           const types = colConf.oneOf.map(t => typeof t === "number"? t : JSON.stringify(t));
           if(colConf.nullable){
             types.unshift("null")

package/lib/{QueryBuilder.d.ts → DboBuilder/QueryBuilder/QueryBuilder.d.ts}

@@ -1,5 +1,5 @@
-import { Filter, LocalParams, TableHandler } from "./DboBuilder";
-import { TableRule } from "./PublishParser";
+import { Filter, LocalParams, TableHandler } from "../../DboBuilder";
+import { TableRule } from "../../PublishParser";
 import { SelectParams, ColumnInfo, PG_COLUMN_UDT_DATA_TYPE, Select } from "prostgles-types";
 export declare type SelectItem = {
     type: "column" | "function" | "aggregation" | "joinedColumn" | "computed";
@@ -119,6 +119,5 @@ export declare class SelectItemBuilder {
 export declare function getNewQuery(_this: TableHandler, filter: Filter, selectParams: (SelectParams & {
     alias?: string;
 }), param3_unused: any, tableRules: TableRule | undefined, localParams: LocalParams | undefined, columns: ColumnInfo[]): Promise<NewQuery>;
-export declare function makeQuery(_this: TableHandler, q: NewQuery, depth?: number, joinFields?: string[], selectParams?: SelectParams): string;
 export {};
 //# sourceMappingURL=QueryBuilder.d.ts.map

package/lib/DboBuilder/QueryBuilder/QueryBuilder.d.ts.map

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