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

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

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

package/dist/server.cjs.development.js

@@ -565,18 +565,6 @@ var getTenantId = function getTenantId(cfg) {
   }
   return null;
 };
-var getLocal = function getLocal(cfg) {
-  var config = cfg.config,
-    logger = cfg.logger;
-  if (process.env.NILEDB_LOCAL) {
-    var _Logger7 = Logger(config, '[local]'),
-      info = _Logger7.info;
-    logger && info(logger, 'NILEDB_LOCAL', process.env.NILEDB_LOCAL);
-    var apiUrl = new URL(process.env.NILEDB_LOCAL);
-    return apiUrl.href;
-  }
-  return 'http://localhost:3000';
-};
 /**
  * @param cfg various overrides
  * @returns the url for REST to use
@@ -585,8 +573,8 @@ var getBasePath = function getBasePath(cfg) {
   var _config$api4;
   var config = cfg.config,
     logger = cfg.logger;
-  var _Logger8 = Logger(config, '[basePath]'),
-    info = _Logger8.info;
+  var _Logger7 = Logger(config, '[basePath]'),
+    info = _Logger7.info;
   var basePath = config == null || (_config$api4 = config.api) == null ? void 0 : _config$api4.basePath;
   var version = '';
   if (!/\/v\d\//.test(String(basePath))) {
@@ -608,8 +596,8 @@ var getBasePath = function getBasePath(cfg) {
 var getControlPlane = function getControlPlane(cfg) {
   var config = cfg.config,
     logger = cfg.logger;
-  var _Logger9 = Logger(config, '[basePath]'),
-    info = _Logger9.info;
+  var _Logger8 = Logger(config, '[basePath]'),
+    info = _Logger8.info;
   if (config != null && config.configureUrl) {
     logger && info(logger, 'config', config.configureUrl);
     return config.configureUrl;
@@ -628,8 +616,8 @@ var getControlPlane = function getControlPlane(cfg) {
 function getDbHost(cfg) {
   var config = cfg.config,
     logger = cfg.logger;
-  var _Logger10 = Logger(config, '[db.host]'),
-    info = _Logger10.info;
+  var _Logger9 = Logger(config, '[db.host]'),
+    info = _Logger9.info;
   if (config != null && config.db && config.db.host) {
     logger && info(logger, 'config', config == null ? void 0 : config.db.host);
     return config.db.host;
@@ -650,8 +638,8 @@ function getDbPort(cfg) {
   var _config$db;
   var config = cfg.config,
     logger = cfg.logger;
-  var _Logger11 = Logger(config, '[db.port]'),
-    info = _Logger11.info;
+  var _Logger10 = Logger(config, '[db.port]'),
+    info = _Logger10.info;
   if (config != null && (_config$db = config.db) != null && _config$db.port && config.db.port != null) {
     var _config$db2;
     logger && info(logger, 'config', config == null ? void 0 : config.db.port);
@@ -675,19 +663,13 @@ var ApiConfig = /*#__PURE__*/function () {
   function ApiConfig(_ref) {
     var basePath = _ref.basePath,
       cookieKey = _ref.cookieKey,
-      token = _ref.token,
-      version = _ref.version,
-      localPath = _ref.localPath;
+      token = _ref.token;
     this.cookieKey = void 0;
     this.basePath = void 0;
-    this.version = void 0;
-    this.localPath = void 0;
     this._token = void 0;
     this.basePath = basePath;
     this.cookieKey = cookieKey;
-    this.version = version;
     this._token = token;
-    this.localPath = localPath != null ? localPath : 'http://localhost:3000';
   }
   return _createClass(ApiConfig, [{
     key: "token",
@@ -704,9 +686,7 @@ var Config = /*#__PURE__*/function () {
     var _this = this,
       _config$db2,
       _config$api$cookieKey2,
-      _config$api3,
-      _config$api$version2,
-      _config$api4;
+      _config$api2;
     this.user = void 0;
     this.password = void 0;
     this.databaseId = void 0;
@@ -720,7 +700,7 @@ var Config = /*#__PURE__*/function () {
     this._userId = void 0;
     this.configure = /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(config) {
-        var _config$db, _config$api$cookieKey, _config$api, _config$api$version, _config$api2;
+        var _config$db, _config$api$cookieKey, _config$api;
         var _Logger, info, error, envVarConfig, _ref3, host, port, dbConfig, configuredHost, configuredPort, basePath, cp, databaseName, url, res, database, possibleError, json, message, _database, apiHost, dbHost, name, id, dburl;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -818,9 +798,7 @@ var Config = /*#__PURE__*/function () {
                 cookieKey: (_config$api$cookieKey = config == null || (_config$api = config.api) == null ? void 0 : _config$api.cookieKey) != null ? _config$api$cookieKey : 'token',
                 token: getToken({
                   config: config
-                }),
-                version: (_config$api$version = config == null || (_config$api2 = config.api) == null ? void 0 : _config$api2.version) != null ? _config$api$version : 2,
-                localPath: getLocal(envVarConfig)
+                })
               });
               _this.db = _extends({
                 user: _this.user,
@@ -869,12 +847,10 @@ var Config = /*#__PURE__*/function () {
     var _configuredPort = _port != null ? _port : getDbPort(_envVarConfig);
     this.api = new ApiConfig({
       basePath: _basePath,
-      cookieKey: (_config$api$cookieKey2 = _config == null || (_config$api3 = _config.api) == null ? void 0 : _config$api3.cookieKey) != null ? _config$api$cookieKey2 : 'token',
+      cookieKey: (_config$api$cookieKey2 = _config == null || (_config$api2 = _config.api) == null ? void 0 : _config$api2.cookieKey) != null ? _config$api$cookieKey2 : 'token',
       token: getToken({
         config: _config
-      }),
-      version: (_config$api$version2 = _config == null || (_config$api4 = _config.api) == null ? void 0 : _config$api4.version) != null ? _config$api$version2 : 2,
-      localPath: getLocal(_envVarConfig)
+      })
     });
     this.db = _extends({
       user: this.user,
@@ -1283,9 +1259,7 @@ function _request() {
     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;
+          _Logger = Logger(config, '[REQUEST]'), info = _Logger.info, error = _Logger.error;
           request = _init.request, init = _objectWithoutPropertiesLoose(_init, _excluded);
           requestUrl = new URL(request.url);
           updatedHeaders = new Headers(request.headers);
@@ -1358,18 +1332,18 @@ var key$7 = 'ME';
  *         description: Unauthorized
  *         content: {}
  */
-function GET$3(_x, _x2, _x3) {
+function GET$3(_x, _x2, _x3, _x4) {
   return _GET$3.apply(this, arguments);
 }
 function _GET$3() {
-  _GET$3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(url, init, log) {
+  _GET$3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(url, init, log, config) {
     var res;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           log('[GET]', url);
           _context.next = 3;
-          return request(url, init);
+          return request(url, init, config);
         case 3:
           res = _context.sent;
           return _context.abrupt("return", res);
@@ -1381,7 +1355,7 @@ function _GET$3() {
   }));
   return _GET$3.apply(this, arguments);
 }
-function route$a(_x4, _x5) {
+function route$a(_x5, _x6) {
   return _route$a.apply(this, arguments);
 }
 function _route$a() {
@@ -1401,7 +1375,7 @@ function _route$a() {
           _context2.next = 7;
           return GET$3(url, {
             request: request
-          }, info);
+          }, info, config);
         case 7:
           return _context2.abrupt("return", _context2.sent);
         case 8:
@@ -1440,7 +1414,7 @@ function _auth() {
           _context.next = 7;
           return request(sessionUrl, {
             request: req
-          });
+          }, config);
         case 7:
           res = _context.sent;
           if (res) {
@@ -1594,60 +1568,68 @@ function _fetch2() {
         case 38:
           return _context.abrupt("return", response);
         case 39:
-          if (!((response == null ? void 0 : response.status) === 401)) {
+          if (!((response == null ? void 0 : response.status) === 404)) {
             _context.next = 41;
             break;
           }
+          return _context.abrupt("return", new ResponseError('Not found', {
+            status: 404
+          }));
+        case 41:
+          if (!((response == null ? void 0 : response.status) === 401)) {
+            _context.next = 43;
+            break;
+          }
           return _context.abrupt("return", new ResponseError('Unauthorized', {
             status: 401
           }));
-        case 41:
+        case 43:
           if (!((response == null ? void 0 : response.status) === 405)) {
-            _context.next = 43;
+            _context.next = 45;
             break;
           }
           return _context.abrupt("return", new ResponseError('Method not allowed', {
             status: 405
           }));
-        case 43:
+        case 45:
           errorHandler = typeof (response == null ? void 0 : response.clone) === 'function' ? response.clone() : null;
           msg = '';
-          _context.prev = 45;
-          _context.next = 48;
+          _context.prev = 47;
+          _context.next = 50;
           return response == null ? void 0 : response.json();
-        case 48:
+        case 50:
           res = _context.sent;
-          _context.next = 59;
+          _context.next = 61;
           break;
-        case 51:
-          _context.prev = 51;
-          _context.t5 = _context["catch"](45);
+        case 53:
+          _context.prev = 53;
+          _context.t5 = _context["catch"](47);
           if (!errorHandler) {
-            _context.next = 58;
+            _context.next = 60;
             break;
           }
-          _context.next = 56;
+          _context.next = 58;
           return errorHandler.text();
-        case 56:
+        case 58:
           msg = _context.sent;
           if (msg) {
             error('[fetch]', '[response]', "[status: " + errorHandler.status + "]", msg);
           }
-        case 58:
+        case 60:
           if (!msg) {
             error('[fetch]', '[response]', _context.t5);
           }
-        case 59:
+        case 61:
           if (!msg) {
-            _context.next = 61;
+            _context.next = 63;
             break;
           }
           return _context.abrupt("return", new ResponseError(msg, {
             status: errorHandler == null ? void 0 : errorHandler.status
           }));
-        case 61:
+        case 63:
           if (!(res && 'message' in res)) {
-            _context.next = 65;
+            _context.next = 67;
             break;
           }
           _res = res, message = _res.message;
@@ -1655,9 +1637,9 @@ function _fetch2() {
           return _context.abrupt("return", new ResponseError(message, {
             status: 400
           }));
-        case 65:
+        case 67:
           if (!(res && 'errors' in res)) {
-            _context.next = 69;
+            _context.next = 71;
             break;
           }
           _res2 = res, _res2$errors = _res2.errors, _message = _res2$errors[0];
@@ -1665,16 +1647,16 @@ function _fetch2() {
           return _context.abrupt("return", new ResponseError(_message, {
             status: 400
           }));
-        case 69:
+        case 71:
           error('[fetch]', '[response]', "[status: " + (errorHandler == null ? void 0 : errorHandler.status) + "]", 'UNHANDLED ERROR');
           return _context.abrupt("return", new ResponseError(null, {
             status: (_response$status = response == null ? void 0 : response.status) != null ? _response$status : 500
           }));
-        case 71:
+        case 73:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[23, 31], [45, 51]]);
+    }, _callee, null, [[23, 31], [47, 53]]);
   }));
   return _fetch2.apply(this, arguments);
 }
@@ -1766,7 +1748,7 @@ function _POST$2() {
           url = apiRoutes(config).USERS(tenant ? tenant : undefined);
           log && log('[POST]', url);
           _context.next = 11;
-          return request(url, init);
+          return request(url, init, config);
         case 11:
           return _context.abrupt("return", _context.sent);
         case 12:
@@ -1834,7 +1816,7 @@ function _GET$2() {
           log('[GET]', url);
           init.method = 'GET';
           _context.next = 11;
-          return request(url, init);
+          return request(url, init, config);
         case 11:
           return _context.abrupt("return", _context.sent);
         case 12:
@@ -1906,7 +1888,7 @@ function _PUT$1() {
           url = apiRoutes(config).USER(userId);
           log('[PUT]', url);
           _context.next = 9;
-          return request(url, init);
+          return request(url, init, config);
         case 9:
           return _context.abrupt("return", _context.sent);
         case 10:
@@ -2028,7 +2010,7 @@ function _GET$1() {
           url = "" + apiRoutes(config).TENANT_USERS(tenantId);
           log('[GET]', '[TENANT_USERS]', url);
           _context.next = 8;
-          return request(url, init);
+          return request(url, init, config);
         case 8:
           return _context.abrupt("return", _context.sent);
         case 9:
@@ -2099,7 +2081,7 @@ function _POST$1() {
           url = apiRoutes(config).TENANT_USERS(tenantId);
           log('[PUT]', url);
           _context.next = 8;
-          return request(url, init);
+          return request(url, init, config);
         case 8:
           return _context.abrupt("return", _context.sent);
         case 9:
@@ -2163,7 +2145,7 @@ function _DELETE$1() {
           url = "" + apiRoutes(config).TENANT_USER(tenantId, userId);
           log('[DELETE]', url);
           _context.next = 10;
-          return request(url, init);
+          return request(url, init, config);
         case 10:
           return _context.abrupt("return", _context.sent);
         case 11:
@@ -2223,7 +2205,7 @@ function _PUT() {
           url = "" + apiRoutes(config).TENANT_USERS(tenantId);
           log('[PUT]', url);
           _context.next = 9;
-          return request(url, init);
+          return request(url, init, config);
         case 9:
           return _context.abrupt("return", _context.sent);
         case 10:
@@ -2360,7 +2342,7 @@ function _GET() {
           }
           log('[GET]', url);
           _context.next = 5;
-          return request(url, init);
+          return request(url, init, config);
         case 5:
           res = _context.sent;
           return _context.abrupt("return", res);
@@ -2426,7 +2408,7 @@ function _DELETE() {
           url = "" + apiRoutes(config).TENANT(tenantId);
           log('[DELETE]', url);
           _context.next = 9;
-          return request(url, init);
+          return request(url, init, config);
         case 9:
           return _context.abrupt("return", _context.sent);
         case 10:
@@ -2493,7 +2475,7 @@ function _POST() {
           url = "" + apiRoutes(config).TENANTS;
           log('[POST]', url);
           _context.next = 6;
-          return request(url, init);
+          return request(url, init, config);
         case 6:
           return _context.abrupt("return", _context.sent);
         case 7:
@@ -2611,7 +2593,7 @@ function _route$6() {
           _context.next = 8;
           return request(url, _extends({}, init, {
             request: req
-          }));
+          }), config);
         case 8:
           res = _context.sent;
           return _context.abrupt("return", res);
@@ -2662,7 +2644,7 @@ function _route$4() {
           return _context.abrupt("return", request(proxyRoutes(config).PROVIDERS, {
             method: req.method,
             request: req
-          }));
+          }, config));
         case 1:
         case "end":
           return _context.stop();
@@ -2686,7 +2668,7 @@ function _route$3() {
           return _context.abrupt("return", request(proxyRoutes(config).CSRF, {
             method: req.method,
             request: req
-          }));
+          }, config));
         case 1:
         case "end":
           return _context.stop();
@@ -2720,7 +2702,7 @@ function _route$2() {
           return request(url, {
             request: request$1,
             method: request$1.method
-          })["catch"](function (e) {
+          }, config)["catch"](function (e) {
             error('an error as occurred', e);
           });
         case 7:
@@ -2773,7 +2755,7 @@ function _route$1() {
           _context.next = 5;
           return request(url, _extends({}, init, {
             request: request$1
-          }));
+          }), config);
         case 5:
           res = _context.sent;
           return _context.abrupt("return", res);
@@ -2801,7 +2783,7 @@ function _route() {
           return _context.abrupt("return", request(proxyRoutes(config)[key], {
             method: req.method,
             request: req
-          }));
+          }, config));
         case 1:
         case "end":
           return _context.stop();
@@ -3091,75 +3073,100 @@ var appRoutes = function appRoutes(prefix) {
  */
 function serverAuth(config, handlers) {
   var _Logger = Logger(config, '[server side login]'),
-    info = _Logger.info;
+    info = _Logger.info,
+    error = _Logger.error;
   return /*#__PURE__*/function () {
     var _login = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-      var _yield$csrfRes$json, _exec;
-      var email, password, sessionUrl, sessionReq, sessionRes, providers, csrf, csrfReq, csrfRes, _ref2, csrfToken, credentials, csrfCookie, signInUrl, postReq, loginRes, authCookie, _ref3, token;
+      var _providers, _exec;
+      var email, password, sessionUrl, sessionReq, sessionRes, providers, csrf, csrfReq, csrfRes, csrfToken, _yield$csrfRes$json, json, _ref2, credentials, csrfCookie, signInUrl, postReq, loginRes, authCookie, _ref3, token;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             email = _ref.email, password = _ref.password;
-            info('Obtaining session');
-            sessionUrl = new URL(config.api.localPath + "/api/auth/providers");
+            if (!(!email || !password)) {
+              _context.next = 3;
+              break;
+            }
+            throw new Error('Server side login requires a user email and password.');
+          case 3:
+            info('Obtaining providers for', email);
+            sessionUrl = new URL(config.api.basePath + "/api/auth/providers");
             sessionReq = new Request(sessionUrl, {
               method: 'GET',
               headers: new Headers({
                 host: sessionUrl.host
               })
             });
-            _context.next = 6;
+            _context.next = 8;
             return handlers.POST(sessionReq);
-          case 6:
+          case 8:
             sessionRes = _context.sent;
-            _context.next = 9;
+            _context.prev = 9;
+            _context.next = 12;
             return sessionRes == null ? void 0 : sessionRes.json();
-          case 9:
+          case 12:
             providers = _context.sent;
+            _context.next = 19;
+            break;
+          case 15:
+            _context.prev = 15;
+            _context.t0 = _context["catch"](9);
+            info(sessionUrl, sessionRes);
+            error(_context.t0);
+          case 19:
             info('Obtaining csrf');
-            csrf = new URL(config.api.localPath + "/api/auth/csrf");
+            csrf = new URL(config.api.basePath + "/api/auth/csrf");
             csrfReq = new Request(csrf, {
               method: 'GET',
               headers: new Headers({
                 host: sessionUrl.host
               })
             });
-            _context.next = 15;
+            _context.next = 24;
             return handlers.POST(csrfReq);
-          case 15:
+          case 24:
             csrfRes = _context.sent;
-            _context.next = 18;
+            _context.prev = 25;
+            _context.next = 28;
             return csrfRes == null ? void 0 : csrfRes.json();
-          case 18:
-            _context.t0 = _yield$csrfRes$json = _context.sent;
-            if (!(_context.t0 != null)) {
-              _context.next = 23;
+          case 28:
+            _context.t1 = _yield$csrfRes$json = _context.sent;
+            if (!(_context.t1 != null)) {
+              _context.next = 33;
               break;
             }
-            _context.t1 = _yield$csrfRes$json;
-            _context.next = 24;
+            _context.t2 = _yield$csrfRes$json;
+            _context.next = 34;
             break;
-          case 23:
-            _context.t1 = {};
-          case 24:
-            _ref2 = _context.t1;
-            csrfToken = _ref2.csrfToken;
-            credentials = providers.credentials;
+          case 33:
+            _context.t2 = {};
+          case 34:
+            json = _context.t2;
+            csrfToken = json == null ? void 0 : json.csrfToken;
+            _context.next = 42;
+            break;
+          case 38:
+            _context.prev = 38;
+            _context.t3 = _context["catch"](25);
+            info(sessionUrl, csrfRes);
+            error(_context.t3, csrfRes);
+          case 42:
+            _ref2 = (_providers = providers) != null ? _providers : {}, credentials = _ref2.credentials;
             csrfCookie = csrfRes == null ? void 0 : csrfRes.headers.get('set-cookie');
             if (credentials) {
-              _context.next = 30;
+              _context.next = 46;
               break;
             }
             throw new Error('Unable to obtain credential provider. Aborting server side login.');
-          case 30:
+          case 46:
             signInUrl = new URL(credentials.callbackUrl);
             if (csrfCookie) {
-              _context.next = 33;
+              _context.next = 49;
               break;
             }
             throw new Error('Unable to authenticate REST');
-          case 33:
-            info('Attempting sign in via', signInUrl.href, 'proxy');
+          case 49:
+            info('Attempting sign in via proxy', signInUrl.href, 'with email', email);
             postReq = new Request(signInUrl, {
               method: 'POST',
               headers: new Headers({
@@ -3173,27 +3180,27 @@ function serverAuth(config, handlers) {
                 callbackUrl: credentials.callbackUrl
               })
             });
-            _context.next = 37;
+            _context.next = 53;
             return handlers.POST(postReq);
-          case 37:
+          case 53:
             loginRes = _context.sent;
             authCookie = loginRes == null ? void 0 : loginRes.headers.get('set-cookie');
             if (authCookie) {
-              _context.next = 41;
+              _context.next = 57;
               break;
             }
             throw new Error('authentication failed');
-          case 41:
+          case 57:
             _ref3 = (_exec = /(nile\.session-token=.+?);/.exec(authCookie)) != null ? _exec : [], token = _ref3[1];
             info('Server login successful', authCookie, csrfCookie);
             return _context.abrupt("return", new Headers({
               cookie: [token, csrfCookie].join('; ')
             }));
-          case 44:
+          case 60:
           case "end":
             return _context.stop();
         }
-      }, _callee);
+      }, _callee, null, [[9, 15], [25, 38]]);
     }));
     function login(_x) {
       return _login.apply(this, arguments);