@niledatabase/server 3.0.0-alpha.44 → 3.0.0-alpha.46

package/dist/index.d.mts

@@ -70,13 +70,13 @@ interface LoginUserResponse {
 interface User {
     id: string;
     email: string;
-    name: string | null;
-    familyName: string | null;
-    givenName: string | null;
-    picture: string | null;
+    name?: string | null;
+    familyName?: string | null;
+    givenName?: string | null;
+    picture?: string | null;
     created: string;
-    updated: string;
-    emailVerified: boolean | null;
+    updated?: string;
+    emailVerified?: string | null;
     tenants: {
         id: string;
     }[];
@@ -145,7 +145,7 @@ type JWT = {
 type ActiveSession = {
     id: string;
     email: string;
-    expires: Date;
+    expires: string;
     user?: {
         id: string;
         name: string;
@@ -219,7 +219,7 @@ declare class Auth extends Config {
     constructor(config: Config, headers?: Headers);
     handleHeaders(init?: RequestInit): RequestInit | undefined;
     get sessionUrl(): string;
-    session: (req: NileRequest<void> | Headers, init?: RequestInit) => Promise<Response | JWT | ActiveSession>;
+    getSession: (req: NileRequest<void> | Headers, init?: RequestInit) => Promise<JWT | ActiveSession | Response | undefined>;
 }
 
 declare class Tenants extends Config {
@@ -273,6 +273,7 @@ declare class Api {
     auth: Auth;
     tenants: Tenants;
     routes: Routes;
+    _headers: undefined | Headers;
     handlers: {
         GET: (req: Request) => Promise<void | Response>;
         POST: (req: Request) => Promise<void | Response>;
@@ -292,6 +293,7 @@ declare class Api {
         email: string;
         password: string;
     }): Promise<void>;
+    session(req?: Request | Headers | null | undefined): Promise<Response | JWT | ActiveSession | null | undefined>;
 }
 
 declare class Server {

package/dist/index.d.ts

@@ -70,13 +70,13 @@ interface LoginUserResponse {
 interface User {
     id: string;
     email: string;
-    name: string | null;
-    familyName: string | null;
-    givenName: string | null;
-    picture: string | null;
+    name?: string | null;
+    familyName?: string | null;
+    givenName?: string | null;
+    picture?: string | null;
     created: string;
-    updated: string;
-    emailVerified: boolean | null;
+    updated?: string;
+    emailVerified?: string | null;
     tenants: {
         id: string;
     }[];
@@ -145,7 +145,7 @@ type JWT = {
 type ActiveSession = {
     id: string;
     email: string;
-    expires: Date;
+    expires: string;
     user?: {
         id: string;
         name: string;
@@ -219,7 +219,7 @@ declare class Auth extends Config {
     constructor(config: Config, headers?: Headers);
     handleHeaders(init?: RequestInit): RequestInit | undefined;
     get sessionUrl(): string;
-    session: (req: NileRequest<void> | Headers, init?: RequestInit) => Promise<Response | JWT | ActiveSession>;
+    getSession: (req: NileRequest<void> | Headers, init?: RequestInit) => Promise<JWT | ActiveSession | Response | undefined>;
 }
 
 declare class Tenants extends Config {
@@ -273,6 +273,7 @@ declare class Api {
     auth: Auth;
     tenants: Tenants;
     routes: Routes;
+    _headers: undefined | Headers;
     handlers: {
         GET: (req: Request) => Promise<void | Response>;
         POST: (req: Request) => Promise<void | Response>;
@@ -292,6 +293,7 @@ declare class Api {
         email: string;
         password: string;
     }): Promise<void>;
+    session(req?: Request | Headers | null | undefined): Promise<Response | JWT | ActiveSession | null | undefined>;
 }
 
 declare class Server {

package/dist/index.js

@@ -132,6 +132,11 @@ var getDatabaseId = (cfg) => {
     logger && info(`${logger}[config] ${config?.databaseId}`);
     return String(config?.databaseId);
   }
+  const dbFromEnv = stringCheck(process.env.NILEDB_ID);
+  if (dbFromEnv) {
+    logger && info(`${logger}[NILEDB_ID] ${dbFromEnv}`);
+    return dbFromEnv;
+  }
   const dbId = stringCheck(process.env.NILEDB_API_URL);
   if (dbId) {
     try {
@@ -140,8 +145,7 @@ var getDatabaseId = (cfg) => {
     } catch (e) {
     }
   }
-  logger && info(`${logger}[NILEDB_ID] ${String(process.env.NILEDB_ID)}`);
-  return process.env.NILEDB_ID;
+  return null;
 };
 var getUsername = (cfg) => {
   const { config, logger } = cfg;
@@ -150,15 +154,22 @@ var getUsername = (cfg) => {
     logger && info(`${logger}[config] ${config.user}`);
     return String(config?.user);
   }
+  const user = stringCheck(process.env.NILEDB_USER);
+  if (user) {
+    logger && info(`${logger}[NILEDB_USER] ${user}`);
+    return user;
+  }
   const pg2 = stringCheck(process.env.NILEDB_POSTGRES_URL);
   if (pg2) {
-    const url = new URL(pg2);
-    if (url.username) {
-      return url.username;
+    try {
+      const url = new URL(pg2);
+      if (url.username) {
+        return url.username;
+      }
+    } catch (e) {
     }
   }
-  logger && info(`${logger}[NILEDB_USER] ${String(process.env.NILEDB_USER)}`);
-  return process.env.NILEDB_USER;
+  return void 0;
 };
 var getPassword = (cfg) => {
   const { config, logger } = cfg;
@@ -168,15 +179,22 @@ var getPassword = (cfg) => {
     log && info(`${logger}[config] ${config?.password}`);
     return String(config?.password);
   }
+  const pass = stringCheck(process.env.NILEDB_PASSWORD);
+  if (pass) {
+    logger && info(`${logger}[NILEDB_PASSWORD] ${pass}`);
+    return pass;
+  }
   const pg2 = stringCheck(process.env.NILEDB_POSTGRES_URL);
   if (pg2) {
-    const url = new URL(pg2);
-    if (url.password) {
-      return url.password;
+    try {
+      const url = new URL(pg2);
+      if (url.password) {
+        return url.password;
+      }
+    } catch (e) {
     }
   }
-  logger && info(`${logger}[NILEDB_PASSWORD] ${String(process.env.NILEDB_PASSWORD)}`);
-  return process.env.NILEDB_PASSWORD;
+  return void 0;
 };
 var getInfoBearer = (cfg) => {
   return `${getUsername(cfg)}:${getPassword(cfg)}`;
@@ -190,8 +208,8 @@ var getToken = (cfg) => {
   }
   const token = stringCheck(process.env.NILEDB_TOKEN);
   if (token) {
-    logger && info(`${logger}[NILEDB_TOKEN] ${process.env.NILEDB_TOKEN}`);
-    return process.env.NILEDB_TOKEN;
+    logger && info(`${logger}[NILEDB_TOKEN] ${token}`);
+    return token;
   }
   return void 0;
 };
@@ -204,8 +222,8 @@ var getDatabaseName = (cfg) => {
   }
   const name = stringCheck(process.env.NILEDB_NAME);
   if (name) {
-    logger && info(`${logger}[NILEDB_NAME] ${process.env.NILEDB_NAME}`);
-    return process.env.NILEDB_NAME;
+    logger && info(`${logger}[NILEDB_NAME] ${name}`);
+    return name;
   }
   if (process.env.NILEDB_POSTGRES_URL) {
     try {
@@ -277,6 +295,10 @@ function getDbHost(cfg) {
     logger && info(`${logger}[config] ${config?.db?.host}`);
     return String(config?.db?.host);
   }
+  if (stringCheck(process.env.NILEDB_HOST)) {
+    logger && info(`${logger}[NILEDB_HOST] ${process.env.NILEDB_HOST}`);
+    return process.env.NILEDB_HOST;
+  }
   const pg2 = stringCheck(process.env.NILEDB_POSTGRES_URL);
   if (pg2) {
     try {
@@ -286,10 +308,6 @@ function getDbHost(cfg) {
     } catch (e) {
     }
   }
-  if (stringCheck(process.env.NILEDB_HOST)) {
-    logger && info(`${logger}[NILEDB_HOST] ${process.env.NILEDB_HOST}`);
-    return process.env.NILEDB_HOST;
-  }
   logger && info(`${logger}[default] db.thenile.dev`);
   return "db.thenile.dev";
 }
@@ -516,10 +534,17 @@ async function request(url, _init, config) {
   updatedHeaders.set("niledb-origin", requestUrl.origin);
   const params = { ...init, headers: updatedHeaders };
   if (params.method === "POST" || params.method === "PUT") {
-    updatedHeaders.set("content-type", "application/json");
-    const initBody = await new Response(_init.request.clone().body).json();
-    const requestBody = await new Response(request2.clone().body).json();
-    params.body = JSON.stringify(initBody ?? requestBody);
+    try {
+      updatedHeaders.set("content-type", "application/json");
+      const initBody = await new Response(_init.request.clone().body).json();
+      const requestBody = await new Response(request2.clone().body).json();
+      params.body = JSON.stringify(initBody ?? requestBody);
+    } catch (e) {
+      updatedHeaders.set("content-type", "application/x-www-form-urlencoded");
+      const initBody = await new Response(_init.request.clone().body).text();
+      const requestBody = await new Response(request2.clone().body).text();
+      params.body = initBody ?? requestBody;
+    }
   }
   try {
     const res = await fetch(url, { ...params }).catch((e) => {
@@ -567,7 +592,11 @@ async function auth(req, config) {
   }
   info("session active");
   try {
-    return await new Response(res.body).json();
+    const session = await new Response(res.body).json();
+    if (Object.keys(session).length === 0) {
+      return void 0;
+    }
+    return session;
   } catch (e) {
     error(e);
     return void 0;
@@ -1322,9 +1351,6 @@ async function route5(req, config) {
     headers: req.headers
   };
   if (req.method === "POST") {
-    if (typeof req.clone === "function") {
-      init.body = req.clone().body;
-    }
     const [provider] = new URL(req.url).pathname.split("/").reverse();
     url = `${proxyRoutes(config)[key5]}/${provider}`;
   }
@@ -1386,17 +1412,15 @@ function matches8(configRoutes, request2) {
 // src/api/routes/auth/callback.ts
 var key6 = "CALLBACK";
 async function route9(req, config) {
-  const { debug, error } = Logger(
+  const { error } = Logger(
     { ...config, debug: config.debug },
     `[ROUTES][${key6}]`
   );
   const [provider] = new URL(req.url).pathname.split("/").reverse();
-  debug(provider);
   try {
     const passThroughUrl = new URL(req.url);
     const params = new URLSearchParams(passThroughUrl.search);
     const url = `${proxyRoutes(config)[key6]}/${provider}${params.toString() !== "" ? `?${params.toString()}` : ""}`;
-    debug("params", { params, passThroughUrl, url, req });
     const res = await request(
       url,
       {
@@ -1407,7 +1431,6 @@ async function route9(req, config) {
     ).catch((e) => {
       error("an error as occurred", e);
     });
-    debug("did the res come back?", { res });
     const location = res?.headers.get("location");
     if (location) {
       return new Response(res?.body, {
@@ -1948,10 +1971,14 @@ var Auth = class extends Config {
   get sessionUrl() {
     return "/auth/session";
   }
-  session = async (req, init) => {
+  getSession = async (req, init) => {
     const _requester = new Requester(this);
     const _init = this.handleHeaders(init);
-    return await _requester.get(req, this.sessionUrl, _init);
+    const session = await _requester.get(req, this.sessionUrl, _init);
+    if (Object.keys(session).length === 0) {
+      return void 0;
+    }
+    return session;
   };
 };
 
@@ -2154,6 +2181,7 @@ var Api = class {
   auth;
   tenants;
   routes;
+  _headers;
   handlers;
   paths;
   constructor(config) {
@@ -2212,10 +2240,19 @@ var Api = class {
     this.users = new Users(this.config, headers);
     this.tenants = new Tenants(this.config, headers);
     this.auth = new Auth(this.config, headers);
+    this._headers = headers;
   }
   async login(payload) {
     this.headers = await serverLogin(this.config, this.handlers)(payload);
   }
+  async session(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