Merge pull request #156 from docusign/CG-DEVDOCS-16799

CG DevDocs 16799

Author: CassandraLoewen

src/main/java/com/docusign/HttpsConnectWebhookhMacValidation.java

@@ -26,12 +26,11 @@ public class HttpsConnectWebhookhMacValidation {
      */
     //ds-snippet-start:Connect1Step1
     private static String ComputeHash(String secret, byte[] payload)
-            throws InvalidKeyException, NoSuchAlgorithmException {
+            throws InvalidKeyException, NoSuchAlgorithmException, UnsupportedEncodingException {
         String digest = "HmacSHA256";
         Mac mac = Mac.getInstance(digest);
-        mac.init(new SecretKeySpec(secret.getBytes(), digest));
-        String base64Hash = new String(Base64.getEncoder().encode(mac.doFinal(payload)));
-        return base64Hash;
+        mac.init(new SecretKeySpec(secret.getBytes("UTF-8"), digest));
+        return Base64.getEncoder().encodeToString(mac.doFinal(payload));
     }
 
     public static boolean HashIsValid(String secret, byte[] payload, String verify)

src/main/java/com/docusign/controller/connect/services/ValidateUsingHmacService.java

@@ -10,12 +10,11 @@
 
 public final class ValidateUsingHmacService {
     public static String computeHash(String secret, byte[] payload)
-            throws InvalidKeyException, NoSuchAlgorithmException {
+            throws InvalidKeyException, NoSuchAlgorithmException, UnsupportedEncodingException {
         String digest = "HmacSHA256";
         Mac mac = Mac.getInstance(digest);
-        mac.init(new SecretKeySpec(secret.getBytes(), digest));
-        String base64Hash = new String(Base64.getEncoder().encode(mac.doFinal(payload)));
-        return base64Hash;
+        mac.init(new SecretKeySpec(secret.getBytes("UTF-8"), digest));
+        return Base64.getEncoder().encodeToString(mac.doFinal(payload));
     }
 
     public static boolean isValid(String secret, byte[] payload, String verify)