neonctl 1.29.4 → 1.29.5

package/auth.js

@@ -5,6 +5,8 @@ import { join } from 'node:path';
 import open from 'open';
 import { log } from './log.js';
 import { fileURLToPath } from 'node:url';
+import { sendError } from './analytics.js';
+import { matchErrorCode } from './errors.js';
 // oauth server timeouts
 const SERVER_TIMEOUT = 10000;
 // where to wait for incoming redirect request from oauth server to arrive
@@ -18,6 +20,7 @@ const NEONCTL_SCOPES = [
     'urn:neoncloud:projects:update',
     'urn:neoncloud:projects:delete',
 ];
+const AUTH_TIMEOUT_SECONDS = 60;
 export const defaultClientID = 'neonctl';
 custom.setHttpOptionsDefaults({
     timeout: SERVER_TIMEOUT,
@@ -38,6 +41,7 @@ export const auth = async ({ oauthHost, clientId }) => {
     //
     // Start HTTP server and wait till /callback is hit
     //
+    log.debug('Starting HTTP Server for callback');
     const server = createServer();
     server.listen(0, '127.0.0.1', function () {
         log.debug(`Listening on port ${this.address().port}`);
@@ -55,7 +59,10 @@ export const auth = async ({ oauthHost, clientId }) => {
     // we store the code_verifier in memory
     const codeVerifier = generators.codeVerifier();
     const codeChallenge = generators.codeChallenge(codeVerifier);
-    return new Promise((resolve) => {
+    return new Promise((resolve, reject) => {
+        const timer = setTimeout(() => {
+            reject(new Error(`Authentication timed out after ${AUTH_TIMEOUT_SECONDS} seconds`));
+        }, AUTH_TIMEOUT_SECONDS * 1000);
         server.on('request', async (request, response) => {
             //
             // Wait for callback and follow oauth flow.
@@ -83,6 +90,7 @@ export const auth = async ({ oauthHost, clientId }) => {
             });
             response.writeHead(200, { 'Content-Type': 'text/html' });
             createReadStream(join(fileURLToPath(new URL('.', import.meta.url)), './callback.html')).pipe(response);
+            clearTimeout(timer);
             resolve(tokenSet);
             server.close();
         });
@@ -96,6 +104,12 @@ export const auth = async ({ oauthHost, clientId }) => {
             code_challenge: codeChallenge,
             code_challenge_method: 'S256',
         });
-        open(authUrl);
+        log.info('Awaiting authentication in web browser.');
+        log.info(`Auth Url: ${authUrl}`);
+        open(authUrl).catch((err) => {
+            const msg = `Failed to open web browser. Please copy & paste auth url to authenticate in browser.`;
+            sendError(err || new Error(msg), matchErrorCode(msg || err?.message));
+            log.error(msg || err?.message);
+        });
     });
 };

package/commands/auth.test.js

@@ -6,7 +6,7 @@ import { runMockServer } from '../test_utils/mock_server';
 jest.unstable_mockModule('open', () => ({
     __esModule: true,
     default: jest.fn((url) => {
-        axios.get(url);
+        return axios.get(url);
     }),
 }));
 // "open" module should be imported after mocking

package/errors.js

@@ -1,6 +1,7 @@
 const ERROR_MATCHERS = [
     [/^Unknown command: (.*)$/, 'UNKNOWN_COMMAND'],
     [/^Missing required argument: (.*)$/, 'MISSING_ARGUMENT'],
+    [/^Failed to open web browser. (.*)$/, 'AUTH_BROWSER_FAILED'],
 ];
 export const matchErrorCode = (message) => {
     if (!message) {

package/package.json

@@ -5,7 +5,7 @@
     "url": "git+ssh://git@github.com/neondatabase/neonctl.git"
   },
   "type": "module",
-  "version": "1.29.4",
+  "version": "1.29.5",
   "description": "CLI tool for NeonDB Cloud management",
   "main": "index.js",
   "author": "NeonDB",
@@ -60,8 +60,8 @@
     "chalk": "^5.2.0",
     "cli-table": "^0.3.11",
     "inquirer": "^9.2.6",
-    "open": "^8.4.0",
-    "openid-client": "^5.1.9",
+    "open": "^10.1.0",
+    "openid-client": "^5.6.5",
     "which": "^3.0.1",
     "yaml": "^2.1.1",
     "yargs": "^17.7.2"