Adding support for views within npm registry values (#7541) (#7575)

* Adding support for views within npm registry values

Author: phil-hodgson

Tasks/Common/npm-common/npmregistry.ts

@@ -97,6 +97,10 @@ export class NpmRegistry implements INpmRegistry {
 
     public static async FromFeedId(feedId: string, authOnly?: boolean): Promise<NpmRegistry> {
         let url = NormalizeRegistry(await util.getFeedRegistryUrl(feedId));
+        return NpmRegistry.FromUrl(url, authOnly);
+    }
+
+    public static FromUrl(url: string, authOnly?: boolean): NpmRegistry {
         let nerfed = util.toNerfDart(url);
         let auth = `${nerfed}:_authToken=${util.getSystemAccessToken()}`;
 

Tasks/Common/npm-common/util.ts

@@ -16,16 +16,14 @@ export function appendToNpmrc(npmrc: string, data: string): void {
 }
 
 export async function getLocalRegistries(npmrc: string): Promise<string[]> {
-    let localRegistries: string[] = [];
-    let registries = NpmrcParser.GetRegistries(npmrc);
-    let collectionUrl = url.parse(await getPackagingCollectionUrl());
-
-    for (let registry of registries) {
-        let registryUrl = url.parse(registry);
-        if (registryUrl.host.toLowerCase() === collectionUrl.host.toLowerCase()) {
-            localRegistries.push(registry);
-        }
-    }
+    // Local registries are VSTS feeds from the SAME collection host 
+    const collectionHost = url.parse(await getPackagingCollectionUrl()).host;
+    const registries = NpmrcParser.GetRegistries(npmrc);
+
+    const localRegistries = registries.filter(registry => {
+        const registryHost = url.parse(registry).host;
+        return registryHost.toLowerCase() === collectionHost.toLowerCase();
+    });
 
     tl.debug(tl.loc('FoundLocalRegistries', localRegistries.length));
     return localRegistries;
@@ -42,19 +40,14 @@ export function getFeedIdFromRegistry(registry: string) {
 }
 
 export async function getLocalNpmRegistries(workingDir: string): Promise<INpmRegistry[]> {
-    let localNpmRegistries: INpmRegistry[] = [];
     let npmrcPath = path.join(workingDir, '.npmrc');
 
     if (tl.exist(npmrcPath)) {
-        let npmRegistries: INpmRegistry[] = [];
-        for (let registry of await getLocalRegistries(npmrcPath)) {
-            npmRegistries.push(await NpmRegistry.FromFeedId(getFeedIdFromRegistry(registry), true));
-        }
-
-        localNpmRegistries = localNpmRegistries.concat(npmRegistries);
+        const localRegistries = await getLocalRegistries(npmrcPath);
+        return localRegistries.map(registry => NpmRegistry.FromUrl(registry, true));
     }
 
-    return localNpmRegistries;
+    return [];
 }
 
 export async function getPackagingCollectionUrl(): Promise<string> {

Tasks/NpmV1/Tests/L0.ts

@@ -1,12 +1,10 @@
 import * as assert from 'assert';
-import * as fs from 'fs';
 import * as path from 'path';
-import * as Q from 'q';
-
 import * as mockery from 'mockery';
 import * as ttm from 'vsts-task-lib/mock-test';
 
 import { NpmMockHelper } from './NpmMockHelper';
+import Lazy_NpmRegistry = require('npm-common/npmregistry');
 
 const BASIC_AUTH_PAT_PASSWD_REGEX = /\/\/.*\/:_password=.*/g;
 const BEARER_AUTH_REGEX = /\/\/.*\/:_authToken=AUTHTOKEN.*/g;
@@ -16,6 +14,7 @@ const AWLAYS_AUTH_REGEX = /\/\/.*\/:always-auth=true.*/g;
 
 describe('Npm Task', function () {
     before(() => {
+        mockery.disable(); // needed to ensure that we can mock vsts-task-lib/task
         mockery.enable({
             useCleanCache: true,
             warnOnUnregistered: false
@@ -236,15 +235,21 @@ describe('Npm Task', function () {
     });
 
     it('gets feed id from VSTS registry', (done: MochaDone) => {
-        mockery.registerMock('vsts-task-lib/task', {});
+        let mockTask = {
+            debug: message => {}
+        };
+        mockery.registerMock('vsts-task-lib/task', mockTask);
         let util = require('npm-common/util');
 
         assert.equal(util.getFeedIdFromRegistry(
-            'http://account.visualstudio.com/_packaging/feedId/npm/registry'),
+            'https://account.visualstudio.com/_packaging/feedId/npm/registry'),
             'feedId');
         assert.equal(util.getFeedIdFromRegistry(
-            'http://account.visualstudio.com/_packaging/feedId/npm/registry/'),
+            'https://account.visualstudio.com/_packaging/feedId/npm/registry/'),
             'feedId');
+        assert.equal(util.getFeedIdFromRegistry(
+            'https://account.visualstudio.com/_packaging/feedId@PreRelease/npm/registry/'),
+            'feedId@PreRelease');
         assert.equal(util.getFeedIdFromRegistry(
             'http://TFSSERVER/_packaging/feedId/npm/registry'),
             'feedId');
@@ -515,4 +520,39 @@ describe('Npm Task', function () {
         done();
     });
 
+    it('handles views in registry URL', async (done: MochaDone) => {
+        // Scenario: Includes view (e.g. @Release) within the registry entry
+        const hostName = 'https://mytfsserver.visualstudio.com';
+        const nerfedRegistry = "//mytfsserver.pkgs.visualstudio.com/npmRegistry@Release/npm/registry/";
+        const registry = `https:${nerfedRegistry}`;
+        const authToken = '**sometoken**';
+
+        const mockTask = {
+            loc: key => "LocValue",
+            debug: msg => null,
+            exist: path => true,
+            getVariable: v => {
+                return (v === 'System.TeamFoundationCollectionUri') ? hostName : null;
+            },
+            getEndpointAuthorization: (id, optional) => {
+                return { scheme: 'OAuth', parameters: { 'AccessToken': authToken } };
+            }
+        };
+        const mockParser = {
+            GetRegistries: (npmrc: string) => [registry]
+        };
+        mockery.registerMock('vsts-task-lib/task', mockTask);
+        mockery.registerMock('./npmrcparser', mockParser);
+        
+        const util = require('npm-common/util');
+        const registries = await util.getLocalNpmRegistries("somePath");
+
+        assert.equal(registries.length, 1, "Expected one response");
+        const npmRegistry: Lazy_NpmRegistry.INpmRegistry = registries[0];
+        assert.equal(npmRegistry.url, registry, "Registry needs to match");
+        assert.equal(npmRegistry.auth, `${nerfedRegistry}:_authToken=${authToken}`, "Auth needs to match");
+        assert.equal(npmRegistry.authOnly, true, "Authonly needs to match");
+        
+        done();
+    });
 });

Tasks/NpmV1/npmcustom.ts

@@ -11,7 +11,6 @@ export async function run(command?: string): Promise<void> {
     let workingDir = tl.getInput(NpmTaskInput.WorkingDir) || process.cwd();
     let npmrc = util.getTempNpmrcPath();
     let npmRegistries: INpmRegistry[] = await getCustomRegistries();
-    let registryLocation = tl.getInput(NpmTaskInput.CustomRegistry);
     let overrideNpmrc = (tl.getInput(NpmTaskInput.CustomRegistry) == RegistryLocation.Feed) ? true : false;
 
     for (let registry of npmRegistries) {

Tasks/NpmV1/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vsts-npm-task",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "description": "VSTS NPM Task",
   "main": "npmtask.js",
   "scripts": {

Tasks/NpmV1/task.json

@@ -9,7 +9,7 @@
     "version": {
         "Major": 1,
         "Minor": 0,
-        "Patch": 16
+        "Patch": 17
     },
     "runsOn": [
         "Agent",

Tasks/NpmV1/task.loc.json

@@ -9,7 +9,7 @@
   "version": {
     "Major": 1,
     "Minor": 0,
-    "Patch": 16
+    "Patch": 17
   },
   "runsOn": [
     "Agent",