@niledatabase/server 4.0.1 → 4.0.2-alpha.2

package/dist/index.mjs

@@ -1982,7 +1982,7 @@ function serverLogin(config, handlers) {
     if (!authCookie) {
       throw new Error("authentication failed");
     }
-    const [, token] = /((__Secure-)?nile\.session-token=.+?);/.exec(authCookie) ?? [];
+    const token = parseToken(loginRes?.headers);
     if (!token) {
       error("Unable to obtain auth token", { authCookie });
       throw new Error("Server login failed");
@@ -1995,6 +1995,17 @@ function serverLogin(config, handlers) {
     return [headers, loginRes];
   };
 }
+function parseToken(headers) {
+  let authCookie = headers?.get("set-cookie");
+  if (!authCookie) {
+    authCookie = headers?.get("cookie");
+  }
+  if (!authCookie) {
+    return void 0;
+  }
+  const [, token] = /((__Secure-)?nile\.session-token=[^;]+)/.exec(authCookie) ?? [];
+  return token;
+}
 var Auth = class extends Config {
   headers;
   resetHeaders;
@@ -2241,8 +2252,15 @@ var Users = class extends Config {
     super(config);
     this.headers = headers;
   }
-  get usersUrl() {
-    return "/users";
+  usersUrl(user) {
+    const params = new URLSearchParams();
+    if (user.newTenantName) {
+      params.set("newTenantName", user.newTenantName);
+    }
+    if (user.tenantId) {
+      params.set("tenantId", user.tenantId);
+    }
+    return `/users?${params.size > 0 ? params : ""}`;
   }
   get tenantUsersUrl() {
     return `/tenants/${this.tenantId ?? "{tenantId}"}/users`;
@@ -2267,10 +2285,10 @@ var Users = class extends Config {
     }
     return void 0;
   }
-  createUser = async (req, init) => {
+  createUser = async (user, init) => {
     const _requester = new Requester(this);
     const _init = this.handleHeaders(init);
-    return await _requester.post(req, this.usersUrl, _init);
+    return await _requester.post(user, this.usersUrl(user), _init);
   };
   createTenantUser = async (req, init) => {
     const _requester = new Requester(this);
@@ -2444,6 +2462,14 @@ var Api = class {
   get headers() {
     return this.#headers;
   }
+  getCookie(req) {
+    if (req instanceof Headers) {
+      return parseToken(req);
+    } else if (req instanceof Request) {
+      return parseToken(req.headers);
+    }
+    return null;
+  }
   login = async (payload, config) => {
     const [headers, loginRes] = await serverLogin(
       this.config,