@niledatabase/server 4.0.1 → 4.0.2-alpha.2

package/dist/index.d.mts

@@ -108,8 +108,20 @@ type Database = {
 interface CreateBasicUserRequest {
     email: string;
     password: string;
-    preferredName?: string;
-    newTenant?: string;
+    name?: string;
+    familyName?: string;
+    givenName?: string;
+    picture?: string;
+    newTenantName?: string;
+    tenantId?: string;
+}
+interface CreateTenantUserRequest {
+    email: string;
+    password: string;
+    name?: string;
+    familyName?: string;
+    givenName?: string;
+    picture?: string;
 }
 declare const LoginUserResponseTokenTypeEnum: {
     readonly AccessToken: "ACCESS_TOKEN";
@@ -261,13 +273,13 @@ declare class Tenants extends Config {
 declare class Users extends Config {
     headers?: Headers;
     constructor(config: Config, headers?: Headers);
-    get usersUrl(): string;
+    usersUrl(user: CreateBasicUserRequest): string;
     get tenantUsersUrl(): string;
     get linkUsersUrl(): string;
     get tenantUserUrl(): string;
     handleHeaders(init?: RequestInit): RequestInit | undefined;
-    createUser: <T = User | Response>(req: NileRequest<CreateBasicUserRequest>, init?: RequestInit) => Promise<T>;
-    createTenantUser: <T = User | Response>(req: NileRequest<CreateBasicUserRequest>, init?: RequestInit) => Promise<T>;
+    createUser: <T = User | Response>(user: CreateBasicUserRequest, init?: RequestInit) => Promise<T>;
+    createTenantUser: <T = User | Response>(req: NileRequest<CreateTenantUserRequest>, init?: RequestInit) => Promise<T>;
     updateUser: <T = User[] | Response>(req: NileRequest<Partial<Omit<User, "email" | "tenants" | "created" | "updated">>>, init?: RequestInit) => Promise<T>;
     listUsers: <T = User[] | Response>(req: NileRequest<void> | Headers, init?: RequestInit) => Promise<T>;
     linkUser: <T = User | Response>(req: NileRequest<{
@@ -308,6 +320,7 @@ declare class Api {
     resetHeaders: (headers?: Headers) => void;
     set headers(headers: Headers | Record<string, string>);
     get headers(): Headers | undefined;
+    getCookie(req?: Request | Headers): string | null | undefined;
     login: (payload: {
         email: string;
         password: string;
@@ -340,4 +353,4 @@ declare class Server {
 }
 declare function create(config?: ServerConfig): Promise<Server>;
 
-export { type ActiveSession, type AfterCreate, type CreateBasicUserRequest, type Database, type JWT, type LoggerType, type LoginUserResponse, type LoginUserResponseToken, LoginUserResponseTokenTypeEnum, create as Nile, type NileDb, type NilePoolConfig, type Opts, Server, type ServerConfig, type Tenant, type User };
+export { type ActiveSession, type AfterCreate, type CreateBasicUserRequest, type CreateTenantUserRequest, type Database, type JWT, type LoggerType, type LoginUserResponse, type LoginUserResponseToken, LoginUserResponseTokenTypeEnum, create as Nile, type NileDb, type NilePoolConfig, type Opts, Server, type ServerConfig, type Tenant, type User };

package/dist/index.d.ts

@@ -108,8 +108,20 @@ type Database = {
 interface CreateBasicUserRequest {
     email: string;
     password: string;
-    preferredName?: string;
-    newTenant?: string;
+    name?: string;
+    familyName?: string;
+    givenName?: string;
+    picture?: string;
+    newTenantName?: string;
+    tenantId?: string;
+}
+interface CreateTenantUserRequest {
+    email: string;
+    password: string;
+    name?: string;
+    familyName?: string;
+    givenName?: string;
+    picture?: string;
 }
 declare const LoginUserResponseTokenTypeEnum: {
     readonly AccessToken: "ACCESS_TOKEN";
@@ -261,13 +273,13 @@ declare class Tenants extends Config {
 declare class Users extends Config {
     headers?: Headers;
     constructor(config: Config, headers?: Headers);
-    get usersUrl(): string;
+    usersUrl(user: CreateBasicUserRequest): string;
     get tenantUsersUrl(): string;
     get linkUsersUrl(): string;
     get tenantUserUrl(): string;
     handleHeaders(init?: RequestInit): RequestInit | undefined;
-    createUser: <T = User | Response>(req: NileRequest<CreateBasicUserRequest>, init?: RequestInit) => Promise<T>;
-    createTenantUser: <T = User | Response>(req: NileRequest<CreateBasicUserRequest>, init?: RequestInit) => Promise<T>;
+    createUser: <T = User | Response>(user: CreateBasicUserRequest, init?: RequestInit) => Promise<T>;
+    createTenantUser: <T = User | Response>(req: NileRequest<CreateTenantUserRequest>, init?: RequestInit) => Promise<T>;
     updateUser: <T = User[] | Response>(req: NileRequest<Partial<Omit<User, "email" | "tenants" | "created" | "updated">>>, init?: RequestInit) => Promise<T>;
     listUsers: <T = User[] | Response>(req: NileRequest<void> | Headers, init?: RequestInit) => Promise<T>;
     linkUser: <T = User | Response>(req: NileRequest<{
@@ -308,6 +320,7 @@ declare class Api {
     resetHeaders: (headers?: Headers) => void;
     set headers(headers: Headers | Record<string, string>);
     get headers(): Headers | undefined;
+    getCookie(req?: Request | Headers): string | null | undefined;
     login: (payload: {
         email: string;
         password: string;
@@ -340,4 +353,4 @@ declare class Server {
 }
 declare function create(config?: ServerConfig): Promise<Server>;
 
-export { type ActiveSession, type AfterCreate, type CreateBasicUserRequest, type Database, type JWT, type LoggerType, type LoginUserResponse, type LoginUserResponseToken, LoginUserResponseTokenTypeEnum, create as Nile, type NileDb, type NilePoolConfig, type Opts, Server, type ServerConfig, type Tenant, type User };
+export { type ActiveSession, type AfterCreate, type CreateBasicUserRequest, type CreateTenantUserRequest, type Database, type JWT, type LoggerType, type LoginUserResponse, type LoginUserResponseToken, LoginUserResponseTokenTypeEnum, create as Nile, type NileDb, type NilePoolConfig, type Opts, Server, type ServerConfig, type Tenant, type User };

package/dist/index.js

@@ -1988,7 +1988,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");
@@ -2001,6 +2001,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;
@@ -2247,8 +2258,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`;
@@ -2273,10 +2291,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);
@@ -2450,6 +2468,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,