Merge pull request #11066 from microsoft/users/zarenner/apiKeyFix

NuGetAuthenticate: Fix bug where wrong error message when specifying …
microsoft · Aug 5, 2019 · f515dad · f515dad
2 parents 245f88d + c990b53
commit f515dad
Show file tree

Hide file tree

Showing 10 changed files with 61 additions and 10 deletions.
diff --git a/Tasks/Common/artifacts-common/Tests/serviceConnectionUtilsTests.ts b/Tasks/Common/artifacts-common/Tests/serviceConnectionUtilsTests.ts
@@ -1,7 +1,7 @@
 import * as assert from "assert";
 import * as mockery from "mockery";
 import { EndpointAuthorization } from "azure-pipelines-task-lib";
-import { ServiceConnectionAuthType, TokenServiceConnection, UsernamePasswordServiceConnection, IAdditionalData } from "../serviceConnectionUtils";
+import { ServiceConnectionAuthType, TokenServiceConnection, UsernamePasswordServiceConnection, ApiKeyServiceConnection, IAdditionalData } from "../serviceConnectionUtils";
 
 export function serviceConnectionUtilsTests() {
 
@@ -21,6 +21,7 @@ export function serviceConnectionUtilsTests() {
 
     beforeEach(() => {
         mockery.resetCache();
+        mockery.registerAllowable("../serviceConnectionUtils");
     });
 
     afterEach(() => {
@@ -55,6 +56,7 @@ export function serviceConnectionUtilsTests() {
 
     it("getPackagingServiceConnections token good", (done: MochaDone) => {
         let mockTask = {
+            loc: msg => msg,
             debug: () => {},
             getDelimitedInput: (key) => ["tokenendpoint1"],
             getEndpointUrl: (key, optional) => "https://contoso.com/nuget/v3/index.json",
@@ -80,6 +82,7 @@ export function serviceConnectionUtilsTests() {
 
     it("getPackagingServiceConnections token missing apitoken throws", (done: MochaDone) => {
         let mockTask = {
+            loc: msg => msg,
             debug: () => {},
             getDelimitedInput: (key) => ["tokenendpoint1"],
             getEndpointUrl: (key, optional) => "https://contoso.com/nuget/v3/index.json",
@@ -98,6 +101,7 @@ export function serviceConnectionUtilsTests() {
 
     it("getPackagingServiceConnections username/password good", (done: MochaDone) => {
         let mockTask = {
+            loc: msg => msg,
             debug: () => {},
             getDelimitedInput: (key) => ["tokenendpoint1"],
             getEndpointUrl: (key, optional) => "https://contoso.com/nuget/v3/index.json",
@@ -124,6 +128,7 @@ export function serviceConnectionUtilsTests() {
 
     it("getPackagingServiceConnections username/password missing username throws", (done: MochaDone) => {
         let mockTask = {
+            loc: msg => msg,
             debug: () => {},
             getDelimitedInput: (key) => ["tokenendpoint1"],
             getEndpointUrl: (key, optional) => "https://contoso.com/nuget/v3/index.json",
@@ -158,6 +163,52 @@ export function serviceConnectionUtilsTests() {
         done();
     });
 
+    it("getPackagingServiceConnections apikey good", (done: MochaDone) => {
+        let mockTask = {
+            loc: msg => msg,
+            debug: () => {},
+            getDelimitedInput: (key) => ["tokenendpoint1"],
+            getEndpointUrl: (key, optional) => "https://contoso.com/nuget/v3/index.json",
+            getEndpointAuthorization: (key, optional) => <EndpointAuthorization>{
+                parameters: { "nugetkey": "someapikey" },
+                scheme: "none"
+            },
+            getEndpointAuthorizationScheme: (key, optional): string => "none"
+        };
+        mockery.registerMock('azure-pipelines-task-lib/task', mockTask);
+
+        let serviceConnectionUtilsWithMocks = require("../serviceConnectionUtils");
+        assert.deepEqual(serviceConnectionUtilsWithMocks.getPackagingServiceConnections(serviceConnectionsKey), [<ApiKeyServiceConnection>{
+            packageSource: {
+                uri: "https://contoso.com/nuget/v3/index.json" 
+            },
+            authType: ServiceConnectionAuthType.ApiKey,
+            apiKey: "someapikey",
+	    additionalData: {}
+        }]);
+        done();
+    });
+
+    it("getPackagingServiceConnections apikey missing nugetkey throws", (done: MochaDone) => {
+        let mockTask = {
+            loc: msg => msg,
+            debug: () => {},
+            getDelimitedInput: (key) => ["tokenendpoint1"],
+            getEndpointUrl: (key, optional) => "https://contoso.com/nuget/v3/index.json",
+            getEndpointAuthorization: (key, optional) => <EndpointAuthorization>{
+                parameters: { /* missing nugetkey */ },
+                scheme: "none"
+            },
+            getEndpointAuthorizationScheme: (key, optional): string => "none"
+        };
+        mockery.registerMock('azure-pipelines-task-lib/task', mockTask);
+
+        let serviceConnectionUtilsWithMocks = require("../serviceConnectionUtils");
+        assert.throws(() => serviceConnectionUtilsWithMocks.getPackagingServiceConnections(serviceConnectionsKey));
+        done();
+    });
+
+
     it("getPackagingServiceConnections token good additional data good", (done: MochaDone) => {
         let mockTask = {
             debug: () => {},

diff --git a/Tasks/Common/artifacts-common/serviceConnectionUtils.ts b/Tasks/Common/artifacts-common/serviceConnectionUtils.ts
@@ -144,7 +144,7 @@ export function getPackagingServiceConnections(endpointsInputName: string, dataP
                     additionalData));
                 break;
             case "none": // We only support this for nuget today. npm and python tasks do not use this endpoint auth scheme.
-                if ("nugetkey" in endpointAuth.parameters) {
+                if (!("nugetkey" in endpointAuth.parameters)) {
                     throw Error(tl.loc("ServiceConnections_Error_FailedToParseServiceEndpoint_MissingParameter", uri, "nugetkey"));
                 }
 

diff --git a/Tasks/MavenAuthenticateV0/task.json b/Tasks/MavenAuthenticateV0/task.json
@@ -10,7 +10,7 @@
     "version": {
         "Major": 0,
         "Minor": 156,
-        "Patch": 0
+        "Patch": 1
     },
     "runsOn": [
         "Agent",

diff --git a/Tasks/MavenAuthenticateV0/task.loc.json b/Tasks/MavenAuthenticateV0/task.loc.json
@@ -10,7 +10,7 @@
   "version": {
     "Major": 0,
     "Minor": 156,
-    "Patch": 0
+    "Patch": 1
   },
   "runsOn": [
     "Agent",

diff --git a/Tasks/NuGetAuthenticateV0/task.json b/Tasks/NuGetAuthenticateV0/task.json
@@ -14,7 +14,7 @@
     "version": {
         "Major": 0,
         "Minor": 156,
-        "Patch": 2
+        "Patch": 3
     },
     "minimumAgentVersion": "2.120.0",
     "instanceNameFormat": "NuGet Authenticate",

diff --git a/Tasks/NuGetAuthenticateV0/task.loc.json b/Tasks/NuGetAuthenticateV0/task.loc.json
@@ -14,7 +14,7 @@
   "version": {
     "Major": 0,
     "Minor": 156,
-    "Patch": 2
+    "Patch": 3
   },
   "minimumAgentVersion": "2.120.0",
   "instanceNameFormat": "ms-resource:loc.instanceNameFormat",

diff --git a/Tasks/PipAuthenticateV1/task.json b/Tasks/PipAuthenticateV1/task.json
@@ -10,7 +10,7 @@
   "version": {
       "Major": 1,
       "Minor": 156,
-      "Patch": 1
+      "Patch": 2
   },
   "runsOn": [
       "Agent",

diff --git a/Tasks/PipAuthenticateV1/task.loc.json b/Tasks/PipAuthenticateV1/task.loc.json
@@ -10,7 +10,7 @@
   "version": {
     "Major": 1,
     "Minor": 156,
-    "Patch": 1
+    "Patch": 2
   },
   "runsOn": [
     "Agent",

diff --git a/Tasks/TwineAuthenticateV1/task.json b/Tasks/TwineAuthenticateV1/task.json
@@ -10,7 +10,7 @@
     "version": {
         "Major": 1,
         "Minor": 156,
-        "Patch": 1
+        "Patch": 2
     },
     "runsOn": [
         "Agent",

diff --git a/Tasks/TwineAuthenticateV1/task.loc.json b/Tasks/TwineAuthenticateV1/task.loc.json
@@ -10,7 +10,7 @@
   "version": {
     "Major": 1,
     "Minor": 156,
-    "Patch": 1
+    "Patch": 2
   },
   "runsOn": [
     "Agent",