Keep things DRY.

Move `GetSha256Hash` into `StringExtensions` as it's needed in >1 place.

Author: grokys

src/GitHub.App/Api/ApiClient.cs

@@ -149,30 +149,10 @@ public IObservable<LicenseMetadata> GetLicenses()
 
         public HostAddress HostAddress { get; }
 
-        static string GetSha256Hash(string input)
-        {
-            Guard.ArgumentNotEmptyString(input, nameof(input));
-
-            try
-            {
-                using (var sha256 = SHA256.Create())
-                {
-                    var bytes = Encoding.UTF8.GetBytes(input);
-                    var hash = sha256.ComputeHash(bytes);
-
-                    return string.Join("", hash.Select(b => b.ToString("x2", CultureInfo.InvariantCulture)));
-                }
-            }
-            catch (Exception e)
-            {
-                log.Error(e, "IMPOSSIBLE! Generating Sha256 hash caused an exception");
-                return null;
-            }
-        }
-
         static string GetFingerprint()
         {
-            return GetSha256Hash(ProductName + ":" + GetMachineIdentifier());
+            var fingerprint = ProductName + ":" + GetMachineIdentifier();
+            return fingerprint.GetSha256Hash();
         }
 
         static string GetMachineNameSafe()

src/GitHub.App/Services/PullRequestService.cs

@@ -16,17 +16,14 @@
 using System.Collections.Generic;
 using LibGit2Sharp;
 using GitHub.Logging;
-using System.Security.Cryptography;
 using GitHub.Extensions;
-using Serilog;
 
 namespace GitHub.Services
 {
     [Export(typeof(IPullRequestService))]
     [PartCreationPolicy(CreationPolicy.Shared)]
     public class PullRequestService : IPullRequestService
     {
-        static readonly ILogger log = LogManager.ForContext<PullRequestService>();
         const string SettingCreatedByGHfVS = "created-by-ghfvs";
         const string SettingGHfVSPullRequest = "ghfvs-pr-owner-number";
 
@@ -413,7 +410,7 @@ public IObservable<Unit> SwitchToBranch(ILocalRepositoryModel repository, IPullR
                 {
                     var branchName = GetLocalBranchesInternal(repository, repo, pullRequest).FirstOrDefault();
 
-                    log.Assert(branchName != null, "PullRequestService.SwitchToBranch called but no local branch found");
+                    Log.Assert(branchName != null, "PullRequestService.SwitchToBranch called but no local branch found");
 
                     if (branchName != null)
                     {
@@ -681,7 +678,7 @@ static string CalculateTempFileName(string relativePath, string commitSha, Encod
             // The combination of relative path, commit SHA and encoding should be sufficient to uniquely identify a file.
             var relativeDir = Path.GetDirectoryName(relativePath) ?? string.Empty;
             var key = relativeDir + '|' + encoding.WebName;
-            var relativePathHash = GetSha256Hash(key);
+            var relativePathHash = key.GetSha256Hash();
             var tempDir = Path.Combine(Path.GetTempPath(), "GitHubVisualStudio", "FileContents", relativePathHash);
             var tempFileName = $"{Path.GetFileNameWithoutExtension(relativePath)}@{commitSha}{Path.GetExtension(relativePath)}";
             return Path.Combine(tempDir, tempFileName);
@@ -713,26 +710,5 @@ static Tuple<string, int> ParseGHfVSConfigKeyValue(string value)
 
             return null;
         }
-
-        static string GetSha256Hash(string input)
-        {
-            Guard.ArgumentNotNull(input, nameof(input));
-
-            try
-            {
-                using (var sha256 = SHA256.Create())
-                {
-                    var bytes = Encoding.UTF8.GetBytes(input);
-                    var hash = sha256.ComputeHash(bytes);
-
-                    return string.Join("", hash.Select(b => b.ToString("x2", CultureInfo.InvariantCulture)));
-                }
-            }
-            catch (Exception e)
-            {
-                log.Error(e, "IMPOSSIBLE! Generating Sha256 hash caused an exception");
-                return null;
-            }
-        }
     }
 }

src/GitHub.Extensions/StringExtensions.cs

@@ -4,8 +4,11 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Security.Cryptography;
 using System.Text;
 using System.Text.RegularExpressions;
+using GitHub.Logging;
+using Splat;
 
 namespace GitHub.Extensions
 {
@@ -222,5 +225,23 @@ public static string Humanize(this string s)
             var combined = String.Join(" ", result);
             return Char.ToUpper(combined[0], CultureInfo.InvariantCulture) + combined.Substring(1);
         }
+
+        /// <summary>
+        /// Generates a SHA256 hash for a string.
+        /// </summary>
+        /// <param name="input">The input string.</param>
+        /// <returns>The SHA256 hash.</returns>
+        public static string GetSha256Hash(this string input)
+        {
+            Guard.ArgumentNotNull(input, nameof(input));
+
+            using (var sha256 = SHA256.Create())
+            {
+                var bytes = Encoding.UTF8.GetBytes(input);
+                var hash = sha256.ComputeHash(bytes);
+
+                return string.Join("", hash.Select(b => b.ToString("x2", CultureInfo.InvariantCulture)));
+            }
+        }
     }
 }