From 6267f543c2ac134c0f8433f8b48659a3949bf210 Mon Sep 17 00:00:00 2001
From: Gar <gar+gh@danger.computer>
Date: Tue, 21 Nov 2023 06:59:43 -0800
Subject: [PATCH] fix: properly catch missing url opener error on interactive
 prompt (#7005)

Closes: https://github.com/npm/cli/issues/7002
---
 lib/utils/open-url-prompt.js                        |  5 ++---
 .../test/lib/utils/open-url-prompt.js.test.cjs      |  8 ++++++++
 test/lib/utils/open-url-prompt.js                   | 13 ++++++++++++-
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/lib/utils/open-url-prompt.js b/lib/utils/open-url-prompt.js
index df0c9709c0774..71a68c253c050 100644
--- a/lib/utils/open-url-prompt.js
+++ b/lib/utils/open-url-prompt.js
@@ -1,5 +1,5 @@
 const readline = require('readline')
-const promiseSpawn = require('@npmcli/promise-spawn')
+const open = require('./open-url.js')
 
 function print (npm, title, url) {
   const json = npm.config.get('json')
@@ -63,8 +63,7 @@ const promptOpen = async (npm, url, title, prompt, emitter) => {
     return
   }
 
-  const command = browser === true ? null : browser
-  await promiseSpawn.open(url, { command })
+  await open(npm, url, 'Browser unavailable.  Please open the URL manually')
 }
 
 module.exports = promptOpen
diff --git a/tap-snapshots/test/lib/utils/open-url-prompt.js.test.cjs b/tap-snapshots/test/lib/utils/open-url-prompt.js.test.cjs
index 968b14a20d90f..f31ec8e041f51 100644
--- a/tap-snapshots/test/lib/utils/open-url-prompt.js.test.cjs
+++ b/tap-snapshots/test/lib/utils/open-url-prompt.js.test.cjs
@@ -5,6 +5,14 @@
  * Make sure to inspect the output below.  Do not ignore changes!
  */
 'use strict'
+exports[`test/lib/utils/open-url-prompt.js TAP does not error when opener can not find command > Outputs extra Browser unavailable message and url 1`] = `
+npm home:
+https://www.npmjs.com
+Browser unavailable.  Please open the URL manually:
+  https://www.npmjs.com
+
+`
+
 exports[`test/lib/utils/open-url-prompt.js TAP opens a url > must match snapshot 1`] = `
 npm home:
 https://www.npmjs.com
diff --git a/test/lib/utils/open-url-prompt.js b/test/lib/utils/open-url-prompt.js
index c889313e162c7..91058ec9e29a4 100644
--- a/test/lib/utils/open-url-prompt.js
+++ b/test/lib/utils/open-url-prompt.js
@@ -126,13 +126,24 @@ t.test('does not open url if canceled', async t => {
 
 t.test('returns error when opener errors', async t => {
   const { error, openerUrl } = await mockOpenUrlPrompt(t, {
-    openerResult: new Error('Opener failed'),
+    openerResult: Object.assign(new Error('Opener failed'), { code: 1 }),
   })
 
   t.match(error, /Opener failed/, 'got the correct error')
   t.equal(openerUrl, 'https://www.npmjs.com', 'did not open')
 })
 
+t.test('does not error when opener can not find command', async t => {
+  const { OUTPUT, error, openerUrl } = await mockOpenUrlPrompt(t, {
+    // openerResult: new Error('Opener failed'),
+    openerResult: Object.assign(new Error('Opener failed'), { code: 127 }),
+  })
+
+  t.notOk(error, 'Did not error')
+  t.equal(openerUrl, 'https://www.npmjs.com', 'did not open')
+  t.matchSnapshot(OUTPUT, 'Outputs extra Browser unavailable message and url')
+})
+
 t.test('throws "canceled" error on SIGINT', async t => {
   const emitter = new EventEmitter()
   const { open } = await mockOpenUrlPrompt(t, {