Add external registry support to authentication check (#365)

sindresorhus · Mar 15, 2019 · 72ebf7d · 72ebf7d
1 parent cc56c0c
commit 72ebf7d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/source/npm-util.js b/source/npm-util.js
@@ -16,9 +16,15 @@ exports.checkConnection = () => pTimeout(
 	'Connection to npm registry timed out'
 );
 
-exports.username = async () => {
+exports.username = async ({externalRegistry}) => {
+	const args = ['whoami'];
+
+	if (externalRegistry) {
+		args.push('--registry', externalRegistry);
+	}
+
 	try {
-		return await execa.stdout('npm', ['whoami']);
+		return await execa.stdout('npm', args);
 	} catch (error) {
 		throw new Error(/ENEEDAUTH/.test(error.stderr) ?
 			'You must be logged in. Use `npm login` and try again.' :

diff --git a/source/prerequisite-tasks.js b/source/prerequisite-tasks.js
@@ -28,9 +28,11 @@ module.exports = (input, pkg, options) => {
 		},
 		{
 			title: 'Verify user is authenticated',
-			skip: () => process.env.NODE_ENV === 'test' || pkg.private || isExternalRegistry,
+			skip: () => process.env.NODE_ENV === 'test' || pkg.private,
 			task: async () => {
-				const username = await npm.username();
+				const username = await npm.username({
+					externalRegistry: isExternalRegistry ? pkg.publishConfig.registry : false
+				});
 
 				const collaborators = await npm.collaborators(pkg.name);
 				if (!collaborators) {