@niledatabase/server 4.0.0-alpha.12 → 4.0.0-alpha.14

package/dist/index.d.mts

@@ -72,10 +72,10 @@ type NilePoolConfig = PoolConfig & {
     afterCreate?: AfterCreate;
 };
 type LoggerType = {
-    info?: (args: unknown[]) => void;
-    warn?: (args: unknown[]) => void;
-    error?: (args: unknown[]) => void;
-    debug?: (args: unknown[]) => void;
+    info?: (args: unknown | unknown[]) => void;
+    warn?: (args: unknown | unknown[]) => void;
+    error?: (args: unknown | unknown[]) => void;
+    debug?: (args: unknown | unknown[]) => void;
 };
 type ServerConfig = {
     databaseId?: string;
@@ -215,20 +215,25 @@ type NileRequest<T> = NRequest<T> | T;
 
 declare class Auth extends Config {
     headers?: Headers;
-    constructor(config: Config, headers?: Headers);
+    resetHeaders?: () => void;
+    constructor(config: Config, headers?: Headers, params?: {
+        resetHeaders: () => void;
+    });
     handleHeaders(init?: RequestInit): RequestInit | undefined;
     get sessionUrl(): string;
-    getSession: (req: NileRequest<void> | Headers, init?: RequestInit) => Promise<JWT | ActiveSession | Response | undefined>;
+    getSession: <T = JWT | ActiveSession | Response | undefined>(req: NileRequest<void> | Headers, init?: RequestInit) => Promise<T>;
     get getCsrfUrl(): string;
-    getCsrf(req: NileRequest<void> | Headers, init?: RequestInit): Promise<JSON | Response>;
+    getCsrf<T = Response | JSON>(req: NileRequest<void> | Headers, init?: RequestInit, raw?: boolean): Promise<T>;
     get listProvidersUrl(): string;
-    listProviders: (req: NileRequest<void> | Headers, init?: RequestInit) => Promise<Response | {
+    listProviders: <T = Response | {
         [key: string]: Provider;
-    }>;
+    }>(req: NileRequest<void> | Headers, init?: RequestInit) => Promise<T>;
     get signOutUrl(): string;
-    signOut: (req: NileRequest<void | {
+    signOut: <T = Response | {
+        url: string;
+    }>(req: NileRequest<void | {
         callbackUrl?: string;
-    }> | Headers, init?: RequestInit) => Promise<Response | JSON>;
+    }> | Headers, init?: RequestInit) => Promise<T>;
 }
 
 declare class Tenants extends Config {
@@ -237,18 +242,18 @@ declare class Tenants extends Config {
     handleHeaders(init?: RequestInit): RequestInit | undefined;
     get tenantsUrl(): string;
     get tenantUrl(): string;
-    createTenant: (req: NileRequest<{
+    createTenant: <T = Tenant | Response>(req: NileRequest<{
         name: string;
-    }> | Headers | string, init?: RequestInit) => Promise<Tenant | Response>;
-    getTenant: (req: NileRequest<{
+    }> | Headers | string, init?: RequestInit) => Promise<T>;
+    getTenant: <T = Tenant | Response>(req: NileRequest<{
         id: string;
-    }> | Headers | string | void, init?: RequestInit) => Promise<Tenant | Response>;
+    }> | Headers | string | void, init?: RequestInit) => Promise<T>;
     get tenantListUrl(): string;
-    listTenants: (req: NileRequest<void> | Headers, init?: RequestInit) => Promise<Tenant[] | Response>;
-    deleteTenant: (req: NileRequest<void> | Headers | string, init?: RequestInit) => Promise<Response>;
-    updateTenant: (req: NileRequest<void> | Headers | {
+    listTenants: <T = Tenant[] | Response>(req: NileRequest<void> | Headers, init?: RequestInit) => Promise<T>;
+    deleteTenant: <T = Response>(req: NileRequest<void> | Headers | string, init?: RequestInit) => Promise<T>;
+    updateTenant: <T = Tenant | Response>(req: NileRequest<void> | Headers | {
         name: string;
-    }, init?: RequestInit) => Promise<Tenant | Response>;
+    }, init?: RequestInit) => Promise<T>;
 }
 
 declare class Users extends Config {
@@ -259,21 +264,21 @@ declare class Users extends Config {
     get linkUsersUrl(): string;
     get tenantUserUrl(): string;
     handleHeaders(init?: RequestInit): RequestInit | undefined;
-    createUser: (req: NileRequest<CreateBasicUserRequest>, init?: RequestInit) => Promise<User | Response>;
-    createTenantUser: (req: NileRequest<CreateBasicUserRequest>, init?: RequestInit) => Promise<User | Response>;
-    updateUser: (req: NileRequest<Partial<Omit<User, "email" | "tenants" | "created" | "updated">>>, init?: RequestInit) => Promise<User | Response>;
-    listUsers: (req: NileRequest<void> | Headers, init?: RequestInit) => Promise<User[] | Response>;
-    linkUser: (req: NileRequest<{
+    createUser: <T = User | Response>(req: NileRequest<CreateBasicUserRequest>, init?: RequestInit) => Promise<T>;
+    createTenantUser: <T = User | Response>(req: NileRequest<CreateBasicUserRequest>, 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<{
         id: string;
         tenantId?: string;
-    }> | Headers | string, init?: RequestInit) => Promise<User | Response>;
-    unlinkUser: (req: NileRequest<{
+    }> | Headers | string, init?: RequestInit) => Promise<T>;
+    unlinkUser: <T = Response>(req: NileRequest<{
         id: string;
         tenantId?: string;
-    }> | Headers | string, init?: RequestInit) => Promise<Response>;
+    }> | Headers | string, init?: RequestInit) => Promise<T>;
     get meUrl(): string;
     me: (req: NileRequest<void> | Headers, init?: RequestInit) => Promise<User | Response>;
-    updateMe: (req: NileRequest<Partial<Omit<User, "email" | "id" | "tenants" | "created" | "updated">>> | Headers, init?: RequestInit) => Promise<User | Response>;
+    updateMe: <T = User | Response>(req: NileRequest<Partial<Omit<User, "email" | "id" | "tenants" | "created" | "updated">>> | Headers, init?: RequestInit) => Promise<T>;
 }
 
 declare class Api {
@@ -296,13 +301,18 @@ declare class Api {
         put: string[];
     };
     constructor(config: Config);
-    updateConfig(config: Config): void;
+    reset: () => void;
+    updateConfig: (config: Config) => void;
+    resetHeaders: () => void;
     set headers(headers: Headers);
-    login(payload: {
+    get headers(): Headers | undefined;
+    login: (payload: {
         email: string;
         password: string;
-    }): Promise<void>;
-    session(req?: Request | Headers | null | undefined): Promise<Response | JWT | ActiveSession | null | undefined>;
+    }, config?: {
+        setCookie?: boolean;
+    }) => Promise<void>;
+    session: (req?: Request | Headers | null | undefined) => Promise<Response | JWT | ActiveSession | null | undefined>;
 }
 
 declare class Server {

package/dist/index.d.ts

@@ -72,10 +72,10 @@ type NilePoolConfig = PoolConfig & {
     afterCreate?: AfterCreate;
 };
 type LoggerType = {
-    info?: (args: unknown[]) => void;
-    warn?: (args: unknown[]) => void;
-    error?: (args: unknown[]) => void;
-    debug?: (args: unknown[]) => void;
+    info?: (args: unknown | unknown[]) => void;
+    warn?: (args: unknown | unknown[]) => void;
+    error?: (args: unknown | unknown[]) => void;
+    debug?: (args: unknown | unknown[]) => void;
 };
 type ServerConfig = {
     databaseId?: string;
@@ -215,20 +215,25 @@ type NileRequest<T> = NRequest<T> | T;
 
 declare class Auth extends Config {
     headers?: Headers;
-    constructor(config: Config, headers?: Headers);
+    resetHeaders?: () => void;
+    constructor(config: Config, headers?: Headers, params?: {
+        resetHeaders: () => void;
+    });
     handleHeaders(init?: RequestInit): RequestInit | undefined;
     get sessionUrl(): string;
-    getSession: (req: NileRequest<void> | Headers, init?: RequestInit) => Promise<JWT | ActiveSession | Response | undefined>;
+    getSession: <T = JWT | ActiveSession | Response | undefined>(req: NileRequest<void> | Headers, init?: RequestInit) => Promise<T>;
     get getCsrfUrl(): string;
-    getCsrf(req: NileRequest<void> | Headers, init?: RequestInit): Promise<JSON | Response>;
+    getCsrf<T = Response | JSON>(req: NileRequest<void> | Headers, init?: RequestInit, raw?: boolean): Promise<T>;
     get listProvidersUrl(): string;
-    listProviders: (req: NileRequest<void> | Headers, init?: RequestInit) => Promise<Response | {
+    listProviders: <T = Response | {
         [key: string]: Provider;
-    }>;
+    }>(req: NileRequest<void> | Headers, init?: RequestInit) => Promise<T>;
     get signOutUrl(): string;
-    signOut: (req: NileRequest<void | {
+    signOut: <T = Response | {
+        url: string;
+    }>(req: NileRequest<void | {
         callbackUrl?: string;
-    }> | Headers, init?: RequestInit) => Promise<Response | JSON>;
+    }> | Headers, init?: RequestInit) => Promise<T>;
 }
 
 declare class Tenants extends Config {
@@ -237,18 +242,18 @@ declare class Tenants extends Config {
     handleHeaders(init?: RequestInit): RequestInit | undefined;
     get tenantsUrl(): string;
     get tenantUrl(): string;
-    createTenant: (req: NileRequest<{
+    createTenant: <T = Tenant | Response>(req: NileRequest<{
         name: string;
-    }> | Headers | string, init?: RequestInit) => Promise<Tenant | Response>;
-    getTenant: (req: NileRequest<{
+    }> | Headers | string, init?: RequestInit) => Promise<T>;
+    getTenant: <T = Tenant | Response>(req: NileRequest<{
         id: string;
-    }> | Headers | string | void, init?: RequestInit) => Promise<Tenant | Response>;
+    }> | Headers | string | void, init?: RequestInit) => Promise<T>;
     get tenantListUrl(): string;
-    listTenants: (req: NileRequest<void> | Headers, init?: RequestInit) => Promise<Tenant[] | Response>;
-    deleteTenant: (req: NileRequest<void> | Headers | string, init?: RequestInit) => Promise<Response>;
-    updateTenant: (req: NileRequest<void> | Headers | {
+    listTenants: <T = Tenant[] | Response>(req: NileRequest<void> | Headers, init?: RequestInit) => Promise<T>;
+    deleteTenant: <T = Response>(req: NileRequest<void> | Headers | string, init?: RequestInit) => Promise<T>;
+    updateTenant: <T = Tenant | Response>(req: NileRequest<void> | Headers | {
         name: string;
-    }, init?: RequestInit) => Promise<Tenant | Response>;
+    }, init?: RequestInit) => Promise<T>;
 }
 
 declare class Users extends Config {
@@ -259,21 +264,21 @@ declare class Users extends Config {
     get linkUsersUrl(): string;
     get tenantUserUrl(): string;
     handleHeaders(init?: RequestInit): RequestInit | undefined;
-    createUser: (req: NileRequest<CreateBasicUserRequest>, init?: RequestInit) => Promise<User | Response>;
-    createTenantUser: (req: NileRequest<CreateBasicUserRequest>, init?: RequestInit) => Promise<User | Response>;
-    updateUser: (req: NileRequest<Partial<Omit<User, "email" | "tenants" | "created" | "updated">>>, init?: RequestInit) => Promise<User | Response>;
-    listUsers: (req: NileRequest<void> | Headers, init?: RequestInit) => Promise<User[] | Response>;
-    linkUser: (req: NileRequest<{
+    createUser: <T = User | Response>(req: NileRequest<CreateBasicUserRequest>, init?: RequestInit) => Promise<T>;
+    createTenantUser: <T = User | Response>(req: NileRequest<CreateBasicUserRequest>, 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<{
         id: string;
         tenantId?: string;
-    }> | Headers | string, init?: RequestInit) => Promise<User | Response>;
-    unlinkUser: (req: NileRequest<{
+    }> | Headers | string, init?: RequestInit) => Promise<T>;
+    unlinkUser: <T = Response>(req: NileRequest<{
         id: string;
         tenantId?: string;
-    }> | Headers | string, init?: RequestInit) => Promise<Response>;
+    }> | Headers | string, init?: RequestInit) => Promise<T>;
     get meUrl(): string;
     me: (req: NileRequest<void> | Headers, init?: RequestInit) => Promise<User | Response>;
-    updateMe: (req: NileRequest<Partial<Omit<User, "email" | "id" | "tenants" | "created" | "updated">>> | Headers, init?: RequestInit) => Promise<User | Response>;
+    updateMe: <T = User | Response>(req: NileRequest<Partial<Omit<User, "email" | "id" | "tenants" | "created" | "updated">>> | Headers, init?: RequestInit) => Promise<T>;
 }
 
 declare class Api {
@@ -296,13 +301,18 @@ declare class Api {
         put: string[];
     };
     constructor(config: Config);
-    updateConfig(config: Config): void;
+    reset: () => void;
+    updateConfig: (config: Config) => void;
+    resetHeaders: () => void;
     set headers(headers: Headers);
-    login(payload: {
+    get headers(): Headers | undefined;
+    login: (payload: {
         email: string;
         password: string;
-    }): Promise<void>;
-    session(req?: Request | Headers | null | undefined): Promise<Response | JWT | ActiveSession | null | undefined>;
+    }, config?: {
+        setCookie?: boolean;
+    }) => Promise<void>;
+    session: (req?: Request | Headers | null | undefined) => Promise<Response | JWT | ActiveSession | null | undefined>;
 }
 
 declare class Server {

package/dist/index.js

@@ -1856,8 +1856,11 @@ var Requester = class extends Config {
     }
     return response;
   }
-  async get(req, url, init) {
+  async get(req, url, init, raw = false) {
     const response = await this.request("GET", url, req, init);
+    if (raw) {
+      return response;
+    }
     if (response && response.status >= 200 && response.status < 300) {
       const cloned = response.clone();
       try {
@@ -1892,7 +1895,7 @@ function serverLogin(config, handlers) {
   return async function login({
     email,
     password
-  }) {
+  }, loginConfig) {
     if (!email || !password) {
       throw new Error("Server side login requires a user email and password.");
     }
@@ -1967,6 +1970,9 @@ function serverLogin(config, handlers) {
     if (!authCookie) {
       throw new Error("authentication failed");
     }
+    if (loginConfig?.setCookie) {
+      return loginRes;
+    }
     const [, token] = /((__Secure-)?nile\.session-token=.+?);/.exec(authCookie) ?? [];
     if (!token) {
       error("Unable to obtain auth token", { authCookie });
@@ -1982,14 +1988,24 @@ function serverLogin(config, handlers) {
 }
 var Auth = class extends Config {
   headers;
-  constructor(config, headers) {
+  resetHeaders;
+  constructor(config, headers, params) {
     super(config);
     this.headers = headers;
+    this.resetHeaders = params?.resetHeaders;
   }
   handleHeaders(init) {
     if (this.headers) {
       const cburl = getCallbackUrl2(this.headers);
-      this.headers.set(X_NILE_ORIGIN, new URL(cburl).origin);
+      if (cburl) {
+        try {
+          this.headers.set(X_NILE_ORIGIN, new URL(cburl).origin);
+        } catch (e) {
+          if (this.logger?.debug) {
+            this.logger.debug("Invalid URL supplied by cookie header");
+          }
+        }
+      }
       if (init) {
         init.headers = new Headers({ ...this.headers, ...init?.headers });
         return init;
@@ -2017,10 +2033,10 @@ var Auth = class extends Config {
   get getCsrfUrl() {
     return "/auth/csrf";
   }
-  async getCsrf(req, init) {
+  async getCsrf(req, init, raw = false) {
     const _requester = new Requester(this);
     const _init = this.handleHeaders(init);
-    return await _requester.get(req, this.getCsrfUrl, _init);
+    return await _requester.get(req, this.getCsrfUrl, _init, raw);
   }
   get listProvidersUrl() {
     return "/auth/providers";
@@ -2036,35 +2052,71 @@ var Auth = class extends Config {
   signOut = async (req, init) => {
     const _requester = new Requester(this);
     const _init = this.handleHeaders(init);
-    const csrf = await this.getCsrf(req);
+    const csrf = await this.getCsrf(
+      req,
+      void 0,
+      true
+    );
+    const csrfHeader = getCsrfToken(csrf.headers);
     const callbackUrl = req && "callbackUrl" in req ? String(req.callbackUrl) : "/";
-    if (csrf instanceof Request) {
-      return csrf;
-    }
-    const csrfToken = "csrfToken" in csrf ? String(csrf.csrfToken) : "";
-    if (!csrfToken) {
+    if (!csrfHeader) {
       return new Response("Request blocked", { status: 400 });
     }
-    return await _requester.post(req, this.signOutUrl, {
+    const headers = new Headers(_init?.headers);
+    const { csrfToken } = await csrf.json() ?? {};
+    const cooks = getCookies(headers);
+    if (csrfHeader) {
+      if (cooks["__Secure-nile.csrf-token"]) {
+        cooks["__Secure-nile.csrf-token"] = encodeURIComponent(csrfHeader);
+      }
+      if (cooks["nile.csrf-token"]) {
+        cooks["nile.csrf-token"] = encodeURIComponent(csrfHeader);
+      }
+    }
+    headers.set(
+      "cookie",
+      Object.keys(cooks).map((key12) => `${key12}=${cooks[key12]}`).join("; ")
+    );
+    const res = await _requester.post(req, this.signOutUrl, {
       method: "post",
       body: JSON.stringify({
         csrfToken,
         callbackUrl,
         json: String(true)
       }),
-      ..._init
+      ..._init,
+      headers
     });
+    this.resetHeaders && this.resetHeaders();
+    return res;
   };
 };
 function getCallbackUrl2(headers) {
   if (headers) {
-    const cookieHeader = headers.get("cookie") || "";
-    const cookies = Object.fromEntries(
-      cookieHeader.split("; ").map((cookie) => cookie.split("=").map(decodeURIComponent))
-    );
-    return cookies["__Secure-nile.callback-url"] || cookies["nile.callback-url"];
+    const cookies = getCookies(headers);
+    if (cookies) {
+      return cookies["__Secure-nile.callback-url"] || cookies["nile.callback-url"];
+    }
   }
 }
+function getCsrfToken(headers) {
+  if (headers) {
+    const cookies = getCookies(headers);
+    if (cookies) {
+      return cookies["__Secure-nile.csrf-token"] || cookies["nile.csrf-token"];
+    }
+  }
+}
+var getCookies = (headers) => {
+  if (!headers) return {};
+  const cookieHeader = headers.get("cookie") || headers.get("set-cookie");
+  if (!cookieHeader) return {};
+  return Object.fromEntries(
+    cookieHeader.split(/,\s*(?=[^;]+=[^;,]+)/).flatMap(
+      (cookie) => cookie.split("; ")[0].split("=").length === 2 ? [cookie.split("; ")[0].split("=").map(decodeURIComponent)] : []
+    )
+  );
+};
 
 // src/tenants/index.ts
 var Tenants = class extends Config {
@@ -2270,7 +2322,9 @@ var Api = class {
   paths;
   constructor(config) {
     this.config = config;
-    this.auth = new Auth(config);
+    this.auth = new Auth(config, void 0, {
+      resetHeaders: this.resetHeaders
+    });
     this.users = new Users(config);
     this.tenants = new Tenants(config);
     this.routes = {
@@ -2316,27 +2370,42 @@ var Api = class {
       delete: [this.routes.TENANT_USER, this.routes.TENANT]
     };
   }
-  updateConfig(config) {
+  reset = () => {
+    this.users = new Users(this.config, this._headers);
+    this.tenants = new Tenants(this.config, this._headers);
+    this.auth = new Auth(this.config, this._headers, {
+      resetHeaders: this.resetHeaders
+    });
+  };
+  updateConfig = (config) => {
     this.config = config;
     this.handlers = Handlers(this.routes, config);
-  }
+  };
+  resetHeaders = () => {
+    this._headers = new Headers();
+    this.reset();
+  };
   set headers(headers) {
-    this.users = new Users(this.config, headers);
-    this.tenants = new Tenants(this.config, headers);
-    this.auth = new Auth(this.config, headers);
     this._headers = headers;
+    this.reset();
   }
-  async login(payload) {
-    this.headers = await serverLogin(this.config, this.handlers)(payload);
+  get headers() {
+    return this._headers;
   }
-  async session(req) {
+  login = async (payload, config) => {
+    this.headers = await serverLogin(this.config, this.handlers)(
+      payload,
+      config
+    );
+  };
+  session = async (req) => {
     if (req instanceof Headers) {
       return this.auth.getSession(req);
     } else if (req instanceof Request) {
       return auth(req, this.config);
     }
     return this.auth.getSession(this._headers);
-  }
+  };
 };
 
 // src/Server.ts