fix: skip redacting urls meant for opening by the user (#8614)

wraithgar · internettrans · web-flow · commit f6028e67aa1b · 2025-09-30T13:49:07.000-07:00
Login urls have tokens in them and need to be shown to the user on stdout, especially if they have no browser and need to copy/paste. This builds off of #8587 and changes things to use proc-log's META notation, which is how this kind of info is sent. --------- Co-authored-by: Jolyn <jolyndenning@gmail.com>
diff --git a/lib/utils/display.js b/lib/utils/display.js
@@ -370,11 +370,11 @@ class Display {
   #writeOutput (level, meta, ...args) {
     switch (level) {
       case output.KEYS.standard:
-        this.#write(this.#stdout, {}, ...args)
+        this.#write(this.#stdout, meta, ...args)
         break
 
       case output.KEYS.error:
-        this.#write(this.#stderr, {}, ...args)
+        this.#write(this.#stderr, meta, ...args)
         break
     }
   }
diff --git a/lib/utils/format.js b/lib/utils/format.js
@@ -41,9 +41,12 @@ function STRIP_C01 (str) {
   return result
 }
 
-const formatWithOptions = ({ prefix: prefixes = [], eol = '\n', ...options }, ...args) => {
+const formatWithOptions = ({ prefix: prefixes = [], eol = '\n', redact = true, ...options }, ...args) => {
   const prefix = prefixes.filter(p => p != null).join(' ')
-  const formatted = redactLog(STRIP_C01(baseFormatWithOptions(options, ...args)))
+  let formatted = STRIP_C01(baseFormatWithOptions(options, ...args))
+  if (redact) {
+    formatted = redactLog(formatted)
+  }
   // Splitting could be changed to only `\n` once we are sure we only emit unix newlines.
   // The eol param to this function will put the correct newlines in place for the returned string.
   const lines = formatted.split(/\r?\n/)
diff --git a/lib/utils/open-url.js b/lib/utils/open-url.js
@@ -1,5 +1,5 @@
 const { open } = require('@npmcli/promise-spawn')
-const { output, input } = require('proc-log')
+const { output, input, META } = require('proc-log')
 const { URL } = require('node:url')
 const readline = require('node:readline/promises')
 const { once } = require('node:events')
@@ -18,7 +18,8 @@ const outputMsg = (json, title, url) => {
   if (json) {
     output.buffer({ title, url })
   } else {
-    output.standard(`${title}:\n${url}`)
+    // These urls are sometimes specifically login urls so we have to turn off redaction to standard output
+    output.standard(`${title}:\n${url}`, { [META]: true, redact: false })
   }
 }
 
diff --git a/mock-registry/lib/index.js b/mock-registry/lib/index.js
@@ -284,7 +284,7 @@ class MockRegistry {
 
   weblogin ({ token = 'npm_default-test-token' }) {
     const doneUrl = new URL('/npm-cli-test/done', this.origin).href
-    const loginUrl = new URL('/npm-cli-test/login', this.origin).href
+    const loginUrl = new URL('/npm-cli-test/login/cli/00000000-0000-0000-0000-000000000000', this.origin).href
     this.nock = this.nock
       .post(this.fullPath('/-/v1/login'), () => {
         return true
diff --git a/test/lib/commands/login.js b/test/lib/commands/login.js
@@ -119,7 +119,7 @@ t.test('legacy', t => {
 
 t.test('web', t => {
   t.test('basic login', async t => {
-    const { npm, registry, login, rc } = await mockLogin(t, {
+    const { outputs, npm, registry, login, rc } = await mockLogin(t, {
       config: { 'auth-type': 'web' },
     })
     registry.weblogin({ token: 'npm_test-token' })
@@ -128,6 +128,7 @@ t.test('web', t => {
     t.same(rc(), {
       '//registry.npmjs.org/:_authToken': 'npm_test-token',
     })
+    t.match(outputs[0], '/npm-cli-test/login/cli/00000000-0000-0000-0000-000000000000')
   })
   t.test('server error', async t => {
     const { registry, login } = await mockLogin(t, {

Original file line number	Diff line number	Diff line change
`@@ -370,11 +370,11 @@ class Display {`
`370`	`370`	`#writeOutput (level, meta, ...args) {`
`371`	`371`	`switch (level) {`
`372`	`372`	`case output.KEYS.standard:`
`373`		`- this.#write(this.#stdout, {}, ...args)`
	`373`	`+ this.#write(this.#stdout, meta, ...args)`
`374`	`374`	`break`
`375`	`375`
`376`	`376`	`case output.KEYS.error:`
`377`		`- this.#write(this.#stderr, {}, ...args)`
	`377`	`+ this.#write(this.#stderr, meta, ...args)`
`378`	`378`	`break`
`379`	`379`	`}`
`380`	`380`	`}`