HOTFIX: User config should be copied before overriding (#3015)

* User config should be copied before overriding

* should override userconfig only if auth helper is being run

* string changes

* Add npm auth helper 23.0 (disabled fallback cred provider)

Author: murali89

Tasks/Npm/Strings/resources.resjson/en-US/resources.resjson

@@ -3,10 +3,10 @@
   "loc.helpMarkDown": "[More Information](https://go.microsoft.com/fwlink/?LinkID=613746)",
   "loc.description": "Run a npm command",
   "loc.instanceNameFormat": "npm $(command)",
-  "loc.input.label.cwd": "Working directory",
+  "loc.input.label.cwd": "working folder",
   "loc.input.help.cwd": "Working directory where the npm command is run. Defaults to the root of the repo.",
-  "loc.input.label.command": "npm command to execute",
-  "loc.input.label.arguments": "Arguments",
+  "loc.input.label.command": "npm command",
+  "loc.input.label.arguments": "arguments",
   "loc.input.help.arguments": "Additional arguments passed to npm.",
   "loc.messages.InvalidCommand": "Only one command should be used for npm. Use 'Arguments' input for additional arguments.",
   "loc.messages.NpmReturnCode": "npm exited with return code: %d",

Tasks/Npm/Tests/NpmMockHelper.ts

@@ -111,10 +111,15 @@ export class NpmMockHelper {
     private setDefaultAnswers() {
         this.setToolPath(this.answers, "npm", NpmMockHelper.NpmCmdPath);
         this.setOsType('WiNdOWs_nT');
+        this.setProjectNpmrcExists();
     }
 
     private setToolPath(answers: ma.TaskLibAnswers, tool: string, path: string) {
         answers.which[tool] = path;
         answers.checkPath[path] = true;
     }
+
+    private setProjectNpmrcExists() {
+        this.answers.exist[path.join(NpmMockHelper.FakeWorkingDirectory, '.npmrc')] = true;
+    }
 }

Tasks/Npm/make.json

@@ -2,7 +2,7 @@
     "externals": {
         "archivePackages": [
             {
-                "url": "https://vstsagenttools.blob.core.windows.net/tools/vsts-npm-auth/0.21.0/vsts-npm-auth.zip",
+                "url": "https://vstsagenttools.blob.core.windows.net/tools/vsts-npm-auth/0.23.0/vsts-npm-auth.zip",
                 "dest": "./Npm/vsts-npm-auth/"
             },
             {

Tasks/Npm/npmtask.ts

@@ -42,20 +42,28 @@ async function executeTask() {
     } else {
 
         // new task version with auth support
-        var npmrcPath: string = path.join(cwd, '.npmrc');
-        var tempNpmrcPath : string = getTempNpmrcPath();
-        var debugLog: boolean = tl.getVariable('system.debug') && tl.getVariable('system.debug').toLowerCase() === 'true';
-
         try{
-            if(tl.osType().toLowerCase() === 'windows_nt') {
+
+            var npmrcPath: string = path.join(cwd, '.npmrc');
+            var tempNpmrcPath : string = getTempNpmrcPath();
+
+            var debugLog: boolean = tl.getVariable('system.debug') && tl.getVariable('system.debug').toLowerCase() === 'true';
+
+            var shouldRunAuthHelper: boolean = tl.osType().toLowerCase() === 'windows_nt' && tl.exist(npmrcPath); 
+            if(shouldRunAuthHelper) {
+                copyUserNpmrc(tempNpmrcPath);
                 await runNpmAuthHelperAsync(getNpmAuthHelperRunner(npmrcPath, tempNpmrcPath, debugLog));
             }
 
             // set required environment variables for npm execution
             var npmExecOptions = <trm.IExecOptions>{
                 env: extend({}, process.env)
             };
-            npmExecOptions.env['npm_config_userconfig'] = tempNpmrcPath;
+
+            if(shouldRunAuthHelper){
+                npmExecOptions.env['npm_config_userconfig'] = tempNpmrcPath;
+            }
+
             if(debugLog) {
                 npmExecOptions.env['npm_config_loglevel'] =  'verbose';
             }
@@ -87,6 +95,25 @@ async function runNpmAuthHelperAsync(npmAuthRunner: trm.ToolRunner) : Promise<nu
     }
 }
 
+function copyUserNpmrc(tempNpmrcPath: string) {
+    // copy the user level npmrc contents, if it exists.
+    var currentUserNpmrcPath : string = getUserNpmrcPath();
+    if(tl.exist(currentUserNpmrcPath)) {
+        tl.debug(`Copying ${currentUserNpmrcPath} to ${tempNpmrcPath} ...`);
+        tl.cp(currentUserNpmrcPath, tempNpmrcPath, /* options */ null, /* continueOnError */ true);
+    }
+}
+
+function getUserNpmrcPath() {
+    var userNpmRc = process.env['npm_config_userconfig'];
+    if(!userNpmRc){
+        // default npm rc is located at user's home folder.
+        userNpmRc = path.join(process.env['HOMEDRIVE'], process.env['HOMEPATH'], '.npmrc');
+    }
+    tl.debug(`User npm rc: ${userNpmRc}`);
+    return userNpmRc;
+}
+
 async function tryRunNpmConfigAsync(npmConfigRunner: trm.ToolRunner, execOptions : trm.IExecOptions) {
     try {
         var code = await npmConfigRunner.exec(execOptions);
@@ -178,6 +205,7 @@ function addBuildCredProviderEnv(env: EnvironmentDictionary) : EnvironmentDictio
     env['VSS_NUGET_ACCESSTOKEN'] = accessToken;
     env['VSS_NUGET_URI_PREFIXES'] = urlPrefixes.join(';');
     env['NPM_CREDENTIALPROVIDERS_PATH'] =  credProviderPath;
+    env['VSS_DISABLE_DEFAULTCREDENTIALPROVIDER'] = '1';
     return env;
 }
 

Tasks/Npm/task.json

@@ -9,7 +9,7 @@
     "version": {
         "Major": 0,
         "Minor": 2,
-        "Patch": 17
+        "Patch": 18
     },
     "demands": [
         "npm"
@@ -20,22 +20,22 @@
         {
             "name": "cwd",
             "type": "filePath",
-            "label": "Working directory",
+            "label": "working folder",
             "defaultValue": "",
             "required": false,
             "helpMarkDown": "Working directory where the npm command is run. Defaults to the root of the repo."
         },
         {
             "name": "command",
             "type": "string",
-            "label": "npm command to execute",
+            "label": "npm command",
             "defaultValue": "install",
             "required": true
         },
         {
             "name": "arguments",
             "type": "string",
-            "label": "Arguments",
+            "label": "arguments",
             "defaultValue": "",
             "helpMarkDown": "Additional arguments passed to npm.",
             "required": false

Tasks/Npm/task.loc.json

@@ -9,7 +9,7 @@
   "version": {
     "Major": 0,
     "Minor": 2,
-    "Patch": 17
+    "Patch": 18
   },
   "demands": [
     "npm"