neonctl 1.32.1 → 1.34.0

package/auth.js

@@ -63,7 +63,7 @@ export const auth = async ({ oauthHost, clientId }) => {
         const timer = setTimeout(() => {
             reject(new Error(`Authentication timed out after ${AUTH_TIMEOUT_SECONDS} seconds`));
         }, AUTH_TIMEOUT_SECONDS * 1000);
-        server.on('request', async (request, response) => {
+        const onRequest = async (request, response) => {
             //
             // Wait for callback and follow oauth flow.
             //
@@ -93,6 +93,9 @@ export const auth = async ({ oauthHost, clientId }) => {
             clearTimeout(timer);
             resolve(tokenSet);
             server.close();
+        };
+        server.on('request', (req, res) => {
+            void onRequest(req, res);
         });
         //
         // Open browser to let user authenticate
@@ -108,8 +111,9 @@ export const auth = async ({ oauthHost, clientId }) => {
         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);
+            const typedErr = err && err instanceof Error ? err : undefined;
+            sendError(typedErr || new Error(msg), matchErrorCode(msg));
+            log.error(msg);
         });
     });
 };

package/commands/auth.js

@@ -64,8 +64,9 @@ export const ensureAuth = async (props) => {
                 const refreshedTokenSet = await refreshToken({
                     oauthHost: props.oauthHost,
                     clientId: props.clientId,
-                }, tokenSet).catch((e) => {
-                    log.error('failed to refresh token\n%s', e?.message);
+                }, tokenSet).catch((err) => {
+                    const typedErr = err && err instanceof Error ? err : undefined;
+                    log.error('failed to refresh token\n%s', typedErr?.message);
                     process.exit(1);
                 });
                 props.apiKey = refreshedTokenSet.access_token || 'UNKNOWN';

package/commands/auth.test.js

@@ -1,29 +1,27 @@
 import axios from 'axios';
-import { vi, beforeAll, describe, test, afterAll, expect } from 'vitest';
+import { vi, beforeAll, describe, afterAll, expect } from 'vitest';
 import { mkdtempSync, rmSync, readFileSync } from 'node:fs';
 import { startOauthServer } from '../test_utils/oauth_server';
-import { runMockServer } from '../test_utils/mock_server';
+import { test } from '../test_utils/fixtures';
 import { authFlow } from './auth';
 vi.mock('open', () => ({ default: vi.fn((url) => axios.get(url)) }));
 vi.mock('../pkg.ts', () => ({ default: { version: '0.0.0' } }));
 describe('auth', () => {
     let configDir = '';
     let oauthServer;
-    let mockServer;
     beforeAll(async () => {
         configDir = mkdtempSync('test-config');
         oauthServer = await startOauthServer();
-        mockServer = await runMockServer('main');
     });
     afterAll(async () => {
         rmSync(configDir, { recursive: true });
         await oauthServer.stop();
-        await new Promise((resolve) => mockServer.close(resolve));
     });
-    test('should auth', async () => {
+    test('should auth', async ({ runMockServer }) => {
+        const server = await runMockServer('main');
         await authFlow({
             _: ['auth'],
-            apiHost: `http://localhost:${mockServer.address().port}`,
+            apiHost: `http://localhost:${server.address().port}`,
             clientId: 'test-client-id',
             configDir,
             forceAuth: true,

package/commands/bootstrap/authjs-secret.js

@@ -0,0 +1,6 @@
+// See https://github.com/nextauthjs/cli/blob/8443988fe7e7f078ead32288dcd1b01b9443f13a/commands/secret.js#L9
+// for reference.
+export function getAuthjsSecret() {
+    const bytes = crypto.getRandomValues(new Uint8Array(32));
+    return Buffer.from(bytes.toString(), 'base64').toString('base64');
+}