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

package/dist/server.esm.js

@@ -561,18 +561,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
@@ -581,8 +569,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))) {
@@ -604,8 +592,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;
@@ -624,8 +612,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;
@@ -646,8 +634,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);
@@ -671,19 +659,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",
@@ -700,9 +682,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;
@@ -716,7 +696,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,
@@ -3101,8 +3077,8 @@ function serverAuth(config, handlers) {
     error = _Logger.error;
   return /*#__PURE__*/function () {
     var _login = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-      var _exec;
-      var email, password, sessionUrl, sessionReq, sessionRes, providers, csrf, csrfReq, csrfRes, csrfToken, _yield$csrfRes$json, json, _providers, credentials, csrfCookie, signInUrl, postReq, loginRes, authCookie, _ref2, 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:
@@ -3114,7 +3090,7 @@ function serverAuth(config, handlers) {
             throw new Error('Server side login requires a user email and password.');
           case 3:
             info('Obtaining providers for', email);
-            sessionUrl = new URL(config.api.localPath + "/api/auth/providers");
+            sessionUrl = new URL(config.api.basePath + "/api/auth/providers");
             sessionReq = new Request(sessionUrl, {
               method: 'GET',
               headers: new Headers({
@@ -3135,11 +3111,11 @@ function serverAuth(config, handlers) {
           case 15:
             _context.prev = 15;
             _context.t0 = _context["catch"](9);
-            info(sessionRes);
+            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({
@@ -3167,28 +3143,29 @@ function serverAuth(config, handlers) {
           case 34:
             json = _context.t2;
             csrfToken = json == null ? void 0 : json.csrfToken;
-            _context.next = 41;
+            _context.next = 42;
             break;
           case 38:
             _context.prev = 38;
             _context.t3 = _context["catch"](25);
+            info(sessionUrl, csrfRes);
             error(_context.t3, csrfRes);
-          case 41:
-            _providers = providers, credentials = _providers.credentials;
+          case 42:
+            _ref2 = (_providers = providers) != null ? _providers : {}, credentials = _ref2.credentials;
             csrfCookie = csrfRes == null ? void 0 : csrfRes.headers.get('set-cookie');
             if (credentials) {
-              _context.next = 45;
+              _context.next = 46;
               break;
             }
             throw new Error('Unable to obtain credential provider. Aborting server side login.');
-          case 45:
+          case 46:
             signInUrl = new URL(credentials.callbackUrl);
             if (csrfCookie) {
-              _context.next = 48;
+              _context.next = 49;
               break;
             }
             throw new Error('Unable to authenticate REST');
-          case 48:
+          case 49:
             info('Attempting sign in via proxy', signInUrl.href, 'with email', email);
             postReq = new Request(signInUrl, {
               method: 'POST',
@@ -3203,23 +3180,23 @@ function serverAuth(config, handlers) {
                 callbackUrl: credentials.callbackUrl
               })
             });
-            _context.next = 52;
+            _context.next = 53;
             return handlers.POST(postReq);
-          case 52:
+          case 53:
             loginRes = _context.sent;
             authCookie = loginRes == null ? void 0 : loginRes.headers.get('set-cookie');
             if (authCookie) {
-              _context.next = 56;
+              _context.next = 57;
               break;
             }
             throw new Error('authentication failed');
-          case 56:
-            _ref2 = (_exec = /(nile\.session-token=.+?);/.exec(authCookie)) != null ? _exec : [], token = _ref2[1];
+          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 59:
+          case 60:
           case "end":
             return _context.stop();
         }