From 977625621061914eeefeb935b56172af33339d00 Mon Sep 17 00:00:00 2001
From: Danny McCormick <damccorm@microsoft.com>
Date: Mon, 5 Aug 2019 11:57:53 -0400
Subject: [PATCH] Yarn sometimes prefers npmrc, so use same token

---
 lib/authutil.js | 10 ++++------
 src/authutil.ts | 14 ++++----------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/lib/authutil.js b/lib/authutil.js
index 1000a91f..bae941bf 100644
--- a/lib/authutil.js
+++ b/lib/authutil.js
@@ -14,11 +14,11 @@ const core = __importStar(require("@actions/core"));
 function configAuth(registryUrl) {
     let npmrc = path.resolve(process.cwd(), '.npmrc');
     let yarnrc = path.resolve(process.cwd(), '.yarnrc');
-    writeRegistryToFile(registryUrl, npmrc, 'NPM_TOKEN');
-    writeRegistryToFile(registryUrl, yarnrc, 'YARN_TOKEN');
+    writeRegistryToFile(registryUrl, npmrc);
+    writeRegistryToFile(registryUrl, yarnrc);
 }
 exports.configAuth = configAuth;
-function writeRegistryToFile(registryUrl, fileLocation, authTokenName) {
+function writeRegistryToFile(registryUrl, fileLocation) {
     core.debug(`Setting auth in ${fileLocation}`);
     let newContents = '';
     if (fs.existsSync(fileLocation)) {
@@ -37,8 +37,6 @@ function writeRegistryToFile(registryUrl, fileLocation, authTokenName) {
             'always-auth=true' +
             os.EOL +
             registryUrl.replace(/(^\w+:|^)/, '') +
-            ':_authToken=${' +
-            authTokenName +
-            '}';
+            ':_authToken=${NODE_AUTH_TOKEN}';
     fs.writeFileSync(fileLocation, newContents);
 }
diff --git a/src/authutil.ts b/src/authutil.ts
index 503a3e14..bcd1f872 100644
--- a/src/authutil.ts
+++ b/src/authutil.ts
@@ -7,15 +7,11 @@ export function configAuth(registryUrl: string) {
   let npmrc: string = path.resolve(process.cwd(), '.npmrc');
   let yarnrc: string = path.resolve(process.cwd(), '.yarnrc');
 
-  writeRegistryToFile(registryUrl, npmrc, 'NPM_TOKEN');
-  writeRegistryToFile(registryUrl, yarnrc, 'YARN_TOKEN');
+  writeRegistryToFile(registryUrl, npmrc);
+  writeRegistryToFile(registryUrl, yarnrc);
 }
 
-function writeRegistryToFile(
-  registryUrl: string,
-  fileLocation: string,
-  authTokenName: string
-) {
+function writeRegistryToFile(registryUrl: string, fileLocation: string) {
   core.debug(`Setting auth in ${fileLocation}`);
   let newContents = '';
   if (fs.existsSync(fileLocation)) {
@@ -34,8 +30,6 @@ function writeRegistryToFile(
     'always-auth=true' +
     os.EOL +
     registryUrl.replace(/(^\w+:|^)/, '') +
-    ':_authToken=${' +
-    authTokenName +
-    '}';
+    ':_authToken=${NODE_AUTH_TOKEN}';
   fs.writeFileSync(fileLocation, newContents);
 }