@niledatabase/server 3.0.0-alpha.18 → 3.0.0-alpha.19

package/dist/server.cjs.development.js

@@ -6,6 +6,85 @@ require('dotenv/config');
 var pg = require('pg');
 var jose = require('jose');
 
+function _arrayLikeToArray(r, a) {
+  (null == a || a > r.length) && (a = r.length);
+  for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
+  return n;
+}
+function asyncGeneratorStep(n, t, e, r, o, a, c) {
+  try {
+    var i = n[a](c),
+      u = i.value;
+  } catch (n) {
+    return void e(n);
+  }
+  i.done ? t(u) : Promise.resolve(u).then(r, o);
+}
+function _asyncToGenerator(n) {
+  return function () {
+    var t = this,
+      e = arguments;
+    return new Promise(function (r, o) {
+      var a = n.apply(t, e);
+      function _next(n) {
+        asyncGeneratorStep(a, r, o, _next, _throw, "next", n);
+      }
+      function _throw(n) {
+        asyncGeneratorStep(a, r, o, _next, _throw, "throw", n);
+      }
+      _next(void 0);
+    });
+  };
+}
+function _defineProperties(e, r) {
+  for (var t = 0; t < r.length; t++) {
+    var o = r[t];
+    o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o);
+  }
+}
+function _createClass(e, r, t) {
+  return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", {
+    writable: !1
+  }), e;
+}
+function _createForOfIteratorHelperLoose(r, e) {
+  var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
+  if (t) return (t = t.call(r)).next.bind(t);
+  if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) {
+    t && (r = t);
+    var o = 0;
+    return function () {
+      return o >= r.length ? {
+        done: !0
+      } : {
+        done: !1,
+        value: r[o++]
+      };
+    };
+  }
+  throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _extends() {
+  return _extends = Object.assign ? Object.assign.bind() : function (n) {
+    for (var e = 1; e < arguments.length; e++) {
+      var t = arguments[e];
+      for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]);
+    }
+    return n;
+  }, _extends.apply(null, arguments);
+}
+function _inheritsLoose(t, o) {
+  t.prototype = Object.create(o.prototype), t.prototype.constructor = t, _setPrototypeOf(t, o);
+}
+function _objectWithoutPropertiesLoose(r, e) {
+  if (null == r) return {};
+  var t = {};
+  for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
+    if (e.includes(n)) continue;
+    t[n] = r[n];
+  }
+  return t;
+}
 function _regeneratorRuntime() {
   _regeneratorRuntime = function () {
     return e;
@@ -307,6 +386,11 @@ function _regeneratorRuntime() {
     }
   }, e;
 }
+function _setPrototypeOf(t, e) {
+  return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) {
+    return t.__proto__ = e, t;
+  }, _setPrototypeOf(t, e);
+}
 function _toPrimitive(t, r) {
   if ("object" != typeof t || !t) return t;
   var e = t[Symbol.toPrimitive];
@@ -321,122 +405,13 @@ function _toPropertyKey(t) {
   var i = _toPrimitive(t, "string");
   return "symbol" == typeof i ? i : i + "";
 }
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
-  try {
-    var info = gen[key](arg);
-    var value = info.value;
-  } catch (error) {
-    reject(error);
-    return;
-  }
-  if (info.done) {
-    resolve(value);
-  } else {
-    Promise.resolve(value).then(_next, _throw);
+function _unsupportedIterableToArray(r, a) {
+  if (r) {
+    if ("string" == typeof r) return _arrayLikeToArray(r, a);
+    var t = {}.toString.call(r).slice(8, -1);
+    return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0;
   }
 }
-function _asyncToGenerator(fn) {
-  return function () {
-    var self = this,
-      args = arguments;
-    return new Promise(function (resolve, reject) {
-      var gen = fn.apply(self, args);
-      function _next(value) {
-        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
-      }
-      function _throw(err) {
-        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
-      }
-      _next(undefined);
-    });
-  };
-}
-function _defineProperties(target, props) {
-  for (var i = 0; i < props.length; i++) {
-    var descriptor = props[i];
-    descriptor.enumerable = descriptor.enumerable || false;
-    descriptor.configurable = true;
-    if ("value" in descriptor) descriptor.writable = true;
-    Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor);
-  }
-}
-function _createClass(Constructor, protoProps, staticProps) {
-  if (protoProps) _defineProperties(Constructor.prototype, protoProps);
-  if (staticProps) _defineProperties(Constructor, staticProps);
-  Object.defineProperty(Constructor, "prototype", {
-    writable: false
-  });
-  return Constructor;
-}
-function _extends() {
-  _extends = Object.assign ? Object.assign.bind() : function (target) {
-    for (var i = 1; i < arguments.length; i++) {
-      var source = arguments[i];
-      for (var key in source) {
-        if (Object.prototype.hasOwnProperty.call(source, key)) {
-          target[key] = source[key];
-        }
-      }
-    }
-    return target;
-  };
-  return _extends.apply(this, arguments);
-}
-function _inheritsLoose(subClass, superClass) {
-  subClass.prototype = Object.create(superClass.prototype);
-  subClass.prototype.constructor = subClass;
-  _setPrototypeOf(subClass, superClass);
-}
-function _setPrototypeOf(o, p) {
-  _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) {
-    o.__proto__ = p;
-    return o;
-  };
-  return _setPrototypeOf(o, p);
-}
-function _objectWithoutPropertiesLoose(source, excluded) {
-  if (source == null) return {};
-  var target = {};
-  var sourceKeys = Object.keys(source);
-  var key, i;
-  for (i = 0; i < sourceKeys.length; i++) {
-    key = sourceKeys[i];
-    if (excluded.indexOf(key) >= 0) continue;
-    target[key] = source[key];
-  }
-  return target;
-}
-function _unsupportedIterableToArray(o, minLen) {
-  if (!o) return;
-  if (typeof o === "string") return _arrayLikeToArray(o, minLen);
-  var n = Object.prototype.toString.call(o).slice(8, -1);
-  if (n === "Object" && o.constructor) n = o.constructor.name;
-  if (n === "Map" || n === "Set") return Array.from(o);
-  if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
-}
-function _arrayLikeToArray(arr, len) {
-  if (len == null || len > arr.length) len = arr.length;
-  for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
-  return arr2;
-}
-function _createForOfIteratorHelperLoose(o, allowArrayLike) {
-  var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"];
-  if (it) return (it = it.call(o)).next.bind(it);
-  if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") {
-    if (it) o = it;
-    var i = 0;
-    return function () {
-      if (i >= o.length) return {
-        done: true
-      };
-      return {
-        done: false,
-        value: o[i++]
-      };
-    };
-  }
-  throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
 
 function Logger(config) {
   for (var _len = arguments.length, params = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
@@ -576,14 +551,9 @@ var getBasePath = function getBasePath(cfg) {
   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))) {
-    var _config$api5, _config$api$version, _config$api6;
-    version = (config == null || (_config$api5 = config.api) == null ? void 0 : _config$api5.version) === 1 ? '' : "/v" + ((_config$api$version = config == null || (_config$api6 = config.api) == null ? void 0 : _config$api6.version) != null ? _config$api$version : 2);
-  }
   if (basePath) {
     logger && info(logger, 'config', basePath);
-    return "" + basePath + version;
+    return basePath;
   }
   if (process.env.NILEDB_API_URL) {
     logger && info(logger, 'NILEDB_API_URL', process.env.NILEDB_API_URL);
@@ -685,8 +655,8 @@ var Config = /*#__PURE__*/function () {
   function Config(_config, logger) {
     var _this = this,
       _config$db2,
-      _config$api$cookieKey2,
-      _config$api2;
+      _config$api$cookieKey3,
+      _config$api3;
     this.user = void 0;
     this.password = void 0;
     this.databaseId = void 0;
@@ -699,9 +669,9 @@ var Config = /*#__PURE__*/function () {
     this._tenantId = void 0;
     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;
-        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;
+      var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(config) {
+        var _config$db, _config$api$cookieKey2, _config$api2;
+        var _Logger, info, error, envVarConfig, _ref3, host, port, dbConfig, configuredHost, configuredPort, basePath, _config$api$cookieKey, _config$api, 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) {
             case 0:
@@ -714,12 +684,27 @@ var Config = /*#__PURE__*/function () {
               configuredPort = port != null ? port : getDbPort(envVarConfig);
               basePath = getBasePath(envVarConfig);
               if (!(configuredHost && _this.databaseName && _this.databaseId && basePath)) {
-                _context.next = 9;
+                _context.next = 12;
                 break;
               }
               info('Already configured, aborting fetch');
+              _this.api = new ApiConfig({
+                basePath: basePath,
+                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
+                })
+              });
+              _this.db = _extends({
+                user: _this.user,
+                password: _this.password,
+                host: configuredHost,
+                port: configuredPort,
+                database: _this.databaseName
+              }, dbConfig);
+              info('[config set]', _this);
               return _context.abrupt("return", _this);
-            case 9:
+            case 12:
               cp = getControlPlane(envVarConfig);
               databaseName = getDatabaseName({
                 config: config,
@@ -730,7 +715,7 @@ var Config = /*#__PURE__*/function () {
                 url.searchParams.set('databaseName', databaseName);
               }
               info('configuring from', url.href);
-              _context.next = 16;
+              _context.next = 19;
               return fetch(url, {
                 headers: {
                   Authorization: "Bearer " + getInfoBearer({
@@ -738,13 +723,13 @@ var Config = /*#__PURE__*/function () {
                   })
                 }
               });
-            case 16:
+            case 19:
               res = _context.sent;
               possibleError = res.clone();
-              _context.prev = 18;
-              _context.next = 21;
+              _context.prev = 21;
+              _context.next = 24;
               return res.json();
-            case 21:
+            case 24:
               json = _context.sent;
               if (res.status === 404) {
                 info('is the configured databaseName correct?');
@@ -756,34 +741,34 @@ var Config = /*#__PURE__*/function () {
               } else {
                 database = json;
               }
-              _context.next = 33;
+              _context.next = 36;
               break;
-            case 26:
-              _context.prev = 26;
-              _context.t0 = _context["catch"](18);
-              _context.next = 30;
+            case 29:
+              _context.prev = 29;
+              _context.t0 = _context["catch"](21);
+              _context.next = 33;
               return possibleError.text();
-            case 30:
+            case 33:
               message = _context.sent;
               error(message);
               database = {
                 message: message
               };
-            case 33:
+            case 36:
               info('[fetched database]', database);
               if (!('message' in database)) {
-                _context.next = 42;
+                _context.next = 45;
                 break;
               }
               if (!('statusCode' in database)) {
-                _context.next = 41;
+                _context.next = 44;
                 break;
               }
               error(database);
               throw new Error('HTTP error has occurred');
-            case 41:
+            case 44:
               throw new Error('Unable to auto-configure. Please remove NILEDB_NAME, NILEDB_API_URL, NILEDB_POSTGRES_URL, and/or NILEDB_HOST from your environment variables.');
-            case 42:
+            case 45:
               if (typeof database === 'object') {
                 _database = database, apiHost = _database.apiHost, dbHost = _database.dbHost, name = _database.name, id = _database.id;
                 basePath = basePath || apiHost;
@@ -792,10 +777,10 @@ var Config = /*#__PURE__*/function () {
                 dburl = new URL(dbHost);
                 configuredHost = dburl.host;
               }
-            case 43:
+            case 46:
               _this.api = new ApiConfig({
                 basePath: basePath,
-                cookieKey: (_config$api$cookieKey = config == null || (_config$api = config.api) == null ? void 0 : _config$api.cookieKey) != null ? _config$api$cookieKey : '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
                 })
@@ -809,11 +794,11 @@ var Config = /*#__PURE__*/function () {
               }, dbConfig);
               info('[config set]', _this);
               return _context.abrupt("return", _this);
-            case 47:
+            case 50:
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[18, 26]]);
+        }, _callee, null, [[21, 29]]);
       }));
       return function (_x) {
         return _ref2.apply(this, arguments);
@@ -847,7 +832,7 @@ var Config = /*#__PURE__*/function () {
     var _configuredPort = _port != null ? _port : getDbPort(_envVarConfig);
     this.api = new ApiConfig({
       basePath: _basePath,
-      cookieKey: (_config$api$cookieKey2 = _config == null || (_config$api2 = _config.api) == null ? void 0 : _config$api2.cookieKey) != null ? _config$api$cookieKey2 : 'token',
+      cookieKey: (_config$api$cookieKey3 = _config == null || (_config$api3 = _config.api) == null ? void 0 : _config$api3.cookieKey) != null ? _config$api$cookieKey3 : 'token',
       token: getToken({
         config: _config
       })
@@ -890,14 +875,12 @@ var Events;
 })(Events || (Events = {}));
 var Eventer = /*#__PURE__*/function () {
   function Eventer() {
-    this.events = void 0;
     this.events = {};
   }
   var _proto = Eventer.prototype;
+  // Publish event and notify all subscribers
   _proto.publish = function publish(eventName, value) {
-    // Get all the callback functions of the current event
     var callbackList = this.events[eventName];
-    // execute each callback function
     if (callbackList) {
       for (var _iterator = _createForOfIteratorHelperLoose(callbackList), _step; !(_step = _iterator()).done;) {
         var callback = _step.value;
@@ -908,19 +891,25 @@ var Eventer = /*#__PURE__*/function () {
   // Subscribe to events
   ;
   _proto.subscribe = function subscribe(eventName, callback) {
-    // initialize this event
     if (!this.events[eventName]) {
       this.events[eventName] = [];
     }
-    // store the callback function of the subscriber
     this.events[eventName].push(callback);
-  };
+  }
+  // Unsubscribe from an event
+  ;
   _proto.unsubscribe = function unsubscribe(eventName, callback) {
-    var toRemove = this.events[eventName].findIndex(function (cb) {
-      return cb === callback;
-    });
-    if (toRemove !== -1) {
-      this.events[eventName].splice(toRemove, 1);
+    var callbackList = this.events[eventName];
+    if (!callbackList) {
+      return; // Early exit if no event exists
+    }
+    var index = callbackList.indexOf(callback);
+    if (index !== -1) {
+      callbackList.splice(index, 1); // Remove the callback
+    }
+    // If there are no more listeners, clean up the event
+    if (callbackList.length === 0) {
+      delete this.events[eventName];
     }
   };
   return Eventer;
@@ -944,9 +933,6 @@ var watchToken = function watchToken(cb) {
 var watchEvictPool = function watchEvictPool(cb) {
   return eventer.subscribe(Events.EvictPool, cb);
 };
-var closeEvictPool = function closeEvictPool(cb) {
-  return eventer.unsubscribe(Events.EvictPool, cb);
-};
 var evictPool = function evictPool(val) {
   eventer.publish(Events.EvictPool, val);
 };
@@ -982,14 +968,6 @@ function createProxyForPool(pool, config) {
   });
 }
 
-function isUUID(value) {
-  if (!value) {
-    return false;
-  }
-  var regex = /^[0-9a-f]{8}-[0-9a-f]{4}-7[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
-  return regex.test(value);
-}
-
 var _excluded$1 = ["afterCreate"];
 var NileDatabase = /*#__PURE__*/function () {
   function NileDatabase(config, id) {
@@ -1021,7 +999,7 @@ var NileDatabase = /*#__PURE__*/function () {
     // start the timer for cleanup
     this.startTimeout();
     this.pool.on('connect', /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(client) {
+      var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(client) {
         var afterCreate;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -1048,7 +1026,7 @@ var NileDatabase = /*#__PURE__*/function () {
       };
     }());
     this.pool.on('error', /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
+      var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -1070,30 +1048,22 @@ var NileDatabase = /*#__PURE__*/function () {
   }
   var _proto = NileDatabase.prototype;
   _proto.startTimeout = function startTimeout() {
-    var _this2 = this;
+    var _this2 = this,
+      _Number2;
     var _Logger3 = Logger(this.config, '[NileInstance]'),
       info = _Logger3.info;
     if (this.timer) {
       clearTimeout(this.timer);
     }
-    this.timer = setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
-          case 0:
-            info('Pool reached idleTimeoutMillis.', _this2.id, 'evicted after', _this2.config.db.idleTimeoutMillis, 'ms');
-            _context3.next = 3;
-            return _this2.pool.end(function () {
-              info('Pool end called');
-              // something odd going on here. Without the callback, pool.end() is flakey
-            });
-          case 3:
-            evictPool(_this2.id);
-          case 4:
-          case "end":
-            return _context3.stop();
-        }
-      }, _callee3);
-    })), this.config.db.idleTimeoutMillis);
+    this.timer = setTimeout(function () {
+      var _Number;
+      info('Pool reached idleTimeoutMillis.', _this2.id, 'evicted after', (_Number = Number(_this2.config.db.idleTimeoutMillis)) != null ? _Number : 30000, 'ms');
+      _this2.pool.end(function () {
+        evictPool(_this2.id);
+        info('Pool end called for', _this2.id);
+        // something odd going on here. Without the callback, pool.end() is flakey
+      });
+    }, (_Number2 = Number(this.config.db.idleTimeoutMillis)) != null ? _Number2 : 30000);
   };
   return NileDatabase;
 }();
@@ -1106,9 +1076,9 @@ function makeAfterCreate(config) {
       warn('Connection was terminated by server', error);
       done(error, conn);
     });
-    if (isUUID(config.tenantId)) {
+    if (config.tenantId) {
       var query = ["SET nile.tenant_id = '" + config.tenantId + "'"];
-      if (isUUID(config.userId)) {
+      if (config.userId) {
         if (!config.tenantId) {
           warn('A user id cannot be set in context without a tenant id');
         }
@@ -1134,6 +1104,7 @@ var DBManager = /*#__PURE__*/function () {
     var _this = this;
     this.connections = void 0;
     this.cleared = void 0;
+    this.poolWatcherFn = void 0;
     this.poolWatcher = function (config) {
       return function (id) {
         var _Logger = Logger(config, '[DBManager]'),
@@ -1141,6 +1112,8 @@ var DBManager = /*#__PURE__*/function () {
         if (id && _this.connections.has(id)) {
           info('Removing', id, 'from db connection pool.');
           _this.connections["delete"](id);
+        } else {
+          info('missed eviction of', id);
         }
       };
     };
@@ -1159,10 +1132,8 @@ var DBManager = /*#__PURE__*/function () {
       _this.connections.set(id, newOne);
       info('created new', id);
       info('# of instances:', _this.connections.size);
-      // resume listening to the evict pool if a connection is requested.
       if (_this.cleared) {
         _this.cleared = false;
-        watchEvictPool(_this.poolWatcher(config));
       }
       return newOne.pool;
     };
@@ -1170,26 +1141,20 @@ var DBManager = /*#__PURE__*/function () {
       var _Logger3 = Logger(config, '[DBManager]'),
         info = _Logger3.info;
       info('Clearing all connections', _this.connections.size);
-      closeEvictPool(_this.poolWatcher(config));
       _this.cleared = true;
       _this.connections.clear();
     };
-    var _Logger4 = Logger(_config, '[DBManager]'),
-      _info = _Logger4.info;
     this.cleared = false;
     this.connections = new Map();
-    // add the base one, so you can at least query
-    var _id = this.makeId();
-    _info('constructor', _id);
-    this.connections.set(_id, new NileDatabase(new Config(_config), _id));
-    watchEvictPool(this.poolWatcher(_config));
+    this.poolWatcherFn = this.poolWatcher(_config);
+    watchEvictPool(this.poolWatcherFn);
   }
   var _proto = DBManager.prototype;
   _proto.makeId = function makeId(tenantId, userId) {
-    if (isUUID(tenantId) && isUUID(userId)) {
+    if (tenantId && userId) {
       return tenantId + ":" + userId;
     }
-    if (isUUID(tenantId)) {
+    if (tenantId) {
       return "" + tenantId;
     }
     return 'base';
@@ -1197,14 +1162,6 @@ var DBManager = /*#__PURE__*/function () {
   return DBManager;
 }();
 
-var getServerId = function getServerId(config) {
-  var cfg = new Config(config);
-  return makeServerId(cfg);
-};
-var makeServerId = function makeServerId(config) {
-  return Buffer.from(JSON.stringify(config), 'utf8').toString('base64');
-};
-
 var NILEDB_API_URL = process.env.NILEDB_API_URL;
 function makeRestUrl(config, path, qp) {
   var url = config.api.basePath || NILEDB_API_URL;
@@ -1253,7 +1210,7 @@ function request(_x, _x2, _x3) {
   return _request.apply(this, arguments);
 }
 function _request() {
-  _request = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(url, _init, config) {
+  _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) {
@@ -1265,7 +1222,6 @@ function _request() {
           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
           });
@@ -1275,26 +1231,26 @@ function _request() {
             params.duplex = 'half';
           }
           info("[" + ((_params$method = params.method) != null ? _params$method : 'GET') + "]", url);
-          _context.next = 12;
+          _context.next = 11;
           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 12:
+        case 11:
           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;
+          _context.next = 18;
           return loggingRes == null ? void 0 : loggingRes.text();
-        case 19:
+        case 18:
           _context.t3 = _context.sent;
           (0, _context.t0)('[Response]', _context.t1, _context.t2, _context.t3);
           return _context.abrupt("return", res);
-        case 22:
+        case 21:
         case "end":
           return _context.stop();
       }
@@ -1332,11 +1288,11 @@ var key$7 = 'ME';
  *         description: Unauthorized
  *         content: {}
  */
-function GET$3(_x, _x2, _x3, _x4) {
-  return _GET$3.apply(this, arguments);
+function GET$4(_x, _x2, _x3, _x4) {
+  return _GET$4.apply(this, arguments);
 }
-function _GET$3() {
-  _GET$3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(url, init, log, config) {
+function _GET$4() {
+  _GET$4 = _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) {
@@ -1353,13 +1309,13 @@ function _GET$3() {
       }
     }, _callee);
   }));
-  return _GET$3.apply(this, arguments);
+  return _GET$4.apply(this, arguments);
 }
 function route$a(_x5, _x6) {
   return _route$a.apply(this, arguments);
 }
 function _route$a() {
-  _route$a = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(request, config) {
+  _route$a = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(request, config) {
     var url, _Logger, info;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
@@ -1373,7 +1329,7 @@ function _route$a() {
           break;
         case 5:
           _context2.next = 7;
-          return GET$3(url, {
+          return GET$4(url, {
             request: request
           }, info, config);
         case 7:
@@ -1398,7 +1354,7 @@ function auth(_x, _x2) {
   return _auth.apply(this, arguments);
 }
 function _auth() {
-  _auth = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, config) {
+  _auth = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, config) {
     var _Logger, info, error, sessionUrl, res;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -1494,9 +1450,9 @@ function _fetch(_x, _x2, _x3) {
   return _fetch2.apply(this, arguments);
 }
 function _fetch2() {
-  _fetch2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, path, opts) {
+  _fetch2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, path, opts) {
     var _config$api, _config$api2, _response$status;
-    var _Logger, info, error, url, cookieKey, headers, basicHeaders, creds, authHeader, token, tenantId, userId, useableUrl, response, res, errorHandler, msg, _res, message, _res2, _res2$errors, _message;
+    var _Logger, info, error, url, cookieKey, headers, basicHeaders, authHeader, token, tenantId, userId, useableUrl, response, res, errorHandler, msg, _res, message, _res2, _res2$errors, _message;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -1506,8 +1462,6 @@ function _fetch2() {
           headers = new Headers(opts == null ? void 0 : opts.headers);
           basicHeaders = new Headers(opts == null ? void 0 : opts.headers);
           basicHeaders.set('content-type', 'application/json; charset=utf-8');
-          creds = Buffer.from(process.env.NILEDB_USER + ":" + process.env.NILEDB_PASSWORD, 'utf8').toString('base64');
-          basicHeaders.set('niledb-creds', creds);
           authHeader = headers.get('Authorization');
           if (!authHeader) {
             token = getTokenFromCookie(headers, cookieKey);
@@ -1526,114 +1480,114 @@ function _fetch2() {
           userId = getUserFromHttp(headers, config);
           updateUserId(userId);
           if (!(url.includes('{tenantId}') && !tenantId)) {
-            _context.next = 16;
+            _context.next = 14;
             break;
           }
           return _context.abrupt("return", new ResponseError('tenantId is not set for request', {
             status: 400
           }));
-        case 16:
+        case 14:
           useableUrl = url.replace('{tenantId}', encodeURIComponent(String(tenantId))).replace('{userId}', encodeURIComponent(String(userId)));
           info('[fetch]', useableUrl);
-          _context.next = 20;
+          _context.next = 18;
           return fetch(useableUrl, _extends({}, opts, {
             headers: basicHeaders
           }))["catch"](function (e) {
             error('[fetch]', '[response]', e);
           });
-        case 20:
+        case 18:
           response = _context.sent;
           if (!(response && response.status >= 200 && response.status < 300)) {
-            _context.next = 39;
+            _context.next = 37;
             break;
           }
           if (!(typeof response.clone === 'function')) {
-            _context.next = 38;
+            _context.next = 36;
             break;
           }
-          _context.prev = 23;
+          _context.prev = 21;
           _context.t0 = info;
-          _context.next = 27;
+          _context.next = 25;
           return response.clone().json();
-        case 27:
+        case 25:
           _context.t1 = _context.sent;
           (0, _context.t0)('[fetch]', '[response]', _context.t1);
-          _context.next = 38;
+          _context.next = 36;
           break;
-        case 31:
-          _context.prev = 31;
-          _context.t2 = _context["catch"](23);
+        case 29:
+          _context.prev = 29;
+          _context.t2 = _context["catch"](21);
           _context.t3 = info;
-          _context.next = 36;
+          _context.next = 34;
           return response.clone().text();
-        case 36:
+        case 34:
           _context.t4 = _context.sent;
           (0, _context.t3)('[fetch]', '[response]', _context.t4);
-        case 38:
+        case 36:
           return _context.abrupt("return", response);
-        case 39:
+        case 37:
           if (!((response == null ? void 0 : response.status) === 404)) {
-            _context.next = 41;
+            _context.next = 39;
             break;
           }
           return _context.abrupt("return", new ResponseError('Not found', {
             status: 404
           }));
-        case 41:
+        case 39:
           if (!((response == null ? void 0 : response.status) === 401)) {
-            _context.next = 43;
+            _context.next = 41;
             break;
           }
           return _context.abrupt("return", new ResponseError('Unauthorized', {
             status: 401
           }));
-        case 43:
+        case 41:
           if (!((response == null ? void 0 : response.status) === 405)) {
-            _context.next = 45;
+            _context.next = 43;
             break;
           }
           return _context.abrupt("return", new ResponseError('Method not allowed', {
             status: 405
           }));
-        case 45:
+        case 43:
           errorHandler = typeof (response == null ? void 0 : response.clone) === 'function' ? response.clone() : null;
           msg = '';
-          _context.prev = 47;
-          _context.next = 50;
+          _context.prev = 45;
+          _context.next = 48;
           return response == null ? void 0 : response.json();
-        case 50:
+        case 48:
           res = _context.sent;
-          _context.next = 61;
+          _context.next = 59;
           break;
-        case 53:
-          _context.prev = 53;
-          _context.t5 = _context["catch"](47);
+        case 51:
+          _context.prev = 51;
+          _context.t5 = _context["catch"](45);
           if (!errorHandler) {
-            _context.next = 60;
+            _context.next = 58;
             break;
           }
-          _context.next = 58;
+          _context.next = 56;
           return errorHandler.text();
-        case 58:
+        case 56:
           msg = _context.sent;
           if (msg) {
             error('[fetch]', '[response]', "[status: " + errorHandler.status + "]", msg);
           }
-        case 60:
+        case 58:
           if (!msg) {
             error('[fetch]', '[response]', _context.t5);
           }
-        case 61:
+        case 59:
           if (!msg) {
-            _context.next = 63;
+            _context.next = 61;
             break;
           }
           return _context.abrupt("return", new ResponseError(msg, {
             status: errorHandler == null ? void 0 : errorHandler.status
           }));
-        case 63:
+        case 61:
           if (!(res && 'message' in res)) {
-            _context.next = 67;
+            _context.next = 65;
             break;
           }
           _res = res, message = _res.message;
@@ -1641,9 +1595,9 @@ function _fetch2() {
           return _context.abrupt("return", new ResponseError(message, {
             status: 400
           }));
-        case 67:
+        case 65:
           if (!(res && 'errors' in res)) {
-            _context.next = 71;
+            _context.next = 69;
             break;
           }
           _res2 = res, _res2$errors = _res2.errors, _message = _res2$errors[0];
@@ -1651,16 +1605,16 @@ function _fetch2() {
           return _context.abrupt("return", new ResponseError(_message, {
             status: 400
           }));
-        case 71:
+        case 69:
           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 73:
+        case 71:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[23, 31], [47, 53]]);
+    }, _callee, null, [[21, 29], [45, 51]]);
   }));
   return _fetch2.apply(this, arguments);
 }
@@ -1727,23 +1681,15 @@ function _fetch2() {
  *         description: Unauthorized
  *         content: {}
  */
-function POST$2(_x, _x2, _x3, _x4) {
+function POST$2(_x, _x2, _x3) {
   return _POST$2.apply(this, arguments);
 }
 function _POST$2() {
-  _POST$2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, session, init, log) {
+  _POST$2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, init, log) {
     var yurl, tenantId, tenant, url;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          if (session) {
-            _context.next = 2;
-            break;
-          }
-          return _context.abrupt("return", new Response(null, {
-            status: 401
-          }));
-        case 2:
           init.body = init.request.body;
           init.method = 'POST';
           yurl = new URL(init.request.url);
@@ -1751,11 +1697,11 @@ function _POST$2() {
           tenant = tenantId != null ? tenantId : getTenantFromHttp(init.request.headers);
           url = apiRoutes(config).USERS(tenant ? tenant : undefined);
           log && log('[POST]', url);
-          _context.next = 11;
+          _context.next = 9;
           return request(url, init, config);
-        case 11:
+        case 9:
           return _context.abrupt("return", _context.sent);
-        case 12:
+        case 10:
         case "end":
           return _context.stop();
       }
@@ -1795,11 +1741,11 @@ function _POST$2() {
  *         description: Unauthorized
  *         content: {}
  */
-function GET$2(_x, _x2, _x3) {
-  return _GET$2.apply(this, arguments);
+function GET$3(_x, _x2, _x3) {
+  return _GET$3.apply(this, arguments);
 }
-function _GET$2() {
-  _GET$2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, init, log) {
+function _GET$3() {
+  _GET$3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, init, log) {
     var yurl, tenantId, tenant, url;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -1829,7 +1775,7 @@ function _GET$2() {
       }
     }, _callee);
   }));
-  return _GET$2.apply(this, arguments);
+  return _GET$3.apply(this, arguments);
 }
 
 /**
@@ -1868,11 +1814,11 @@ function _GET$2() {
  *         description: Unauthorized
  *         content: {}
  */
-function PUT$1(_x, _x2, _x3, _x4) {
-  return _PUT$1.apply(this, arguments);
+function PUT$2(_x, _x2, _x3, _x4) {
+  return _PUT$2.apply(this, arguments);
 }
-function _PUT$1() {
-  _PUT$1 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, session, init, log) {
+function _PUT$2() {
+  _PUT$2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, session, init, log) {
     var _URL$pathname$split$r, userId, url;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -1901,7 +1847,7 @@ function _PUT$1() {
       }
     }, _callee);
   }));
-  return _PUT$1.apply(this, arguments);
+  return _PUT$2.apply(this, arguments);
 }
 
 var key$6 = 'USERS';
@@ -1909,7 +1855,7 @@ function route$9(_x, _x2) {
   return _route$9.apply(this, arguments);
 }
 function _route$9() {
-  _route$9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(request, config) {
+  _route$9 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(request, config) {
     var _Logger, info, session;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -1926,21 +1872,21 @@ function _route$9() {
           break;
         case 7:
           _context.next = 9;
-          return GET$2(config, {
+          return GET$3(config, {
             request: request
           }, info);
         case 9:
           return _context.abrupt("return", _context.sent);
         case 10:
           _context.next = 12;
-          return POST$2(config, session, {
+          return POST$2(config, {
             request: request
           }, info);
         case 12:
           return _context.abrupt("return", _context.sent);
         case 13:
           _context.next = 15;
-          return PUT$1(config, session, {
+          return PUT$2(config, session, {
             request: request
           }, info);
         case 15:
@@ -1992,11 +1938,11 @@ function matches$9(configRoutes, request) {
  *            schema:
  *              $ref: '#/components/schemas/APIError'
  */
-function GET$1(_x, _x2, _x3) {
-  return _GET$1.apply(this, arguments);
+function GET$2(_x, _x2, _x3) {
+  return _GET$2.apply(this, arguments);
 }
-function _GET$1() {
-  _GET$1 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, init, log) {
+function _GET$2() {
+  _GET$2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, init, log) {
     var yurl, _yurl$pathname$split$, tenantId, url;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -2023,7 +1969,7 @@ function _GET$1() {
       }
     }, _callee);
   }));
-  return _GET$1.apply(this, arguments);
+  return _GET$2.apply(this, arguments);
 }
 
 /**
@@ -2070,7 +2016,7 @@ function POST$1(_x, _x2, _x3, _x4) {
   return _POST$1.apply(this, arguments);
 }
 function _POST$1() {
-  _POST$1 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, session, init, log) {
+  _POST$1 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, session, init, log) {
     var yurl, _yurl$pathname$split$, tenantId, url;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -2127,7 +2073,7 @@ function DELETE$1(_x, _x2, _x3) {
   return _DELETE$1.apply(this, arguments);
 }
 function _DELETE$1() {
-  _DELETE$1 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, init, log) {
+  _DELETE$1 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, init, log) {
     var yurl, _yurl$pathname$split$, userId, tenantId, url;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -2186,11 +2132,11 @@ function _DELETE$1() {
  *      "201":
  *        description: add user to tenant
  */
-function PUT(_x, _x2, _x3) {
-  return _PUT.apply(this, arguments);
+function PUT$1(_x, _x2, _x3) {
+  return _PUT$1.apply(this, arguments);
 }
-function _PUT() {
-  _PUT = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, init, log) {
+function _PUT$1() {
+  _PUT$1 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, init, log) {
     var yurl, _yurl$pathname$split$, tenantId, url;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -2218,7 +2164,7 @@ function _PUT() {
       }
     }, _callee);
   }));
-  return _PUT.apply(this, arguments);
+  return _PUT$1.apply(this, arguments);
 }
 
 var key$5 = 'TENANT_USERS';
@@ -2226,7 +2172,7 @@ function route$8(_x, _x2) {
   return _route$8.apply(this, arguments);
 }
 function _route$8() {
-  _route$8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(request, config) {
+  _route$8 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(request, config) {
     var _Logger, info, session;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -2252,7 +2198,7 @@ function _route$8() {
           break;
         case 10:
           _context.next = 12;
-          return GET$1(config, {
+          return GET$2(config, {
             request: request
           }, info);
         case 12:
@@ -2266,7 +2212,7 @@ function _route$8() {
           return _context.abrupt("return", _context.sent);
         case 16:
           _context.next = 18;
-          return PUT(config, {
+          return PUT$1(config, {
             request: request
           }, info);
         case 18:
@@ -2331,11 +2277,11 @@ function matches$8(configRoutes, request) {
  *         description: Unauthorized
  *         content: {}
  */
-function GET(_x, _x2, _x3, _x4) {
-  return _GET.apply(this, arguments);
+function GET$1(_x, _x2, _x3, _x4) {
+  return _GET$1.apply(this, arguments);
 }
-function _GET() {
-  _GET = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, session, init, log) {
+function _GET$1() {
+  _GET$1 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, session, init, log) {
     var url, res;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -2356,6 +2302,74 @@ function _GET() {
       }
     }, _callee);
   }));
+  return _GET$1.apply(this, arguments);
+}
+
+/**
+ * @swagger
+ * /api/tenants/{tenantId}:
+ *   get:
+ *    tags:
+ *    - tenants
+ *    summary: Obtains a specific tenant.
+ *    operationId: getTenant
+ *    parameters:
+ *    - name: tenantId
+ *      in: path
+ *      required: true
+ *      schema:
+ *        type: string
+ *    responses:
+ *      "200":
+ *        description: the desired tenant
+ *        application/json:
+ *          schema:
+ *            $ref: '#/components/schemas/Tenant'
+ *      "401":
+ *        description: Unauthorized
+ *        content:
+ *          application/json:
+ *            schema:
+ *              $ref: '#/components/schemas/APIError'
+ *      "404":
+ *        description: Tenant not found
+ *        content:
+ *          application/json:
+ *            schema:
+ *              $ref: '#/components/schemas/APIError'
+ */
+function GET(_x, _x2, _x3) {
+  return _GET.apply(this, arguments);
+}
+function _GET() {
+  _GET = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, init, log) {
+    var yurl, _yurl$pathname$split$, tenantId, url;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          yurl = new URL(init.request.url);
+          _yurl$pathname$split$ = yurl.pathname.split('/').reverse(), tenantId = _yurl$pathname$split$[0];
+          if (tenantId) {
+            _context.next = 4;
+            break;
+          }
+          return _context.abrupt("return", new Response(null, {
+            status: 404
+          }));
+        case 4:
+          init.method = 'GET';
+          url = "" + apiRoutes(config).TENANT(tenantId);
+          log('[GET]', url);
+          _context.next = 9;
+          return request(url, init, config);
+        case 9:
+          return _context.abrupt("return", _context.sent);
+        case 10:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
   return _GET.apply(this, arguments);
 }
 
@@ -2393,7 +2407,7 @@ function DELETE(_x, _x2, _x3) {
   return _DELETE.apply(this, arguments);
 }
 function _DELETE() {
-  _DELETE = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, init, log) {
+  _DELETE = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, init, log) {
     var yurl, _yurl$pathname$split$, tenantId, url;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -2424,6 +2438,76 @@ function _DELETE() {
   return _DELETE.apply(this, arguments);
 }
 
+/**
+ * @swagger
+ * /api/tenants/{tenantId}:
+ *   put:
+ *    tags:
+ *    - tenants
+ *    summary: Obtains a specific tenant.
+ *    operationId: updateTenant
+ *    parameters:
+ *    - name: tenantId
+ *      in: path
+ *      required: true
+ *      schema:
+ *        type: string
+ *    responses:
+ *      "201":
+ *        description: update an existing tenant
+ *        content:
+ *          application/json:
+ *            schema:
+ *               $ref: '#/components/schemas/Tenant'
+ *      "401":
+ *        description: Unauthorized
+ *        content:
+ *          application/json:
+ *            schema:
+ *              $ref: '#/components/schemas/APIError'
+ *      "404":
+ *        description: Tenant not found
+ *        content:
+ *          application/json:
+ *            schema:
+ *              $ref: '#/components/schemas/APIError'
+ */
+function PUT(_x, _x2, _x3) {
+  return _PUT.apply(this, arguments);
+}
+function _PUT() {
+  _PUT = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, init, log) {
+    var yurl, _yurl$pathname$split$, tenantId, url;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          yurl = new URL(init.request.url);
+          _yurl$pathname$split$ = yurl.pathname.split('/').reverse(), tenantId = _yurl$pathname$split$[0];
+          if (tenantId) {
+            _context.next = 4;
+            break;
+          }
+          return _context.abrupt("return", new Response(null, {
+            status: 404
+          }));
+        case 4:
+          init.body = init.request.body;
+          init.method = 'PUT';
+          url = "" + apiRoutes(config).TENANT(tenantId);
+          log('[PUT]', url);
+          _context.next = 10;
+          return request(url, init, config);
+        case 10:
+          return _context.abrupt("return", _context.sent);
+        case 11:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _PUT.apply(this, arguments);
+}
+
 /**
  * @swagger
  * /api/tenants:
@@ -2469,7 +2553,7 @@ function POST(_x, _x2, _x3) {
   return _POST.apply(this, arguments);
 }
 function _POST() {
-  _POST = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, init, log) {
+  _POST = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, init, log) {
     var url;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -2491,13 +2575,21 @@ function _POST() {
   return _POST.apply(this, arguments);
 }
 
+function isUUID(value) {
+  if (!value) {
+    return false;
+  }
+  // is any UUID
+  var regex = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5|7][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/;
+  return regex.test(value);
+}
 var key$4 = 'TENANTS';
 function route$7(_x, _x2) {
   return _route$7.apply(this, arguments);
 }
 function _route$7() {
-  _route$7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(request, config) {
-    var _Logger, info, session;
+  _route$7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(request, config) {
+    var _Logger, info, session, _request$url$split$re, possibleTenantId;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -2517,35 +2609,54 @@ function _route$7() {
             status: 401
           }));
         case 7:
+          _request$url$split$re = request.url.split('/').reverse(), possibleTenantId = _request$url$split$re[0];
           _context.t0 = request.method;
-          _context.next = _context.t0 === 'GET' ? 10 : _context.t0 === 'POST' ? 13 : _context.t0 === 'DELETE' ? 16 : 19;
+          _context.next = _context.t0 === 'GET' ? 11 : _context.t0 === 'POST' ? 18 : _context.t0 === 'DELETE' ? 21 : _context.t0 === 'PUT' ? 24 : 27;
           break;
-        case 10:
-          _context.next = 12;
-          return GET(config, session, {
+        case 11:
+          if (!isUUID(possibleTenantId)) {
+            _context.next = 15;
+            break;
+          }
+          _context.next = 14;
+          return GET(config, {
             request: request
           }, info);
-        case 12:
+        case 14:
           return _context.abrupt("return", _context.sent);
-        case 13:
-          _context.next = 15;
+        case 15:
+          _context.next = 17;
+          return GET$1(config, session, {
+            request: request
+          }, info);
+        case 17:
+          return _context.abrupt("return", _context.sent);
+        case 18:
+          _context.next = 20;
           return POST(config, {
             request: request
           }, info);
-        case 15:
+        case 20:
           return _context.abrupt("return", _context.sent);
-        case 16:
-          _context.next = 18;
+        case 21:
+          _context.next = 23;
           return DELETE(config, {
             request: request
           }, info);
-        case 18:
+        case 23:
           return _context.abrupt("return", _context.sent);
-        case 19:
+        case 24:
+          _context.next = 26;
+          return PUT(config, {
+            request: request
+          }, info);
+        case 26:
+          return _context.abrupt("return", _context.sent);
+        case 27:
           return _context.abrupt("return", new Response('method not allowed', {
             status: 405
           }));
-        case 20:
+        case 28:
         case "end":
           return _context.stop();
       }
@@ -2574,7 +2685,7 @@ function route$6(_x, _x2) {
   return _route$6.apply(this, arguments);
 }
 function _route$6() {
-  _route$6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, config) {
+  _route$6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, config) {
     var url, init, _URL$pathname$split$r, provider, passThroughUrl, params, res;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -2617,7 +2728,7 @@ function route$5(_x, _x2) {
   return _route$5.apply(this, arguments);
 }
 function _route$5() {
-  _route$5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, config) {
+  _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:
@@ -2641,7 +2752,7 @@ function route$4(_x, _x2) {
   return _route$4.apply(this, arguments);
 }
 function _route$4() {
-  _route$4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, config) {
+  _route$4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, config) {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -2665,7 +2776,7 @@ function route$3(_x, _x2) {
   return _route$3.apply(this, arguments);
 }
 function _route$3() {
-  _route$3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, config) {
+  _route$3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, config) {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -2690,7 +2801,7 @@ function route$2(_x, _x2) {
   return _route$2.apply(this, arguments);
 }
 function _route$2() {
-  _route$2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(request$1, config) {
+  _route$2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(request$1, config) {
     var _Logger, error, _URL$pathname$split$r, provider, passThroughUrl, params, url, res, location;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -2742,7 +2853,7 @@ function route$1(_x, _x2) {
   return _route$1.apply(this, arguments);
 }
 function _route$1() {
-  _route$1 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(request$1, config) {
+  _route$1 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(request$1, config) {
     var url, init, _URL$pathname$split$r, provider, res;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -2780,7 +2891,7 @@ function route(_x, _x2) {
   return _route.apply(this, arguments);
 }
 function _route() {
-  _route = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, config) {
+  _route = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, config) {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -2805,7 +2916,7 @@ function GETTER(configRoutes, config) {
     info = _Logger.info,
     warn = _Logger.warn;
   return /*#__PURE__*/function () {
-    var _GET = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(req) {
+    var _GET = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(req) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -2908,7 +3019,7 @@ function POSTER(configRoutes, config) {
     info = _Logger.info,
     warn = _Logger.warn;
   return /*#__PURE__*/function () {
-    var _POST = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(req) {
+    var _POST = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(req) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -2997,7 +3108,7 @@ function DELETER(configRoutes, config) {
     info = _Logger.info,
     warn = _Logger.warn;
   return /*#__PURE__*/function () {
-    var _DELETE = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(req) {
+    var _DELETE = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(req) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -3037,7 +3148,7 @@ function PUTER(configRoutes, config) {
     info = _Logger.info,
     warn = _Logger.warn;
   return /*#__PURE__*/function () {
-    var _PUT = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(req) {
+    var _PUT = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(req) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -3124,7 +3235,7 @@ function serverAuth(config, handlers) {
     error = _Logger.error;
   var routes = appRoutes(config.routePrefix);
   return /*#__PURE__*/function () {
-    var _login = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
+    var _login = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
       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) {
@@ -3276,7 +3387,7 @@ var Requester = /*#__PURE__*/function (_Config) {
   _inheritsLoose(Requester, _Config);
   var _proto = Requester.prototype;
   _proto.rawRequest = /*#__PURE__*/function () {
-    var _rawRequest = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(method, url, init, body) {
+    var _rawRequest = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(method, url, init, body) {
       var _init, res;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -3322,7 +3433,7 @@ var Requester = /*#__PURE__*/function (_Config) {
   _proto.request =
   /*#__PURE__*/
   function () {
-    var _request = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(method, url, req, init) {
+    var _request = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(method, url, req, init) {
       var headers, tenantId, cookie, _headers, _tenantId, _cookie, body, _init;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -3396,7 +3507,7 @@ var Requester = /*#__PURE__*/function (_Config) {
     return request;
   }();
   _proto.post = /*#__PURE__*/function () {
-    var _post = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(req, url, init) {
+    var _post = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(req, url, init) {
       var response;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
@@ -3424,7 +3535,7 @@ var Requester = /*#__PURE__*/function (_Config) {
     return post;
   }();
   _proto.get = /*#__PURE__*/function () {
-    var _get = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(req, url, init) {
+    var _get = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(req, url, init) {
       var response;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
@@ -3452,7 +3563,7 @@ var Requester = /*#__PURE__*/function (_Config) {
     return get;
   }();
   _proto.put = /*#__PURE__*/function () {
-    var _put = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(req, url, init) {
+    var _put = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(req, url, init) {
       var response;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
@@ -3480,7 +3591,7 @@ var Requester = /*#__PURE__*/function (_Config) {
     return put;
   }();
   _proto["delete"] = /*#__PURE__*/function () {
-    var _delete2 = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(req, url, init) {
+    var _delete2 = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(req, url, init) {
       var response;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
@@ -3516,7 +3627,7 @@ var Tenants = /*#__PURE__*/function (_Config) {
     _this = _Config.call(this, config) || this;
     _this.headers = void 0;
     _this.createTenant = /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, init) {
+      var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, init) {
         var _req, _requester, _init;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -3545,7 +3656,7 @@ var Tenants = /*#__PURE__*/function (_Config) {
       };
     }();
     _this.getTenant = /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(req, init) {
+      var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(req, init) {
         var _requester, _init;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
@@ -3567,7 +3678,7 @@ var Tenants = /*#__PURE__*/function (_Config) {
       };
     }();
     _this.listTenants = /*#__PURE__*/function () {
-      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(req, init) {
+      var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(req, init) {
         var _requester, _init;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
@@ -3631,7 +3742,7 @@ var Users = /*#__PURE__*/function (_Config) {
     _this = _Config.call(this, config) || this;
     _this.headers = void 0;
     _this.createUser = /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, init) {
+      var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, init) {
         var _requester, _init;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -3653,7 +3764,7 @@ var Users = /*#__PURE__*/function (_Config) {
       };
     }();
     _this.updateUser = /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(userId, req, init) {
+      var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(userId, req, init) {
         var _requester, _init;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
@@ -3675,7 +3786,7 @@ var Users = /*#__PURE__*/function (_Config) {
       };
     }();
     _this.listUsers = /*#__PURE__*/function () {
-      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(req, init) {
+      var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(req, init) {
         var _requester, _init;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
@@ -3697,7 +3808,7 @@ var Users = /*#__PURE__*/function (_Config) {
       };
     }();
     _this.linkUser = /*#__PURE__*/function () {
-      var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(req, init) {
+      var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(req, init) {
         var _requester, _init;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
@@ -3723,7 +3834,7 @@ var Users = /*#__PURE__*/function (_Config) {
       return "/tenants/" + ((_this$tenantId = _this.tenantId) != null ? _this$tenantId : '{tenantId}') + "/users/" + (userId != null ? userId : '{userId}');
     };
     _this.getUserId = /*#__PURE__*/function () {
-      var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(req) {
+      var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(req) {
         var body;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
@@ -3760,7 +3871,7 @@ var Users = /*#__PURE__*/function (_Config) {
       };
     }();
     _this.unlinkUser = /*#__PURE__*/function () {
-      var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(req, init) {
+      var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(req, init) {
         var _requester, userId, _init;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
@@ -3786,7 +3897,7 @@ var Users = /*#__PURE__*/function (_Config) {
       };
     }();
     _this.me = /*#__PURE__*/function () {
-      var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(req, init) {
+      var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(req, init) {
         var _requester, _init;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
@@ -3861,7 +3972,7 @@ var Api = /*#__PURE__*/function () {
   }
   var _proto = Api.prototype;
   _proto.login = /*#__PURE__*/function () {
-    var _login = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(payload) {
+    var _login = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(payload) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -3895,9 +4006,7 @@ var Server = /*#__PURE__*/function () {
     this.config = void 0;
     this.api = void 0;
     this.manager = void 0;
-    this.servers = void 0;
     this.config = new Config(config, '[initial config]');
-    this.servers = new Map();
     this.api = new Api(this.config);
     this.manager = new DBManager(this.config);
     watchTenantId(function (tenantId) {
@@ -3915,7 +4024,7 @@ var Server = /*#__PURE__*/function () {
     this.config = new Config(cfg);
   };
   _proto.init = /*#__PURE__*/function () {
-    var _init = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(cfg) {
+    var _init = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(cfg) {
       var updatedConfig;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -3925,11 +4034,9 @@ var Server = /*#__PURE__*/function () {
           case 2:
             updatedConfig = _context.sent;
             this.setConfig(updatedConfig);
-            this.manager.clear(this.config);
-            this.manager = new DBManager(this.config);
             this.api = new Api(this.config);
             return _context.abrupt("return", this);
-          case 8:
+          case 6:
           case "end":
             return _context.stop();
         }
@@ -3941,32 +4048,19 @@ var Server = /*#__PURE__*/function () {
     return init;
   }();
   /**
-   * A utility function if you want to manage different NileDB instances yourself
-   * returns the global Server object, an existing server that's already been configured,
-   * or a new one if the config isn't in the cache
+   * A convenience function that applies a config and ensures whatever was passed is set properly
    */
   _proto.getInstance = function getInstance(config) {
     var _config = _extends({}, this.config, config);
-    var serverId = getServerId(_config);
-    var currentServerId = makeServerId(this.config);
-    if (serverId === currentServerId) {
-      return this;
-    }
-    var existing = this.servers.get(serverId);
-    if (existing) {
-      // be sure the config is up to date
-      var updatedConfig = new Config(_config);
-      existing.setConfig(updatedConfig);
-      // propagate special config items
-      existing.tenantId = updatedConfig.tenantId;
-      existing.userId = updatedConfig.userId;
-      existing.token = updatedConfig.api.token;
-      existing.databaseId = updatedConfig.databaseId;
-      return existing;
-    }
-    var newServer = new Server(_config);
-    this.servers.set(serverId, newServer);
-    return newServer;
+    // be sure the config is up to date
+    var updatedConfig = new Config(_config);
+    this.setConfig(updatedConfig);
+    // propagate special config items
+    this.tenantId = updatedConfig.tenantId;
+    this.userId = updatedConfig.userId;
+    this.token = updatedConfig.api.token;
+    this.databaseId = updatedConfig.databaseId;
+    return this;
   };
   return _createClass(Server, [{
     key: "databaseId",
@@ -4025,16 +4119,18 @@ var Server = /*#__PURE__*/function () {
     }
   }]);
 }();
+var server;
 function create(_x2) {
   return _create.apply(this, arguments);
 }
 function _create() {
-  _create = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(config) {
-    var server;
+  _create = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(config) {
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          server = new Server(config);
+          if (!server) {
+            server = new Server(config);
+          }
           _context2.next = 3;
           return server.init();
         case 3: