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

package/dist/index.d.mts

@@ -318,7 +318,7 @@ declare class Tenants {
     acceptInvite<T = Response>(req?: {
         identifier: string;
         token: string;
-        redirectUrl?: string;
+        callbackUrl?: string;
     }, rawResponse?: boolean): Promise<T>;
     /**
      * Delete a pending invite using `DELETE /api/tenants/{tenantId}/invite/{inviteId}`.

package/dist/index.d.ts

@@ -318,7 +318,7 @@ declare class Tenants {
     acceptInvite<T = Response>(req?: {
         identifier: string;
         token: string;
-        redirectUrl?: string;
+        callbackUrl?: string;
     }, rawResponse?: boolean): Promise<T>;
     /**
      * Delete a pending invite using `DELETE /api/tenants/{tenantId}/invite/{inviteId}`.

package/dist/index.js

@@ -131,139 +131,6 @@ function isUUID(value) {
   return regex.test(value);
 }
 
-// src/api/utils/request.ts
-async function request(url, _init, config) {
-  const { debug, info, error } = config.logger("[REQUEST]");
-  const { request: request2, ...init } = _init;
-  const requestUrl = new URL(request2.url);
-  const updatedHeaders = new Headers({});
-  if (request2.headers.get("cookie")) {
-    updatedHeaders.set("cookie", String(request2.headers.get("cookie")));
-  }
-  if (request2.headers.get(TENANT_COOKIE)) {
-    updatedHeaders.set(
-      TENANT_COOKIE,
-      String(request2.headers.get(TENANT_COOKIE))
-    );
-  }
-  if (config.secureCookies != null) {
-    updatedHeaders.set(HEADER_SECURE_COOKIES, String(config.secureCookies));
-  } else {
-    updatedHeaders.set(
-      HEADER_SECURE_COOKIES,
-      process.env.NODE_ENV === "production" ? "true" : "false"
-    );
-  }
-  updatedHeaders.set("host", requestUrl.host);
-  if (config.callbackUrl) {
-    const cbUrl = new URL(config.callbackUrl);
-    debug(`Obtained origin from config.callbackUrl ${config.callbackUrl}`);
-    updatedHeaders.set(HEADER_ORIGIN, cbUrl.origin);
-  } else if (config.origin) {
-    debug(`Obtained origin from config.origin ${config.origin}`);
-    updatedHeaders.set(HEADER_ORIGIN, config.origin);
-  } else {
-    const passedOrigin = request2.headers.get(HEADER_ORIGIN);
-    if (passedOrigin) {
-      updatedHeaders.set(HEADER_ORIGIN, passedOrigin);
-    } else {
-      const reqOrigin = config.routePrefix !== DEFAULT_PREFIX ? `${requestUrl.origin}${config.routePrefix}` : requestUrl.origin;
-      updatedHeaders.set(HEADER_ORIGIN, reqOrigin);
-      debug(`Obtained origin from request ${reqOrigin}`);
-    }
-  }
-  const params = { ...init };
-  if (params.method?.toLowerCase() === "post" || params.method?.toLowerCase() === "put") {
-    try {
-      updatedHeaders.set("content-type", "application/json");
-      const bodyStream = _init.body ?? _init.request?.body ?? request2.body;
-      const bodyText = await new Response(bodyStream).text();
-      try {
-        params.body = JSON.stringify(JSON.parse(bodyText));
-      } catch {
-        updatedHeaders.set("content-type", "application/x-www-form-urlencoded");
-        params.body = bodyText;
-      }
-    } catch (e) {
-      error("Failed to parse request body");
-    }
-  }
-  params.headers = updatedHeaders;
-  const fullUrl = `${url}${requestUrl.search}`;
-  if (config.debug) {
-    params.headers.set("request-id", crypto.randomUUID());
-    params.cache = "no-store";
-  }
-  await config.extensionCtx?.runExtensions(
-    "onRequest" /* onRequest */,
-    config,
-    params,
-    _init
-  );
-  try {
-    const res = await fetch(fullUrl, {
-      ...params
-    }).catch((e) => {
-      error("An error has occurred in the fetch", {
-        message: e.message,
-        stack: e.stack
-      });
-      return new Response(
-        "An unexpected (most likely configuration) problem has occurred",
-        { status: 500 }
-      );
-    });
-    const loggingRes = typeof res?.clone === "function" ? res?.clone() : null;
-    info(`[${params.method ?? "GET"}] ${fullUrl}`, {
-      status: res?.status,
-      statusText: res?.statusText,
-      text: await loggingRes?.text()
-    });
-    const updatedRes = await config.extensionCtx?.runExtensions(
-      "onResponse" /* onResponse */,
-      config,
-      { ...params, response: res }
-    );
-    if (updatedRes) {
-      return updatedRes;
-    }
-    return res;
-  } catch (e) {
-    if (e instanceof Error) {
-      error("An error has occurred in the fetch", {
-        message: e.message,
-        stack: e.stack
-      });
-    }
-    return new Response(
-      "An unexpected (most likely configuration) problem has occurred",
-      { status: 500 }
-    );
-  }
-}
-
-// src/api/utils/auth.ts
-async function auth(req, config) {
-  const { info, error } = config.logger("[nileauth]");
-  info("checking auth");
-  const sessionUrl = `${config.apiUrl}/auth/session`;
-  info(`using session ${sessionUrl}`);
-  req.headers.delete("content-length");
-  const res = await request(sessionUrl, { request: req }, config);
-  try {
-    const session = await new Response(res.body).json();
-    if (Object.keys(session).length === 0) {
-      info("no session found");
-      return void 0;
-    }
-    info("session active");
-    return session;
-  } catch (e) {
-    error(e);
-    return void 0;
-  }
-}
-
 // src/utils/Logger.ts
 var red = "\x1B[31m";
 var yellow = "\x1B[38;2;255;255;0m";
@@ -477,8 +344,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 +419,170 @@ 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/utils/request.ts
+async function request(url, _init, config) {
+  const { debug, info, error, warn: warn2 } = config.logger("[REQUEST]");
+  const { request: request2, ...init } = _init;
+  const requestUrl = new URL(request2.url);
+  const updatedHeaders = new Headers({});
+  if (request2.headers.get("cookie")) {
+    updatedHeaders.set("cookie", String(request2.headers.get("cookie")));
+  }
+  if (request2.headers.get(TENANT_COOKIE)) {
+    updatedHeaders.set(
+      TENANT_COOKIE,
+      String(request2.headers.get(TENANT_COOKIE))
+    );
+  }
+  if (config.secureCookies != null) {
+    updatedHeaders.set(HEADER_SECURE_COOKIES, String(config.secureCookies));
+  } else {
+    updatedHeaders.set(
+      HEADER_SECURE_COOKIES,
+      process.env.NODE_ENV === "production" ? "true" : "false"
+    );
+  }
+  updatedHeaders.set("host", requestUrl.host);
+  if (config.callbackUrl) {
+    const cbUrl = new URL(config.callbackUrl);
+    debug(`Obtained origin from config.callbackUrl ${config.callbackUrl}`);
+    updatedHeaders.set(HEADER_ORIGIN, cbUrl.origin);
+  } else if (config.origin) {
+    debug(`Obtained origin from config.origin ${config.origin}`);
+    updatedHeaders.set(HEADER_ORIGIN, config.origin);
+  } else {
+    const passedOrigin = request2.headers.get(HEADER_ORIGIN);
+    if (passedOrigin) {
+      updatedHeaders.set(HEADER_ORIGIN, passedOrigin);
+    } else {
+      const { headers } = ctx.get();
+      const host = headers.get("host");
+      if (host) {
+        const serverSideOrigin = `${getProtocolFromHeaders(headers)}://${host}`;
+        updatedHeaders.set(HEADER_ORIGIN, serverSideOrigin);
+        debug(`Obtained origin from server side headers ${serverSideOrigin}`);
+      } else {
+        const reqOrigin = config.routePrefix !== DEFAULT_PREFIX ? `${requestUrl.origin}${config.routePrefix}` : requestUrl.origin;
+        updatedHeaders.set(HEADER_ORIGIN, reqOrigin);
+        debug(`Obtained origin from request ${reqOrigin}`);
+      }
+    }
+  }
+  const params = { ...init };
+  if (params.method?.toLowerCase() === "post" || params.method?.toLowerCase() === "put") {
+    try {
+      updatedHeaders.set("content-type", "application/json");
+      const bodyStream = _init.body ?? _init.request?.body ?? request2.body;
+      const bodyText = await new Response(bodyStream).text();
+      try {
+        params.body = JSON.stringify(JSON.parse(bodyText));
+      } catch {
+        updatedHeaders.set("content-type", "application/x-www-form-urlencoded");
+        params.body = bodyText;
+      }
+    } catch (e) {
+      error("Failed to parse request body");
+    }
+  }
+  params.headers = updatedHeaders;
+  const fullUrl = `${url}${requestUrl.search}`;
+  if (config.debug) {
+    params.headers.set("request-id", crypto.randomUUID());
+    params.cache = "no-store";
+  }
+  await config.extensionCtx?.runExtensions(
+    "onRequest" /* onRequest */,
+    config,
+    params,
+    _init
+  );
+  try {
+    const res = await fetch(fullUrl, {
+      ...params
+    }).catch((e) => {
+      error("An error has occurred in the fetch", {
+        message: e.message,
+        stack: e.stack
+      });
+      return new Response(
+        "An unexpected (most likely configuration) problem has occurred",
+        { status: 500 }
+      );
+    });
+    const loggingRes = typeof res?.clone === "function" ? res?.clone() : null;
+    info(`[${params.method ?? "GET"}] ${fullUrl}`, {
+      status: res?.status,
+      statusText: res?.statusText,
+      text: await loggingRes?.text()
+    });
+    const updatedRes = await config.extensionCtx?.runExtensions(
+      "onResponse" /* onResponse */,
+      config,
+      { ...params, response: res }
+    );
+    if (updatedRes) {
+      return updatedRes;
+    }
+    return res;
+  } catch (e) {
+    if (e instanceof Error) {
+      error("An error has occurred in the fetch", {
+        message: e.message,
+        stack: e.stack
+      });
+    }
+    return new Response(
+      "An unexpected (most likely configuration) problem has occurred",
+      { status: 500 }
+    );
+  }
+}
+function getProtocolFromHeaders(headers) {
+  const get = (key17) => headers instanceof Headers ? headers.get(key17) : headers[key17.toLowerCase()];
+  const xfp = get("x-forwarded-proto");
+  if (xfp) return xfp.toLowerCase();
+  const forwarded = get("forwarded");
+  if (forwarded) {
+    const match = forwarded.match(/proto=(https?)/i);
+    if (match) return match[1].toLowerCase();
+  }
+  const ref = get("referer") || get("origin");
+  if (ref && ref.startsWith("https")) return "https";
+  return "http";
+}
+
+// src/api/utils/auth.ts
+async function auth(req, config) {
+  const { info, error } = config.logger("[nileauth]");
+  info("checking auth");
+  const sessionUrl = `${config.apiUrl}/auth/session`;
+  info(`using session ${sessionUrl}`);
+  req.headers.delete("content-length");
+  const res = await request(sessionUrl, { request: req }, config);
+  try {
+    const session = await new Response(res.body).json();
+    if (Object.keys(session).length === 0) {
+      info("no session found");
+      return void 0;
+    }
+    info("session active");
+    return session;
+  } catch (e) {
+    error(e);
+    return void 0;
+  }
+}
 
 // src/api/routes/me/index.ts
 var key = "ME";
@@ -2694,7 +2734,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 +2888,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 +2973,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();
@@ -3176,7 +3235,6 @@ var Tenants = class {
     return withNileContext(
       this.#config,
       async () => {
-        await runExtensionContext(this.#config);
         const { csrfToken } = await obtainCsrf(
           this.#config
         );
@@ -3188,11 +3246,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();
@@ -3225,8 +3284,8 @@ var Tenants = class {
         throw new Error("The identifier and token are required.");
       }
       const { identifier, token } = req;
-      const defaults = defaultCallbackUrl3(this.#config);
-      const callbackUrl = String(defaults.callbackUrl);
+      const { callbackUrl: cbUrl } = defaultCallbackUrl3(this.#config);
+      const callbackUrl = fQUrl2(cbUrl, req?.callbackUrl ?? "/");
       const res = await fetchInvite(
         this.#config,
         "PUT",
@@ -3294,21 +3353,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 +3445,7 @@ var Server = class {
     watchHeaders((headers) => {
       if (headers) {
         this.#config.context.headers = new Headers(headers);
+        this.#config.context.preserveHeaders = true;
         this.#reset();
       }
     });