prostgles-server 4.2.289 → 4.2.291

package/lib/FileManager/initFileManager.ts

@@ -162,12 +162,12 @@ export async function initFileManager(this: FileManager, prg: Prostgles) {
   /**
    * 4. Serve media through express
    */
-  const { fileServeRoute = `/${fileTableName}`, expressApp: app } = fileTable;
+  const { fileServePath: fileServeRoute = `/${fileTableName}`, expressApp: app } = fileTable;
 
   if (fileServeRoute.endsWith("/")) {
     throw `fileServeRoute must not end with a '/'`;
   }
-  this.fileRoute = fileServeRoute;
+  this.path = fileServeRoute;
 
   app.get(this.fileRouteExpress, async (req, res) => {
     const mediaTableHandler = this.dbo[fileTableName] as unknown as TableHandler | undefined;

package/lib/ProstglesTypes.ts

@@ -42,7 +42,7 @@ export type FileTableConfig = {
   /**
    * GET path used in serving media. defaults to /${tableName}
    */
-  fileServeRoute?: string;
+  fileServePath?: string;
 
   /**
    * If defined the the files will not be deleted immediately

package/lib/RestApi.ts

@@ -1,11 +1,12 @@
 import * as bodyParser from "body-parser";
 import { Express } from "express";
-import { HTTP_FAIL_CODES } from "./Auth/AuthHandler";
+import { HTTP_FAIL_CODES, removeExpressRoute } from "./Auth/AuthHandler";
 import { ExpressReq, ExpressRes } from "./Auth/AuthTypes";
 import { getSerializedClientErrorFromPGError } from "./DboBuilder/DboBuilder";
 import { Prostgles } from "./Prostgles";
 import { runClientMethod, runClientRequest, runClientSqlRequest } from "./runClientRequest";
 import { VoidFunction } from "./SchemaWatch/SchemaWatch";
+import { isDefined } from "prostgles-types";
 const jsonParser = bodyParser.json();
 
 export type ExpressApp = {
@@ -37,7 +38,7 @@ export type RestApiConfig = {
   /**
    * Defaults to "/api"
    */
-  routePrefix: string;
+  path?: string;
 };
 
 export class RestApi {
@@ -49,13 +50,18 @@ export class RestApi {
     schema: string;
   };
   expressApp: Express;
-  constructor({ expressApp, routePrefix, prostgles }: RestApiConfig & { prostgles: Prostgles }) {
+  path = "/api";
+  constructor({ expressApp, path, prostgles }: RestApiConfig & { prostgles: Prostgles }) {
+    if (isDefined(path) && !path.trim()) {
+      throw new Error("path cannot be empty");
+    }
+    this.path = path || "/api";
     this.prostgles = prostgles;
     this.routes = {
-      db: `${routePrefix}/db/:tableName/:command`,
-      sql: `${routePrefix}/db/sql`,
-      methods: `${routePrefix}/methods/:method`,
-      schema: `${routePrefix}/schema`,
+      db: `${path}/db/:tableName/:command`,
+      sql: `${path}/db/sql`,
+      methods: `${path}/methods/:method`,
+      schema: `${path}/schema`,
     };
     this.expressApp = expressApp;
     expressApp.post(this.routes.db, jsonParser, this.onPostTableCommand);
@@ -68,6 +74,7 @@ export class RestApi {
     this.expressApp.removeListener(this.routes.db, this.onPostTableCommand);
     this.expressApp.removeListener(this.routes.sql, this.onPostSql);
     this.expressApp.removeListener(this.routes.methods, this.onPostMethod);
+    removeExpressRoute(this.expressApp, [this.path]);
   };
   onPostMethod = async (req: ExpressReq, res: ExpressRes) => {
     const { method = "" } = req.params;

package/package.json

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

package/dist/Auth/utils/getUserOrError.d.ts

@@ -1,10 +0,0 @@
-import type { AuthHandler } from "../AuthHandler";
-import { AuthClientRequest } from "../AuthTypes";
-import { type GetUserOrRedirected } from "./handleGetUser";
-/**
- * Used by:
- *  - setCatchAllRequestHandler
- *  - loginSignupConfig.use
- */
-export declare function getUserOrError(this: AuthHandler, clientReq: AuthClientRequest): Promise<GetUserOrRedirected>;
-//# sourceMappingURL=getUserOrError.d.ts.map

package/dist/Auth/utils/getUserOrError.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getUserOrError.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/getUserOrError.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAqB,MAAM,cAAc,CAAC;AAEpE,OAAO,EAAe,KAAK,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAGxE;;;;GAIG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,WAAW,EACjB,SAAS,EAAE,iBAAiB,GAC3B,OAAO,CAAC,mBAAmB,CAAC,CAuC9B"}

package/dist/Auth/utils/getUserOrError.js

@@ -1,48 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserOrError = void 0;
-/**
- * Used by:
- *  - setCatchAllRequestHandler
- *  - loginSignupConfig.use
- */
-async function getUserOrError(clientReq) {
-    // const sid = this.getValidatedSid(clientReq);
-    // if (!sid) return { sid };
-    try {
-        // const userOrErrorCode = await throttledAuthCall(async () => {
-        //   return this.opts.getUser(
-        //     this.validateSid(sid),
-        //     this.dbo as DBOFullyTyped,
-        //     this.db,
-        //     getClientRequestIPsInfo(clientReq),
-        //     clientReq
-        //   );
-        // }, 50);
-        // if (isAuthError(userOrErrorCode)) {
-        //   const error: AuthResponse.AuthFailure | undefined =
-        //     typeof userOrErrorCode === "string" ?
-        //       { success: false, code: userOrErrorCode }
-        //     : userOrErrorCode;
-        //   return {
-        //     sid,
-        //     error,
-        //   };
-        // }
-        // if (sid && userOrErrorCode?.user) {
-        //   return { sid, ...userOrErrorCode };
-        // }
-        // return {
-        //   sid,
-        // };
-        return this.handleGetUser(clientReq);
-    }
-    catch (_err) {
-        return {
-            sid: this.getValidatedSid(clientReq),
-            error: { success: false, code: "server-error" },
-        };
-    }
-}
-exports.getUserOrError = getUserOrError;
-//# sourceMappingURL=getUserOrError.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"getUserOrError.js","sourceRoot":"","sources":["../../../lib/Auth/utils/getUserOrError.ts"],"names":[],"mappings":";;;AAQA;;;;GAIG;AACI,KAAK,UAAU,cAAc,CAElC,SAA4B;IAE5B,+CAA+C;IAC/C,4BAA4B;IAE5B,IAAI,CAAC;QACH,gEAAgE;QAChE,8BAA8B;QAC9B,6BAA6B;QAC7B,iCAAiC;QACjC,eAAe;QACf,0CAA0C;QAC1C,gBAAgB;QAChB,OAAO;QACP,UAAU;QAEV,sCAAsC;QACtC,wDAAwD;QACxD,4CAA4C;QAC5C,kDAAkD;QAClD,yBAAyB;QAEzB,aAAa;QACb,WAAW;QACX,aAAa;QACb,OAAO;QACP,IAAI;QACJ,sCAAsC;QACtC,wCAAwC;QACxC,IAAI;QACJ,WAAW;QACX,SAAS;QACT,KAAK;QACL,OAAO,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IACvC,CAAC;IAAC,OAAO,IAAI,EAAE,CAAC;QACd,OAAO;YACL,GAAG,EAAE,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC;YACpC,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE;SAChD,CAAC;IACJ,CAAC;AACH,CAAC;AA1CD,wCA0CC"}

package/lib/Auth/utils/getUserOrError.ts

@@ -1,56 +0,0 @@
-import { AuthResponse } from "prostgles-types";
-import { DBOFullyTyped } from "../../DBSchemaBuilder";
-import type { AuthHandler } from "../AuthHandler";
-import { AuthClientRequest, AuthResultWithSID } from "../AuthTypes";
-import { getClientRequestIPsInfo } from "../utils/getClientRequestIPsInfo";
-import { isAuthError, type GetUserOrRedirected } from "./handleGetUser";
-import { throttledAuthCall } from "./throttledReject";
-
-/**
- * Used by:
- *  - setCatchAllRequestHandler
- *  - loginSignupConfig.use
- */
-export async function getUserOrError(
-  this: AuthHandler,
-  clientReq: AuthClientRequest
-): Promise<GetUserOrRedirected> {
-  // const sid = this.getValidatedSid(clientReq);
-  // if (!sid) return { sid };
-
-  try {
-    // const userOrErrorCode = await throttledAuthCall(async () => {
-    //   return this.opts.getUser(
-    //     this.validateSid(sid),
-    //     this.dbo as DBOFullyTyped,
-    //     this.db,
-    //     getClientRequestIPsInfo(clientReq),
-    //     clientReq
-    //   );
-    // }, 50);
-
-    // if (isAuthError(userOrErrorCode)) {
-    //   const error: AuthResponse.AuthFailure | undefined =
-    //     typeof userOrErrorCode === "string" ?
-    //       { success: false, code: userOrErrorCode }
-    //     : userOrErrorCode;
-
-    //   return {
-    //     sid,
-    //     error,
-    //   };
-    // }
-    // if (sid && userOrErrorCode?.user) {
-    //   return { sid, ...userOrErrorCode };
-    // }
-    // return {
-    //   sid,
-    // };
-    return this.handleGetUser(clientReq);
-  } catch (_err) {
-    return {
-      sid: this.getValidatedSid(clientReq),
-      error: { success: false, code: "server-error" },
-    };
-  }
-}