fix getClientRequestIPsInfo types

prostgles · Dec 21, 2024 · 35cb1bb · 35cb1bb
1 parent fc246db
commit 35cb1bb
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/lib/Auth/AuthHandler.ts b/lib/Auth/AuthHandler.ts
@@ -13,7 +13,6 @@ import { DB, DBHandlerServer, Prostgles } from "../Prostgles";
 import {
   Auth,
   AuthClientRequest,
-  AuthResult,
   AuthResultOrError,
   AuthResultWithSID,
   BasicSession,

diff --git a/lib/Auth/utils/getClientRequestIPsInfo.ts b/lib/Auth/utils/getClientRequestIPsInfo.ts
@@ -1,7 +1,9 @@
-import { AuthClientRequest, LoginClientInfo } from "../AuthTypes";
-export const getClientRequestIPsInfo = <T extends AuthClientRequest>(
-  req: T
-): T & LoginClientInfo => {
+import { PRGLIOSocket } from "../../DboBuilder/DboBuilderTypes";
+import { ExpressReq, LoginClientInfo } from "../AuthTypes";
+type ClientReq =
+  | { socket: PRGLIOSocket; httpReq?: undefined }
+  | { httpReq: ExpressReq; socket?: undefined };
+export const getClientRequestIPsInfo = <T extends ClientReq>(req: T): T & LoginClientInfo => {
   if (req.httpReq) {
     const ip_address = req.httpReq.ip;
     if (!ip_address) throw new Error("ip_address missing from req.httpReq");

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "4.2.193",
+  "version": "4.2.194",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/tests/server/package-lock.json b/tests/server/package-lock.json