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

package/dist/server.cjs.development.js

@@ -413,40 +413,43 @@ function _unsupportedIterableToArray(r, a) {
   }
 }
 
-function Logger(config) {
+var red = '\x1b[31m';
+var yellow = '\x1b[33m';
+var reset = '\x1b[0m';
+var baseLogger = function baseLogger(config) {
   for (var _len = arguments.length, params = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
     params[_key - 1] = arguments[_key];
   }
   return {
-    info: function info() {
+    info: function info(message, meta) {
       if (config != null && config.debug) {
-        var _console;
-        for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-          args[_key2] = arguments[_key2];
-        }
-        // eslint-disable-next-line no-console
-        (_console = console).info.apply(_console, ['[niledb]'].concat(params, args));
+        console.info("[niledb][DEBUG]" + params.join('') + " " + message, meta ? "\n" + JSON.stringify(meta, null, 2) : '');
       }
     },
-    warn: function warn() {
+    warn: function warn(message, meta) {
       if (config != null && config.debug) {
-        var _console2;
-        for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
-          args[_key3] = arguments[_key3];
-        }
-        // eslint-disable-next-line no-console
-        (_console2 = console).warn.apply(_console2, ['[niledb]'].concat(params, args));
+        console.warn(yellow + "[niledb][WARN]" + reset + params.join('') + " " + message, JSON.stringify(meta, null, 2));
       }
     },
-    error: function error() {
-      var _console3;
-      for (var _len4 = arguments.length, args = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
-        args[_key4] = arguments[_key4];
-      }
-      // eslint-disable-next-line no-console
-      (_console3 = console).error.apply(_console3, ['[niledb]', '[ERROR]'].concat(params, args));
+    error: function error(message, meta) {
+      console.error(red + "[niledb][ERROR]" + reset + params.join('') + " " + message, meta);
     }
   };
+};
+function Logger(config) {
+  var _config$logger$info, _config$logger, _config$logger$warn, _config$logger2, _config$logger$error, _config$logger3;
+  for (var _len2 = arguments.length, params = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
+    params[_key2 - 1] = arguments[_key2];
+  }
+  var base = baseLogger(config, params);
+  var info = (_config$logger$info = config == null || (_config$logger = config.logger) == null ? void 0 : _config$logger.info) != null ? _config$logger$info : base.info;
+  var warn = (_config$logger$warn = config == null || (_config$logger2 = config.logger) == null ? void 0 : _config$logger2.warn) != null ? _config$logger$warn : base.warn;
+  var error = (_config$logger$error = config == null || (_config$logger3 = config.logger) == null ? void 0 : _config$logger3.error) != null ? _config$logger$error : base.error;
+  return {
+    info: info,
+    warn: warn,
+    error: error
+  };
 }
 
 var getDatabaseId = function getDatabaseId(cfg) {
@@ -455,14 +458,14 @@ var getDatabaseId = function getDatabaseId(cfg) {
   var _Logger = Logger(config, '[databaseId]'),
     info = _Logger.info;
   if (config != null && config.databaseId) {
-    logger && info(logger, 'config', config.databaseId);
+    logger && info(logger + "[config] " + config.databaseId);
     return String(config == null ? void 0 : config.databaseId);
   }
   if (process.env.NILEDB_POSTGRES_URL) {
     var pgUrl = new URL(process.env.NILEDB_POSTGRES_URL);
     return pgUrl.pathname.substring(1);
   }
-  logger && info(logger, 'env', process.env.NILEDB_ID);
+  logger && info(logger + "[NILEDB_ID] " + process.env.NILEDB_ID);
   return process.env.NILEDB_ID;
 };
 var getUsername = function getUsername(cfg) {
@@ -471,10 +474,10 @@ var getUsername = function getUsername(cfg) {
   var _Logger2 = Logger(config, '[username]'),
     info = _Logger2.info;
   if (config != null && config.user) {
-    logger && info(logger, 'config', config.user);
+    logger && info(logger + "[config] " + config.user);
     return String(config == null ? void 0 : config.user);
   }
-  logger && info(logger, 'NILEDB_USER', process.env.NILEDB_USER);
+  logger && info(logger + "[NILEDB_USER] " + process.env.NILEDB_USER);
   return process.env.NILEDB_USER;
 };
 var getPassword = function getPassword(cfg) {
@@ -484,10 +487,10 @@ var getPassword = function getPassword(cfg) {
   var _Logger3 = Logger(config, '[password]'),
     info = _Logger3.info;
   if (config != null && config.password) {
-    log && info(logger, 'config', config.password);
+    log && info(logger + "[config] " + config.password);
     return String(config.password);
   }
-  log && info(logger, 'NILEDB_PASSWORD', process.env.NILEDB_PASSWORD);
+  logger && info(logger + "[NILEDB_PASSWORD] " + process.env.NILEDB_PASSWORD);
   return process.env.NILEDB_PASSWORD;
 };
 var getInfoBearer = function getInfoBearer(cfg) {
@@ -501,11 +504,11 @@ var getToken = function getToken(cfg) {
     info = _Logger4.info;
   if (config != null && (_config$api = config.api) != null && _config$api.token) {
     var _config$api2, _config$api3;
-    logger && info(logger, 'config', (_config$api2 = config.api) == null ? void 0 : _config$api2.token);
+    logger && info(logger + "[config] " + ((_config$api2 = config.api) == null ? void 0 : _config$api2.token));
     return String((_config$api3 = config.api) == null ? void 0 : _config$api3.token);
   }
   if (process.env.NILEDB_TOKEN) {
-    logger && info(logger, 'NILEDB_TOKEN', process.env.NILEDB_TOKEN);
+    logger && info(logger + "[NILEDB_TOKEN] " + process.env.NILEDB_TOKEN);
     return process.env.NILEDB_TOKEN;
   }
   return undefined;
@@ -516,11 +519,11 @@ var getDatabaseName = function getDatabaseName(cfg) {
   var _Logger5 = Logger(config, '[databaseName]'),
     info = _Logger5.info;
   if (config != null && config.databaseName) {
-    logger && info(logger, 'config', config.databaseName);
+    logger && info(logger + "[config] " + config.databaseName);
     return String(config.databaseName);
   }
   if (process.env.NILEDB_NAME) {
-    logger && info(logger, 'NILEDB_NAME', process.env.NILEDB_NAME);
+    logger && info(logger + "[NILEDB_NAME] " + process.env.NILEDB_NAME);
     return process.env.NILEDB_NAME;
   }
   return null;
@@ -531,11 +534,11 @@ var getTenantId = function getTenantId(cfg) {
   var _Logger6 = Logger(config, '[tenantId]'),
     info = _Logger6.info;
   if (config != null && config.tenantId) {
-    logger && info(logger, 'config', config.tenantId);
+    logger && info(logger + "[config] " + config.tenantId);
     return config.tenantId;
   }
   if (process.env.NILEDB_TENANT) {
-    logger && info(logger, 'NILEDB_TENANT', process.env.NILEDB_TENANT);
+    logger && info(logger + "[NILEDB_TENANT] " + process.env.NILEDB_TENANT);
     return process.env.NILEDB_TENANT;
   }
   return null;
@@ -549,18 +552,19 @@ var getBasePath = function getBasePath(cfg) {
   var config = cfg.config,
     logger = cfg.logger;
   var _Logger7 = Logger(config, '[basePath]'),
+    warn = _Logger7.warn,
     info = _Logger7.info;
   var basePath = config == null || (_config$api4 = config.api) == null ? void 0 : _config$api4.basePath;
   if (basePath) {
-    logger && info(logger, 'config', basePath);
+    logger && info(logger + "[config] " + basePath);
     return basePath;
   }
   if (process.env.NILEDB_API_URL) {
-    logger && info(logger, 'NILEDB_API_URL', process.env.NILEDB_API_URL);
+    logger && info(logger + "[NILEDB_API_URL] " + process.env.NILEDB_API_URL);
     var apiUrl = new URL(process.env.NILEDB_API_URL);
     return apiUrl.href;
   }
-  info('not set. Must run auto-configuration');
+  warn('not set. Must run auto-configuration');
   return undefined;
 };
 var getControlPlane = function getControlPlane(cfg) {
@@ -569,18 +573,18 @@ var getControlPlane = function getControlPlane(cfg) {
   var _Logger8 = Logger(config, '[basePath]'),
     info = _Logger8.info;
   if (config != null && config.configureUrl) {
-    logger && info(logger, 'config', config.configureUrl);
+    logger && info(logger + "[config] " + config.configureUrl);
     return config.configureUrl;
   }
   if (process.env.NILEDB_CONFIGURE) {
-    logger && info(logger, 'NILEDB_CONFIGURE', process.env.NILEDB_CONFIGURE);
+    logger && info(logger + "[NILEDB_CONFIGURE] " + process.env.NILEDB_CONFIGURE);
     // backwards compatible, but not really
     if (!process.env.NILEDB_CONFIGURE.startsWith('http')) {
       return "https://" + process.env.NILEDB_CONFIGURE;
     }
     return process.env.NILEDB_CONFIGURE;
   }
-  logger && info(logger, 'default', 'https://global.thenile.dev');
+  logger && info(logger + "[default] https://global.thenile.dev");
   return 'https://global.thenile.dev';
 };
 function getDbHost(cfg) {
@@ -589,19 +593,19 @@ function getDbHost(cfg) {
   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);
+    logger && info(logger + "[config] " + (config == null ? void 0 : config.db.host));
     return config.db.host;
   }
   if (process.env.NILEDB_POSTGRES_URL) {
     var pgUrl = new URL(process.env.NILEDB_POSTGRES_URL);
-    logger && info(logger, 'NILEDB_POSTGRES_URL', pgUrl.host);
+    logger && info(logger + "[NILEDB_POSTGRES_URL] " + pgUrl.host);
     return pgUrl.host;
   }
   if (process.env.NILEDB_HOST) {
-    logger && info(logger, 'NILEDB_HOST', process.env.NILEDB_HOST);
+    logger && info(logger + "[NILEDB_HOST] " + process.env.NILEDB_HOST);
     return process.env.NILEDB_HOST;
   }
-  logger && info(logger, 'default', 'db.thenile.dev');
+  logger && info(logger + "[default] db.thenile.dev");
   return 'db.thenile.dev';
 }
 function getDbPort(cfg) {
@@ -612,14 +616,14 @@ function getDbPort(cfg) {
     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);
+    logger && info(logger + "[config] " + (config == null ? void 0 : config.db.port));
     return Number((_config$db2 = config.db) == null ? void 0 : _config$db2.port);
   }
   if (process.env.NILEDB_PORT) {
-    logger && info(logger, 'config', process.env.NILEDB_PORT);
+    logger && info(logger + "[NILEDB_PORT] " + process.env.NILEDB_PORT);
     return Number(process.env.NILEDB_PORT);
   }
-  logger && info(logger, 'default', 5432);
+  logger && info(logger + "[default] 5432");
   return 5432;
 }
 // don't let people accidentally log secrets to production
@@ -702,7 +706,10 @@ var Config = /*#__PURE__*/function () {
                 port: configuredPort,
                 database: _this.databaseName
               }, dbConfig);
-              info('[config set]', _this);
+              info('[config set]', {
+                db: _this.db,
+                api: _this.api
+              });
               return _context.abrupt("return", _this);
             case 12:
               cp = getControlPlane(envVarConfig);
@@ -714,7 +721,7 @@ var Config = /*#__PURE__*/function () {
               if (databaseName) {
                 url.searchParams.set('databaseName', databaseName);
               }
-              info('configuring from', url.href);
+              info("configuring from " + url.href);
               _context.next = 19;
               return fetch(url, {
                 headers: {
@@ -792,7 +799,10 @@ var Config = /*#__PURE__*/function () {
                 port: configuredPort,
                 database: _this.databaseName
               }, dbConfig);
-              info('[config set]', _this);
+              info('[config set]', {
+                db: _this.db,
+                api: _this.api
+              });
               return _context.abrupt("return", _this);
             case 50:
             case "end":
@@ -957,7 +967,7 @@ function createProxyForPool(pool, config) {
           for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
             args[_key] = arguments[_key];
           }
-          info.apply(void 0, args);
+          info.apply(void 0, ['query'].concat(args));
           // @ts-expect-error - not mine
           var called = caller.apply(this, args);
           return called;
@@ -991,7 +1001,7 @@ var NileDatabase = /*#__PURE__*/function () {
       remaining = _objectWithoutPropertiesLoose(poolConfig, _excluded$1);
     config.db = poolConfig;
     this.config = config;
-    info(this.config.db);
+    info(JSON.stringify(this.config.db));
     this.pool = createProxyForPool(new pg.Pool(remaining), this.config);
     if (typeof afterCreate === 'function') {
       warn('Providing an pool configuration will stop automatic tenant context setting.');
@@ -1010,7 +1020,10 @@ var NileDatabase = /*#__PURE__*/function () {
                 var _Logger2 = Logger(config, '[after create callback]'),
                   error = _Logger2.error;
                 if (err) {
-                  error('after create failed', err);
+                  error('after create failed', {
+                    message: err.message,
+                    stack: err.stack
+                  });
                   evictPool(_this.id);
                 }
               });
@@ -1026,11 +1039,14 @@ 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(err) {
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              info('pool failed', e);
+              info('pool failed', {
+                message: err.message,
+                stack: err.stack
+              });
               if (_this.timer) {
                 clearTimeout(_this.timer);
               }
@@ -1057,10 +1073,10 @@ var NileDatabase = /*#__PURE__*/function () {
     }
     this.timer = setTimeout(function () {
       var _Number;
-      info('Pool reached idleTimeoutMillis.', _this2.id, 'evicted after', (_Number = Number(_this2.config.db.idleTimeoutMillis)) != null ? _Number : 30000, 'ms');
+      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);
+        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);
@@ -1073,7 +1089,10 @@ function makeAfterCreate(config) {
     info = _Logger4.info;
   return function (conn, done) {
     conn.on('error', function errorHandler(error) {
-      warn('Connection was terminated by server', error);
+      warn('Connection was terminated by server', {
+        message: error.message,
+        stack: error.stack
+      });
       done(error, conn);
     });
     if (config.tenantId) {
@@ -1087,10 +1106,10 @@ function makeAfterCreate(config) {
       // in this example we use pg driver's connection API
       conn.query(query.join(';'), function (err) {
         if (query.length === 1) {
-          info('[tenant id]', config.tenantId);
+          info("[tenant id] " + config.tenantId);
         }
         if (query.length === 2) {
-          info('[user id]', config.userId);
+          info("[user id] " + config.userId);
         }
         done(err, conn);
       });
@@ -1108,12 +1127,13 @@ var DBManager = /*#__PURE__*/function () {
     this.poolWatcher = function (config) {
       return function (id) {
         var _Logger = Logger(config, '[DBManager]'),
-          info = _Logger.info;
+          info = _Logger.info,
+          warn = _Logger.warn;
         if (id && _this.connections.has(id)) {
-          info('Removing', id, 'from db connection pool.');
+          info("Removing " + id + " from db connection pool.");
           _this.connections["delete"](id);
         } else {
-          info('missed eviction of', id);
+          warn("missed eviction of " + id);
         }
       };
     };
@@ -1122,16 +1142,16 @@ var DBManager = /*#__PURE__*/function () {
         info = _Logger2.info;
       var id = _this.makeId(config.tenantId, config.userId);
       var existing = _this.connections.get(id);
-      info('# of instances:', _this.connections.size);
+      info("# of instances: " + _this.connections.size);
       if (existing) {
-        info('returning existing', id);
+        info("returning existing " + id);
         existing.startTimeout();
         return existing.pool;
       }
       var newOne = new NileDatabase(new Config(config), id);
       _this.connections.set(id, newOne);
-      info('created new', id);
-      info('# of instances:', _this.connections.size);
+      info("created new " + id);
+      info("# of instances: " + _this.connections.size);
       if (_this.cleared) {
         _this.cleared = false;
       }
@@ -1140,7 +1160,7 @@ var DBManager = /*#__PURE__*/function () {
     this.clear = function (config) {
       var _Logger3 = Logger(config, '[DBManager]'),
         info = _Logger3.info;
-      info('Clearing all connections', _this.connections.size);
+      info("Clearing all connections " + _this.connections.size);
       _this.cleared = true;
       _this.connections.clear();
     };
@@ -1230,27 +1250,35 @@ function _request() {
             // @ts-expect-error - its there
             params.duplex = 'half';
           }
-          info("[" + ((_params$method = params.method) != null ? _params$method : 'GET') + "]", url);
-          _context.next = 11;
+          _context.next = 10;
           return fetch(url, _extends({}, params))["catch"](function (e) {
-            error('An error has occurred in the fetch', e);
+            error('An error has occurred in the fetch', {
+              message: e.message,
+              stack: e.stack
+            });
             return new Response('An unexpected (most likely configuration) problem has occurred', {
               status: 500
             });
           });
-        case 11:
+        case 10:
           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.t1 = "[" + ((_params$method = params.method) != null ? _params$method : 'GET') + "] " + url;
+          _context.t2 = res == null ? void 0 : res.status;
+          _context.t3 = res == null ? void 0 : res.statusText;
           _context.next = 18;
           return loggingRes == null ? void 0 : loggingRes.text();
         case 18:
-          _context.t3 = _context.sent;
-          (0, _context.t0)('[Response]', _context.t1, _context.t2, _context.t3);
+          _context.t4 = _context.sent;
+          _context.t5 = {
+            status: _context.t2,
+            statusText: _context.t3,
+            text: _context.t4
+          };
+          (0, _context.t0)(_context.t1, _context.t5);
           return _context.abrupt("return", res);
-        case 21:
+        case 22:
         case "end":
           return _context.stop();
       }
@@ -1288,22 +1316,21 @@ var key$7 = 'ME';
  *         description: Unauthorized
  *         content: {}
  */
-function GET$4(_x, _x2, _x3, _x4) {
+function GET$4(_x, _x2, _x3) {
   return _GET$4.apply(this, arguments);
 }
 function _GET$4() {
-  _GET$4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(url, init, log, config) {
+  _GET$4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(url, init, config) {
     var res;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          log('[GET]', url);
-          _context.next = 3;
+          _context.next = 2;
           return request(url, init, config);
-        case 3:
+        case 2:
           res = _context.sent;
           return _context.abrupt("return", res);
-        case 5:
+        case 4:
         case "end":
           return _context.stop();
       }
@@ -1311,34 +1338,31 @@ function _GET$4() {
   }));
   return _GET$4.apply(this, arguments);
 }
-function route$a(_x5, _x6) {
+function route$a(_x4, _x5) {
   return _route$a.apply(this, arguments);
 }
 function _route$a() {
   _route$a = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(request, config) {
-    var url, _Logger, info;
+    var url;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           url = apiRoutes(config)[key$7];
-          _Logger = Logger(_extends({}, config, {
-            debug: config.debug
-          }), '[ROUTES]', "[" + key$7 + "]"), info = _Logger.info;
           _context2.t0 = request.method;
-          _context2.next = _context2.t0 === 'GET' ? 5 : 8;
+          _context2.next = _context2.t0 === 'GET' ? 4 : 7;
           break;
-        case 5:
-          _context2.next = 7;
+        case 4:
+          _context2.next = 6;
           return GET$4(url, {
             request: request
-          }, info, config);
-        case 7:
+          }, config);
+        case 6:
           return _context2.abrupt("return", _context2.sent);
-        case 8:
+        case 7:
           return _context2.abrupt("return", new Response('method not allowed', {
             status: 405
           }));
-        case 9:
+        case 8:
         case "end":
           return _context2.stop();
       }
@@ -1362,7 +1386,7 @@ function _auth() {
           _Logger = Logger(config, '[nileauth]'), info = _Logger.info, error = _Logger.error;
           info('checking auth');
           sessionUrl = config.api.basePath + "/auth/session";
-          info('using session', sessionUrl);
+          info("using session" + sessionUrl);
           // handle the pass through with posts
           req.headers["delete"]('content-length');
           _context.next = 7;
@@ -1488,21 +1512,24 @@ function _fetch2() {
           }));
         case 14:
           useableUrl = url.replace('{tenantId}', encodeURIComponent(String(tenantId))).replace('{userId}', encodeURIComponent(String(userId)));
-          info('[fetch]', useableUrl);
+          info("[fetch] " + useableUrl);
           _context.next = 18;
           return fetch(useableUrl, _extends({}, opts, {
             headers: basicHeaders
           }))["catch"](function (e) {
-            error('[fetch]', '[response]', e);
+            error('[fetch][response]', {
+              message: e.message,
+              stack: e.stack
+            });
           });
         case 18:
           response = _context.sent;
           if (!(response && response.status >= 200 && response.status < 300)) {
-            _context.next = 37;
+            _context.next = 40;
             break;
           }
           if (!(typeof response.clone === 'function')) {
-            _context.next = 36;
+            _context.next = 39;
             break;
           }
           _context.prev = 21;
@@ -1511,110 +1538,121 @@ function _fetch2() {
           return response.clone().json();
         case 25:
           _context.t1 = _context.sent;
-          (0, _context.t0)('[fetch]', '[response]', _context.t1);
-          _context.next = 36;
+          _context.t2 = "[fetch][response] " + _context.t1;
+          (0, _context.t0)(_context.t2);
+          _context.next = 39;
           break;
-        case 29:
-          _context.prev = 29;
-          _context.t2 = _context["catch"](21);
-          _context.t3 = info;
-          _context.next = 34;
+        case 30:
+          _context.prev = 30;
+          _context.t3 = _context["catch"](21);
+          _context.t4 = info;
+          _context.next = 35;
           return response.clone().text();
-        case 34:
-          _context.t4 = _context.sent;
-          (0, _context.t3)('[fetch]', '[response]', _context.t4);
-        case 36:
+        case 35:
+          _context.t5 = _context.sent;
+          _context.t6 = "[fetch][response] " + _context.t5;
+          _context.t7 = {
+            e: _context.t3
+          };
+          (0, _context.t4)(_context.t6, _context.t7);
+        case 39:
           return _context.abrupt("return", response);
-        case 37:
+        case 40:
           if (!((response == null ? void 0 : response.status) === 404)) {
-            _context.next = 39;
+            _context.next = 42;
             break;
           }
           return _context.abrupt("return", new ResponseError('Not found', {
             status: 404
           }));
-        case 39:
+        case 42:
           if (!((response == null ? void 0 : response.status) === 401)) {
-            _context.next = 41;
+            _context.next = 44;
             break;
           }
           return _context.abrupt("return", new ResponseError('Unauthorized', {
             status: 401
           }));
-        case 41:
+        case 44:
           if (!((response == null ? void 0 : response.status) === 405)) {
-            _context.next = 43;
+            _context.next = 46;
             break;
           }
           return _context.abrupt("return", new ResponseError('Method not allowed', {
             status: 405
           }));
-        case 43:
+        case 46:
           errorHandler = typeof (response == null ? void 0 : response.clone) === 'function' ? response.clone() : null;
           msg = '';
-          _context.prev = 45;
-          _context.next = 48;
+          _context.prev = 48;
+          _context.next = 51;
           return response == null ? void 0 : response.json();
-        case 48:
+        case 51:
           res = _context.sent;
-          _context.next = 59;
+          _context.next = 62;
           break;
-        case 51:
-          _context.prev = 51;
-          _context.t5 = _context["catch"](45);
+        case 54:
+          _context.prev = 54;
+          _context.t8 = _context["catch"](48);
           if (!errorHandler) {
-            _context.next = 58;
+            _context.next = 61;
             break;
           }
-          _context.next = 56;
+          _context.next = 59;
           return errorHandler.text();
-        case 56:
+        case 59:
           msg = _context.sent;
           if (msg) {
-            error('[fetch]', '[response]', "[status: " + errorHandler.status + "]", msg);
+            error("[fetch][response] status: " + errorHandler.status + "]", {
+              message: msg
+            });
           }
-        case 58:
+        case 61:
           if (!msg) {
-            error('[fetch]', '[response]', _context.t5);
+            error('[fetch][response]', {
+              e: _context.t8
+            });
           }
-        case 59:
+        case 62:
           if (!msg) {
-            _context.next = 61;
+            _context.next = 64;
             break;
           }
           return _context.abrupt("return", new ResponseError(msg, {
             status: errorHandler == null ? void 0 : errorHandler.status
           }));
-        case 61:
+        case 64:
           if (!(res && 'message' in res)) {
-            _context.next = 65;
+            _context.next = 68;
             break;
           }
           _res = res, message = _res.message;
-          error('[fetch]', '[response]', "[status: " + (errorHandler == null ? void 0 : errorHandler.status) + "]", message);
+          error("[fetch][response] status: " + (errorHandler == null ? void 0 : errorHandler.status) + "] " + message);
           return _context.abrupt("return", new ResponseError(message, {
             status: 400
           }));
-        case 65:
+        case 68:
           if (!(res && 'errors' in res)) {
-            _context.next = 69;
+            _context.next = 72;
             break;
           }
           _res2 = res, _res2$errors = _res2.errors, _message = _res2$errors[0];
-          error('[fetch]', '[response]', "[status: " + (errorHandler == null ? void 0 : errorHandler.status) + "]", _message);
+          error("[fetch][response] status: " + (errorHandler == null ? void 0 : errorHandler.status) + "] " + _message);
           return _context.abrupt("return", new ResponseError(_message, {
             status: 400
           }));
-        case 69:
-          error('[fetch]', '[response]', "[status: " + (errorHandler == null ? void 0 : errorHandler.status) + "]", 'UNHANDLED ERROR');
+        case 72:
+          error("[fetch][response] status: " + (errorHandler == null ? void 0 : errorHandler.status) + "] UNHANDLED ERROR", {
+            res: res
+          });
           return _context.abrupt("return", new ResponseError(null, {
             status: (_response$status = response == null ? void 0 : response.status) != null ? _response$status : 500
           }));
-        case 71:
+        case 74:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[21, 29], [45, 51]]);
+    }, _callee, null, [[21, 30], [48, 54]]);
   }));
   return _fetch2.apply(this, arguments);
 }
@@ -1681,11 +1719,11 @@ function _fetch2() {
  *         description: Unauthorized
  *         content: {}
  */
-function POST$2(_x, _x2, _x3) {
+function POST$2(_x, _x2) {
   return _POST$2.apply(this, arguments);
 }
 function _POST$2() {
-  _POST$2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, init, log) {
+  _POST$2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, init) {
     var yurl, tenantId, tenant, url;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -1696,12 +1734,11 @@ function _POST$2() {
           tenantId = yurl.searchParams.get('tenantId');
           tenant = tenantId != null ? tenantId : getTenantFromHttp(init.request.headers);
           url = apiRoutes(config).USERS(tenant ? tenant : undefined);
-          log && log('[POST]', url);
-          _context.next = 9;
+          _context.next = 8;
           return request(url, init, config);
-        case 9:
+        case 8:
           return _context.abrupt("return", _context.sent);
-        case 10:
+        case 9:
         case "end":
           return _context.stop();
       }
@@ -1757,19 +1794,18 @@ function _GET$3() {
             _context.next = 6;
             break;
           }
-          log('[GET]', '[ERROR]', 'No tenant id provided.');
+          log('[GET] No tenant id provided.');
           return _context.abrupt("return", new Response(null, {
             status: 404
           }));
         case 6:
           url = apiRoutes(config).TENANT_USERS(tenant);
-          log('[GET]', url);
           init.method = 'GET';
-          _context.next = 11;
+          _context.next = 10;
           return request(url, init, config);
-        case 11:
+        case 10:
           return _context.abrupt("return", _context.sent);
-        case 12:
+        case 11:
         case "end":
           return _context.stop();
       }
@@ -1814,11 +1850,11 @@ function _GET$3() {
  *         description: Unauthorized
  *         content: {}
  */
-function PUT$2(_x, _x2, _x3, _x4) {
+function PUT$2(_x, _x2, _x3) {
   return _PUT$2.apply(this, arguments);
 }
 function _PUT$2() {
-  _PUT$2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, session, init, log) {
+  _PUT$2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, session, init) {
     var _URL$pathname$split$r, userId, url;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -1836,12 +1872,11 @@ function _PUT$2() {
           // update the user
           _URL$pathname$split$r = new URL(init.request.url).pathname.split('/').reverse(), userId = _URL$pathname$split$r[0];
           url = apiRoutes(config).USER(userId);
-          log('[PUT]', url);
-          _context.next = 9;
+          _context.next = 8;
           return request(url, init, config);
-        case 9:
+        case 8:
           return _context.abrupt("return", _context.sent);
-        case 10:
+        case 9:
         case "end":
           return _context.stop();
       }
@@ -1862,7 +1897,7 @@ function _route$9() {
         case 0:
           _Logger = Logger(_extends({}, config, {
             debug: config.debug
-          }), '[ROUTES]', "[" + key$6 + "]"), info = _Logger.info;
+          }), "[ROUTES][" + key$6 + "]"), info = _Logger.info;
           _context.next = 3;
           return auth(request, config);
         case 3:
@@ -1881,14 +1916,14 @@ function _route$9() {
           _context.next = 12;
           return POST$2(config, {
             request: request
-          }, info);
+          });
         case 12:
           return _context.abrupt("return", _context.sent);
         case 13:
           _context.next = 15;
           return PUT$2(config, session, {
             request: request
-          }, info);
+          });
         case 15:
           return _context.abrupt("return", _context.sent);
         case 16:
@@ -1938,32 +1973,23 @@ function matches$9(configRoutes, request) {
  *            schema:
  *              $ref: '#/components/schemas/APIError'
  */
-function GET$2(_x, _x2, _x3) {
+function GET$2(_x, _x2) {
   return _GET$2.apply(this, arguments);
 }
 function _GET$2() {
-  _GET$2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, init, log) {
+  _GET$2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, init) {
     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$[1];
-          if (tenantId) {
-            _context.next = 4;
-            break;
-          }
-          return _context.abrupt("return", new Response(null, {
-            status: 404
-          }));
-        case 4:
           url = "" + apiRoutes(config).TENANT_USERS(tenantId);
-          log('[GET]', '[TENANT_USERS]', url);
-          _context.next = 8;
+          _context.next = 5;
           return request(url, init, config);
-        case 8:
+        case 5:
           return _context.abrupt("return", _context.sent);
-        case 9:
+        case 6:
         case "end":
           return _context.stop();
       }
@@ -2012,11 +2038,11 @@ function _GET$2() {
  *            schema:
  *              $ref: '#/components/schemas/User'
  */
-function POST$1(_x, _x2, _x3, _x4) {
+function POST$1(_x, _x2, _x3) {
   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) {
     var yurl, _yurl$pathname$split$, tenantId, url;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -2029,12 +2055,11 @@ function _POST$1() {
           });
           init.method = 'PUT';
           url = apiRoutes(config).TENANT_USERS(tenantId);
-          log('[PUT]', url);
-          _context.next = 8;
+          _context.next = 7;
           return request(url, init, config);
-        case 8:
+        case 7:
           return _context.abrupt("return", _context.sent);
-        case 9:
+        case 8:
         case "end":
           return _context.stop();
       }
@@ -2069,36 +2094,27 @@ function _POST$1() {
  *      "204":
  *        description: User removed
  */
-function DELETE$1(_x, _x2, _x3) {
+function DELETE$1(_x, _x2) {
   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) {
     var yurl, _yurl$pathname$split$, userId, tenantId, url;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           yurl = new URL(init.request.url); // eslint-disable-next-line @typescript-eslint/no-unused-vars
           _yurl$pathname$split$ = yurl.pathname.split('/').reverse(), userId = _yurl$pathname$split$[0], tenantId = _yurl$pathname$split$[2];
-          if (tenantId) {
-            _context.next = 4;
-            break;
-          }
-          return _context.abrupt("return", new Response(null, {
-            status: 404
-          }));
-        case 4:
           init.method = 'DELETE';
           init.body = JSON.stringify({
             email: userId
           });
           url = "" + apiRoutes(config).TENANT_USER(tenantId, userId);
-          log('[DELETE]', url);
-          _context.next = 10;
+          _context.next = 7;
           return request(url, init, config);
-        case 10:
+        case 7:
           return _context.abrupt("return", _context.sent);
-        case 11:
+        case 8:
         case "end":
           return _context.stop();
       }
@@ -2132,33 +2148,24 @@ function _DELETE$1() {
  *      "201":
  *        description: add user to tenant
  */
-function PUT$1(_x, _x2, _x3) {
+function PUT$1(_x, _x2) {
   return _PUT$1.apply(this, arguments);
 }
 function _PUT$1() {
-  _PUT$1 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, init, log) {
+  _PUT$1 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, init) {
     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$[1];
-          if (tenantId) {
-            _context.next = 4;
-            break;
-          }
-          return _context.abrupt("return", new Response(null, {
-            status: 404
-          }));
-        case 4:
           init.method = 'PUT';
           url = "" + apiRoutes(config).TENANT_USERS(tenantId);
-          log('[PUT]', url);
-          _context.next = 9;
+          _context.next = 6;
           return request(url, init, config);
-        case 9:
+        case 6:
           return _context.abrupt("return", _context.sent);
-        case 10:
+        case 7:
         case "end":
           return _context.stop();
       }
@@ -2173,13 +2180,13 @@ function route$8(_x, _x2) {
 }
 function _route$8() {
   _route$8 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(request, config) {
-    var _Logger, info, session;
+    var _Logger, info, session, yurl, _yurl$pathname$split$, tenantId;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _Logger = Logger(_extends({}, config, {
             debug: config.debug
-          }), '[ROUTES]', "[" + key$5 + "]"), info = _Logger.info;
+          }), "[ROUTES][" + key$5 + "]"), info = _Logger.info;
           _context.next = 3;
           return auth(request, config);
         case 3:
@@ -2193,42 +2200,53 @@ function _route$8() {
             status: 401
           }));
         case 7:
+          yurl = new URL(request.url);
+          _yurl$pathname$split$ = yurl.pathname.split('/').reverse(), tenantId = _yurl$pathname$split$[1];
+          if (tenantId) {
+            _context.next = 12;
+            break;
+          }
+          info('No tenant id found in path');
+          return _context.abrupt("return", new Response(null, {
+            status: 404
+          }));
+        case 12:
           _context.t0 = request.method;
-          _context.next = _context.t0 === 'GET' ? 10 : _context.t0 === 'POST' ? 13 : _context.t0 === 'PUT' ? 16 : _context.t0 === 'DELETE' ? 19 : 22;
+          _context.next = _context.t0 === 'GET' ? 15 : _context.t0 === 'POST' ? 18 : _context.t0 === 'PUT' ? 21 : _context.t0 === 'DELETE' ? 24 : 27;
           break;
-        case 10:
-          _context.next = 12;
+        case 15:
+          _context.next = 17;
           return GET$2(config, {
             request: request
-          }, info);
-        case 12:
+          });
+        case 17:
           return _context.abrupt("return", _context.sent);
-        case 13:
-          _context.next = 15;
+        case 18:
+          _context.next = 20;
           return POST$1(config, session, {
             request: request
-          }, info);
-        case 15:
+          });
+        case 20:
           return _context.abrupt("return", _context.sent);
-        case 16:
-          _context.next = 18;
+        case 21:
+          _context.next = 23;
           return PUT$1(config, {
             request: request
-          }, info);
-        case 18:
+          });
+        case 23:
           return _context.abrupt("return", _context.sent);
-        case 19:
-          _context.next = 21;
+        case 24:
+          _context.next = 26;
           return DELETE$1(config, {
             request: request
-          }, info);
-        case 21:
+          });
+        case 26:
           return _context.abrupt("return", _context.sent);
-        case 22:
+        case 27:
           return _context.abrupt("return", new Response('method not allowed', {
             status: 405
           }));
-        case 23:
+        case 28:
         case "end":
           return _context.stop();
       }
@@ -2277,11 +2295,11 @@ function matches$8(configRoutes, request) {
  *         description: Unauthorized
  *         content: {}
  */
-function GET$1(_x, _x2, _x3, _x4) {
+function GET$1(_x, _x2, _x3) {
   return _GET$1.apply(this, arguments);
 }
 function _GET$1() {
-  _GET$1 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, session, init, log) {
+  _GET$1 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, session, init) {
     var url, res;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -2290,13 +2308,12 @@ function _GET$1() {
           if (typeof session === 'object' && 'user' in session && session.user) {
             url = "" + apiRoutes(config).USER_TENANTS(session.user.id);
           }
-          log('[GET]', url);
-          _context.next = 5;
+          _context.next = 4;
           return request(url, init, config);
-        case 5:
+        case 4:
           res = _context.sent;
           return _context.abrupt("return", res);
-        case 7:
+        case 6:
         case "end":
           return _context.stop();
       }
@@ -2350,16 +2367,16 @@ function _GET() {
           yurl = new URL(init.request.url);
           _yurl$pathname$split$ = yurl.pathname.split('/').reverse(), tenantId = _yurl$pathname$split$[0];
           if (tenantId) {
-            _context.next = 4;
+            _context.next = 5;
             break;
           }
+          log('[GET] No tenant id provided.');
           return _context.abrupt("return", new Response(null, {
             status: 404
           }));
-        case 4:
+        case 5:
           init.method = 'GET';
           url = "" + apiRoutes(config).TENANT(tenantId);
-          log('[GET]', url);
           _context.next = 9;
           return request(url, init, config);
         case 9:
@@ -2403,11 +2420,11 @@ function _GET() {
  *            schema:
  *              $ref: '#/components/schemas/APIError'
  */
-function DELETE(_x, _x2, _x3) {
+function DELETE(_x, _x2) {
   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) {
     var yurl, _yurl$pathname$split$, tenantId, url;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -2424,12 +2441,11 @@ function _DELETE() {
         case 4:
           init.method = 'DELETE';
           url = "" + apiRoutes(config).TENANT(tenantId);
-          log('[DELETE]', url);
-          _context.next = 9;
+          _context.next = 8;
           return request(url, init, config);
-        case 9:
+        case 8:
           return _context.abrupt("return", _context.sent);
-        case 10:
+        case 9:
         case "end":
           return _context.stop();
       }
@@ -2472,11 +2488,11 @@ function _DELETE() {
  *            schema:
  *              $ref: '#/components/schemas/APIError'
  */
-function PUT(_x, _x2, _x3) {
+function PUT(_x, _x2) {
   return _PUT.apply(this, arguments);
 }
 function _PUT() {
-  _PUT = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, init, log) {
+  _PUT = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, init) {
     var yurl, _yurl$pathname$split$, tenantId, url;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -2494,12 +2510,11 @@ function _PUT() {
           init.body = init.request.body;
           init.method = 'PUT';
           url = "" + apiRoutes(config).TENANT(tenantId);
-          log('[PUT]', url);
-          _context.next = 10;
+          _context.next = 9;
           return request(url, init, config);
-        case 10:
+        case 9:
           return _context.abrupt("return", _context.sent);
-        case 11:
+        case 10:
         case "end":
           return _context.stop();
       }
@@ -2549,11 +2564,11 @@ function _PUT() {
  *            schema:
  *              $ref: '#/components/schemas/APIError'
  */
-function POST(_x, _x2, _x3) {
+function POST(_x, _x2) {
   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) {
     var url;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -2561,12 +2576,11 @@ function _POST() {
           init.body = init.request.body;
           init.method = 'POST';
           url = "" + apiRoutes(config).TENANTS;
-          log('[POST]', url);
-          _context.next = 6;
+          _context.next = 5;
           return request(url, init, config);
-        case 6:
+        case 5:
           return _context.abrupt("return", _context.sent);
-        case 7:
+        case 6:
         case "end":
           return _context.stop();
       }
@@ -2595,7 +2609,7 @@ function _route$7() {
         case 0:
           _Logger = Logger(_extends({}, config, {
             debug: config.debug
-          }), '[ROUTES]', "[" + key$4 + "]"), info = _Logger.info;
+          }), "[ROUTES][" + key$4 + "]"), info = _Logger.info;
           _context.next = 3;
           return auth(request, config);
         case 3:
@@ -2628,28 +2642,28 @@ function _route$7() {
           _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 20:
           return _context.abrupt("return", _context.sent);
         case 21:
           _context.next = 23;
           return DELETE(config, {
             request: request
-          }, info);
+          });
         case 23:
           return _context.abrupt("return", _context.sent);
         case 24:
           _context.next = 26;
           return PUT(config, {
             request: request
-          }, info);
+          });
         case 26:
           return _context.abrupt("return", _context.sent);
         case 27:
@@ -2808,7 +2822,7 @@ function _route$2() {
         case 0:
           _Logger = Logger(_extends({}, config, {
             debug: config.debug
-          }), '[ROUTES]', "[" + key$2 + "]"), error = _Logger.error;
+          }), "[ROUTES][" + key$2 + "]"), error = _Logger.error;
           _URL$pathname$split$r = new URL(request$1.url).pathname.split('/').reverse(), provider = _URL$pathname$split$r[0];
           passThroughUrl = new URL(request$1.url);
           params = new URLSearchParams(passThroughUrl.search);
@@ -3248,7 +3262,7 @@ function serverAuth(config, handlers) {
             }
             throw new Error('Server side login requires a user email and password.');
           case 3:
-            info('Obtaining providers for', email);
+            info("Obtaining providers for " + email);
             sessionUrl = new URL("" + ORIGIN + routes.PROVIDERS);
             sessionReq = new Request(sessionUrl, {
               method: 'GET',
@@ -3276,7 +3290,9 @@ function serverAuth(config, handlers) {
           case 17:
             _context.prev = 17;
             _context.t0 = _context["catch"](11);
-            info(sessionUrl, sessionRes);
+            info(sessionUrl, {
+              sessionRes: sessionRes
+            });
             error(_context.t0);
           case 21:
             info('Obtaining csrf');
@@ -3313,8 +3329,12 @@ function serverAuth(config, handlers) {
           case 40:
             _context.prev = 40;
             _context.t3 = _context["catch"](27);
-            info(sessionUrl, csrfRes);
-            error(_context.t3, csrfRes);
+            info(sessionUrl, {
+              csrfRes: csrfRes
+            });
+            error(_context.t3, {
+              csrfRes: csrfRes
+            });
           case 44:
             _ref2 = (_providers = providers) != null ? _providers : {}, credentials = _ref2.credentials;
             csrfCookie = csrfRes == null ? void 0 : csrfRes.headers.get('set-cookie');
@@ -3331,7 +3351,7 @@ function serverAuth(config, handlers) {
             }
             throw new Error('Unable to authenticate REST');
           case 51:
-            info('Attempting sign in with email', email);
+            info("Attempting sign in with email " + email);
             postReq = new Request(signInUrl, {
               method: 'POST',
               headers: new Headers({
@@ -3363,7 +3383,10 @@ function serverAuth(config, handlers) {
             }
             throw new Error('Server login failed');
           case 62:
-            info('Server login successful', authCookie, csrfCookie);
+            info('Server login successful', {
+              authCookie: authCookie,
+              csrfCookie: csrfCookie
+            });
             return _context.abrupt("return", new Headers({
               cookie: [token, csrfCookie].join('; ')
             }));