Merge pull request #699 from whoisj/v1.17/fix-bitbucket

Fix Bitbucket Authentication

Author: J Wyman

Bitbucket.Authentication/Src/Authority.cs

@@ -166,7 +166,7 @@ public async Task<bool> ValidateCredentials(TargetUri targetUri, string username
             }
 
             // If the basic authentication test failed then try again as OAuth
-            if (await ValidateCredentials(targetUri, new Token(credentials.Password, TokenType.BitbucketPassword)))
+            if (await ValidateCredentials(targetUri, new Token(credentials.Password, TokenType.BitbucketAccess)))
             {
                 return true;
             }

Bitbucket.Authentication/Src/Rest/RestClient.cs

@@ -26,7 +26,9 @@ public async Task<AuthenticationResult> TryGetUser(TargetUri targetUri, int requ
                 Authorization = authorization,
                 Timeout = TimeSpan.FromMilliseconds(requestTimeout),
             };
-            var requestUri = targetUri.CreateWith(restRootUrl);
+
+            var apiUrl = new Uri(restRootUrl, UserUrl);
+            var requestUri = targetUri.CreateWith(apiUrl);
 
             using (var response = await Network.HttpGetAsync(requestUri, options))
             {

Microsoft.Alm.Authentication/Src/Network.cs

@@ -440,6 +440,7 @@ private HttpClient GetHttpClient(TargetUri targetUri, HttpMessageHandler handler
                                 switch (token.Type)
                                 {
                                     case TokenType.AzureAccess:
+                                    case TokenType.BitbucketAccess:
                                         {
                                             // ADAL access tokens are packed into the Authorization header.
                                             httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Value);

Microsoft.Alm.Authentication/Src/TokenType.cs

@@ -60,22 +60,16 @@ public enum TokenType
         [System.ComponentModel.Description("Test-only Token")]
         Test = 5,
 
-        /// <summary>
-        /// Bitbucket Password Tokens.
-        /// </summary>
-        [System.ComponentModel.Description("Bitbucket Password Token")]
-        BitbucketPassword = 6,
-
         /// <summary>
         /// Bitbucket Access Tokens.
         /// </summary>
         [System.ComponentModel.Description("Bitbucket Access Token")]
-        BitbucketAccess = 7,
+        BitbucketAccess = 6,
 
         /// <summary>
         /// Used to auto-refresh Bitbucket Access Tokens.
         /// </summary>
         [System.ComponentModel.Description("Bitbucket Refresh Token")]
-        BitbucketRefresh = 8,
+        BitbucketRefresh = 7,
     }
 }