Fix tests for always-auth

__tests__/__snapshots__/authutil.test.ts.snap

@@ -2,20 +2,30 @@
 
 exports[`installer tests Appends trailing slash to registry 1`] = `
 "//registry.npmjs.org/:_authToken=\${NODE_AUTH_TOKEN}
-registry=https://registry.npmjs.org/"
+registry=https://registry.npmjs.org/
+always-auth=false"
 `;
 
 exports[`installer tests Automatically configures GPR scope 1`] = `
 "npm.pkg.github.com/:_authToken=\${NODE_AUTH_TOKEN}
-@ownername:registry=npm.pkg.github.com/"
+@ownername:registry=npm.pkg.github.com/
+always-auth=false"
 `;
 
 exports[`installer tests Configures scoped npm registries 1`] = `
 "//registry.npmjs.org/:_authToken=\${NODE_AUTH_TOKEN}
-@myscope:registry=https://registry.npmjs.org/"
+@myscope:registry=https://registry.npmjs.org/
+always-auth=false"
+`;
+
+exports[`installer tests Sets up npmrc for always-auth true 1`] = `
+"//registry.npmjs.org/:_authToken=\${NODE_AUTH_TOKEN}
+registry=https://registry.npmjs.org/
+always-auth=true"
 `;
 
 exports[`installer tests Sets up npmrc for npmjs 1`] = `
 "//registry.npmjs.org/:_authToken=\${NODE_AUTH_TOKEN}
-registry=https://registry.npmjs.org/"
+registry=https://registry.npmjs.org/
+always-auth=false"
 `;

__tests__/authutil.test.ts

@@ -33,13 +33,13 @@ describe('installer tests', () => {
   });
 
   it('Sets up npmrc for npmjs', async () => {
-    await auth.configAuthentication('https://registry.npmjs.org/');
+    await auth.configAuthentication('https://registry.npmjs.org/', 'false');
     expect(fs.existsSync(rcFile)).toBe(true);
     expect(fs.readFileSync(rcFile, {encoding: 'utf8'})).toMatchSnapshot();
   });
 
   it('Appends trailing slash to registry', async () => {
-    await auth.configAuthentication('https://registry.npmjs.org');
+    await auth.configAuthentication('https://registry.npmjs.org', 'false');
 
     expect(fs.existsSync(rcFile)).toBe(true);
     expect(fs.readFileSync(rcFile, {encoding: 'utf8'})).toMatchSnapshot();
@@ -47,16 +47,22 @@ describe('installer tests', () => {
 
   it('Configures scoped npm registries', async () => {
     process.env['INPUT_SCOPE'] = 'myScope';
-    await auth.configAuthentication('https://registry.npmjs.org');
+    await auth.configAuthentication('https://registry.npmjs.org', 'false');
 
     expect(fs.existsSync(rcFile)).toBe(true);
     expect(fs.readFileSync(rcFile, {encoding: 'utf8'})).toMatchSnapshot();
   });
 
   it('Automatically configures GPR scope', async () => {
-    await auth.configAuthentication('npm.pkg.github.com');
+    await auth.configAuthentication('npm.pkg.github.com', 'false');
 
     expect(fs.existsSync(rcFile)).toBe(true);
     expect(fs.readFileSync(rcFile, {encoding: 'utf8'})).toMatchSnapshot();
   });
+
+  it('Sets up npmrc for always-auth true', async () => {
+    await auth.configAuthentication('https://registry.npmjs.org/', 'true');
+    expect(fs.existsSync(rcFile)).toBe(true);
+    expect(fs.readFileSync(rcFile, {encoding: 'utf8'})).toMatchSnapshot();
+  });
 });

lib/authutil.js

@@ -12,15 +12,15 @@ const os = __importStar(require("os"));
 const path = __importStar(require("path"));
 const core = __importStar(require("@actions/core"));
 const github = __importStar(require("@actions/github"));
-function configAuthentication({ registryUrl, alwaysAuth }) {
+function configAuthentication(registryUrl, alwaysAuth) {
     const npmrc = path.resolve(process.env['RUNNER_TEMP'] || process.cwd(), '.npmrc');
     if (!registryUrl.endsWith('/')) {
         registryUrl += '/';
     }
-    writeRegistryToFile({ registryUrl, fileLocation: npmrc, alwaysAuth });
+    writeRegistryToFile(registryUrl, npmrc, alwaysAuth);
 }
 exports.configAuthentication = configAuthentication;
-function writeRegistryToFile({ registryUrl, fileLocation, alwaysAuth }) {
+function writeRegistryToFile(registryUrl, fileLocation, alwaysAuth) {
     let scope = core.getInput('scope');
     if (!scope && registryUrl.indexOf('npm.pkg.github.com') > -1) {
         scope = github.context.repo.owner;

lib/setup-node.js

@@ -37,7 +37,7 @@ function run() {
             const registryUrl = core.getInput('registry-url');
             const alwaysAuth = core.getInput('always-auth');
             if (registryUrl) {
-                auth.configAuthentication({ registryUrl, alwaysAuth });
+                auth.configAuthentication(registryUrl, alwaysAuth);
             }
             // TODO: setup proxy from runner proxy config
             const matchersPath = path.join(__dirname, '..', '.github');

src/authutil.ts

@@ -4,14 +4,7 @@ import * as path from 'path';
 import * as core from '@actions/core';
 import * as github from '@actions/github';
 
-interface ConfigureAuthenticationParams {
+export function configAuthentication(registryUrl: string, alwaysAuth: string) {
-  registryUrl: string;
-  alwaysAuth: string;
-}
-export function configAuthentication({
-  registryUrl,
-  alwaysAuth
-}: ConfigureAuthenticationParams) {
   const npmrc: string = path.resolve(
     process.env['RUNNER_TEMP'] || process.cwd(),
     '.npmrc'
@@ -20,19 +13,14 @@ export function configAuthentication({
     registryUrl += '/';
   }
 
-  writeRegistryToFile({registryUrl, fileLocation: npmrc, alwaysAuth});
+  writeRegistryToFile(registryUrl, npmrc, alwaysAuth);
 }
 
-interface WriteRegistryToFileParams {
+function writeRegistryToFile(
-  registryUrl: string;
+  registryUrl: string,
-  fileLocation: string;
+  fileLocation: string,
-  alwaysAuth: string;
+  alwaysAuth: string
-}
+) {
-function writeRegistryToFile({
-  registryUrl,
-  fileLocation,
-  alwaysAuth
-}: WriteRegistryToFileParams) {
   let scope: string = core.getInput('scope');
   if (!scope && registryUrl.indexOf('npm.pkg.github.com') > -1) {
     scope = github.context.repo.owner;

src/setup-node.ts

@@ -21,7 +21,7 @@ async function run() {
     const registryUrl: string = core.getInput('registry-url');
     const alwaysAuth: string = core.getInput('always-auth');
     if (registryUrl) {
-      auth.configAuthentication({registryUrl, alwaysAuth});
+      auth.configAuthentication(registryUrl, alwaysAuth);
     }
 
     // TODO: setup proxy from runner proxy config