@niledatabase/server 4.0.0-alpha.1 → 4.0.0-alpha.2

package/dist/index.d.mts

@@ -1,34 +1,47 @@
 import pg, { PoolConfig, PoolClient } from 'pg';
 
-type ConfigRoutes = {
-    SIGNIN?: string;
-    SESSION?: string;
-    PROVIDERS?: string;
-    CSRF?: string;
-    CALLBACK?: string;
-    SIGNOUT?: string;
-    ME?: string;
-    ERROR?: string;
-    TENANTS?: string;
-    TENANT_USERS?: string;
-    USERS?: string;
+type Routes = {
+    SIGNIN: string;
+    SESSION: string;
+    PROVIDERS: string;
+    CSRF: string;
+    CALLBACK: string;
+    SIGNOUT: string;
+    ERROR: string;
+    ME: string;
+    USERS: string;
+    TENANTS: string;
+    TENANT: string;
+    TENANT_USER: string;
+    TENANT_USERS: string;
+    SIGNUP: string;
+    VERIFY_REQUEST: string;
+    PASSWORD_RESET: string;
+    LOG: string;
 };
+
 type ApiParams = {
     basePath?: string | undefined;
     cookieKey?: string;
     token?: string | undefined;
     callbackUrl?: string | undefined;
+    routes?: Partial<Routes>;
+    routePrefix?: string | undefined;
+    secureCookies?: boolean;
 };
 declare class ApiConfig {
     cookieKey?: string;
     basePath?: string | undefined;
+    routes?: Partial<Routes>;
+    routePrefix?: string;
+    secureCookies?: boolean;
     /**
      * The client side callback url. Defaults to nothing (so nile.origin will be it), but in the cases of x-origin, you want to set this explicitly to be sure nile-auth does the right thing
      * If this is set, any `callbackUrl` from the client will be ignored.
      */
     callbackUrl?: string;
     private _token?;
-    constructor({ basePath, cookieKey, token, callbackUrl }: ApiParams);
+    constructor(config?: ServerConfig, logger?: string);
     get token(): string | undefined;
     set token(value: string | undefined);
 }
@@ -37,10 +50,7 @@ declare class Config {
     password: string;
     databaseId: string;
     databaseName: string;
-    routePrefix?: string;
-    routes?: ConfigRoutes;
     logger?: LoggerType;
-    secureCookies?: boolean | undefined;
     debug: boolean;
     db: NilePoolConfig;
     api: ApiConfig;
@@ -76,7 +86,6 @@ type ServerConfig = {
     userId?: string | null | undefined;
     debug?: boolean;
     configureUrl?: string;
-    secureCookies?: boolean;
     db?: NilePoolConfig;
     api?: ApiParams;
     logger?: LoggerType;
@@ -157,26 +166,6 @@ type ActiveSession = {
     };
 };
 
-type Routes = {
-    SIGNIN: string;
-    SESSION: string;
-    PROVIDERS: string;
-    CSRF: string;
-    CALLBACK: string;
-    SIGNOUT: string;
-    ERROR: string;
-    ME: string;
-    USERS: string;
-    TENANTS: string;
-    TENANT: string;
-    TENANT_USER: string;
-    TENANT_USERS: string;
-    SIGNUP: string;
-    VERIFY_REQUEST: string;
-    PASSWORD_RESET: string;
-    LOG: string;
-};
-
 interface NileBody<R, B> {
     readonly body: ReadableStream<Uint8Array> | null | B;
     readonly bodyUsed: boolean;

package/dist/index.d.ts

@@ -1,34 +1,47 @@
 import pg, { PoolConfig, PoolClient } from 'pg';
 
-type ConfigRoutes = {
-    SIGNIN?: string;
-    SESSION?: string;
-    PROVIDERS?: string;
-    CSRF?: string;
-    CALLBACK?: string;
-    SIGNOUT?: string;
-    ME?: string;
-    ERROR?: string;
-    TENANTS?: string;
-    TENANT_USERS?: string;
-    USERS?: string;
+type Routes = {
+    SIGNIN: string;
+    SESSION: string;
+    PROVIDERS: string;
+    CSRF: string;
+    CALLBACK: string;
+    SIGNOUT: string;
+    ERROR: string;
+    ME: string;
+    USERS: string;
+    TENANTS: string;
+    TENANT: string;
+    TENANT_USER: string;
+    TENANT_USERS: string;
+    SIGNUP: string;
+    VERIFY_REQUEST: string;
+    PASSWORD_RESET: string;
+    LOG: string;
 };
+
 type ApiParams = {
     basePath?: string | undefined;
     cookieKey?: string;
     token?: string | undefined;
     callbackUrl?: string | undefined;
+    routes?: Partial<Routes>;
+    routePrefix?: string | undefined;
+    secureCookies?: boolean;
 };
 declare class ApiConfig {
     cookieKey?: string;
     basePath?: string | undefined;
+    routes?: Partial<Routes>;
+    routePrefix?: string;
+    secureCookies?: boolean;
     /**
      * The client side callback url. Defaults to nothing (so nile.origin will be it), but in the cases of x-origin, you want to set this explicitly to be sure nile-auth does the right thing
      * If this is set, any `callbackUrl` from the client will be ignored.
      */
     callbackUrl?: string;
     private _token?;
-    constructor({ basePath, cookieKey, token, callbackUrl }: ApiParams);
+    constructor(config?: ServerConfig, logger?: string);
     get token(): string | undefined;
     set token(value: string | undefined);
 }
@@ -37,10 +50,7 @@ declare class Config {
     password: string;
     databaseId: string;
     databaseName: string;
-    routePrefix?: string;
-    routes?: ConfigRoutes;
     logger?: LoggerType;
-    secureCookies?: boolean | undefined;
     debug: boolean;
     db: NilePoolConfig;
     api: ApiConfig;
@@ -76,7 +86,6 @@ type ServerConfig = {
     userId?: string | null | undefined;
     debug?: boolean;
     configureUrl?: string;
-    secureCookies?: boolean;
     db?: NilePoolConfig;
     api?: ApiParams;
     logger?: LoggerType;
@@ -157,26 +166,6 @@ type ActiveSession = {
     };
 };
 
-type Routes = {
-    SIGNIN: string;
-    SESSION: string;
-    PROVIDERS: string;
-    CSRF: string;
-    CALLBACK: string;
-    SIGNOUT: string;
-    ERROR: string;
-    ME: string;
-    USERS: string;
-    TENANTS: string;
-    TENANT: string;
-    TENANT_USER: string;
-    TENANT_USERS: string;
-    SIGNUP: string;
-    VERIFY_REQUEST: string;
-    PASSWORD_RESET: string;
-    LOG: string;
-};
-
 interface NileBody<R, B> {
     readonly body: ReadableStream<Uint8Array> | null | B;
     readonly bodyUsed: boolean;

package/dist/index.js

@@ -92,8 +92,8 @@ async function request(url, _init, config) {
       String(request2.headers.get(X_NILE_TENANT))
     );
   }
-  if ("secureCookies" in config && config.secureCookies != null) {
-    updatedHeaders.set(X_NILE_SECURECOOKIES, String(config.secureCookies));
+  if (config.api.secureCookies != null) {
+    updatedHeaders.set(X_NILE_SECURECOOKIES, String(config.api.secureCookies));
   }
   updatedHeaders.set("host", requestUrl.host);
   if (config.api.callbackUrl) {
@@ -184,7 +184,7 @@ var getSecureCookies = (cfg) => {
   if (stringCheck(process.env.NILEDB_SECURECOOKIES)) {
     return Boolean(process.env.NILEDB_SECURECOOKIES);
   }
-  return config?.secureCookies;
+  return config?.api?.secureCookies;
 };
 var getDatabaseId = (cfg) => {
   const { config, logger } = cfg;
@@ -308,6 +308,19 @@ var getTenantId = (cfg) => {
   }
   return null;
 };
+var getCookieKey = (cfg) => {
+  const { config, logger } = cfg;
+  const { info } = Logger(config, "[cookieKey]");
+  if (stringCheck(config?.api?.cookieKey)) {
+    logger && info(`${logger}[config] ${config?.api?.cookieKey}`);
+    return String(config?.api?.cookieKey);
+  }
+  if (stringCheck(process.env.NILEDB_COOKIE_KEY)) {
+    logger && info(`${logger}[NILEDB_COOKIE_KEY] ${process.env.NILEDB_COOKIE_KEY}`);
+    return String(process.env.NILEDB_COOKIE_KEY);
+  }
+  return "token";
+};
 var getBasePath = (cfg) => {
   const { config, logger } = cfg;
   const { warn, info, error } = Logger(config, "[basePath]");
@@ -410,17 +423,24 @@ var stringCheck = (str) => {
 var ApiConfig = class {
   cookieKey;
   basePath;
+  routes;
+  routePrefix;
+  secureCookies;
   /**
    * The client side callback url. Defaults to nothing (so nile.origin will be it), but in the cases of x-origin, you want to set this explicitly to be sure nile-auth does the right thing
    * If this is set, any `callbackUrl` from the client will be ignored.
    */
   callbackUrl;
   _token;
-  constructor({ basePath, cookieKey, token, callbackUrl }) {
-    this.basePath = basePath;
-    this.cookieKey = cookieKey;
-    this.callbackUrl = callbackUrl;
-    this._token = token;
+  constructor(config, logger) {
+    const envVarConfig = { config, logger };
+    this.cookieKey = getCookieKey(envVarConfig);
+    this._token = getToken(envVarConfig);
+    this.callbackUrl = getCallbackUrl(envVarConfig);
+    this.secureCookies = getSecureCookies(envVarConfig);
+    this.basePath = getBasePath(envVarConfig);
+    this.routes = config?.api?.routes;
+    this.routePrefix = config?.api?.routePrefix;
   }
   get token() {
     return this._token;
@@ -434,10 +454,7 @@ var Config = class {
   password;
   databaseId;
   databaseName;
-  routePrefix;
-  routes;
   logger;
-  secureCookies;
   debug;
   db;
   api;
@@ -472,23 +489,15 @@ var Config = class {
         );
       }
     }
-    this.secureCookies = getSecureCookies(envVarConfig);
     this.databaseId = getDatabaseId(envVarConfig);
     this.databaseName = getDatabaseName(envVarConfig);
     this._tenantId = getTenantId(envVarConfig);
     this.debug = Boolean(config?.debug);
     this._userId = config?.userId;
-    const callbackUrl = config?.api?.callbackUrl ?? getCallbackUrl(envVarConfig);
-    const basePath = getBasePath(envVarConfig);
     const { host, port, ...dbConfig } = config?.db ?? {};
     const configuredHost = host ?? getDbHost(envVarConfig);
     const configuredPort = port ?? getDbPort(envVarConfig);
-    this.api = new ApiConfig({
-      basePath,
-      cookieKey: config?.api?.cookieKey ?? "token",
-      token: getToken({ config }),
-      callbackUrl
-    });
+    this.api = new ApiConfig(config, logger);
     this.db = {
       user: this.user,
       password: this.password,
@@ -506,18 +515,12 @@ var Config = class {
       config
     };
     const { host, port, ...dbConfig } = config.db ?? {};
-    const callbackUrl = config?.api?.callbackUrl ?? getCallbackUrl(envVarConfig);
     let configuredHost = host ?? getDbHost(envVarConfig);
     const configuredPort = port ?? getDbPort(envVarConfig);
     let basePath = getBasePath(envVarConfig);
     if (configuredHost && this.databaseName && this.databaseId && basePath) {
       info("Already configured, aborting fetch");
-      this.api = new ApiConfig({
-        basePath,
-        cookieKey: config?.api?.cookieKey ?? "token",
-        token: getToken({ config }),
-        callbackUrl
-      });
+      this.api = new ApiConfig(config);
       this.db = {
         user: this.user,
         password: this.password,
@@ -602,12 +605,7 @@ var Config = class {
         configuredHost = dburl.hostname;
       }
     }
-    this.api = new ApiConfig({
-      basePath,
-      cookieKey: config?.api?.cookieKey ?? "token",
-      token: getToken({ config }),
-      callbackUrl
-    });
+    this.api = new ApiConfig(config);
     this.db = {
       user: this.user,
       password: this.password,
@@ -1008,8 +1006,8 @@ function makeBasicHeaders(config, opts) {
       headers.set("Authorization", `Bearer ${getToken({ config })}`);
     }
   }
-  if ("secureCookies" in config && config.secureCookies != null) {
-    headers.set(X_NILE_SECURECOOKIES, String(config.secureCookies));
+  if (config && config.api.secureCookies != null) {
+    headers.set(X_NILE_SECURECOOKIES, String(config.api.secureCookies));
   }
   return headers;
 }
@@ -1892,7 +1890,7 @@ var Requester = class extends Config {
 var ORIGIN = "https://us-west-2.api.dev.thenile.dev";
 function serverLogin(config, handlers) {
   const { info, error, debug } = Logger(config, "[server side login]");
-  const routes = appRoutes(config.routePrefix);
+  const routes = appRoutes(config.api.routePrefix);
   return async function login({
     email,
     password
@@ -2226,8 +2224,8 @@ var Api = class {
     this.users = new Users(config);
     this.tenants = new Tenants(config);
     this.routes = {
-      ...appRoutes(config?.routePrefix),
-      ...config?.routes
+      ...appRoutes(config?.api.routePrefix),
+      ...config?.api.routes
     };
     this.handlers = Handlers(this.routes, config);
     this.paths = {