@niledatabase/server 3.0.0-alpha.27 → 3.0.0-alpha.29

package/dist/Api.d.ts

@@ -1,10 +1,12 @@
 import { Routes } from './api/types';
+import Auth from './auth';
 import Tenants from './tenants';
 import Users from './users';
 import { Config } from './utils/Config';
 export declare class Api {
     config: Config;
     users: Users;
+    auth: Auth;
     tenants: Tenants;
     routes: Routes;
     handlers: {

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

@@ -1,4 +1,12 @@
 import { Config } from '../../utils/Config';
+export type JWT = {
+    email: string;
+    sub: string;
+    id: string;
+    iat: number;
+    exp: number;
+    jti: string;
+};
 export type ActiveSession = {
     id: string;
     email: string;

package/dist/api/utils/routes/apiRoutes.d.ts

@@ -3,7 +3,10 @@ type ApiRouteKeys = keyof typeof apiRoutes;
 export type ApiRoutePaths = (typeof apiRoutes)[ApiRouteKeys];
 export declare const apiRoutes: (config: Config) => {
     ME: string;
-    USERS: (tenantId?: string) => string;
+    USERS: (qp: {
+        tenantId?: null | string;
+        newTenantName?: null | string;
+    }) => string;
     USER: (userId: string) => string;
     TENANTS: string;
     TENANT: (tenantId: string) => string;

package/dist/api/utils/routes/makeRestUrl.d.ts

@@ -1,2 +1,2 @@
 import { Config } from '../../../utils/Config';
-export declare function makeRestUrl(config: Config, path: string, qp?: Record<string, string>): string;
+export declare function makeRestUrl(config: Config, path: string, qp?: Record<string, string | null>): string;

package/dist/auth/index.d.ts

@@ -1,8 +1,10 @@
+import { ActiveSession, JWT } from '../api/utils/auth';
 import { Config } from '../utils/Config';
+import { NileRequest } from '../utils/Requester';
 /**
  * a helper function to log in server side.
  */
-export default function serverAuth(config: Config, handlers: {
+export declare function serverLogin(config: Config, handlers: {
     GET: (req: Request) => Promise<void | Response>;
     POST: (req: Request) => Promise<void | Response>;
     DELETE: (req: Request) => Promise<void | Response>;
@@ -11,3 +13,10 @@ export default function serverAuth(config: Config, handlers: {
     email: string;
     password: string;
 }) => Promise<Headers>;
+export default class Auth extends Config {
+    headers?: Headers;
+    constructor(config: Config, headers?: Headers);
+    handleHeaders(init?: RequestInit): RequestInit | undefined;
+    get sessionUrl(): string;
+    session: (req: NileRequest<void> | Headers, init?: RequestInit) => Promise<Response | JWT | ActiveSession>;
+}

package/dist/server.cjs.development.js

@@ -1217,22 +1217,30 @@ var DBManager = /*#__PURE__*/function () {
 }();
 
 var NILEDB_API_URL = process.env.NILEDB_API_URL;
+function filterNullUndefined(obj) {
+  if (!obj) {
+    return undefined;
+  }
+  return Object.fromEntries(Object.entries(obj).filter(function (_ref) {
+    var value = _ref[1];
+    return value !== null && value !== undefined;
+  }));
+}
 function makeRestUrl(config, path, qp) {
   var url = config.api.basePath || NILEDB_API_URL;
   if (!url) {
     throw new Error('An API url is required. Set it via NILEDB_API_URL. Was auto configuration run?');
   }
-  var params = new URLSearchParams(qp);
-  return "" + [url, path.substring(1, path.length)].join('/') + (qp ? "?" + params.toString() : '');
+  var params = new URLSearchParams(filterNullUndefined(qp));
+  var strParams = params.toString();
+  return "" + [url, path.substring(1, path.length)].join('/') + (strParams ? "?" + strParams : '');
 }
 
 var apiRoutes = function apiRoutes(config) {
   return {
     ME: makeRestUrl(config, '/me'),
-    USERS: function USERS(tenantId) {
-      return makeRestUrl(config, '/users', tenantId ? {
-        tenantId: tenantId
-      } : undefined);
+    USERS: function USERS(qp) {
+      return makeRestUrl(config, '/users', qp);
     },
     USER: function USER(userId) {
       return makeRestUrl(config, "/users/" + userId);
@@ -1781,7 +1789,7 @@ function POST$2(_x, _x2) {
 }
 function _POST$2() {
   _POST$2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, init) {
-    var yurl, tenantId, tenant, url;
+    var yurl, tenantId, newTenantName, tenant, url;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -1789,13 +1797,17 @@ function _POST$2() {
           init.method = 'POST';
           yurl = new URL(init.request.url);
           tenantId = yurl.searchParams.get('tenantId');
+          newTenantName = yurl.searchParams.get('newTenantName');
           tenant = tenantId != null ? tenantId : getTenantFromHttp(init.request.headers);
-          url = apiRoutes(config).USERS(tenant ? tenant : undefined);
-          _context.next = 8;
+          url = apiRoutes(config).USERS({
+            tenantId: tenant,
+            newTenantName: newTenantName
+          });
+          _context.next = 9;
           return request(url, init, config);
-        case 8:
-          return _context.abrupt("return", _context.sent);
         case 9:
+          return _context.abrupt("return", _context.sent);
+        case 10:
         case "end":
           return _context.stop();
       }
@@ -3295,179 +3307,6 @@ var appRoutes = function appRoutes(prefix) {
   };
 };
 
-// url host does not matter, we only match on the 1st leg by path
-var ORIGIN = 'https://us-west-2.api.dev.thenile.dev';
-/**
- * a helper function to log in server side.
- */
-function serverAuth(config, handlers) {
-  var _Logger = Logger(config, '[server side login]'),
-    info = _Logger.info,
-    error = _Logger.error,
-    debug = _Logger.debug;
-  var routes = appRoutes(config.routePrefix);
-  return /*#__PURE__*/function () {
-    var _login = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-      var _providers, _exec;
-      var email, password, sessionUrl, baseHeaders, sessionReq, sessionRes, providers, csrf, csrfReq, csrfRes, csrfToken, _yield$csrfRes$json, json, _ref2, credentials, csrfCookie, signInUrl, body, postReq, loginRes, authCookie, _ref3, token, headers;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            email = _ref.email, password = _ref.password;
-            if (!(!email || !password)) {
-              _context.next = 3;
-              break;
-            }
-            throw new Error('Server side login requires a user email and password.');
-          case 3:
-            sessionUrl = new URL("" + ORIGIN + routes.PROVIDERS);
-            baseHeaders = {
-              host: sessionUrl.host,
-              'niledb-origin': ORIGIN
-            };
-            info("Obtaining providers for " + email);
-            sessionReq = new Request(sessionUrl, _extends({
-              method: 'GET'
-            }, baseHeaders));
-            _context.next = 9;
-            return handlers.POST(sessionReq);
-          case 9:
-            sessionRes = _context.sent;
-            if (!((sessionRes == null ? void 0 : sessionRes.status) === 404)) {
-              _context.next = 12;
-              break;
-            }
-            throw new Error('Unable to login, cannot find region api.');
-          case 12:
-            _context.prev = 12;
-            _context.next = 15;
-            return sessionRes == null ? void 0 : sessionRes.json();
-          case 15:
-            providers = _context.sent;
-            _context.next = 22;
-            break;
-          case 18:
-            _context.prev = 18;
-            _context.t0 = _context["catch"](12);
-            info(sessionUrl, {
-              sessionRes: sessionRes
-            });
-            error(_context.t0);
-          case 22:
-            info('Obtaining csrf');
-            csrf = new URL("" + ORIGIN + routes.CSRF);
-            csrfReq = new Request(csrf, {
-              method: 'GET',
-              headers: new Headers(_extends({}, baseHeaders))
-            });
-            _context.next = 27;
-            return handlers.POST(csrfReq);
-          case 27:
-            csrfRes = _context.sent;
-            _context.prev = 28;
-            _context.next = 31;
-            return csrfRes == null ? void 0 : csrfRes.json();
-          case 31:
-            _context.t1 = _yield$csrfRes$json = _context.sent;
-            if (!(_context.t1 != null)) {
-              _context.next = 36;
-              break;
-            }
-            _context.t2 = _yield$csrfRes$json;
-            _context.next = 37;
-            break;
-          case 36:
-            _context.t2 = {};
-          case 37:
-            json = _context.t2;
-            csrfToken = json == null ? void 0 : json.csrfToken;
-            _context.next = 45;
-            break;
-          case 41:
-            _context.prev = 41;
-            _context.t3 = _context["catch"](28);
-            info(sessionUrl, {
-              csrfRes: csrfRes
-            });
-            error(_context.t3, {
-              csrfRes: csrfRes
-            });
-          case 45:
-            _ref2 = (_providers = providers) != null ? _providers : {}, credentials = _ref2.credentials;
-            csrfCookie = csrfRes == null ? void 0 : csrfRes.headers.get('set-cookie');
-            if (credentials) {
-              _context.next = 49;
-              break;
-            }
-            throw new Error('Unable to obtain credential provider. Aborting server side login.');
-          case 49:
-            signInUrl = new URL(credentials.callbackUrl);
-            if (csrfCookie) {
-              _context.next = 53;
-              break;
-            }
-            debug('CSRF failed', {
-              headers: csrfRes == null ? void 0 : csrfRes.headers
-            });
-            throw new Error('Unable to authenticate REST, CSRF missing.');
-          case 53:
-            info("Attempting sign in with email " + email + " " + signInUrl.href);
-            body = JSON.stringify({
-              email: email,
-              password: password,
-              csrfToken: csrfToken,
-              callbackUrl: credentials.callbackUrl
-            });
-            postReq = new Request(signInUrl, {
-              method: 'POST',
-              headers: new Headers(_extends({}, baseHeaders, {
-                'content-type': 'application/json',
-                cookie: csrfCookie.split(',').join('; ')
-              })),
-              body: body
-            });
-            _context.next = 58;
-            return handlers.POST(postReq);
-          case 58:
-            loginRes = _context.sent;
-            authCookie = loginRes == null ? void 0 : loginRes.headers.get('set-cookie');
-            if (authCookie) {
-              _context.next = 62;
-              break;
-            }
-            throw new Error('authentication failed');
-          case 62:
-            _ref3 = (_exec = /((__Secure-)?nile\.session-token=.+?);/.exec(authCookie)) != null ? _exec : [], token = _ref3[1];
-            if (token) {
-              _context.next = 66;
-              break;
-            }
-            error('Unable to obtain auth token', {
-              authCookie: authCookie
-            });
-            throw new Error('Server login failed');
-          case 66:
-            info('Server login successful', {
-              authCookie: authCookie,
-              csrfCookie: csrfCookie
-            });
-            headers = new Headers(_extends({}, baseHeaders, {
-              cookie: [token, csrfCookie].join('; ')
-            }));
-            return _context.abrupt("return", headers);
-          case 69:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee, null, [[12, 18], [28, 41]]);
-    }));
-    function login(_x) {
-      return _login.apply(this, arguments);
-    }
-    return login;
-  }();
-}
-
 var Requester = /*#__PURE__*/function (_Config) {
   function Requester(config) {
     return _Config.call(this, config) || this;
@@ -3709,6 +3548,233 @@ var Requester = /*#__PURE__*/function (_Config) {
   return Requester;
 }(Config);
 
+// url host does not matter, we only match on the 1st leg by path
+var ORIGIN = 'https://us-west-2.api.dev.thenile.dev';
+/**
+ * a helper function to log in server side.
+ */
+function serverLogin(config, handlers) {
+  var _Logger = Logger(config, '[server side login]'),
+    info = _Logger.info,
+    error = _Logger.error,
+    debug = _Logger.debug;
+  var routes = appRoutes(config.routePrefix);
+  return /*#__PURE__*/function () {
+    var _login = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
+      var _providers, _exec;
+      var email, password, sessionUrl, baseHeaders, sessionReq, sessionRes, providers, csrf, csrfReq, csrfRes, csrfToken, _yield$csrfRes$json, json, _ref2, credentials, csrfCookie, signInUrl, body, postReq, loginRes, authCookie, _ref3, token, headers;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            email = _ref.email, password = _ref.password;
+            if (!(!email || !password)) {
+              _context.next = 3;
+              break;
+            }
+            throw new Error('Server side login requires a user email and password.');
+          case 3:
+            sessionUrl = new URL("" + ORIGIN + routes.PROVIDERS);
+            baseHeaders = {
+              host: sessionUrl.host,
+              'niledb-origin': ORIGIN
+            };
+            info("Obtaining providers for " + email);
+            sessionReq = new Request(sessionUrl, _extends({
+              method: 'GET'
+            }, baseHeaders));
+            _context.next = 9;
+            return handlers.POST(sessionReq);
+          case 9:
+            sessionRes = _context.sent;
+            if (!((sessionRes == null ? void 0 : sessionRes.status) === 404)) {
+              _context.next = 12;
+              break;
+            }
+            throw new Error('Unable to login, cannot find region api.');
+          case 12:
+            _context.prev = 12;
+            _context.next = 15;
+            return sessionRes == null ? void 0 : sessionRes.json();
+          case 15:
+            providers = _context.sent;
+            _context.next = 22;
+            break;
+          case 18:
+            _context.prev = 18;
+            _context.t0 = _context["catch"](12);
+            info(sessionUrl, {
+              sessionRes: sessionRes
+            });
+            error(_context.t0);
+          case 22:
+            info('Obtaining csrf');
+            csrf = new URL("" + ORIGIN + routes.CSRF);
+            csrfReq = new Request(csrf, {
+              method: 'GET',
+              headers: new Headers(_extends({}, baseHeaders))
+            });
+            _context.next = 27;
+            return handlers.POST(csrfReq);
+          case 27:
+            csrfRes = _context.sent;
+            _context.prev = 28;
+            _context.next = 31;
+            return csrfRes == null ? void 0 : csrfRes.json();
+          case 31:
+            _context.t1 = _yield$csrfRes$json = _context.sent;
+            if (!(_context.t1 != null)) {
+              _context.next = 36;
+              break;
+            }
+            _context.t2 = _yield$csrfRes$json;
+            _context.next = 37;
+            break;
+          case 36:
+            _context.t2 = {};
+          case 37:
+            json = _context.t2;
+            csrfToken = json == null ? void 0 : json.csrfToken;
+            _context.next = 45;
+            break;
+          case 41:
+            _context.prev = 41;
+            _context.t3 = _context["catch"](28);
+            info(sessionUrl, {
+              csrfRes: csrfRes
+            });
+            error(_context.t3, {
+              csrfRes: csrfRes
+            });
+          case 45:
+            _ref2 = (_providers = providers) != null ? _providers : {}, credentials = _ref2.credentials;
+            csrfCookie = csrfRes == null ? void 0 : csrfRes.headers.get('set-cookie');
+            if (credentials) {
+              _context.next = 49;
+              break;
+            }
+            throw new Error('Unable to obtain credential provider. Aborting server side login.');
+          case 49:
+            signInUrl = new URL(credentials.callbackUrl);
+            if (csrfCookie) {
+              _context.next = 53;
+              break;
+            }
+            debug('CSRF failed', {
+              headers: csrfRes == null ? void 0 : csrfRes.headers
+            });
+            throw new Error('Unable to authenticate REST, CSRF missing.');
+          case 53:
+            info("Attempting sign in with email " + email + " " + signInUrl.href);
+            body = JSON.stringify({
+              email: email,
+              password: password,
+              csrfToken: csrfToken,
+              callbackUrl: credentials.callbackUrl
+            });
+            postReq = new Request(signInUrl, {
+              method: 'POST',
+              headers: new Headers(_extends({}, baseHeaders, {
+                'content-type': 'application/json',
+                cookie: csrfCookie.split(',').join('; ')
+              })),
+              body: body
+            });
+            _context.next = 58;
+            return handlers.POST(postReq);
+          case 58:
+            loginRes = _context.sent;
+            authCookie = loginRes == null ? void 0 : loginRes.headers.get('set-cookie');
+            if (authCookie) {
+              _context.next = 62;
+              break;
+            }
+            throw new Error('authentication failed');
+          case 62:
+            _ref3 = (_exec = /((__Secure-)?nile\.session-token=.+?);/.exec(authCookie)) != null ? _exec : [], token = _ref3[1];
+            if (token) {
+              _context.next = 66;
+              break;
+            }
+            error('Unable to obtain auth token', {
+              authCookie: authCookie
+            });
+            throw new Error('Server login failed');
+          case 66:
+            info('Server login successful', {
+              authCookie: authCookie,
+              csrfCookie: csrfCookie
+            });
+            headers = new Headers(_extends({}, baseHeaders, {
+              cookie: [token, csrfCookie].join('; ')
+            }));
+            return _context.abrupt("return", headers);
+          case 69:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[12, 18], [28, 41]]);
+    }));
+    function login(_x) {
+      return _login.apply(this, arguments);
+    }
+    return login;
+  }();
+}
+var Auth = /*#__PURE__*/function (_Config) {
+  function Auth(config, headers) {
+    var _this;
+    _this = _Config.call(this, config) || this;
+    _this.headers = void 0;
+    _this.session = /*#__PURE__*/function () {
+      var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(req, init) {
+        var _requester, _init;
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              _requester = new Requester(_this);
+              _init = _this.handleHeaders(init);
+              _context2.next = 4;
+              return _requester.get(req, _this.sessionUrl, _init);
+            case 4:
+              return _context2.abrupt("return", _context2.sent);
+            case 5:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2);
+      }));
+      return function (_x2, _x3) {
+        return _ref4.apply(this, arguments);
+      };
+    }();
+    _this.headers = headers;
+    return _this;
+  }
+  _inheritsLoose(Auth, _Config);
+  var _proto = Auth.prototype;
+  _proto.handleHeaders = function handleHeaders(init) {
+    if (this.headers) {
+      if (init) {
+        var _init2;
+        init.headers = new Headers(_extends({}, this.headers, (_init2 = init) == null ? void 0 : _init2.headers));
+        return init;
+      } else {
+        init = {
+          headers: this.headers
+        };
+        return init;
+      }
+    }
+    return undefined;
+  };
+  return _createClass(Auth, [{
+    key: "sessionUrl",
+    get: function get() {
+      return '/auth/session';
+    }
+  }]);
+}(Config);
+
 var Tenants = /*#__PURE__*/function (_Config) {
   function Tenants(config, headers) {
     var _this;
@@ -4049,10 +4115,12 @@ var Api = /*#__PURE__*/function () {
   function Api(config) {
     this.config = void 0;
     this.users = void 0;
+    this.auth = void 0;
     this.tenants = void 0;
     this.routes = void 0;
     this.handlers = void 0;
     this.config = config;
+    this.auth = new Auth(config);
     this.users = new Users(config);
     this.tenants = new Tenants(config);
     this.routes = _extends({}, appRoutes(config == null ? void 0 : config.routePrefix), config == null ? void 0 : config.routes);
@@ -4069,7 +4137,7 @@ var Api = /*#__PURE__*/function () {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _context.next = 2;
-            return serverAuth(this.config, this.handlers)(payload);
+            return serverLogin(this.config, this.handlers)(payload);
           case 2:
             this.headers = _context.sent;
           case 3: