@niledatabase/server 3.0.0-alpha.8 → 3.0.0-alpha.9

package/dist/server.cjs.development.js

@@ -613,7 +613,11 @@ var getControlPlane = function getControlPlane(cfg) {
     logger && info(logger, 'NILEDB_CONFIGURE', process.env.NILEDB_CONFIGURE);
     return process.env.NILEDB_CONFIGURE;
   }
-  logger && info(logger, 'default', process.env.NILEDB_CONFIGURE);
+  if (config != null && config.configureUrl) {
+    logger && info(logger, 'NILEDB_CONFIGURE', config.configureUrl);
+    return config.configureUrl;
+  }
+  logger && info(logger, 'default', 'https://global.thenile.dev');
   return 'https://global.thenile.dev';
 };
 function getDbHost(cfg) {
@@ -3081,6 +3085,8 @@ var appRoutes = function appRoutes(prefix) {
  * a helper function to log in server side.
  */
 function serverAuth(config, handlers) {
+  var _Logger = Logger(config, '[serverAuth]'),
+    info = _Logger.info;
   return /*#__PURE__*/function () {
     var _login = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
       var _yield$csrfRes$json, _exec;
@@ -3089,6 +3095,7 @@ function serverAuth(config, handlers) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             email = _ref.email, password = _ref.password;
+            info('Obtaining session');
             sessionUrl = new URL(config.api.localPath + "/api/auth/providers");
             sessionReq = new Request(sessionUrl, {
               method: 'GET',
@@ -3096,14 +3103,15 @@ function serverAuth(config, handlers) {
                 host: sessionUrl.host
               })
             });
-            _context.next = 5;
+            _context.next = 6;
             return handlers.POST(sessionReq);
-          case 5:
+          case 6:
             sessionRes = _context.sent;
-            _context.next = 8;
+            _context.next = 9;
             return sessionRes == null ? void 0 : sessionRes.json();
-          case 8:
+          case 9:
             providers = _context.sent;
+            info('Obtaining csrf');
             csrf = new URL(config.api.localPath + "/api/auth/csrf");
             csrfReq = new Request(csrf, {
               method: 'GET',
@@ -3111,36 +3119,36 @@ function serverAuth(config, handlers) {
                 host: sessionUrl.host
               })
             });
-            _context.next = 13;
+            _context.next = 15;
             return handlers.POST(csrfReq);
-          case 13:
+          case 15:
             csrfRes = _context.sent;
-            _context.next = 16;
+            _context.next = 18;
             return csrfRes == null ? void 0 : csrfRes.json();
-          case 16:
+          case 18:
             _context.t0 = _yield$csrfRes$json = _context.sent;
             if (!(_context.t0 != null)) {
-              _context.next = 21;
+              _context.next = 23;
               break;
             }
             _context.t1 = _yield$csrfRes$json;
-            _context.next = 22;
+            _context.next = 24;
             break;
-          case 21:
+          case 23:
             _context.t1 = {};
-          case 22:
+          case 24:
             _ref2 = _context.t1;
             csrfToken = _ref2.csrfToken;
             credentials = providers.credentials;
             csrfCookie = csrfRes == null ? void 0 : csrfRes.headers.get('set-cookie');
-            expect(csrfCookie).toContain('nile.csrf-token=');
             signInUrl = new URL(credentials.callbackUrl);
             if (csrfCookie) {
-              _context.next = 30;
+              _context.next = 31;
               break;
             }
-            throw new Error('unable to authenticate REST');
-          case 30:
+            throw new Error('Unable to authenticate REST');
+          case 31:
+            info('Attempting sign in to', signInUrl.href);
             postReq = new Request(signInUrl, {
               method: 'POST',
               headers: new Headers({
@@ -3154,23 +3162,23 @@ function serverAuth(config, handlers) {
                 callbackUrl: credentials.callbackUrl
               })
             });
-            _context.next = 33;
+            _context.next = 35;
             return handlers.POST(postReq);
-          case 33:
+          case 35:
             loginRes = _context.sent;
             authCookie = loginRes == null ? void 0 : loginRes.headers.get('set-cookie');
             if (authCookie) {
-              _context.next = 37;
+              _context.next = 39;
               break;
             }
             throw new Error('authentication failed');
-          case 37:
-            expect(authCookie).toContain('nile.session-token=');
+          case 39:
+            info('Server login successful');
             _ref3 = (_exec = /(nile\.session-token=.+?);/.exec(authCookie)) != null ? _exec : [], token = _ref3[1];
             return _context.abrupt("return", new Headers({
               cookie: [token, csrfCookie].join('; ')
             }));
-          case 40:
+          case 42:
           case "end":
             return _context.stop();
         }