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

package/dist/index.mjs

@@ -2432,24 +2432,38 @@ function handlersWithContext(configRoutes, config) {
       const updatedConfig = updateConfig(response, config);
       return { response, nile: new Server(updatedConfig) };
     },
-    POST: POST5,
-    DELETE: DELETE3,
-    PUT: PUT4
+    POST: async (req) => {
+      const response = await POST5(req);
+      const updatedConfig = updateConfig(response, config);
+      return { response, nile: new Server(updatedConfig) };
+    },
+    DELETE: async (req) => {
+      const response = await DELETE3(req);
+      const updatedConfig = updateConfig(response, config);
+      return { response, nile: new Server(updatedConfig) };
+    },
+    PUT: async (req) => {
+      const response = await PUT4(req);
+      const updatedConfig = updateConfig(response, config);
+      return { response, nile: new Server(updatedConfig) };
+    }
   };
 }
 function updateConfig(response, config) {
   let origin = "http://localhost:3000";
   let headers = null;
-  if (response.status === 302) {
+  if (response?.status === 302) {
     const location = response.headers.get("location");
     if (location) {
       origin = location;
     }
   }
   const setCookies = [];
-  for (const [key12, value] of response.headers) {
-    if (key12.toLowerCase() === "set-cookie") {
-      setCookies.push(value);
+  if (response?.headers) {
+    for (const [key12, value] of response.headers) {
+      if (key12.toLowerCase() === "set-cookie") {
+        setCookies.push(value);
+      }
     }
   }
   if (setCookies.length > 0) {
@@ -2546,6 +2560,9 @@ var Api = class {
     this.#headers = new Headers(headers ?? {});
     this.reset();
   };
+  /**
+   * Merge headers together
+   */
   set headers(headers) {
     const updates = [];
     if (headers instanceof Headers) {
@@ -2559,7 +2576,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;
@@ -2586,8 +2605,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;
     }
@@ -2602,23 +2631,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>"
+      );
     }
   };
 };