@niledatabase/server 5.0.0-alpha.27 → 5.0.0-alpha.28

package/dist/index.js

@@ -477,8 +477,17 @@ var ctx = {
     if (partial.headers === null) {
       store.headers = new Headers();
     } else if (partial.headers && store.headers instanceof Headers) {
-      for (const [k, v] of new Headers(partial.headers).entries()) {
-        store.headers.set(k, v);
+      for (const [key17, value] of new Headers(partial.headers).entries()) {
+        if (key17.toLowerCase() === "cookie") {
+          const existingCookies = parseCookieHeader(
+            store.headers.get("cookie") || ""
+          );
+          const newCookies = parseCookieHeader(value);
+          const mergedCookies = { ...existingCookies, ...newCookies };
+          store.headers.set("cookie", serializeCookies(mergedCookies));
+        } else {
+          store.headers.set(key17, value);
+        }
       }
     }
     if ("tenantId" in partial)
@@ -543,6 +552,16 @@ function serializeContext(context) {
     preserveHeaders: context.preserveHeaders
   });
 }
+function parseCookieHeader(header) {
+  return header.split(";").map((c) => c.trim()).filter(Boolean).reduce((acc, curr) => {
+    const [key17, ...val] = curr.split("=");
+    if (key17) acc[key17] = val.join("=");
+    return acc;
+  }, {});
+}
+function serializeCookies(cookies) {
+  return Object.entries(cookies).map(([k, v]) => `${k}=${v}`).join("; ");
+}
 
 // src/api/routes/me/index.ts
 var key = "ME";
@@ -2694,7 +2713,7 @@ var Auth = class {
         ].filter(Boolean).join("; ");
         const uHeaders = new Headers({ cookie });
         updateHeaders(uHeaders);
-        ctx.set({ headers: uHeaders });
+        ctx.set({ headers: uHeaders, preserveHeaders: true });
       } else {
         error("Unable to set context after sign in", {
           headers: signInRes.headers
@@ -2848,6 +2867,22 @@ async function obtainCsrf(config, rawResponse = false) {
   }
 }
 
+// src/utils/qualifyDomain.ts
+function fQUrl2(callbackUrl, path) {
+  if (path.startsWith("/")) {
+    if (callbackUrl) {
+      const { origin } = new URL(callbackUrl);
+      return `${origin}${path}`;
+    }
+  }
+  try {
+    new URL(path);
+  } catch {
+    throw new Error("An invalid URL has been passed.");
+  }
+  return path;
+}
+
 // src/users/index.ts
 var Users = class {
   #config;
@@ -2917,7 +2952,10 @@ var Users = class {
   async verifySelf(options, rawResponse = false) {
     return withNileContext(this.#config, async () => {
       const bypassEmail = typeof options === "object" && options?.bypassEmail === true;
-      const callbackUrl = typeof options === "object" ? options.callbackUrl : defaultCallbackUrl2().callbackUrl;
+      const callbackUrl = fQUrl2(
+        defaultCallbackUrl2().callbackUrl,
+        typeof options === "object" ? String(options.callbackUrl) : "/"
+      );
       let res;
       try {
         const me = await this.getSelf();
@@ -3188,11 +3226,12 @@ var Tenants = class {
           if ("email" in req) {
             identifier = req.email;
           }
+          const { callbackUrl: cbUrl } = defaultCallbackUrl3(this.#config);
           if ("callbackUrl" in req) {
-            callbackUrl = fQUrl2(req.callbackUrl ?? "", this.#config);
+            callbackUrl = fQUrl2(cbUrl, req.callbackUrl ?? "/");
           }
           if ("redirectUrl" in req) {
-            redirectUrl = fQUrl2(req.redirectUrl ?? "", this.#config);
+            redirectUrl = fQUrl2(cbUrl, req.redirectUrl ?? "/");
           }
         }
         const { headers } = ctx.get();
@@ -3294,21 +3333,6 @@ function defaultCallbackUrl3(config) {
   }
   return { callbackUrl: cb, redirectUrl: redirect };
 }
-function fQUrl2(path, config) {
-  if (path.startsWith("/")) {
-    const { callbackUrl } = defaultCallbackUrl3(config);
-    if (callbackUrl) {
-      const { origin } = new URL(callbackUrl);
-      return `${origin}${path}`;
-    }
-  }
-  try {
-    new URL(path);
-  } catch {
-    throw new Error("An invalid URL has been passed.");
-  }
-  return path;
-}
 
 // src/api/handlers/withContext/index.ts
 function handlersWithContext(config) {
@@ -3401,6 +3425,7 @@ var Server = class {
     watchHeaders((headers) => {
       if (headers) {
         this.#config.context.headers = new Headers(headers);
+        this.#config.context.preserveHeaders = true;
         this.#reset();
       }
     });