@niledatabase/server 4.2.0-alpha.3 → 4.2.0-alpha.4

package/dist/index.d.mts

@@ -338,6 +338,9 @@ declare class Api {
     reset: () => void;
     updateConfig: (config: Config) => void;
     resetHeaders: (headers?: Headers) => void;
+    /**
+     * Merge headers together
+     */
     set headers(headers: Headers | Record<string, string>);
     get headers(): Headers | undefined;
     getCookie(req?: Request | Headers): string | null | undefined;
@@ -348,7 +351,7 @@ declare class Api {
         returnResponse?: boolean;
     }) => Promise<Response | undefined>;
     session: (req?: Request | Headers | null | undefined) => Promise<Response | JWT | ActiveSession | null | undefined>;
-    setContext: (req: Request | Headers | Record<string, string>) => void;
+    setContext: (req: Request | Headers | Record<string, string> | unknown) => void;
 }
 
 declare class Server {

package/dist/index.d.ts

@@ -338,6 +338,9 @@ declare class Api {
     reset: () => void;
     updateConfig: (config: Config) => void;
     resetHeaders: (headers?: Headers) => void;
+    /**
+     * Merge headers together
+     */
     set headers(headers: Headers | Record<string, string>);
     get headers(): Headers | undefined;
     getCookie(req?: Request | Headers): string | null | undefined;
@@ -348,7 +351,7 @@ declare class Api {
         returnResponse?: boolean;
     }) => Promise<Response | undefined>;
     session: (req?: Request | Headers | null | undefined) => Promise<Response | JWT | ActiveSession | null | undefined>;
-    setContext: (req: Request | Headers | Record<string, string>) => void;
+    setContext: (req: Request | Headers | Record<string, string> | unknown) => void;
 }
 
 declare class Server {

package/dist/index.js

@@ -2566,6 +2566,9 @@ var Api = class {
     this.#headers = new Headers(headers ?? {});
     this.reset();
   };
+  /**
+   * Merge headers together
+   */
   set headers(headers) {
     const updates = [];
     if (headers instanceof Headers) {
@@ -2579,7 +2582,9 @@ var Api = class {
     }
     const merged = {};
     this.#headers?.forEach((value, key12) => {
-      merged[key12.toLowerCase()] = value;
+      if (key12.toLowerCase() !== "cookie") {
+        merged[key12.toLowerCase()] = value;
+      }
     });
     for (const [key12, value] of updates) {
       merged[key12] = value;
@@ -2606,8 +2611,18 @@ var Api = class {
       this.config,
       this.handlers
     )(payload);
-    this.headers = headers;
     this.setContext(headers);
+    try {
+      const res = await loginRes.json();
+      if (res.id) {
+        this.config.userId = res.id;
+      }
+    } catch (e) {
+      const { warn } = Logger(this.config, "[API][login]");
+      if (warn) {
+        warn("Unable to set user id from login attempt.");
+      }
+    }
     if (config?.returnResponse) {
       return loginRes;
     }
@@ -2622,23 +2637,26 @@ var Api = class {
     return this.auth.getSession(this.#headers);
   };
   setContext = (req) => {
-    if (req instanceof Headers) {
-      this.headers = req;
-      return;
-    } else if (req instanceof Request) {
-      this.headers = new Headers(req.headers);
-      return;
-    }
-    const headers = new Headers(req);
-    if (headers) {
-      this.headers = headers;
-    } else {
-      const { warn } = Logger(this.config, "[API]");
-      if (warn) {
-        warn(
-          "Set context expects a Request, Header instance or an object of Record<string, string>"
-        );
+    try {
+      if (req instanceof Headers) {
+        this.headers = req;
+        return;
+      } else if (req instanceof Request) {
+        this.headers = new Headers(req.headers);
+        return;
+      }
+      const headers = new Headers(req);
+      if (headers) {
+        this.headers = headers;
+        return;
       }
+    } catch {
+    }
+    const { warn } = Logger(this.config, "[API]");
+    if (warn) {
+      warn(
+        "Set context expects a Request, Header instance or an object of Record<string, string>"
+      );
     }
   };
 };