logout: Fix npm-logout to remove scope config if specified

Fixes: #10529
Credit: @wyze
Reviewed-By: @iarna
PR-URL: npm/npm#11417

lib/logout.js

@@ -8,6 +8,15 @@ var mapToRegistry = require('./utils/map-to-registry.js')
 
 logout.usage = 'npm logout [--registry=<url>] [--scope=<@scope>]'
 
+function afterLogout (normalized, cb) {
+  var scope = npm.config.get('scope')
+
+  if (scope) npm.config.del(scope + ':registry')
+
+  npm.config.clearCredentialsByURI(normalized)
+  npm.config.save('user', cb)
+}
+
 function logout (args, cb) {
   cb = dezalgo(cb)
 
@@ -19,13 +28,12 @@ function logout (args, cb) {
       npm.registry.logout(normalized, { auth: auth }, function (err) {
         if (err) return cb(err)
 
-        npm.config.clearCredentialsByURI(normalized)
-        npm.config.save('user', cb)
+        afterLogout(normalized, cb)
       })
     } else if (auth.username || auth.password) {
       log.verbose('logout', 'clearing user credentials for', normalized)
-      npm.config.clearCredentialsByURI(normalized)
-      npm.config.save('user', cb)
+
+      afterLogout(normalized, cb)
     } else {
       cb(new Error(
         'Not logged in to', normalized + ',', "so can't log out."

test/tap/logout-scoped.js

@@ -0,0 +1,70 @@
+var fs = require('fs')
+var path = require('path')
+
+var mkdirp = require('mkdirp')
+var mr = require('npm-registry-mock')
+var rimraf = require('rimraf')
+var test = require('tap').test
+
+var common = require('../common-tap.js')
+
+var pkg = path.resolve(__dirname, 'logout')
+var outfile = path.join(pkg, '_npmrc')
+var opts = { cwd: pkg }
+
+var contents = function () {/*
+foo=boo
+@bar:registry=http://localhost:1337
+//localhost:1337/:_authToken=glarb
+*/}.toString().split('\n').slice(1, -1).join('\n')
+
+function mocks (server) {
+  server.delete('/-/user/token/glarb')
+    .reply(200, {})
+}
+
+test('setup', function (t) {
+  cleanup()
+  setup()
+  t.end()
+})
+
+test('npm logout', function (t) {
+  mr({ port: common.port, plugin: mocks }, function (err, s) {
+    if (err) throw err
+
+    common.npm(
+      [
+        'logout',
+        '--registry', common.registry,
+        '--scope', '@bar',
+        '--loglevel', 'silent',
+        '--userconfig', outfile
+      ],
+      opts,
+      function (err, code) {
+        t.ifError(err, 'no error output')
+        t.notOk(code, 'exited OK')
+
+        var config = fs.readFileSync(outfile, 'utf8')
+        t.equal(config, 'foo=boo\n', 'creds gone')
+        s.close()
+        t.end()
+      }
+    )
+  })
+})
+
+test('cleanup', function (t) {
+  cleanup()
+  t.end()
+})
+
+function setup () {
+  mkdirp.sync(pkg)
+  fs.writeFileSync(outfile, contents)
+}
+
+function cleanup () {
+  rimraf.sync(pkg)
+}