Merge branch 'master' of https://github.com/ReallyLiri/Bitbucket.Net …

…into ReallyLiri-master
lvermeulen · Jan 3, 2020 · e062514 · e062514
2 parents b4978e7 + b8d60c2
commit e062514
Show file tree

Hide file tree

Showing 24 changed files with 169 additions and 117 deletions.
diff --git a/Bitbucket.Net.sln b/Bitbucket.Net.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2036
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28803.156
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bitbucket.Net", "src\Bitbucket.Net\Bitbucket.Net.csproj", "{51EBF9F3-7DFA-4C72-B38D-D07B1ED7FCEE}"
 EndProject

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
  [![license](https://img.shields.io/github/license/lvermeulen/Bitbucket.Net.svg?maxAge=2592000)](https://github.com/lvermeulen/Bitbucket.Net/blob/master/LICENSE) [![NuGet](https://img.shields.io/nuget/v/Bitbucket.Net.svg?maxAge=2592000)](https://www.nuget.org/packages/Bitbucket.Net/) 
  ![](https://img.shields.io/badge/.net-4.5.2-yellowgreen.svg) ![](https://img.shields.io/badge/netstandard-1.4-yellowgreen.svg)
 
-Client for Bitbucket
+Client for Bitbucket Server
 
 ## Features
 * [X] Audit

diff --git a/global.json b/global.json
@@ -1,5 +1,6 @@
-{
+{
+  "projects": [ "src", "test" ],
   "sdk": {
-    "version": "2.1.4"
+    "version": "1.1.13"
   }
-}
+}
diff --git a/src/Bitbucket.Net/Bitbucket.Net.csproj b/src/Bitbucket.Net/Bitbucket.Net.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>net452;netstandard1.4</TargetFrameworks>
@@ -13,11 +13,12 @@
     <RepositoryType>git</RepositoryType>
     <PackageTags>bitbucket</PackageTags>
     <PackageIconUrl>https://i.imgur.com/OsDAzyV.png</PackageIconUrl>
+    <LangVersion>7</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Flurl.Http" Version="2.1.1" />
-    <PackageReference Include="Microsoft.CSharp" Version="4.4.1" />
+    <PackageReference Include="Flurl.Http" Version="2.4.1" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Bitbucket.Net/BitbucketClient.cs b/src/Bitbucket.Net/BitbucketClient.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
+using Bitbucket.Net.Common;
 using Bitbucket.Net.Common.Models;
 using Flurl;
 using Flurl.Http;
@@ -14,23 +15,48 @@ namespace Bitbucket.Net
 {
     public partial class BitbucketClient
     {
-        private static readonly ISerializer s_serializer = new NewtonsoftJsonSerializer(new JsonSerializerSettings { ContractResolver = new CamelCasePropertyNamesContractResolver() });
+        private static readonly ISerializer s_serializer = new NewtonsoftJsonSerializer(new JsonSerializerSettings
+        {
+            ContractResolver = new CamelCasePropertyNamesContractResolver(),
+            NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore
+        });
+
+        static BitbucketClient()
+        {
+            JsonConvert.DefaultSettings = () => new JsonSerializerSettings
+            {
+                ContractResolver = new CamelCasePropertyNamesContractResolver(),
+                NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore
+            };
+        }
 
         private readonly Url _url;
+        private readonly Func<string> _getToken;
         private readonly string _userName;
         private readonly string _password;
 
-        public BitbucketClient(string url, string userName, string password)
+        private BitbucketClient(string url)
         {
             _url = url;
+        }
+
+        public BitbucketClient(string url, string userName, string password)
+            : this(url)
+        {
             _userName = userName;
             _password = password;
         }
 
+        public BitbucketClient(string url, Func<string> getToken)
+            : this(url)
+        {
+            _getToken = getToken;
+        }
+
         private IFlurlRequest GetBaseUrl(string root = "/api", string version = "1.0") => new Url(_url)
             .AppendPathSegment($"/rest{root}/{version}")
             .ConfigureRequest(settings => settings.JsonSerializer = s_serializer)
-            .WithBasicAuth(_userName, _password);
+            .WithAuthentication(_getToken, _userName, _password);
 
         private async Task<TResult> ReadResponseContentAsync<TResult>(HttpResponseMessage responseMessage, Func<string, TResult> contentHandler = null)
         {

diff --git a/src/Bitbucket.Net/Branches/BitbucketClient.cs b/src/Bitbucket.Net/Branches/BitbucketClient.cs
@@ -68,6 +68,7 @@ public async Task<bool> DeleteRepoBranchAsync(string projectKey, string reposito
             };
 
             var response = await GetBranchUrl($"/projects/{projectKey}/repos/{repositorySlug}/branches")
+                .WithHeader("Content-Type", "application/json")
                 .SendAsync(HttpMethod.Delete, new StringContent(JsonConvert.SerializeObject(data)))
                 .ConfigureAwait(false);
 

diff --git a/src/Bitbucket.Net/CommentLikes/BitbucketClient.cs b/src/Bitbucket.Net/CommentLikes/BitbucketClient.cs
@@ -36,7 +36,7 @@ await GetCommentLikesUrl($"/projects/{projectKey}/repos/{repositorySlug}/commits
         public async Task<bool> LikeCommitCommentAsync(string projectKey, string repositorySlug, string commitId, string commentId)
         {
             var response = await GetCommentLikesUrl($"/projects/{projectKey}/repos/{repositorySlug}/commits/{commitId}/comments/{commentId}/likes")
-                .PostAsync(new StringContent(""))
+                .PostJsonAsync(new StringContent(""))
                 .ConfigureAwait(false);
 
             return await HandleResponseAsync(response).ConfigureAwait(false);
@@ -73,7 +73,7 @@ await GetCommentLikesUrl($"/projects/{projectKey}/repos/{repositorySlug}/pull-re
         public async Task<bool> LikePullRequestCommentAsync(string projectKey, string repositorySlug, string pullRequestId, string commentId)
         {
             var response = await GetCommentLikesUrl($"/projects/{projectKey}/repos/{repositorySlug}/pull-requests/{pullRequestId}/comments/{commentId}/likes")
-                .PostAsync(new StringContent(""))
+                .PostJsonAsync(new StringContent(""))
                 .ConfigureAwait(false);
 
             return await HandleResponseAsync(response).ConfigureAwait(false);

diff --git a/src/Bitbucket.Net/Common/BitbucketHelpers.cs b/src/Bitbucket.Net/Common/BitbucketHelpers.cs
@@ -274,6 +274,13 @@ public static string LineTypeToString(LineTypes lineType)
             return result;
         }
 
+        public static string LineTypeToString(LineTypes? lineType)
+        {
+            return lineType.HasValue
+                ? LineTypeToString(lineType.Value)
+                : null;
+        }
+
         public static LineTypes StringToLineType(string s)
         {
             var pair = s_stringByLineTypes.FirstOrDefault(kvp => kvp.Value.Equals(s, StringComparison.OrdinalIgnoreCase));
@@ -306,6 +313,13 @@ public static string FileTypeToString(FileTypes fileType)
             return result;
         }
 
+        public static string FileTypeToString(FileTypes? fileType)
+        {
+            return fileType.HasValue
+                ? FileTypeToString(fileType.Value)
+                : null;
+        }
+
         public static FileTypes StringToFileType(string s)
         {
             var pair = s_stringByFileTypes.FirstOrDefault(kvp => kvp.Value.Equals(s, StringComparison.OrdinalIgnoreCase));
@@ -573,6 +587,13 @@ public static string DiffTypeToString(DiffTypes diffType)
             return result;
         }
 
+        public static string DiffTypeToString(DiffTypes? diffType)
+        {
+            return diffType.HasValue
+                ? DiffTypeToString(diffType.Value)
+                : null;
+        }
+
         #endregion
 
         #region TagTypes

diff --git a/src/Bitbucket.Net/Common/DynamicDictionary.cs b/src/Bitbucket.Net/Common/DynamicDictionary.cs
diff --git a/src/Bitbucket.Net/Common/FlurlRequestExtensions.cs b/src/Bitbucket.Net/Common/FlurlRequestExtensions.cs
@@ -0,0 +1,19 @@
+using System;
+using Flurl.Http;
+
+namespace Bitbucket.Net.Common
+{
+    public static class FlurlRequestExtensions
+    {
+        public static IFlurlRequest WithAuthentication(this IFlurlRequest request, Func<string> getToken, string userName, string password)
+        {
+            if (getToken != null)
+            {
+                string token = getToken();
+                return request.WithOAuthBearerToken(token);
+            }
+
+            return request.WithBasicAuth(userName, password);
+        }
+    }
+}
diff --git a/src/Bitbucket.Net/Core/Admin/BitbucketClient.cs b/src/Bitbucket.Net/Core/Admin/BitbucketClient.cs
@@ -42,7 +42,7 @@ public async Task<DeletableGroupOrUser> CreateAdminGroupAsync(string name)
         {
             var response = await GetAdminUrl("/groups")
                 .SetQueryParam("name", name)
-                .PostAsync(new StringContent(""))
+                .PostJsonAsync(new StringContent(""))
                 .ConfigureAwait(false);
 
             return await HandleResponseAsync<DeletableGroupOrUser>(response).ConfigureAwait(false);
@@ -144,23 +144,23 @@ public async Task<bool> CreateAdminUserAsync(string name, string password, strin
 
             var response = await GetAdminUrl("/users")
                 .SetQueryParams(queryParamValues)
-                .PostAsync(new StringContent(""))
+                .PostJsonAsync(new StringContent(""))
                 .ConfigureAwait(false);
 
             return await HandleResponseAsync(response).ConfigureAwait(false);
         }
 
         public async Task<UserInfo> UpdateAdminUserAsync(string name = null, string displayName = null, string emailAddress = null)
         {
-            var data = new DynamicDictionary
+            var data = new
             {
-                { name, "name" },
-                { displayName, "displayName" },
-                { emailAddress, "email" }
+                name,
+                displayName,
+                email = emailAddress
             };
 
             var response = await GetAdminUrl("/users")
-                .PutJsonAsync(data.ToDictionary())
+                .PutJsonAsync(data)
                 .ConfigureAwait(false);
 
             return await HandleResponseAsync<UserInfo>(response).ConfigureAwait(false);

diff --git a/src/Bitbucket.Net/Core/Markup/BitbucketClient.cs b/src/Bitbucket.Net/Core/Markup/BitbucketClient.cs
@@ -30,7 +30,7 @@ public async Task<string> PreviewMarkupAsync(string text,
             var response = await GetMarkupUrl("/preview")
                 .WithHeader("X-Atlassian-Token", "no-check")
                 .SetQueryParams(queryParamValues)
-                .PostAsync(new StringContent(text))
+                .PostJsonAsync(new StringContent(text))
                 .ConfigureAwait(false);
 
             return await HandleResponseAsync<string>(response, s =>