@niledatabase/server 5.0.0-alpha.6 → 5.0.0-alpha.8

package/dist/index.d.mts

@@ -376,6 +376,7 @@ declare class Server {
         headers: Headers | undefined;
         userId: string | null | undefined;
         tenantId: string | null | undefined;
+        preserveHeaders: boolean;
     };
 }
 declare function create(config?: NileConfig): Server;
@@ -483,6 +484,11 @@ type NileConfig = {
      * Functions to run at various points to make life easier
      */
     extensions?: Extension[];
+    /**
+     * In some cases, like when using REST context, we want to preserve the headers from the request,
+     * regardless of what an extension might do
+     */
+    preserveHeaders?: boolean;
 };
 type NileDb = NilePoolConfig & {
     tenantId?: string;

package/dist/index.d.ts

@@ -376,6 +376,7 @@ declare class Server {
         headers: Headers | undefined;
         userId: string | null | undefined;
         tenantId: string | null | undefined;
+        preserveHeaders: boolean;
     };
 }
 declare function create(config?: NileConfig): Server;
@@ -483,6 +484,11 @@ type NileConfig = {
      * Functions to run at various points to make life easier
      */
     extensions?: Extension[];
+    /**
+     * In some cases, like when using REST context, we want to preserve the headers from the request,
+     * regardless of what an extension might do
+     */
+    preserveHeaders?: boolean;
 };
 type NileDb = NilePoolConfig & {
     tenantId?: string;

package/dist/index.js

@@ -439,7 +439,7 @@ async function fetchTenantUsers(config, method, payload) {
   const { body, params } = {};
   if (!config.tenantId) {
     throw new Error(
-      'Unable to fetch tenant, the tenantId context is missing. Call nile.setContext({ tenantId }), set nile.tenantId = "tenantId", or add it to the function call'
+      "Unable to fetch the user's tenants, the tenantId context is missing. Call nile.setContext({ tenantId })"
     );
   }
   if (!isUUID(config.tenantId)) {
@@ -530,7 +530,7 @@ function matches4(configRoutes, request2) {
 async function fetchInvite(config, method, body) {
   if (!config.tenantId) {
     throw new Error(
-      'Unable to fetch tenant, the tenantId context is missing. Call nile.setContext({ tenantId }), set nile.tenantId = "tenantId", or add it to the function call'
+      "Unable to fetch the invite for the tenant, the tenantId context is missing. Call nile.setContext({ tenantId })"
     );
   }
   if (!isUUID(config.tenantId)) {
@@ -585,7 +585,7 @@ function matches5(configRoutes, request2) {
 async function fetchInvites(config) {
   if (!config.tenantId) {
     throw new Error(
-      'Unable to fetch tenant, the tenantId context is missing. Call nile.setContext({ tenantId }), set nile.tenantId = "tenantId", or add it to the function call'
+      "Unable to fetch invites for the tenant, the tenantId context is missing. Call nile.setContext({ tenantId })"
     );
   }
   if (!isUUID(config.tenantId)) {
@@ -698,7 +698,7 @@ async function fetchTenants(config, method, body) {
 async function fetchTenant(config, method, body) {
   if (!config.tenantId) {
     throw new Error(
-      'Unable to fetch tenant, the tenantId context is missing. Call nile.setContext({ tenantId }), set nile.tenantId = "tenantId", or add it to the function call'
+      "Unable to fetch tenants, the tenantId context is missing. Call nile.setContext({ tenantId })"
     );
   }
   if (!isUUID(config.tenantId)) {
@@ -2515,16 +2515,13 @@ var Users = class {
   async verifySelf(options, rawResponse = false) {
     const bypassEmail = typeof options === "object" ? options.bypassEmail ?? process.env.NODE_ENV !== "production" : process.env.NODE_ENV !== "production";
     const callbackUrl = typeof options === "object" ? options.callbackUrl : defaultCallbackUrl2(this.#config).callbackUrl;
+    let res;
     try {
       const me = await this.getSelf();
       if (me instanceof Response) {
         return me;
       }
-      const res = await verifyEmailAddress(
-        this.#config,
-        me,
-        String(callbackUrl)
-      );
+      res = await verifyEmailAddress(this.#config, me, String(callbackUrl));
       return res;
     } catch {
       this.#logger?.warn(
@@ -2532,12 +2529,12 @@ var Users = class {
       );
     }
     if (bypassEmail) {
-      return this.updateSelf({ emailVerified: true }, rawResponse);
+      res = this.updateSelf({ emailVerified: true }, rawResponse);
     }
     this.#logger.error(
       "Unable to verify email address. Configure your SMTP server in the console."
     );
-    return void 0;
+    return res;
   }
 };
 async function verifyEmailAddress(config, user, callback) {
@@ -2848,7 +2845,8 @@ function updateConfig(response, config) {
   return {
     ...config,
     origin,
-    headers: headers ?? void 0
+    headers: headers ?? void 0,
+    preserveHeaders: true
   };
 }
 
@@ -2863,17 +2861,32 @@ function bindHandleOnRequest(instance) {
         }
         const ext = await create2(instance);
         if (ext.onRequest) {
-          const modified = await ext.onRequest(_init.request);
-          if (modified?.headers) {
-            const modHeaders = new Headers(modified.headers);
-            const cookie = modHeaders.get("cookie");
+          const previousContext = instance.getContext();
+          if (previousContext.preserveHeaders) {
+            instance.setContext({ preserveHeaders: false });
+          }
+          await ext.onRequest(_init.request);
+          const updatedContext = instance.getContext();
+          if (updatedContext?.headers) {
+            const cookie = updatedContext.headers.get("cookie");
             if (cookie) {
-              params.headers.set("cookie", cookie);
-              debug(`${ext.id ?? create2.name} modified cookie`);
+              params.headers.set(
+                "cookie",
+                mergeCookies(
+                  previousContext.preserveHeaders ? previousContext.headers?.get("cookie") : null,
+                  updatedContext.headers.get("cookie")
+                )
+              );
+            }
+            if (updatedContext.tenantId) {
+              params.headers.set(
+                TENANT_COOKIE,
+                String(updatedContext.headers.get(TENANT_COOKIE))
+              );
             }
           }
+          debug(`${ext.id ?? create2.name} ran onRequest`);
         }
-        debug(`${ext.id ?? create2.name} ran onRequest`);
       }
     }
   };
@@ -2883,6 +2896,17 @@ function buildExtensionConfig(instance) {
     handleOnRequest: bindHandleOnRequest(instance)
   };
 }
+function mergeCookies(...cookieStrings) {
+  const cookieMap = /* @__PURE__ */ new Map();
+  for (const str of cookieStrings) {
+    if (!str) continue;
+    for (const part of str.split(";")) {
+      const [key17, value] = part.split("=").map((s) => s.trim());
+      if (key17 && value) cookieMap.set(key17, value);
+    }
+  }
+  return [...cookieMap.entries()].map(([k, v]) => `${k}=${v}`).join("; ");
+}
 
 // src/Server.ts
 var Server = class {
@@ -2894,6 +2918,7 @@ var Server = class {
   #paths;
   #manager;
   #headers;
+  #preserveHeaders;
   constructor(config) {
     this.#config = new Config({
       ...config,
@@ -2919,6 +2944,7 @@ var Server = class {
       ...this.#config.handlers,
       withContext: handlersWithContext(this.#config)
     };
+    this.#preserveHeaders = config?.preserveHeaders ?? false;
     this.#paths = this.#config.paths;
     this.#config.tenantId = getTenantId({ config: this.#config });
     this.#manager = new DBManager(this.#config);
@@ -2985,6 +3011,10 @@ var Server = class {
       ok = true;
       this.#config.userId = req.userId;
     }
+    if (req && typeof req === "object" && "preserveHeaders" in req) {
+      ok = true;
+      this.#preserveHeaders = Boolean(req.preserveHeaders);
+    }
     if (ok) {
       return;
     }
@@ -3007,7 +3037,8 @@ var Server = class {
     return {
       headers: this.#headers,
       userId: this.#config.userId,
-      tenantId: this.#config.tenantId
+      tenantId: this.#config.tenantId,
+      preserveHeaders: this.#preserveHeaders
     };
   }
   /**
@@ -3051,6 +3082,7 @@ var Server = class {
     for (const [key17, value] of Object.entries(merged)) {
       this.#headers.set(key17, value);
     }
+    this.#config.logger("[handleHeaders]").debug(JSON.stringify(merged));
     this.#config.headers = this.#headers;
   }
   /**