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

package/dist/server.cjs.development.js

@@ -3113,6 +3113,8 @@ 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.
  */
@@ -3120,7 +3122,7 @@ 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;
@@ -3136,7 +3138,7 @@ function serverAuth(config, handlers) {
             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({
@@ -3167,7 +3169,7 @@ function serverAuth(config, handlers) {
             error(_context.t0);
           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({
@@ -3211,14 +3213,14 @@ function serverAuth(config, handlers) {
             }
             throw new Error('Unable to obtain credential provider. Aborting server side login.');
           case 48:
-            signInUrl = new URL(routes.SIGNIN);
+            signInUrl = new URL(credentials.callbackUrl);
             if (csrfCookie) {
               _context.next = 51;
               break;
             }
             throw new Error('Unable to authenticate REST');
           case 51:
-            info('Attempting sign in via proxy', signInUrl.href, 'with email', email);
+            info('Attempting sign in with email', email);
             postReq = new Request(signInUrl, {
               method: 'POST',
               headers: new Headers({
@@ -3244,11 +3246,17 @@ function serverAuth(config, handlers) {
             throw new Error('authentication failed');
           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 62:
+          case 64:
           case "end":
             return _context.stop();
         }