@niledatabase/server 3.0.0-alpha.0 → 3.0.0-alpha.2

package/dist/api/handlers/DELETE.d.ts

@@ -1,3 +1,3 @@
 import { Routes } from '../types';
 import { Config } from '../../utils/Config';
-export default function DELETER(configRoutes: Routes, config: Config): (req: Request) => Promise<void | Response>;
+export default function DELETER(configRoutes: Routes, config: Config): (req: Request) => Promise<Response>;

package/dist/api/handlers/GET.d.ts

@@ -1,3 +1,3 @@
 import { Routes } from '../types';
 import { Config } from '../../utils/Config';
-export default function GETTER(configRoutes: Routes, config: Config): (req: Request) => Promise<void | Response>;
+export default function GETTER(configRoutes: Routes, config: Config): (req: Request) => Promise<Response>;

package/dist/api/handlers/POST.d.ts

@@ -1,3 +1,3 @@
 import { Routes } from '../types';
 import { Config } from '../../utils/Config';
-export default function POSTER(configRoutes: Routes, config: Config): (req: Request) => Promise<void | Response>;
+export default function POSTER(configRoutes: Routes, config: Config): (req: Request) => Promise<Response>;

package/dist/api/handlers/PUT.d.ts

@@ -1,3 +1,3 @@
 import { Routes } from '../types';
 import { Config } from '../../utils/Config';
-export default function PUTER(configRoutes: Routes, config: Config): (req: Request) => Promise<void | Response>;
+export default function PUTER(configRoutes: Routes, config: Config): (req: Request) => Promise<Response>;

package/dist/api/handlers/index.d.ts

@@ -1,8 +1,8 @@
 import { Config } from '../../utils/Config';
 import { Routes } from '../types';
 export default function Handlers(configRoutes: Routes, config: Config): {
-    GET: (req: Request) => Promise<void | Response>;
-    POST: (req: Request) => Promise<void | Response>;
-    DELETE: (req: Request) => Promise<void | Response>;
-    PUT: (req: Request) => Promise<void | Response>;
+    GET: (req: Request) => Promise<Response>;
+    POST: (req: Request) => Promise<Response>;
+    DELETE: (req: Request) => Promise<Response>;
+    PUT: (req: Request) => Promise<Response>;
 };

package/dist/api/routes/auth/csrf.d.ts

@@ -1,3 +1,3 @@
 import { Routes } from '../../types';
-export default function route(req: Request): Promise<void | Response>;
+export default function route(req: Request): Promise<Response>;
 export declare function matches(configRoutes: Routes, request: Request): boolean;

package/dist/api/routes/auth/error.d.ts

@@ -1,3 +1,3 @@
 import { Routes } from '../../types';
-export default function route(req: Request): Promise<void | Response>;
+export default function route(req: Request): Promise<Response>;
 export declare function matches(configRoutes: Routes, request: Request): boolean;

package/dist/api/routes/auth/providers.d.ts

@@ -1,3 +1,3 @@
 import { Routes } from '../../types';
-export default function route(req: Request): Promise<void | Response>;
+export default function route(req: Request): Promise<Response>;
 export declare function matches(configRoutes: Routes, request: Request): boolean;

package/dist/api/routes/auth/session.d.ts

@@ -1,3 +1,4 @@
 import { Routes } from '../../types';
-export default function route(req: Request): Promise<void | Response>;
+import { Config } from '../../../utils/Config';
+export default function route(req: Request, config: Config): Promise<Response>;
 export declare function matches(configRoutes: Routes, request: Request): boolean;

package/dist/api/routes/auth/signin.d.ts

@@ -29,5 +29,5 @@
  *         content: {}
  */
 import { Routes } from '../../types';
-export default function route(request: Request): Promise<void | Response>;
+export default function route(req: Request): Promise<Response>;
 export declare function matches(configRoutes: Routes, request: Request): boolean;

package/dist/api/routes/auth/signout.d.ts

@@ -1,3 +1,3 @@
 import { Routes } from '../../types';
-export default function route(request: Request): Promise<void | Response>;
+export default function route(request: Request): Promise<Response>;
 export declare function matches(configRoutes: Routes, request: Request): boolean;

package/dist/api/routes/me/index.d.ts

@@ -1,4 +1,4 @@
 import { Routes } from '../../types';
 import { Config } from '../../../utils/Config';
-export default function route(request: Request, config: Config): Promise<void | Response>;
+export default function route(request: Request, config: Config): Promise<Response>;
 export declare function matches(configRoutes: Routes, request: Request): boolean;

package/dist/api/routes/tenants/GET.d.ts

@@ -29,4 +29,4 @@ import { ActiveSession } from '../../utils/auth';
  */
 export declare function GET(session: ActiveSession, init: RequestInit & {
     request: Request;
-}, log: (...args: string[]) => void): Promise<void | Response>;
+}, log: (...args: string[]) => void): Promise<Response>;

package/dist/api/routes/tenants/POST.d.ts

@@ -42,4 +42,4 @@ import { ActiveSession } from '../../utils/auth';
  */
 export declare function POST(session: ActiveSession, init: RequestInit & {
     request: Request;
-}, log: (...args: string[]) => void): Promise<void | Response>;
+}, log: (...args: string[]) => void): Promise<Response>;

package/dist/api/routes/tenants/[tenantId]/DELETE.d.ts

@@ -31,4 +31,4 @@ import { ActiveSession } from '../../../utils/auth';
  */
 export declare function DELETE(session: ActiveSession, init: RequestInit & {
     request: Request;
-}, log: (...args: string[]) => void): Promise<void | Response>;
+}, log: (...args: string[]) => void): Promise<Response>;

package/dist/api/routes/tenants/[tenantId]/users/GET.d.ts

@@ -32,4 +32,4 @@ import { ActiveSession } from '../../../../utils/auth';
  */
 export declare function GET(session: ActiveSession, init: RequestInit & {
     request: Request;
-}, log: (...args: string[]) => void): Promise<void | Response>;
+}, log: (...args: string[]) => void): Promise<Response>;

package/dist/api/routes/tenants/[tenantId]/users/POST.d.ts

@@ -41,4 +41,4 @@ import { ActiveSession } from '../../../../utils/auth';
  */
 export declare function POST(session: ActiveSession, init: RequestInit & {
     request: Request;
-}, log: (...args: string[]) => void): Promise<void | Response>;
+}, log: (...args: string[]) => void): Promise<Response>;

package/dist/api/routes/tenants/[tenantId]/users/PUT.d.ts

@@ -27,4 +27,4 @@ import { ActiveSession } from '../../../../utils/auth';
  */
 export declare function PUT(session: ActiveSession, init: RequestInit & {
     request: Request;
-}, log: (...args: string[]) => void): Promise<void | Response>;
+}, log: (...args: string[]) => void): Promise<Response>;

package/dist/api/routes/tenants/[tenantId]/users/[userId]/DELETE.d.ts

@@ -27,4 +27,4 @@ import { ActiveSession } from '../../../../../utils/auth';
  */
 export declare function DELETE(session: ActiveSession, init: RequestInit & {
     request: Request;
-}, log: (...args: string[]) => void): Promise<void | Response>;
+}, log: (...args: string[]) => void): Promise<Response>;

package/dist/api/routes/tenants/[tenantId]/users/index.d.ts

@@ -1,4 +1,4 @@
 import { Config } from '../../../../../utils/Config';
 import { Routes } from '../../../../types';
-export default function route(request: Request, config: Config): Promise<void | Response>;
+export default function route(request: Request, config: Config): Promise<Response>;
 export declare function matches(configRoutes: Routes, request: Request): boolean;

package/dist/api/routes/tenants/index.d.ts

@@ -1,4 +1,4 @@
 import { Config } from '../../../utils/Config';
 import { Routes } from '../../types';
-export default function route(request: Request, config: Config): Promise<void | Response>;
+export default function route(request: Request, config: Config): Promise<Response>;
 export declare function matches(configRoutes: Routes, request: Request): boolean;

package/dist/api/routes/users/GET.d.ts

@@ -6,7 +6,7 @@
  *     - users
  *     summary: lists users in the tenant
  *     description: Returns information about the users within the tenant
- *       provided. You can also pass the a `niledb-tenantId` in the header or in a cookie.
+ *       provided. You can also pass the a `niledb-tenant-id` in the header or in a cookie.
  *     operationId: listUsers
  *     parameters:
  *       - name: tenantId
@@ -31,4 +31,4 @@
  */
 export declare function GET(init: RequestInit & {
     request: Request;
-}, log: (...args: string[]) => void): Promise<void | Response>;
+}, log: (...args: string[]) => void): Promise<Response>;

package/dist/api/routes/users/POST.d.ts

@@ -63,4 +63,4 @@ import { ActiveSession } from '../../utils/auth';
  */
 export declare function POST(session: void | ActiveSession, init: RequestInit & {
     request: Request;
-}, log?: (...args: string[]) => void): Promise<void | Response>;
+}, log?: (...args: string[]) => void): Promise<Response>;

package/dist/api/routes/users/[userId]/PUT.d.ts

@@ -37,4 +37,4 @@ import { ActiveSession } from '../../../utils/auth';
  */
 export declare function PUT(session: void | ActiveSession, init: RequestInit & {
     request: Request;
-}, log: (...args: string[]) => void): Promise<void | Response>;
+}, log: (...args: string[]) => void): Promise<Response>;

package/dist/api/routes/users/index.d.ts

@@ -1,4 +1,4 @@
 import { Routes } from '../../types';
 import { Config } from '../../../utils/Config';
-export default function route(request: Request, config: Config): Promise<void | Response>;
+export default function route(request: Request, config: Config): Promise<Response>;
 export declare function matches(configRoutes: Routes, request: Request): boolean;

package/dist/api/utils/auth.d.ts

@@ -2,5 +2,13 @@ import { Config } from '../../utils/Config';
 export type ActiveSession = {
     id: string;
     email: string;
+    expires: Date;
+    user?: {
+        id: string;
+        name: string;
+        image: string;
+        email: string;
+        emailVerified: void | Date;
+    };
 };
 export default function auth(req: Request, config: Config): Promise<void | ActiveSession>;

package/dist/api/utils/request.d.ts

@@ -1,3 +1,4 @@
+import { Config } from '../../utils/Config';
 export default function request(url: string, _init: RequestInit & {
     request: Request;
-}): Promise<void | Response>;
+}, config?: Config): Promise<Response>;

package/dist/server.cjs.development.js

@@ -2103,40 +2103,56 @@ function urlMatches(requestUrl, route) {
 }
 
 var _excluded = ["request"];
-// const { log } = console;
-function request(_x, _x2) {
+var _console$1 = console,
+  log$1 = _console$1.log;
+function request(_x, _x2, _x3) {
   return _request.apply(this, arguments);
 }
 function _request() {
-  _request = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(url, _init) {
-    var request, init, requestUrl, updatedHeaders, params, _init$body, res;
+  _request = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(url, _init, config) {
+    var _params$method;
+    var _Logger, info, error, request, init, requestUrl, updatedHeaders, params, _init$body, res, loggingRes;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
+          _Logger = Logger(_extends({}, config, {
+            debug: config == null ? void 0 : config.debug
+          }), '[REQUEST]', "[" + url + "]"), info = _Logger.info, error = _Logger.error;
           request = _init.request, init = _objectWithoutPropertiesLoose(_init, _excluded);
           requestUrl = new URL(request.url);
-          updatedHeaders = new Headers(request.headers); // updatedHeaders.delete('content-length');
-          // updatedHeaders.delete('transfer-encoding');
+          updatedHeaders = new Headers(request.headers);
+          updatedHeaders.set('host', requestUrl.host);
           updatedHeaders.set('niledb-origin', requestUrl.origin);
           updatedHeaders.set('niledb-creds', Buffer.from(process.env.NILEDB_USER + ":" + process.env.NILEDB_PASSWORD).toString('base64'));
           params = _extends({}, init, {
             headers: updatedHeaders
           });
           if (params.method === 'POST' || params.method === 'PUT') {
-            updatedHeaders.set('content-type', 'text/plain;charset=UTF-8');
             params.body = (_init$body = init.body) != null ? _init$body : request.body;
             // @ts-expect-error - its there
             params.duplex = 'half';
           }
-          // log(`[${params.method ?? 'GET'}]`, url);
-          _context.next = 9;
-          return fetch(url, _extends({}, params))["catch"](function () {
-            // log('An error has occurred in the fetch', e);
+          log$1("[" + ((_params$method = params.method) != null ? _params$method : 'GET') + "]", url);
+          _context.next = 12;
+          return fetch(url, _extends({}, params))["catch"](function (e) {
+            error('An error has occurred in the fetch', e);
+            return new Response('An unexpected (most likely configuration) problem has occurred', {
+              status: 500
+            });
           });
-        case 9:
+        case 12:
           res = _context.sent;
+          loggingRes = typeof (res == null ? void 0 : res.clone) === 'function' ? res == null ? void 0 : res.clone() : null;
+          _context.t0 = info;
+          _context.t1 = res == null ? void 0 : res.status;
+          _context.t2 = res == null ? void 0 : res.statusText;
+          _context.next = 19;
+          return loggingRes == null ? void 0 : loggingRes.text();
+        case 19:
+          _context.t3 = _context.sent;
+          (0, _context.t0)('[Response]', _context.t1, _context.t2, _context.t3);
           return _context.abrupt("return", res);
-        case 11:
+        case 22:
         case "end":
           return _context.stop();
       }
@@ -2180,15 +2196,17 @@ function GET$3(_x, _x2) {
 }
 function _GET$3() {
   _GET$3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(init, log) {
+    var res;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          log('[GET]');
+          log('[GET]', url);
           _context.next = 3;
           return request(url, init);
         case 3:
-          return _context.abrupt("return", _context.sent);
-        case 4:
+          res = _context.sent;
+          return _context.abrupt("return", res);
+        case 5:
         case "end":
           return _context.stop();
       }
@@ -2244,30 +2262,32 @@ function _auth() {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _Logger = Logger(_extends({}, config, {
-            debug: true
+            debug: config.debug
           }), '[nileauth]'), info = _Logger.info;
           info('checking auth');
           sessionUrl = config.api.basePath + "/auth/session";
           info('using session', sessionUrl);
-          _context.next = 6;
+          // handle the pass through with posts
+          req.headers["delete"]('content-length');
+          _context.next = 7;
           return request(sessionUrl, {
             request: req
           });
-        case 6:
+        case 7:
           res = _context.sent;
           if (res) {
-            _context.next = 10;
+            _context.next = 11;
             break;
           }
           info('no session found');
           return _context.abrupt("return", undefined);
-        case 10:
+        case 11:
           info('session active');
-          _context.next = 13;
+          _context.next = 14;
           return new Response(res.body).json();
-        case 13:
-          return _context.abrupt("return", _context.sent);
         case 14:
+          return _context.abrupt("return", _context.sent);
+        case 15:
         case "end":
           return _context.stop();
       }
@@ -2383,7 +2403,7 @@ function _POST$2() {
  *     - users
  *     summary: lists users in the tenant
  *     description: Returns information about the users within the tenant
- *       provided. You can also pass the a `niledb-tenantId` in the header or in a cookie.
+ *       provided. You can also pass the a `niledb-tenant-id` in the header or in a cookie.
  *     operationId: listUsers
  *     parameters:
  *       - name: tenantId
@@ -2945,17 +2965,21 @@ function GET(_x, _x2, _x3) {
 }
 function _GET() {
   _GET = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(session, init, log) {
-    var url;
+    var url, res;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           url = "" + apiRoutes.USER_TENANTS(session.id);
+          if (typeof session === 'object' && 'user' in session && session.user) {
+            url = "" + apiRoutes.USER_TENANTS(session.user.id);
+          }
           log('[GET]', url);
-          _context.next = 4;
+          _context.next = 5;
           return request(url, init);
-        case 4:
-          return _context.abrupt("return", _context.sent);
         case 5:
+          res = _context.sent;
+          return _context.abrupt("return", res);
+        case 7:
         case "end":
           return _context.stop();
       }
@@ -3177,26 +3201,29 @@ function route$6(_x) {
   return _route$6.apply(this, arguments);
 }
 function _route$6() {
-  _route$6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(request$1) {
+  _route$6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(req) {
     var url, init, _URL$pathname$split$r, provider, passThroughUrl, params, res;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           url = proxyRoutes[key$2];
           init = {
-            method: request$1.method
+            method: req.method,
+            headers: req.headers
           };
-          if (request$1.method === 'POST') {
-            init.body = request$1.body;
-            _URL$pathname$split$r = new URL(request$1.url).pathname.split('/').reverse(), provider = _URL$pathname$split$r[0];
+          if (req.method === 'POST') {
+            if (typeof req.clone === 'function') {
+              init.body = req.clone().body;
+            }
+            _URL$pathname$split$r = new URL(req.url).pathname.split('/').reverse(), provider = _URL$pathname$split$r[0];
             url = proxyRoutes[key$2] + "/" + provider;
           }
-          passThroughUrl = new URL(request$1.url);
+          passThroughUrl = new URL(req.url);
           params = new URLSearchParams(passThroughUrl.search);
           url = "" + url + (params.toString() !== '' ? "?" + params.toString() : '');
           _context.next = 8;
           return request(url, _extends({}, init, {
-            request: request$1
+            request: req
           }));
         case 8:
           res = _context.sent;
@@ -3213,18 +3240,18 @@ function matches$6(configRoutes, request) {
   return urlMatches(request.url, configRoutes[key$2]);
 }
 
-function route$5(_x) {
+function route$5(_x, _x2) {
   return _route$5.apply(this, arguments);
 }
 function _route$5() {
-  _route$5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(req) {
+  _route$5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, config) {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           return _context.abrupt("return", request(proxyRoutes.SESSION, {
             method: req.method,
             request: req
-          }));
+          }, config));
         case 1:
         case "end":
           return _context.stop();
@@ -3434,7 +3461,7 @@ function GETTER(configRoutes, config) {
               _context.next = 10;
               break;
             }
-            return _context.abrupt("return", route$5(req));
+            return _context.abrupt("return", route$5(req, config));
           case 10:
             if (!matches$6(configRoutes, req)) {
               _context.next = 12;
@@ -3516,7 +3543,7 @@ function POSTER(configRoutes, config) {
               _context.next = 8;
               break;
             }
-            return _context.abrupt("return", route$5(req));
+            return _context.abrupt("return", route$5(req, config));
           case 8:
             if (!matches$6(configRoutes, req)) {
               _context.next = 10;