Fixed Speedygeek#306 (Speedygeek#307)

fixed UpdateUserIdentity and UpdateUserIdentityAsync
abc516 · Sep 30, 2017 · e4dfe33 · e4dfe33
1 parent 5053911
commit e4dfe33
Show file tree

Hide file tree

Showing 8 changed files with 192 additions and 11 deletions.
diff --git a/src/ZendeskApi_v2/Core.cs b/src/ZendeskApi_v2/Core.cs
@@ -107,7 +107,9 @@ public Core(string zendeskApiUrl, string user, string password, string apiToken,
         public T GetByPageUrl<T>(string pageUrl, int perPage = 100)
         {
             if (string.IsNullOrEmpty(pageUrl))
+            {
                 return JsonConvert.DeserializeObject<T>("");
+            }
 
             var resource = Regex.Split(pageUrl, "api/v2/").Last() + "&per_page=" + perPage;
             return RunRequest<T>(resource, RequestMethod.Get);
@@ -329,13 +331,21 @@ protected bool GenericBoolPut(string resource, object body = null)
         protected string GetPasswordOrTokenAuthHeader()
         {
             if (!ApiToken.IsNullOrWhiteSpace() && !User.IsNullOrWhiteSpace())
+            {
                 return GetAuthHeader(User + "/token", ApiToken);
+            }
             else if (!Password.IsNullOrWhiteSpace() && !User.IsNullOrWhiteSpace())
+            {
                 return GetAuthHeader(User, Password);
+            }
             else if (!OAuthToken.IsNullOrWhiteSpace())
+            {
                 return GetAuthBearerHeader(OAuthToken);
+            }
             else
+            {
                 return string.Empty;
+            }
         }
 
         protected string GetAuthBearerHeader(string oAuthToken)
@@ -353,7 +363,9 @@ protected string GetAuthHeader(string userName, string password)
         public async Task<T> GetByPageUrlAsync<T>(string pageUrl, int perPage = 100)
         {
             if (string.IsNullOrEmpty(pageUrl))
+            {
                 return JsonConvert.DeserializeObject<T>("");
+            }
 
             var resource = Regex.Split(pageUrl, "api/v2/").Last() + "&per_page=" + perPage;
             return await RunRequestAsync<T>(resource, RequestMethod.Get);

diff --git a/src/ZendeskApi_v2/Extensions/StringExtensions.cs b/src/ZendeskApi_v2/Extensions/StringExtensions.cs
@@ -7,11 +7,17 @@ internal static bool IsNullOrWhiteSpace(this string value)
 
             // this is needed because .net 3.5 and older don't have 
             // string.IsNullOrWhiteSpace
-            if (value == null) return true;
+            if (value == null)
+            {
+                return true;
+            }
 
             for (int i = 0; i < value.Length; i++)
             {
-                if (!char.IsWhiteSpace(value[i])) return false;
+                if (!char.IsWhiteSpace(value[i]))
+                {
+                    return false;
+                }
             }
 
             return true;

diff --git a/src/ZendeskApi_v2/Models/GroupResponseBase.cs b/src/ZendeskApi_v2/Models/GroupResponseBase.cs
@@ -50,10 +50,14 @@ public long TotalPages
         private long GetPageFromParameter()
         {
             if (string.IsNullOrEmpty(PreviousPage))
+            {
                 return 1;
+            }
 
             if (string.IsNullOrEmpty(NextPage))
+            {
                 return TotalPages;
+            }
 
             Dictionary<string, string> dict = NextPage.GetQueryStringDict();
             if (dict.ContainsKey("page"))
@@ -68,7 +72,9 @@ private int GetPageSizeFromParameter()
         {
             var page = NextPage ?? PreviousPage;
             if (page == null)
+            {
                 return 100;
+            }
 
             Dictionary<string, string> dict = page.GetQueryStringDict();
             if (dict.ContainsKey("per_page"))

diff --git a/src/ZendeskApi_v2/Requests/Attachments.cs b/src/ZendeskApi_v2/Requests/Attachments.cs
@@ -58,15 +58,19 @@ public Upload UploadAttachments(IEnumerable<ZenFile> files, int? timeout = null)
         {
             var zenFiles = files as IList<ZenFile> ?? files.ToList();
             if (!zenFiles.Any())
+            {
                 return null;
+            }
 
             var res = UploadAttachment(zenFiles.First(), timeout);
 
             if (zenFiles.Count() > 1)
             {
                 var otherFiles = zenFiles.Skip(1);
                 foreach (var curFile in otherFiles)
+                {
                     res = UploadAttachment(curFile, res.Token, timeout);
+                }
             }
 
             return res;
@@ -102,7 +106,9 @@ public async Task<Upload> UploadAttachmentsAsync(IEnumerable<ZenFile> files, int
         {
             var zenFiles = files as IList<ZenFile> ?? files.ToList();
             if (!zenFiles.Any())
+            {
                 return null;
+            }
 
             var res = UploadAttachmentAsync(zenFiles.First(), timeout);
 

diff --git a/src/ZendeskApi_v2/Requests/HelpCenter/Categories.cs b/src/ZendeskApi_v2/Requests/HelpCenter/Categories.cs
@@ -50,7 +50,10 @@ public IndividualCategoryResponse GetCategoryById(long id)
         public IndividualCategoryResponse CreateCategory(Category category)
         {
             if (string.IsNullOrEmpty(category.Locale))
+            {
                 category.Locale = Locale;
+            }
+
             var body = new { category };
 
             return GenericPost<IndividualCategoryResponse>("help_center/categories.json", body);

diff --git a/src/ZendeskApi_v2/Requests/Tickets.cs b/src/ZendeskApi_v2/Requests/Tickets.cs
@@ -421,7 +421,10 @@ public JobStatusResponse BulkImportTickets(IEnumerable<TicketImport> tickets)
         public IndividualTicketResponse UpdateTicket(Ticket ticket, Comment comment = null)
         {
             if (comment != null)
+            {
                 ticket.Comment = comment;
+            }
+
             var body = new { ticket };
 
             return GenericPut<IndividualTicketResponse>($"{_tickets}/{ticket.Id}.json", body);
@@ -745,7 +748,10 @@ public async Task<JobStatusResponse> BulkImportTicketsAsync(IEnumerable<TicketIm
         public async Task<IndividualTicketResponse> UpdateTicketAsync(Ticket ticket, Comment comment = null)
         {
             if (comment != null)
+            {
                 ticket.Comment = comment;
+            }
+
             var body = new { ticket };
 
             return await GenericPutAsync<IndividualTicketResponse>($"{_tickets}/{ticket.Id}.json", body);
@@ -957,7 +963,9 @@ private string GetResourceStringWithSideLoadOptionsParam(string resource, Ticket
             if (sideLoadOptions != TicketSideLoadOptionsEnum.None)
             {
                 if (sideLoadOptions.HasFlag(TicketSideLoadOptionsEnum.None))
+                {
                     sideLoadOptions &= ~TicketSideLoadOptionsEnum.None;
+                }
 
                 string sideLoads = sideLoadOptions.ToString().ToLower().Replace(" ", "");
                 resource += (resource.Contains("?") ? "&" : "?") + "include=" + sideLoads;