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

package/dist/auth/index.d.ts

@@ -2,7 +2,12 @@ import { Config } from '../utils/Config';
 /**
  * a helper function to log in server side.
  */
-export default function login(config: Config): ({ email, password, }: {
+export default function serverAuth(config: Config, handlers: {
+    GET: (req: Request) => Promise<void | Response>;
+    POST: (req: Request) => Promise<void | Response>;
+    DELETE: (req: Request) => Promise<void | Response>;
+    PUT: (req: Request) => Promise<void | Response>;
+}): ({ email, password, }: {
     email: string;
     password: string;
 }) => Promise<Headers>;

package/dist/server.cjs.development.js

@@ -1399,13 +1399,11 @@ function auth(_x, _x2) {
 }
 function _auth() {
   _auth = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, config) {
-    var _Logger, info, sessionUrl, res;
+    var _Logger, info, error, sessionUrl, res;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          _Logger = Logger(_extends({}, config, {
-            debug: config.debug
-          }), '[nileauth]'), info = _Logger.info;
+          _Logger = Logger(config, '[nileauth]'), info = _Logger.info, error = _Logger.error;
           info('checking auth');
           sessionUrl = config.api.basePath + "/auth/session";
           info('using session', sessionUrl);
@@ -1425,15 +1423,21 @@ function _auth() {
           return _context.abrupt("return", undefined);
         case 11:
           info('session active');
-          _context.next = 14;
+          _context.prev = 12;
+          _context.next = 15;
           return new Response(res.body).json();
-        case 14:
-          return _context.abrupt("return", _context.sent);
         case 15:
+          return _context.abrupt("return", _context.sent);
+        case 18:
+          _context.prev = 18;
+          _context.t0 = _context["catch"](12);
+          error(_context.t0);
+          return _context.abrupt("return", undefined);
+        case 22:
         case "end":
           return _context.stop();
       }
-    }, _callee);
+    }, _callee, null, [[12, 18]]);
   }));
   return _auth.apply(this, arguments);
 }
@@ -2797,81 +2801,96 @@ function matches(configRoutes, request) {
 }
 
 function GETTER(configRoutes, config) {
+  var _Logger = Logger(config, '[GET MATCHER]'),
+    info = _Logger.info,
+    warn = _Logger.warn;
   return /*#__PURE__*/function () {
     var _GET = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(req) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (!matches$a(configRoutes, req)) {
-              _context.next = 2;
+              _context.next = 3;
               break;
             }
+            info('matches me');
             return _context.abrupt("return", route$a(req, config));
-          case 2:
-            if (!matches$9(configRoutes, req)) {
-              _context.next = 4;
-              break;
-            }
-            return _context.abrupt("return", route$9(req, config));
-          case 4:
+          case 3:
             if (!matches$8(configRoutes, req)) {
               _context.next = 6;
               break;
             }
+            info('matches tenant users');
             return _context.abrupt("return", route$8(req, config));
           case 6:
+            if (!matches$9(configRoutes, req)) {
+              _context.next = 9;
+              break;
+            }
+            info('matches users');
+            return _context.abrupt("return", route$9(req, config));
+          case 9:
             if (!matches$7(configRoutes, req)) {
-              _context.next = 8;
+              _context.next = 12;
               break;
             }
+            info('matches tenants');
             return _context.abrupt("return", route$7(req, config));
-          case 8:
+          case 12:
             if (!matches$5(configRoutes, req)) {
-              _context.next = 10;
+              _context.next = 15;
               break;
             }
+            info('matches session');
             return _context.abrupt("return", route$5(req, config));
-          case 10:
+          case 15:
             if (!matches$6(configRoutes, req)) {
-              _context.next = 12;
+              _context.next = 18;
               break;
             }
+            info('matches signin');
             return _context.abrupt("return", route$6(req, config));
-          case 12:
+          case 18:
             if (!matches$4(configRoutes, req)) {
-              _context.next = 14;
+              _context.next = 21;
               break;
             }
+            info('matches providers');
             return _context.abrupt("return", route$4(req, config));
-          case 14:
+          case 21:
             if (!matches$3(configRoutes, req)) {
-              _context.next = 16;
+              _context.next = 24;
               break;
             }
+            info('matches csrf');
             return _context.abrupt("return", route$3(req, config));
-          case 16:
+          case 24:
             if (!matches$2(configRoutes, req)) {
-              _context.next = 18;
+              _context.next = 27;
               break;
             }
+            info('matches callback');
             return _context.abrupt("return", route$2(req, config));
-          case 18:
+          case 27:
             if (!matches$1(configRoutes, req)) {
-              _context.next = 20;
+              _context.next = 30;
               break;
             }
+            info('matches signout');
             return _context.abrupt("return", route$1(req, config));
-          case 20:
+          case 30:
             if (!matches(configRoutes, req)) {
-              _context.next = 22;
+              _context.next = 33;
               break;
             }
+            info('matches error');
             return _context.abrupt("return", route(req, config));
-          case 22:
+          case 33:
+            warn('No GET routes matched');
             return _context.abrupt("return", new Response(null, {
               status: 404
             }));
-          case 23:
+          case 35:
           case "end":
             return _context.stop();
         }
@@ -2885,69 +2904,82 @@ 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 = 2;
+              _context.next = 3;
               break;
             }
+            info('matches tenant users');
             return _context.abrupt("return", route$8(req, config));
-          case 2:
+          case 3:
             if (!matches$9(configRoutes, req)) {
-              _context.next = 4;
+              _context.next = 6;
               break;
             }
+            info('matches users');
             return _context.abrupt("return", route$9(req, config));
-          case 4:
+          case 6:
             if (!matches$7(configRoutes, req)) {
-              _context.next = 6;
+              _context.next = 9;
               break;
             }
+            info('matches tenants');
             return _context.abrupt("return", route$7(req, config));
-          case 6:
+          case 9:
             if (!matches$5(configRoutes, req)) {
-              _context.next = 8;
+              _context.next = 12;
               break;
             }
+            info('matches session');
             return _context.abrupt("return", route$5(req, config));
-          case 8:
+          case 12:
             if (!matches$6(configRoutes, req)) {
-              _context.next = 10;
+              _context.next = 15;
               break;
             }
+            info('matches signin');
             return _context.abrupt("return", route$6(req, config));
-          case 10:
+          case 15:
             if (!matches$4(configRoutes, req)) {
-              _context.next = 12;
+              _context.next = 18;
               break;
             }
+            info('matches providers');
             return _context.abrupt("return", route$4(req, config));
-          case 12:
+          case 18:
             if (!matches$3(configRoutes, req)) {
-              _context.next = 14;
+              _context.next = 21;
               break;
             }
+            info('matches csrf');
             return _context.abrupt("return", route$3(req, config));
-          case 14:
+          case 21:
             if (!matches$2(configRoutes, req)) {
-              _context.next = 16;
+              _context.next = 24;
               break;
             }
+            info('matches callback');
             return _context.abrupt("return", route$2(req, config));
-          case 16:
+          case 24:
             if (!matches$1(configRoutes, req)) {
-              _context.next = 18;
+              _context.next = 27;
               break;
             }
+            info('matches signout');
             return _context.abrupt("return", route$1(req, config));
-          case 18:
+          case 27:
+            warn('No POST routes matched');
             return _context.abrupt("return", new Response(null, {
               status: 404
             }));
-          case 19:
+          case 29:
           case "end":
             return _context.stop();
         }
@@ -2961,27 +2993,33 @@ function POSTER(configRoutes, config) {
 }
 
 function DELETER(configRoutes, config) {
+  var _Logger = Logger(config, '[DELETE MATCHER]'),
+    info = _Logger.info,
+    warn = _Logger.warn;
   return /*#__PURE__*/function () {
     var _DELETE = _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 = 2;
+              _context.next = 3;
               break;
             }
+            info('matches tenant users');
             return _context.abrupt("return", route$8(req, config));
-          case 2:
+          case 3:
             if (!matches$7(configRoutes, req)) {
-              _context.next = 4;
+              _context.next = 6;
               break;
             }
+            info('matches tenants');
             return _context.abrupt("return", route$7(req, config));
-          case 4:
+          case 6:
+            warn('No DELETE routes matched');
             return _context.abrupt("return", new Response(null, {
               status: 404
             }));
-          case 5:
+          case 8:
           case "end":
             return _context.stop();
         }
@@ -2995,33 +3033,40 @@ function DELETER(configRoutes, config) {
 }
 
 function PUTER(configRoutes, config) {
+  var _Logger = Logger(config, '[PUT MATCHER]'),
+    info = _Logger.info,
+    warn = _Logger.warn;
   return /*#__PURE__*/function () {
     var _PUT = _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 = 2;
+              _context.next = 3;
               break;
             }
+            info('matches tenant users');
             return _context.abrupt("return", route$8(req, config));
-          case 2:
+          case 3:
             if (!matches$9(configRoutes, req)) {
-              _context.next = 4;
+              _context.next = 6;
               break;
             }
+            info('matches users');
             return _context.abrupt("return", route$9(req, config));
-          case 4:
+          case 6:
             if (!matches$7(configRoutes, req)) {
-              _context.next = 6;
+              _context.next = 9;
               break;
             }
+            info('matches tenants');
             return _context.abrupt("return", route$7(req, config));
-          case 6:
+          case 9:
+            warn('No PUT routes matched');
             return _context.abrupt("return", new Response(null, {
               status: 404
             }));
-          case 7:
+          case 11:
           case "end":
             return _context.stop();
         }
@@ -3068,14 +3113,16 @@ var appRoutes = function appRoutes(prefix) {
   };
 };
 
+// url host does not matter, we only match on the 1st leg by path
+var ORIGIN = 'http://localhost';
 /**
  * a helper function to log in server side.
  */
-function login(config) {
+function serverAuth(config, handlers) {
   var _Logger = Logger(config, '[server side login]'),
     info = _Logger.info,
     error = _Logger.error;
-  var routes = proxyRoutes(config);
+  var routes = appRoutes(config.routePrefix);
   return /*#__PURE__*/function () {
     var _login = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
       var _providers, _exec;
@@ -3091,7 +3138,7 @@ function login(config) {
             throw new Error('Server side login requires a user email and password.');
           case 3:
             info('Obtaining providers for', email);
-            sessionUrl = new URL(routes.PROVIDERS);
+            sessionUrl = new URL("" + ORIGIN + routes.PROVIDERS);
             sessionReq = new Request(sessionUrl, {
               method: 'GET',
               headers: new Headers({
@@ -3099,75 +3146,81 @@ function login(config) {
               })
             });
             _context.next = 8;
-            return fetch(sessionReq);
+            return handlers.POST(sessionReq);
           case 8:
             sessionRes = _context.sent;
-            _context.prev = 9;
-            _context.next = 12;
+            if (!((sessionRes == null ? void 0 : sessionRes.status) === 404)) {
+              _context.next = 11;
+              break;
+            }
+            throw new Error('Unable to login, cannot find region api.');
+          case 11:
+            _context.prev = 11;
+            _context.next = 14;
             return sessionRes == null ? void 0 : sessionRes.json();
-          case 12:
+          case 14:
             providers = _context.sent;
-            _context.next = 19;
+            _context.next = 21;
             break;
-          case 15:
-            _context.prev = 15;
-            _context.t0 = _context["catch"](9);
+          case 17:
+            _context.prev = 17;
+            _context.t0 = _context["catch"](11);
             info(sessionUrl, sessionRes);
             error(_context.t0);
-          case 19:
+          case 21:
             info('Obtaining csrf');
-            csrf = new URL(routes.CSRF);
+            csrf = new URL("" + ORIGIN + routes.CSRF);
             csrfReq = new Request(csrf, {
               method: 'GET',
               headers: new Headers({
                 host: sessionUrl.host
               })
             });
-            _context.next = 24;
-            return fetch(csrfReq);
-          case 24:
+            _context.next = 26;
+            return handlers.POST(csrfReq);
+          case 26:
             csrfRes = _context.sent;
-            _context.prev = 25;
-            _context.next = 28;
+            _context.prev = 27;
+            _context.next = 30;
             return csrfRes == null ? void 0 : csrfRes.json();
-          case 28:
+          case 30:
             _context.t1 = _yield$csrfRes$json = _context.sent;
             if (!(_context.t1 != null)) {
-              _context.next = 33;
+              _context.next = 35;
               break;
             }
             _context.t2 = _yield$csrfRes$json;
-            _context.next = 34;
+            _context.next = 36;
             break;
-          case 33:
+          case 35:
             _context.t2 = {};
-          case 34:
+          case 36:
             json = _context.t2;
             csrfToken = json == null ? void 0 : json.csrfToken;
-            _context.next = 42;
+            _context.next = 44;
             break;
-          case 38:
-            _context.prev = 38;
-            _context.t3 = _context["catch"](25);
+          case 40:
+            _context.prev = 40;
+            _context.t3 = _context["catch"](27);
             info(sessionUrl, csrfRes);
             error(_context.t3, csrfRes);
-          case 42:
+          case 44:
             _ref2 = (_providers = providers) != null ? _providers : {}, credentials = _ref2.credentials;
             csrfCookie = csrfRes == null ? void 0 : csrfRes.headers.get('set-cookie');
             if (credentials) {
-              _context.next = 46;
+              _context.next = 48;
               break;
             }
             throw new Error('Unable to obtain credential provider. Aborting server side login.');
-          case 46:
-            signInUrl = new URL(routes.SIGNIN);
+          case 48:
+            signInUrl = new URL(credentials.callbackUrl);
             if (csrfCookie) {
-              _context.next = 49;
+              _context.next = 51;
               break;
             }
             throw new Error('Unable to authenticate REST');
-          case 49:
-            info('Attempting sign in via proxy', signInUrl.href, 'with email', email);
+          case 51:
+            info('Attempting sign in with email', email);
             postReq = new Request(signInUrl, {
               method: 'POST',
               headers: new Headers({
@@ -3181,27 +3234,33 @@ function login(config) {
                 callbackUrl: credentials.callbackUrl
               })
             });
-            _context.next = 53;
-            return fetch(postReq);
-          case 53:
+            _context.next = 55;
+            return handlers.POST(postReq);
+          case 55:
             loginRes = _context.sent;
             authCookie = loginRes == null ? void 0 : loginRes.headers.get('set-cookie');
             if (authCookie) {
-              _context.next = 57;
+              _context.next = 59;
               break;
             }
             throw new Error('authentication failed');
-          case 57:
+          case 59:
             _ref3 = (_exec = /(nile\.session-token=.+?);/.exec(authCookie)) != null ? _exec : [], token = _ref3[1];
+            if (token) {
+              _context.next = 62;
+              break;
+            }
+            throw new Error('Server login failed');
+          case 62:
             info('Server login successful', authCookie, csrfCookie);
             return _context.abrupt("return", new Headers({
               cookie: [token, csrfCookie].join('; ')
             }));
-          case 60:
+          case 64:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[9, 15], [25, 38]]);
+      }, _callee, null, [[11, 17], [27, 40]]);
     }));
     function login(_x) {
       return _login.apply(this, arguments);
@@ -3807,7 +3866,7 @@ var Api = /*#__PURE__*/function () {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _context.next = 2;
-            return login(this.config)(payload);
+            return serverAuth(this.config, this.handlers)(payload);
           case 2:
             this.headers = _context.sent;
           case 3:
@@ -3816,10 +3875,10 @@ var Api = /*#__PURE__*/function () {
         }
       }, _callee, this);
     }));
-    function login$1(_x) {
+    function login(_x) {
       return _login.apply(this, arguments);
     }
-    return login$1;
+    return login;
   }();
   return _createClass(Api, [{
     key: "headers",