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

package/dist/server.cjs.development.js

@@ -482,8 +482,12 @@ var getDatabaseId = function getDatabaseId(cfg) {
     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);
+    try {
+      var pgUrl = new URL(process.env.NILEDB_POSTGRES_URL);
+      return pgUrl.pathname.substring(1);
+    } catch (e) {
+      // ok to fail
+    }
   }
   logger && info(logger + "[NILEDB_ID] " + process.env.NILEDB_ID);
   return process.env.NILEDB_ID;
@@ -546,6 +550,14 @@ var getDatabaseName = function getDatabaseName(cfg) {
     logger && info(logger + "[NILEDB_NAME] " + process.env.NILEDB_NAME);
     return process.env.NILEDB_NAME;
   }
+  if (process.env.NILEDB_POSTGRES_URL) {
+    try {
+      var pgUrl = new URL(process.env.NILEDB_POSTGRES_URL);
+      return pgUrl.pathname.substring(1);
+    } catch (e) {
+      // ok to fail
+    }
+  }
   return null;
 };
 var getTenantId = function getTenantId(cfg) {
@@ -573,7 +585,8 @@ var getBasePath = function getBasePath(cfg) {
     logger = cfg.logger;
   var _Logger7 = Logger(config, '[basePath]'),
     warn = _Logger7.warn,
-    info = _Logger7.info;
+    info = _Logger7.info,
+    error = _Logger7.error;
   var basePath = config == null || (_config$api4 = config.api) == null ? void 0 : _config$api4.basePath;
   if (basePath) {
     logger && info(logger + "[config] " + basePath);
@@ -581,8 +594,14 @@ var getBasePath = function getBasePath(cfg) {
   }
   if (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;
+    try {
+      var apiUrl = new URL(process.env.NILEDB_API_URL);
+      return apiUrl.href;
+    } catch (e) {
+      if (e instanceof Error) {
+        error(e.stack);
+      }
+    }
   }
   warn('not set. Must run auto-configuration');
   return undefined;
@@ -617,9 +636,13 @@ function getDbHost(cfg) {
     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.hostname);
-    return pgUrl.hostname;
+    try {
+      var pgUrl = new URL(process.env.NILEDB_POSTGRES_URL);
+      logger && info(logger + "[NILEDB_POSTGRES_URL] " + pgUrl.hostname);
+      return pgUrl.hostname;
+    } catch (e) {
+      // ok to fail
+    }
   }
   if (process.env.NILEDB_HOST) {
     logger && info(logger + "[NILEDB_HOST] " + process.env.NILEDB_HOST);
@@ -643,6 +666,16 @@ function getDbPort(cfg) {
     logger && info(logger + "[NILEDB_PORT] " + process.env.NILEDB_PORT);
     return Number(process.env.NILEDB_PORT);
   }
+  if (process.env.NILEDB_POSTGRES_URL) {
+    try {
+      var pgUrl = new URL(process.env.NILEDB_POSTGRES_URL);
+      if (pgUrl.port) {
+        return Number(pgUrl.port);
+      }
+    } catch (e) {
+      // ok to fail
+    }
+  }
   logger && info(logger + "[default] 5432");
   return 5432;
 }
@@ -1356,7 +1389,7 @@ function _request() {
   return _request.apply(this, arguments);
 }
 
-var key$7 = 'ME';
+var key$8 = 'ME';
 /**
  * @swagger
  * /api/me:
@@ -1407,16 +1440,16 @@ function _GET$4() {
   }));
   return _GET$4.apply(this, arguments);
 }
-function route$a(_x4, _x5) {
-  return _route$a.apply(this, arguments);
+function route$b(_x4, _x5) {
+  return _route$b.apply(this, arguments);
 }
-function _route$a() {
-  _route$a = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(request, config) {
+function _route$b() {
+  _route$b = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(request, config) {
     var url;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          url = apiRoutes(config)[key$7];
+          url = apiRoutes(config)[key$8];
           _context2.t0 = request.method;
           _context2.next = _context2.t0 === 'GET' ? 4 : 7;
           break;
@@ -1437,10 +1470,10 @@ function _route$a() {
       }
     }, _callee2);
   }));
-  return _route$a.apply(this, arguments);
+  return _route$b.apply(this, arguments);
 }
-function matches$a(configRoutes, request) {
-  return urlMatches(request.url, configRoutes[key$7]);
+function matches$b(configRoutes, request) {
+  return urlMatches(request.url, configRoutes[key$8]);
 }
 
 function auth(_x, _x2) {
@@ -1808,11 +1841,11 @@ function _fetch2() {
  *         description: Unauthorized
  *         content: {}
  */
-function POST$2(_x, _x2) {
-  return _POST$2.apply(this, arguments);
+function POST$3(_x, _x2) {
+  return _POST$3.apply(this, arguments);
 }
-function _POST$2() {
-  _POST$2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, init) {
+function _POST$3() {
+  _POST$3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, init) {
     var yurl, tenantId, newTenantName, tenant, url;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -1837,7 +1870,7 @@ function _POST$2() {
       }
     }, _callee);
   }));
-  return _POST$2.apply(this, arguments);
+  return _POST$3.apply(this, arguments);
 }
 
 /**
@@ -1978,19 +2011,19 @@ function _PUT$2() {
   return _PUT$2.apply(this, arguments);
 }
 
-var key$6 = 'USERS';
-function route$9(_x, _x2) {
-  return _route$9.apply(this, arguments);
+var key$7 = 'USERS';
+function route$a(_x, _x2) {
+  return _route$a.apply(this, arguments);
 }
-function _route$9() {
-  _route$9 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(request, config) {
+function _route$a() {
+  _route$a = _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) {
         case 0:
           _Logger = Logger(_extends({}, config, {
             debug: config.debug
-          }), "[ROUTES][" + key$6 + "]"), info = _Logger.info;
+          }), "[ROUTES][" + key$7 + "]"), info = _Logger.info;
           _context.next = 3;
           return auth(request, config);
         case 3:
@@ -2007,7 +2040,7 @@ function _route$9() {
           return _context.abrupt("return", _context.sent);
         case 10:
           _context.next = 12;
-          return POST$2(config, {
+          return POST$3(config, {
             request: request
           });
         case 12:
@@ -2029,10 +2062,10 @@ function _route$9() {
       }
     }, _callee);
   }));
-  return _route$9.apply(this, arguments);
+  return _route$a.apply(this, arguments);
 }
-function matches$9(configRoutes, request) {
-  return urlMatches(request.url, configRoutes[key$6]);
+function matches$a(configRoutes, request) {
+  return urlMatches(request.url, configRoutes[key$7]);
 }
 
 /**
@@ -2131,11 +2164,11 @@ function _GET$2() {
  *            schema:
  *              $ref: '#/components/schemas/User'
  */
-function POST$1(_x, _x2, _x3) {
-  return _POST$1.apply(this, arguments);
+function POST$2(_x, _x2, _x3) {
+  return _POST$2.apply(this, arguments);
 }
-function _POST$1() {
-  _POST$1 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, session, init) {
+function _POST$2() {
+  _POST$2 = _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) {
@@ -2158,7 +2191,7 @@ function _POST$1() {
       }
     }, _callee);
   }));
-  return _POST$1.apply(this, arguments);
+  return _POST$2.apply(this, arguments);
 }
 
 /**
@@ -2267,19 +2300,19 @@ function _PUT$1() {
   return _PUT$1.apply(this, arguments);
 }
 
-var key$5 = 'TENANT_USERS';
-function route$8(_x, _x2) {
-  return _route$8.apply(this, arguments);
+var key$6 = 'TENANT_USERS';
+function route$9(_x, _x2) {
+  return _route$9.apply(this, arguments);
 }
-function _route$8() {
-  _route$8 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(request, config) {
+function _route$9() {
+  _route$9 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(request, config) {
     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$6 + "]"), info = _Logger.info;
           _context.next = 3;
           return auth(request, config);
         case 3:
@@ -2316,7 +2349,7 @@ function _route$8() {
           return _context.abrupt("return", _context.sent);
         case 18:
           _context.next = 20;
-          return POST$1(config, session, {
+          return POST$2(config, session, {
             request: request
           });
         case 20:
@@ -2345,17 +2378,17 @@ function _route$8() {
       }
     }, _callee);
   }));
-  return _route$8.apply(this, arguments);
+  return _route$9.apply(this, arguments);
 }
-function matches$8(configRoutes, request) {
+function matches$9(configRoutes, request) {
   var url = new URL(request.url);
   var _url$pathname$split$r = url.pathname.split('/').reverse(),
     userId = _url$pathname$split$r[0],
     possibleTenantId = _url$pathname$split$r[1],
     tenantId = _url$pathname$split$r[2];
-  var route = configRoutes[key$5].replace('{tenantId}', tenantId).replace('{userId}', userId);
+  var route = configRoutes[key$6].replace('{tenantId}', tenantId).replace('{userId}', userId);
   if (userId === 'users') {
-    route = configRoutes[key$5].replace('{tenantId}', possibleTenantId);
+    route = configRoutes[key$6].replace('{tenantId}', possibleTenantId);
   }
   return urlMatches(request.url, route);
 }
@@ -2657,11 +2690,11 @@ function _PUT() {
  *            schema:
  *              $ref: '#/components/schemas/APIError'
  */
-function POST(_x, _x2) {
-  return _POST.apply(this, arguments);
+function POST$1(_x, _x2) {
+  return _POST$1.apply(this, arguments);
 }
-function _POST() {
-  _POST = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, init) {
+function _POST$1() {
+  _POST$1 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, init) {
     var url;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -2679,7 +2712,7 @@ function _POST() {
       }
     }, _callee);
   }));
-  return _POST.apply(this, arguments);
+  return _POST$1.apply(this, arguments);
 }
 
 function isUUID(value) {
@@ -2690,19 +2723,19 @@ function isUUID(value) {
   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);
+var key$5 = 'TENANTS';
+function route$8(_x, _x2) {
+  return _route$8.apply(this, arguments);
 }
-function _route$7() {
-  _route$7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(request, config) {
+function _route$8() {
+  _route$8 = _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:
           _Logger = Logger(_extends({}, config, {
             debug: config.debug
-          }), "[ROUTES][" + key$4 + "]"), info = _Logger.info;
+          }), "[ROUTES][" + key$5 + "]"), info = _Logger.info;
           _context.next = 3;
           return auth(request, config);
         case 3:
@@ -2740,7 +2773,7 @@ function _route$7() {
           return _context.abrupt("return", _context.sent);
         case 18:
           _context.next = 20;
-          return POST(config, {
+          return POST$1(config, {
             request: request
           });
         case 20:
@@ -2769,10 +2802,10 @@ function _route$7() {
       }
     }, _callee);
   }));
-  return _route$7.apply(this, arguments);
+  return _route$8.apply(this, arguments);
 }
-function matches$7(configRoutes, request) {
-  return urlMatches(request.url, configRoutes[key$4]);
+function matches$8(configRoutes, request) {
+  return urlMatches(request.url, configRoutes[key$5]);
 }
 
 var proxyRoutes = function proxyRoutes(config) {
@@ -2787,17 +2820,17 @@ var proxyRoutes = function proxyRoutes(config) {
   };
 };
 
-var key$3 = 'SIGNIN';
-function route$6(_x, _x2) {
-  return _route$6.apply(this, arguments);
+var key$4 = 'SIGNIN';
+function route$7(_x, _x2) {
+  return _route$7.apply(this, arguments);
 }
-function _route$6() {
-  _route$6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, config) {
+function _route$7() {
+  _route$7 = _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) {
         case 0:
-          url = proxyRoutes(config)[key$3];
+          url = proxyRoutes(config)[key$4];
           init = {
             method: req.method,
             headers: req.headers
@@ -2807,7 +2840,7 @@ function _route$6() {
               init.body = req.clone().body;
             }
             _URL$pathname$split$r = new URL(req.url).pathname.split('/').reverse(), provider = _URL$pathname$split$r[0];
-            url = proxyRoutes(config)[key$3] + "/" + provider;
+            url = proxyRoutes(config)[key$4] + "/" + provider;
           }
           passThroughUrl = new URL(req.url);
           params = new URLSearchParams(passThroughUrl.search);
@@ -2825,17 +2858,17 @@ function _route$6() {
       }
     }, _callee);
   }));
-  return _route$6.apply(this, arguments);
+  return _route$7.apply(this, arguments);
 }
-function matches$6(configRoutes, request) {
-  return urlMatches(request.url, configRoutes[key$3]);
+function matches$7(configRoutes, request) {
+  return urlMatches(request.url, configRoutes[key$4]);
 }
 
-function route$5(_x, _x2) {
-  return _route$5.apply(this, arguments);
+function route$6(_x, _x2) {
+  return _route$6.apply(this, arguments);
 }
-function _route$5() {
-  _route$5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, config) {
+function _route$6() {
+  _route$6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, config) {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -2849,17 +2882,17 @@ function _route$5() {
       }
     }, _callee);
   }));
-  return _route$5.apply(this, arguments);
+  return _route$6.apply(this, arguments);
 }
-function matches$5(configRoutes, request) {
+function matches$6(configRoutes, request) {
   return urlMatches(request.url, configRoutes.SESSION);
 }
 
-function route$4(_x, _x2) {
-  return _route$4.apply(this, arguments);
+function route$5(_x, _x2) {
+  return _route$5.apply(this, arguments);
 }
-function _route$4() {
-  _route$4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, config) {
+function _route$5() {
+  _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:
@@ -2873,17 +2906,17 @@ function _route$4() {
       }
     }, _callee);
   }));
-  return _route$4.apply(this, arguments);
+  return _route$5.apply(this, arguments);
 }
-function matches$4(configRoutes, request) {
+function matches$5(configRoutes, request) {
   return urlMatches(request.url, configRoutes.PROVIDERS);
 }
 
-function route$3(_x, _x2) {
-  return _route$3.apply(this, arguments);
+function route$4(_x, _x2) {
+  return _route$4.apply(this, arguments);
 }
-function _route$3() {
-  _route$3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, config) {
+function _route$4() {
+  _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:
@@ -2897,25 +2930,25 @@ function _route$3() {
       }
     }, _callee);
   }));
-  return _route$3.apply(this, arguments);
+  return _route$4.apply(this, arguments);
 }
-function matches$3(configRoutes, request) {
+function matches$4(configRoutes, request) {
   return urlMatches(request.url, configRoutes.CSRF);
 }
 
-var key$2 = 'CALLBACK';
-function route$2(_x, _x2) {
-  return _route$2.apply(this, arguments);
+var key$3 = 'CALLBACK';
+function route$3(_x, _x2) {
+  return _route$3.apply(this, arguments);
 }
-function _route$2() {
-  _route$2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(request$1, config) {
+function _route$3() {
+  _route$3 = _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) {
         case 0:
           _Logger = Logger(_extends({}, config, {
             debug: config.debug
-          }), "[ROUTES][" + key$2 + "]"), error = _Logger.error;
+          }), "[ROUTES][" + key$3 + "]"), 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);
@@ -2949,30 +2982,30 @@ function _route$2() {
       }
     }, _callee);
   }));
-  return _route$2.apply(this, arguments);
+  return _route$3.apply(this, arguments);
 }
-function matches$2(configRoutes, request) {
+function matches$3(configRoutes, request) {
   return urlMatches(request.url, configRoutes.CALLBACK);
 }
 
-var key$1 = 'SIGNOUT';
-function route$1(_x, _x2) {
-  return _route$1.apply(this, arguments);
+var key$2 = 'SIGNOUT';
+function route$2(_x, _x2) {
+  return _route$2.apply(this, arguments);
 }
-function _route$1() {
-  _route$1 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(request$1, config) {
+function _route$2() {
+  _route$2 = _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) {
         case 0:
-          url = proxyRoutes(config)[key$1];
+          url = proxyRoutes(config)[key$2];
           init = {
             method: request$1.method
           };
           if (request$1.method === 'POST') {
             init.body = request$1.body;
             _URL$pathname$split$r = new URL(request$1.url).pathname.split('/').reverse(), provider = _URL$pathname$split$r[0];
-            url = proxyRoutes(config)[key$1] + "/" + provider;
+            url = proxyRoutes(config)[key$2] + "/" + provider;
           }
           _context.next = 5;
           return request(url, _extends({}, init, {
@@ -2987,22 +3020,22 @@ function _route$1() {
       }
     }, _callee);
   }));
-  return _route$1.apply(this, arguments);
+  return _route$2.apply(this, arguments);
 }
-function matches$1(configRoutes, request) {
-  return urlMatches(request.url, configRoutes[key$1]);
+function matches$2(configRoutes, request) {
+  return urlMatches(request.url, configRoutes[key$2]);
 }
 
-var key = 'ERROR';
-function route(_x, _x2) {
-  return _route.apply(this, arguments);
+var key$1 = 'ERROR';
+function route$1(_x, _x2) {
+  return _route$1.apply(this, arguments);
 }
-function _route() {
-  _route = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, config) {
+function _route$1() {
+  _route$1 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, config) {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          return _context.abrupt("return", request(proxyRoutes(config)[key], {
+          return _context.abrupt("return", request(proxyRoutes(config)[key$1], {
             method: req.method,
             request: req
           }, config));
@@ -3012,10 +3045,10 @@ function _route() {
       }
     }, _callee);
   }));
-  return _route.apply(this, arguments);
+  return _route$1.apply(this, arguments);
 }
-function matches(configRoutes, request) {
-  return urlMatches(request.url, configRoutes[key]);
+function matches$1(configRoutes, request) {
+  return urlMatches(request.url, configRoutes[key$1]);
 }
 
 function GETTER(configRoutes, config) {
@@ -3027,82 +3060,82 @@ function GETTER(configRoutes, config) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            if (!matches$a(configRoutes, req)) {
+            if (!matches$b(configRoutes, req)) {
               _context.next = 3;
               break;
             }
             info('matches me');
-            return _context.abrupt("return", route$a(req, config));
+            return _context.abrupt("return", route$b(req, config));
           case 3:
-            if (!matches$8(configRoutes, req)) {
+            if (!matches$9(configRoutes, req)) {
               _context.next = 6;
               break;
             }
             info('matches tenant users');
-            return _context.abrupt("return", route$8(req, config));
+            return _context.abrupt("return", route$9(req, config));
           case 6:
-            if (!matches$9(configRoutes, req)) {
+            if (!matches$a(configRoutes, req)) {
               _context.next = 9;
               break;
             }
             info('matches users');
-            return _context.abrupt("return", route$9(req, config));
+            return _context.abrupt("return", route$a(req, config));
           case 9:
-            if (!matches$7(configRoutes, req)) {
+            if (!matches$8(configRoutes, req)) {
               _context.next = 12;
               break;
             }
             info('matches tenants');
-            return _context.abrupt("return", route$7(req, config));
+            return _context.abrupt("return", route$8(req, config));
           case 12:
-            if (!matches$5(configRoutes, req)) {
+            if (!matches$6(configRoutes, req)) {
               _context.next = 15;
               break;
             }
             info('matches session');
-            return _context.abrupt("return", route$5(req, config));
+            return _context.abrupt("return", route$6(req, config));
           case 15:
-            if (!matches$6(configRoutes, req)) {
+            if (!matches$7(configRoutes, req)) {
               _context.next = 18;
               break;
             }
             info('matches signin');
-            return _context.abrupt("return", route$6(req, config));
+            return _context.abrupt("return", route$7(req, config));
           case 18:
-            if (!matches$4(configRoutes, req)) {
+            if (!matches$5(configRoutes, req)) {
               _context.next = 21;
               break;
             }
             info('matches providers');
-            return _context.abrupt("return", route$4(req, config));
+            return _context.abrupt("return", route$5(req, config));
           case 21:
-            if (!matches$3(configRoutes, req)) {
+            if (!matches$4(configRoutes, req)) {
               _context.next = 24;
               break;
             }
             info('matches csrf');
-            return _context.abrupt("return", route$3(req, config));
+            return _context.abrupt("return", route$4(req, config));
           case 24:
-            if (!matches$2(configRoutes, req)) {
+            if (!matches$3(configRoutes, req)) {
               _context.next = 27;
               break;
             }
             info('matches callback');
-            return _context.abrupt("return", route$2(req, config));
+            return _context.abrupt("return", route$3(req, config));
           case 27:
-            if (!matches$1(configRoutes, req)) {
+            if (!matches$2(configRoutes, req)) {
               _context.next = 30;
               break;
             }
             info('matches signout');
-            return _context.abrupt("return", route$1(req, config));
+            return _context.abrupt("return", route$2(req, config));
           case 30:
-            if (!matches(configRoutes, req)) {
+            if (!matches$1(configRoutes, req)) {
               _context.next = 33;
               break;
             }
             info('matches error');
-            return _context.abrupt("return", route(req, config));
+            return _context.abrupt("return", route$1(req, config));
           case 33:
             warn('No GET routes matched');
             return _context.abrupt("return", new Response(null, {
@@ -3121,83 +3154,212 @@ function GETTER(configRoutes, config) {
   }();
 }
 
-function POSTER(configRoutes, config) {
-  var _Logger = Logger(config, '[POST MATCHER]'),
-    info = _Logger.info,
-    warn = _Logger.warn;
-  return /*#__PURE__*/function () {
-    var _POST = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(req) {
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            if (!matches$8(configRoutes, req)) {
-              _context.next = 3;
-              break;
-            }
-            info('matches tenant users');
-            return _context.abrupt("return", route$8(req, config));
-          case 3:
-            if (!matches$9(configRoutes, req)) {
-              _context.next = 6;
-              break;
-            }
-            info('matches users');
-            return _context.abrupt("return", route$9(req, config));
-          case 6:
-            if (!matches$7(configRoutes, req)) {
-              _context.next = 9;
-              break;
-            }
-            info('matches tenants');
-            return _context.abrupt("return", route$7(req, config));
-          case 9:
-            if (!matches$5(configRoutes, req)) {
-              _context.next = 12;
-              break;
-            }
-            info('matches session');
-            return _context.abrupt("return", route$5(req, config));
-          case 12:
-            if (!matches$6(configRoutes, req)) {
-              _context.next = 15;
-              break;
-            }
-            info('matches signin');
-            return _context.abrupt("return", route$6(req, config));
-          case 15:
-            if (!matches$4(configRoutes, req)) {
-              _context.next = 18;
-              break;
-            }
-            info('matches providers');
-            return _context.abrupt("return", route$4(req, config));
-          case 18:
-            if (!matches$3(configRoutes, req)) {
-              _context.next = 21;
-              break;
+/**
+ * @swagger
+ * /api/signup:
+ *   post:
+ *     tags:
+ *       - users
+ *     summary: signs a user up
+ *     description: signs a user up and logs them in. Expects a email and password combo
+ *     operationId: signUp
+ *     parameters:
+ *       - name: tenantId
+ *         description: A tenant id to add the user to when they are created
+ *         in: query
+ *         schema:
+ *           type: string
+ *       - name: newTenantName
+ *         description: A tenant name to create, then the user to when they are created
+ *         in: query
+ *         schema:
+ *           type: string
+ *     requestBody:
+ *       description: |-
+ *         The email and password combination the user will use to authenticate.
+ *         The `name` is optional; if provided it will be recorded in the `users` table.
+ *         The `newTenant` is optional; if provided, it is used as the name of a new tenant record associated with the newly created user.
+ *       content:
+ *         application/json:
+ *           schema:
+ *             $ref: '#/components/schemas/CreateBasicUserRequest'
+ *           examples:
+ *             Create User Request:
+ *               summary: Creates a user with basic credentials
+ *               description: Create User Request
+ *               value:
+ *                 email: a.user@somedomain.com
+ *                 password: somepassword
+ *                 name: A. User
+ *             Create User Request with Tenant:
+ *               summary: Creates a user and a new tenant for that user
+ *               description: Create User Request with Tenant
+ *               value:
+ *                 email: a.user@somedomain.com
+ *                 password: somepassword
+ *                 name: A. User
+ *                 newTenant: My Sandbox
+ *     responses:
+ *       "201":
+ *         description: User and session created
+ *         content:
+ *           application/json:
+ *             schema:
+ *               $ref: "#/components/schemas/User"
+ *       "400":
+ *         description: API/Database failures
+ *         content:
+ *           text/plain:
+ *             schema:
+ *               type: string
+ *       "401":
+ *         description: Unauthorized
+ *         content: {}
+ */
+function POST(_x, _x2) {
+  return _POST.apply(this, arguments);
+}
+function _POST() {
+  _POST = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, init) {
+    var url;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          init.body = init.request.body;
+          init.method = 'POST';
+          url = "" + apiRoutes(config).SIGNUP;
+          _context.next = 5;
+          return request(url, init, config);
+        case 5:
+          return _context.abrupt("return", _context.sent);
+        case 6:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _POST.apply(this, arguments);
+}
+
+var key = 'SIGNUP';
+function route(_x, _x2) {
+  return _route.apply(this, arguments);
+}
+function _route() {
+  _route = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(request, config) {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.t0 = request.method;
+          _context.next = _context.t0 === 'POST' ? 3 : 6;
+          break;
+        case 3:
+          _context.next = 5;
+          return POST(config, {
+            request: request
+          });
+        case 5:
+          return _context.abrupt("return", _context.sent);
+        case 6:
+          return _context.abrupt("return", new Response('method not allowed', {
+            status: 405
+          }));
+        case 7:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _route.apply(this, arguments);
+}
+function matches(configRoutes, request) {
+  return urlMatches(request.url, configRoutes[key]);
+}
+
+function POSTER(configRoutes, config) {
+  var _Logger = Logger(config, '[POST MATCHER]'),
+    info = _Logger.info,
+    warn = _Logger.warn;
+  return /*#__PURE__*/function () {
+    var _POST = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(req) {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!matches$9(configRoutes, req)) {
+              _context.next = 3;
+              break;
             }
-            info('matches csrf');
-            return _context.abrupt("return", route$3(req, config));
+            info('matches tenant users');
+            return _context.abrupt("return", route$9(req, config));
+          case 3:
+            if (!matches(configRoutes, req)) {
+              _context.next = 6;
+              break;
+            }
+            info('matches signup');
+            return _context.abrupt("return", route(req, config));
+          case 6:
+            if (!matches$a(configRoutes, req)) {
+              _context.next = 9;
+              break;
+            }
+            info('matches users');
+            return _context.abrupt("return", route$a(req, config));
+          case 9:
+            if (!matches$8(configRoutes, req)) {
+              _context.next = 12;
+              break;
+            }
+            info('matches tenants');
+            return _context.abrupt("return", route$8(req, config));
+          case 12:
+            if (!matches$6(configRoutes, req)) {
+              _context.next = 15;
+              break;
+            }
+            info('matches session');
+            return _context.abrupt("return", route$6(req, config));
+          case 15:
+            if (!matches$7(configRoutes, req)) {
+              _context.next = 18;
+              break;
+            }
+            info('matches signin');
+            return _context.abrupt("return", route$7(req, config));
+          case 18:
+            if (!matches$5(configRoutes, req)) {
+              _context.next = 21;
+              break;
+            }
+            info('matches providers');
+            return _context.abrupt("return", route$5(req, config));
           case 21:
-            if (!matches$2(configRoutes, req)) {
+            if (!matches$4(configRoutes, req)) {
               _context.next = 24;
               break;
             }
-            info('matches callback');
-            return _context.abrupt("return", route$2(req, config));
+            info('matches csrf');
+            return _context.abrupt("return", route$4(req, config));
           case 24:
-            if (!matches$1(configRoutes, req)) {
+            if (!matches$3(configRoutes, req)) {
               _context.next = 27;
               break;
             }
-            info('matches signout');
-            return _context.abrupt("return", route$1(req, config));
+            info('matches callback');
+            return _context.abrupt("return", route$3(req, config));
           case 27:
+            if (!matches$2(configRoutes, req)) {
+              _context.next = 30;
+              break;
+            }
+            info('matches signout');
+            return _context.abrupt("return", route$2(req, config));
+          case 30:
             warn('No POST routes matched');
             return _context.abrupt("return", new Response(null, {
               status: 404
             }));
-          case 29:
+          case 32:
           case "end":
             return _context.stop();
         }
@@ -3219,19 +3381,19 @@ function DELETER(configRoutes, config) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            if (!matches$8(configRoutes, req)) {
+            if (!matches$9(configRoutes, req)) {
               _context.next = 3;
               break;
             }
             info('matches tenant users');
-            return _context.abrupt("return", route$8(req, config));
+            return _context.abrupt("return", route$9(req, config));
           case 3:
-            if (!matches$7(configRoutes, req)) {
+            if (!matches$8(configRoutes, req)) {
               _context.next = 6;
               break;
             }
             info('matches tenants');
-            return _context.abrupt("return", route$7(req, config));
+            return _context.abrupt("return", route$8(req, config));
           case 6:
             warn('No DELETE routes matched');
             return _context.abrupt("return", new Response(null, {
@@ -3259,26 +3421,26 @@ function PUTER(configRoutes, config) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            if (!matches$8(configRoutes, req)) {
+            if (!matches$9(configRoutes, req)) {
               _context.next = 3;
               break;
             }
             info('matches tenant users');
-            return _context.abrupt("return", route$8(req, config));
+            return _context.abrupt("return", route$9(req, config));
           case 3:
-            if (!matches$9(configRoutes, req)) {
+            if (!matches$a(configRoutes, req)) {
               _context.next = 6;
               break;
             }
             info('matches users');
-            return _context.abrupt("return", route$9(req, config));
+            return _context.abrupt("return", route$a(req, config));
           case 6:
-            if (!matches$7(configRoutes, req)) {
+            if (!matches$8(configRoutes, req)) {
               _context.next = 9;
               break;
             }
             info('matches tenants');
-            return _context.abrupt("return", route$7(req, config));
+            return _context.abrupt("return", route$8(req, config));
           case 9:
             warn('No PUT routes matched');
             return _context.abrupt("return", new Response(null, {
@@ -3459,7 +3621,7 @@ var Requester = /*#__PURE__*/function (_Config) {
   }();
   _proto.post = /*#__PURE__*/function () {
     var _post = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(req, url, init) {
-      var response;
+      var response, cloned;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -3468,17 +3630,25 @@ var Requester = /*#__PURE__*/function (_Config) {
           case 2:
             response = _context3.sent;
             if (!(response && response.status >= 200 && response.status < 300)) {
-              _context3.next = 5;
+              _context3.next = 13;
               break;
             }
-            return _context3.abrupt("return", response.json());
-          case 5:
+            cloned = response.clone();
+            _context3.prev = 5;
+            _context3.next = 8;
+            return cloned.json();
+          case 8:
+            return _context3.abrupt("return", _context3.sent);
+          case 11:
+            _context3.prev = 11;
+            _context3.t0 = _context3["catch"](5);
+          case 13:
             return _context3.abrupt("return", response);
-          case 6:
+          case 14:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, this);
+      }, _callee3, this, [[5, 11]]);
     }));
     function post(_x9, _x10, _x11) {
       return _post.apply(this, arguments);
@@ -3487,7 +3657,7 @@ var Requester = /*#__PURE__*/function (_Config) {
   }();
   _proto.get = /*#__PURE__*/function () {
     var _get = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(req, url, init) {
-      var response;
+      var response, cloned;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -3496,17 +3666,25 @@ var Requester = /*#__PURE__*/function (_Config) {
           case 2:
             response = _context4.sent;
             if (!(response && response.status >= 200 && response.status < 300)) {
-              _context4.next = 5;
+              _context4.next = 13;
               break;
             }
-            return _context4.abrupt("return", response.json());
-          case 5:
+            cloned = response.clone();
+            _context4.prev = 5;
+            _context4.next = 8;
+            return cloned.json();
+          case 8:
+            return _context4.abrupt("return", _context4.sent);
+          case 11:
+            _context4.prev = 11;
+            _context4.t0 = _context4["catch"](5);
+          case 13:
             return _context4.abrupt("return", response);
-          case 6:
+          case 14:
           case "end":
             return _context4.stop();
         }
-      }, _callee4, this);
+      }, _callee4, this, [[5, 11]]);
     }));
     function get(_x12, _x13, _x14) {
       return _get.apply(this, arguments);
@@ -3515,7 +3693,7 @@ var Requester = /*#__PURE__*/function (_Config) {
   }();
   _proto.put = /*#__PURE__*/function () {
     var _put = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(req, url, init) {
-      var response;
+      var response, cloned;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
@@ -3524,17 +3702,25 @@ var Requester = /*#__PURE__*/function (_Config) {
           case 2:
             response = _context5.sent;
             if (!(response && response.status >= 200 && response.status < 300)) {
-              _context5.next = 5;
+              _context5.next = 13;
               break;
             }
-            return _context5.abrupt("return", response.json());
-          case 5:
+            cloned = response.clone();
+            _context5.prev = 5;
+            _context5.next = 8;
+            return cloned.json();
+          case 8:
+            return _context5.abrupt("return", _context5.sent);
+          case 11:
+            _context5.prev = 11;
+            _context5.t0 = _context5["catch"](5);
+          case 13:
             return _context5.abrupt("return", response);
-          case 6:
+          case 14:
           case "end":
             return _context5.stop();
         }
-      }, _callee5, this);
+      }, _callee5, this, [[5, 11]]);
     }));
     function put(_x15, _x16, _x17) {
       return _put.apply(this, arguments);
@@ -3551,14 +3737,8 @@ var Requester = /*#__PURE__*/function (_Config) {
             return this.request('DELETE', url, req, init);
           case 2:
             response = _context6.sent;
-            if (!(response && response.status >= 200 && response.status < 300)) {
-              _context6.next = 5;
-              break;
-            }
-            return _context6.abrupt("return", response.json());
-          case 5:
             return _context6.abrupt("return", response);
-          case 6:
+          case 4:
           case "end":
             return _context6.stop();
         }
@@ -3874,6 +4054,55 @@ var Tenants = /*#__PURE__*/function (_Config) {
         return _ref3.apply(this, arguments);
       };
     }();
+    _this.deleteTenant = /*#__PURE__*/function () {
+      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) {
+            case 0:
+              if (typeof req === 'string') {
+                _this.tenantId = req;
+              }
+              _requester = new Requester(_this);
+              _init = _this.handleHeaders(init);
+              return _context4.abrupt("return", _requester["delete"](req, _this.tenantUrl, _init));
+            case 4:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4);
+      }));
+      return function (_x7, _x8) {
+        return _ref4.apply(this, arguments);
+      };
+    }();
+    _this.updateTenant = /*#__PURE__*/function () {
+      var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(req, init) {
+        var _req, _requester, _init;
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
+            case 0:
+              if (req && 'name' in req) {
+                _req = new Request("" + _this.api.basePath + _this.tenantUrl, {
+                  body: JSON.stringify(req),
+                  method: 'PUT'
+                });
+              } else {
+                _req = req;
+              }
+              _requester = new Requester(_this);
+              _init = _this.handleHeaders(init);
+              return _context5.abrupt("return", _requester.put(_req, _this.tenantUrl, _init));
+            case 4:
+            case "end":
+              return _context5.stop();
+          }
+        }, _callee5);
+      }));
+      return function (_x9, _x10) {
+        return _ref5.apply(this, arguments);
+      };
+    }();
     _this.headers = headers;
     return _this;
   }
@@ -3941,8 +4170,8 @@ var Users = /*#__PURE__*/function (_Config) {
         return _ref.apply(this, arguments);
       };
     }();
-    _this.updateUser = /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(userId, req, init) {
+    _this.createTenantUser = /*#__PURE__*/function () {
+      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) {
@@ -3950,7 +4179,7 @@ var Users = /*#__PURE__*/function (_Config) {
               _requester = new Requester(_this);
               _init = _this.handleHeaders(init);
               _context2.next = 4;
-              return _requester.put(req, _this.usersUrl + "/" + userId, _init);
+              return _requester.post(req, _this.tenantUsersUrl, _init);
             case 4:
               return _context2.abrupt("return", _context2.sent);
             case 5:
@@ -3959,33 +4188,42 @@ var Users = /*#__PURE__*/function (_Config) {
           }
         }, _callee2);
       }));
-      return function (_x3, _x4, _x5) {
+      return function (_x3, _x4) {
         return _ref2.apply(this, arguments);
       };
     }();
-    _this.listUsers = /*#__PURE__*/function () {
+    _this.updateUser = /*#__PURE__*/function () {
       var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(req, init) {
-        var _requester, _init;
+        var _req, _requester, _init;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
+              if (req && 'id' in req) {
+                _req = new Request("" + _this.api.basePath + _this.tenantUserUrl, {
+                  body: JSON.stringify(req),
+                  method: 'PUT'
+                });
+                _this.userId = String(req.id);
+              } else {
+                _req = req;
+              }
               _requester = new Requester(_this);
               _init = _this.handleHeaders(init);
-              _context3.next = 4;
-              return _requester.get(req, _this.tenantUsersUrl, _init);
-            case 4:
-              return _context3.abrupt("return", _context3.sent);
+              _context3.next = 5;
+              return _requester.put(_req, _this.tenantUserUrl, _init);
             case 5:
+              return _context3.abrupt("return", _context3.sent);
+            case 6:
             case "end":
               return _context3.stop();
           }
         }, _callee3);
       }));
-      return function (_x6, _x7) {
+      return function (_x5, _x6) {
         return _ref3.apply(this, arguments);
       };
     }();
-    _this.linkUser = /*#__PURE__*/function () {
+    _this.listUsers = /*#__PURE__*/function () {
       var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(req, init) {
         var _requester, _init;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
@@ -3994,7 +4232,7 @@ var Users = /*#__PURE__*/function (_Config) {
               _requester = new Requester(_this);
               _init = _this.handleHeaders(init);
               _context4.next = 4;
-              return _requester.put(req, _this.tenantUsersUrl, _init);
+              return _requester.get(req, _this.tenantUsersUrl, _init);
             case 4:
               return _context4.abrupt("return", _context4.sent);
             case 5:
@@ -4003,68 +4241,65 @@ var Users = /*#__PURE__*/function (_Config) {
           }
         }, _callee4);
       }));
-      return function (_x8, _x9) {
+      return function (_x7, _x8) {
         return _ref4.apply(this, arguments);
       };
     }();
-    _this.tenantUsersDeleteUrl = function (userId) {
-      var _this$tenantId;
-      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 body;
+    _this.linkUser = /*#__PURE__*/function () {
+      var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(req, init) {
+        var _requester, _init;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              if (!(req instanceof Request)) {
-                _context5.next = 6;
-                break;
-              }
-              _context5.next = 3;
-              return new Response(req == null ? void 0 : req.body).json();
-            case 3:
-              body = _context5.sent;
-              if (!body) {
-                _context5.next = 6;
-                break;
+              _requester = new Requester(_this);
+              if (typeof req === 'string') {
+                _this.userId = req;
+              } else {
+                if ('id' in req) {
+                  _this.userId = req.id;
+                }
+                if ('tenantId' in req) {
+                  _this.tenantId = req.tenantId;
+                }
               }
-              return _context5.abrupt("return", body.id);
+              _init = _this.handleHeaders(init);
+              _context5.next = 5;
+              return _requester.put(req, _this.linkUsersUrl, _init);
+            case 5:
+              return _context5.abrupt("return", _context5.sent);
             case 6:
-              if (!('id' in req)) {
-                _context5.next = 8;
-                break;
-              }
-              return _context5.abrupt("return", req.id);
-            case 8:
-              return _context5.abrupt("return", null);
-            case 9:
             case "end":
               return _context5.stop();
           }
         }, _callee5);
       }));
-      return function (_x10) {
+      return function (_x9, _x10) {
         return _ref5.apply(this, arguments);
       };
     }();
     _this.unlinkUser = /*#__PURE__*/function () {
       var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(req, init) {
-        var _requester, userId, _init;
+        var _requester, _init;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
+              if (typeof req === 'string') {
+                _this.userId = req;
+              } else {
+                if ('id' in req) {
+                  _this.userId = req.id;
+                }
+                if ('tenantId' in req) {
+                  _this.tenantId = req.tenantId;
+                }
+              }
               _requester = new Requester(_this);
-              _context6.next = 3;
-              return _this.getUserId(req);
-            case 3:
-              userId = _context6.sent;
               _init = _this.handleHeaders(init);
-              _context6.next = 7;
-              return _requester["delete"](req, _this.tenantUsersDeleteUrl(userId), _init);
-            case 7:
+              _context6.next = 5;
+              return _requester["delete"](req, _this.linkUsersUrl, _init);
+            case 5:
               return _context6.abrupt("return", _context6.sent);
-            case 8:
+            case 6:
             case "end":
               return _context6.stop();
           }
@@ -4096,6 +4331,28 @@ var Users = /*#__PURE__*/function (_Config) {
         return _ref7.apply(this, arguments);
       };
     }();
+    _this.updateMe = /*#__PURE__*/function () {
+      var _ref8 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(req, init) {
+        var _requester, _init;
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
+            case 0:
+              _requester = new Requester(_this);
+              _init = _this.handleHeaders(init);
+              _context8.next = 4;
+              return _requester.put(req, _this.meUrl, _init);
+            case 4:
+              return _context8.abrupt("return", _context8.sent);
+            case 5:
+            case "end":
+              return _context8.stop();
+          }
+        }, _callee8);
+      }));
+      return function (_x15, _x16) {
+        return _ref8.apply(this, arguments);
+      };
+    }();
     _this.headers = headers;
     return _this;
   }
@@ -4124,8 +4381,20 @@ var Users = /*#__PURE__*/function (_Config) {
   }, {
     key: "tenantUsersUrl",
     get: function get() {
-      var _this$tenantId2;
-      return "/tenants/" + ((_this$tenantId2 = this.tenantId) != null ? _this$tenantId2 : '{tenantId}') + "/users";
+      var _this$tenantId;
+      return "/tenants/" + ((_this$tenantId = this.tenantId) != null ? _this$tenantId : '{tenantId}') + "/users";
+    }
+  }, {
+    key: "linkUsersUrl",
+    get: function get() {
+      var _this$tenantId2, _this$userId;
+      return "/tenants/" + ((_this$tenantId2 = this.tenantId) != null ? _this$tenantId2 : '{tenantId}') + "/users/" + ((_this$userId = this.userId) != null ? _this$userId : '{userId}') + "/link";
+    }
+  }, {
+    key: "tenantUserUrl",
+    get: function get() {
+      var _this$tenantId3, _this$userId2;
+      return "/tenants/" + ((_this$tenantId3 = this.tenantId) != null ? _this$tenantId3 : '{tenantId}') + "/users/" + ((_this$userId2 = this.userId) != null ? _this$userId2 : '{userId}');
     }
   }, {
     key: "meUrl",