From 4a2fdd04770ae5779b188ed83ad9f047055e54b8 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Thu, 14 Dec 2017 09:49:50 +0100
Subject: [PATCH] refactor: use _auth= when migrating npm tokens
---
lib/config/decrypt.js | 2 +-
lib/config/massage.js | 2 +-
test/config/__snapshots__/massage.spec.js.snap | 2 +-
test/config/decrypt.spec.js | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/config/decrypt.js b/lib/config/decrypt.js
index 961ce0919b..811f208f92 100644
--- a/lib/config/decrypt.js
+++ b/lib/config/decrypt.js
@@ -19,7 +19,7 @@ function decryptConfig(config, privateKey) {
logger.info(`Decrypted ${eKey}`);
if (eKey === 'npmToken') {
logger.info('Migrating npmToken to npmrc');
- decryptedConfig.npmrc = `//registry.npmjs.org/:_authToken=${decryptedStr}\n`;
+ decryptedConfig.npmrc = `_auth=${decryptedStr}\n`;
} else {
decryptedConfig[eKey] = decryptedStr;
}
diff --git a/lib/config/massage.js b/lib/config/massage.js
index ab17e80aa8..2be9ac3051 100644
--- a/lib/config/massage.js
+++ b/lib/config/massage.js
@@ -22,7 +22,7 @@ function massageConfig(config) {
if (allowedStrings.includes(key) && typeof val === 'string') {
massagedConfig[key] = [val];
} else if (key === 'npmToken' && val && val.length < 30) {
- massagedConfig.npmrc = `//registry.npmjs.org/:_authToken=${val}\n`;
+ massagedConfig.npmrc = `_auth=${val}\n`;
delete massagedConfig.npmToken;
} else if (isObject(val)) {
massagedConfig[key] = massageConfig(val);
diff --git a/test/config/__snapshots__/massage.spec.js.snap b/test/config/__snapshots__/massage.spec.js.snap
index 5b3b9202f9..52d4610879 100644
--- a/test/config/__snapshots__/massage.spec.js.snap
+++ b/test/config/__snapshots__/massage.spec.js.snap
@@ -2,7 +2,7 @@
exports[`config/massage massageConfig massages npmToken 1`] = `
Object {
- "npmrc": "//registry.npmjs.org/:_authToken=some-token
+ "npmrc": "_auth=some-token
",
}
`;
diff --git a/test/config/decrypt.spec.js b/test/config/decrypt.spec.js
index c96616a8fe..98e1a04520 100644
--- a/test/config/decrypt.spec.js
+++ b/test/config/decrypt.spec.js
@@ -57,7 +57,7 @@ describe('config/decrypt', () => {
);
expect(res.packageFiles[0].devDependencies.npmToken).not.toBeDefined();
expect(res.packageFiles[0].devDependencies.npmrc).toEqual(
- '//registry.npmjs.org/:_authToken=abcdef-ghijklm-nopqf-stuvwxyz\n'
+ '_auth=abcdef-ghijklm-nopqf-stuvwxyz\n'
);
});
});
--
GitLab