@niledatabase/server 3.0.0-alpha.32 → 3.0.0-alpha.33

package/dist/server.cjs.development.js

@@ -465,6 +465,13 @@ function Logger(config) {
   };
 }
 
+var getSecureCookies = function getSecureCookies(cfg) {
+  var config = cfg.config;
+  if (process.env.NILEDB_SECURECOOKIES) {
+    return Boolean(process.env.NILEDB_SECURECOOKIES);
+  }
+  return config == null ? void 0 : config.secureCookies;
+};
 var getDatabaseId = function getDatabaseId(cfg) {
   var config = cfg.config,
     logger = cfg.logger;
@@ -681,6 +688,7 @@ var Config = /*#__PURE__*/function () {
     this.routePrefix = void 0;
     this.routes = void 0;
     this.logger = void 0;
+    this.secureCookies = void 0;
     this.debug = void 0;
     this.db = void 0;
     this.api = void 0;
@@ -852,6 +860,7 @@ var Config = /*#__PURE__*/function () {
         throw new Error('Password is required. Set NILEDB_PASSWORD as an environment variable or set `password` in the config options.');
       }
     }
+    this.secureCookies = getSecureCookies(_envVarConfig);
     this.databaseId = getDatabaseId(_envVarConfig);
     this.databaseName = getDatabaseName(_envVarConfig);
     this._tenantId = getTenantId(_envVarConfig);
@@ -1489,6 +1498,7 @@ var ResponseError = function ResponseError(body, init) {
 
 var X_NILE_TENANT = 'niledb-tenant-id';
 var X_NILE_USER_ID = 'niledb-user-id';
+var X_NILE_SECURECOOKIES = 'niledb-useSecureCookies';
 function getTokenFromCookie(headers, cookieKey) {
   var _headers$get;
   var cookie = (_headers$get = headers.get('cookie')) == null ? void 0 : _headers$get.split('; ');
@@ -1530,52 +1540,60 @@ function getUserFromHttp(headers, config) {
   }
   return (_headers$get2 = headers == null ? void 0 : headers.get(X_NILE_USER_ID)) != null ? _headers$get2 : config.userId;
 }
+function makeBasicHeaders(config, opts) {
+  var _config$api;
+  var headers = new Headers(opts == null ? void 0 : opts.headers);
+  headers.set('content-type', 'application/json; charset=utf-8');
+  var cookieKey = (_config$api = config.api) == null ? void 0 : _config$api.cookieKey;
+  // this is old, but still maybe something worth keeping.
+  var authHeader = headers.get('Authorization');
+  if (!authHeader) {
+    var token = getTokenFromCookie(headers, cookieKey);
+    if (token) {
+      headers.set('Authorization', "Bearer " + token);
+    } else if (getToken({
+      config: config
+    })) {
+      headers.set('Authorization', "Bearer " + getToken({
+        config: config
+      }));
+    }
+  }
+  if (config.secureCookies) {
+    headers.set(X_NILE_SECURECOOKIES, 'true');
+  }
+  return headers;
+}
 function _fetch(_x, _x2, _x3) {
   return _fetch2.apply(this, arguments);
 }
 function _fetch2() {
   _fetch2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, path, opts) {
-    var _config$api, _config$api2;
-    var _Logger, debug, error, url, cookieKey, headers, basicHeaders, authHeader, token, tenantId, userId, useableUrl, _response$status, response, _opts$method, _opts$method2, res, errorHandler, msg, _res, message, _res2, _res2$errors, _message;
+    var _config$api2;
+    var _Logger, debug, error, url, headers, tenantId, basicHeaders, userId, useableUrl, _response$status, response, _opts$method, _opts$method2, res, errorHandler, msg, _res, message, _res2, _res2$errors, _message;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _Logger = Logger(config, '[server]'), debug = _Logger.debug, error = _Logger.error;
-          url = "" + ((_config$api = config.api) == null ? void 0 : _config$api.basePath) + path;
-          cookieKey = (_config$api2 = config.api) == null ? void 0 : _config$api2.cookieKey;
+          url = "" + ((_config$api2 = config.api) == null ? void 0 : _config$api2.basePath) + path;
           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');
-          // this is old, but still maybe something worth keeping.
-          authHeader = headers.get('Authorization');
-          if (!authHeader) {
-            token = getTokenFromCookie(headers, cookieKey);
-            if (token) {
-              basicHeaders.set('Authorization', "Bearer " + token);
-            } else if (getToken({
-              config: config
-            })) {
-              basicHeaders.set('Authorization', "Bearer " + getToken({
-                config: config
-              }));
-            }
-          }
           tenantId = getTenantFromHttp(headers, config);
+          basicHeaders = makeBasicHeaders(config, opts);
           updateTenantId(tenantId);
           userId = getUserFromHttp(headers, config);
           updateUserId(userId);
           if (!(url.includes('{tenantId}') && !tenantId)) {
-            _context.next = 14;
+            _context.next = 10;
             break;
           }
           return _context.abrupt("return", new ResponseError('tenantId is not set for request', {
             status: 400
           }));
-        case 14:
+        case 10:
           useableUrl = url.replace('{tenantId}', encodeURIComponent(String(tenantId))).replace('{userId}', encodeURIComponent(String(userId)));
           debug("[fetch] " + useableUrl);
-          _context.prev = 16;
-          _context.next = 19;
+          _context.prev = 12;
+          _context.next = 15;
           return fetch(useableUrl, _extends({}, opts, {
             headers: basicHeaders
           }))["catch"](function (e) {
@@ -1584,111 +1602,111 @@ function _fetch2() {
               stack: e.stack
             });
           });
-        case 19:
+        case 15:
           response = _context.sent;
           if (!(response && response.status >= 200 && response.status < 300)) {
-            _context.next = 42;
+            _context.next = 38;
             break;
           }
           if (!(typeof response.clone === 'function')) {
-            _context.next = 41;
+            _context.next = 37;
             break;
           }
-          _context.prev = 22;
+          _context.prev = 18;
           _context.t0 = debug;
           _context.t1 = "[fetch][response][" + ((_opts$method = opts == null ? void 0 : opts.method) != null ? _opts$method : 'GET') + "] " + response.status + " " + useableUrl;
-          _context.next = 27;
+          _context.next = 23;
           return response.clone().json();
-        case 27:
+        case 23:
           _context.t2 = _context.sent;
           _context.t3 = {
             body: _context.t2
           };
           (0, _context.t0)(_context.t1, _context.t3);
-          _context.next = 41;
+          _context.next = 37;
           break;
-        case 32:
-          _context.prev = 32;
-          _context.t4 = _context["catch"](22);
+        case 28:
+          _context.prev = 28;
+          _context.t4 = _context["catch"](18);
           _context.t5 = debug;
           _context.t6 = "[fetch][response][" + ((_opts$method2 = opts == null ? void 0 : opts.method) != null ? _opts$method2 : 'GET') + "] " + response.status + " " + useableUrl;
-          _context.next = 38;
+          _context.next = 34;
           return response.clone().text();
-        case 38:
+        case 34:
           _context.t7 = _context.sent;
           _context.t8 = {
             body: _context.t7
           };
           (0, _context.t5)(_context.t6, _context.t8);
-        case 41:
+        case 37:
           return _context.abrupt("return", response);
-        case 42:
+        case 38:
           if (!((response == null ? void 0 : response.status) === 404)) {
-            _context.next = 44;
+            _context.next = 40;
             break;
           }
           return _context.abrupt("return", new ResponseError('Not found', {
             status: 404
           }));
-        case 44:
+        case 40:
           if (!((response == null ? void 0 : response.status) === 401)) {
-            _context.next = 46;
+            _context.next = 42;
             break;
           }
           return _context.abrupt("return", new ResponseError('Unauthorized', {
             status: 401
           }));
-        case 46:
+        case 42:
           if (!((response == null ? void 0 : response.status) === 405)) {
-            _context.next = 48;
+            _context.next = 44;
             break;
           }
           return _context.abrupt("return", new ResponseError('Method not allowed', {
             status: 405
           }));
-        case 48:
+        case 44:
           errorHandler = typeof (response == null ? void 0 : response.clone) === 'function' ? response.clone() : null;
           msg = '';
-          _context.prev = 50;
-          _context.next = 53;
+          _context.prev = 46;
+          _context.next = 49;
           return response == null ? void 0 : response.json();
-        case 53:
+        case 49:
           res = _context.sent;
-          _context.next = 64;
+          _context.next = 60;
           break;
-        case 56:
-          _context.prev = 56;
-          _context.t9 = _context["catch"](50);
+        case 52:
+          _context.prev = 52;
+          _context.t9 = _context["catch"](46);
           if (!errorHandler) {
-            _context.next = 63;
+            _context.next = 59;
             break;
           }
-          _context.next = 61;
+          _context.next = 57;
           return errorHandler.text();
-        case 61:
+        case 57:
           msg = _context.sent;
           if (msg) {
             error("[fetch][response] status: " + errorHandler.status + "]", {
               message: msg
             });
           }
-        case 63:
+        case 59:
           if (!msg) {
             error('[fetch][response]', {
               e: _context.t9
             });
           }
-        case 64:
+        case 60:
           if (!msg) {
-            _context.next = 66;
+            _context.next = 62;
             break;
           }
           return _context.abrupt("return", new ResponseError(msg, {
             status: errorHandler == null ? void 0 : errorHandler.status
           }));
-        case 66:
+        case 62:
           if (!(res && 'message' in res)) {
-            _context.next = 70;
+            _context.next = 66;
             break;
           }
           _res = res, message = _res.message;
@@ -1696,9 +1714,9 @@ function _fetch2() {
           return _context.abrupt("return", new ResponseError(message, {
             status: 400
           }));
-        case 70:
+        case 66:
           if (!(res && 'errors' in res)) {
-            _context.next = 74;
+            _context.next = 70;
             break;
           }
           _res2 = res, _res2$errors = _res2.errors, _message = _res2$errors[0];
@@ -1706,24 +1724,24 @@ function _fetch2() {
           return _context.abrupt("return", new ResponseError(_message, {
             status: 400
           }));
-        case 74:
+        case 70:
           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 78:
-          _context.prev = 78;
-          _context.t10 = _context["catch"](16);
+        case 74:
+          _context.prev = 74;
+          _context.t10 = _context["catch"](12);
           return _context.abrupt("return", new ResponseError('an unexpected error has occurred', {
             status: 500
           }));
-        case 81:
+        case 77:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[16, 78], [22, 32], [50, 56]]);
+    }, _callee, null, [[12, 74], [18, 28], [46, 52]]);
   }));
   return _fetch2.apply(this, arguments);
 }