From 2e31376048a225e9a974cccbff6708b973b012b7 Mon Sep 17 00:00:00 2001
From: Fu Diwei <fudiwei@sina.com>
Date: Mon, 2 Aug 2021 21:31:05 +0800
Subject: [PATCH] fix(work): fix typo

---
 .../Extensions/WechatApiClientEventExtensions.cs   |  4 ++--
 ...sions.cs => WechatWorkClientEventExtensions.cs} | 14 ++++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)
 rename src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/{WechatWorkClientEventSerializationExtensions.cs => WechatWorkClientEventExtensions.cs} (96%)

diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientEventExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientEventExtensions.cs
index 5746079f..1a214fa1 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientEventExtensions.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientEventExtensions.cs
@@ -299,7 +299,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
         /// <param name="callbackTimestamp">微信回调通知中的 timestamp 字段。</param>
         /// <param name="callbackNonce">微信回调通知中的 nonce 字段。</param>
         /// <param name="callbackJson">微信回调通知中请求正文（JSON 格式）。</param>
-        /// <param name="callbackSignature">微信回调通知中的 signature 字段。</param>
+        /// <param name="callbackSignature">微信回调通知中的 msg_signature 字段。</param>
         /// <returns></returns>
         public static bool VerifyEventSignatureFromJson(this WechatApiClient client, string callbackTimestamp, string callbackNonce, string callbackJson, string callbackSignature)
         {
@@ -331,7 +331,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
         /// <param name="callbackTimestamp">微信回调通知中的 timestamp 字段。</param>
         /// <param name="callbackNonce">微信回调通知中的 nonce 字段。</param>
         /// <param name="callbackXml">微信回调通知中请求正文（XML 格式）。</param>
-        /// <param name="callbackSignature">微信回调通知中的 signature 字段。</param>
+        /// <param name="callbackSignature">微信回调通知中的 msg_signature 字段。</param>
         /// <returns></returns>
         public static bool VerifyEventSignatureFromXml(this WechatApiClient client, string callbackTimestamp, string callbackNonce, string callbackXml, string callbackSignature)
         {
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientEventSerializationExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientEventExtensions.cs
similarity index 96%
rename from src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientEventSerializationExtensions.cs
rename to src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientEventExtensions.cs
index bd85e72a..e2c800bd 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientEventSerializationExtensions.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientEventExtensions.cs
@@ -7,9 +7,9 @@ using System.Xml.Serialization;
 namespace SKIT.FlurlHttpClient.Wechat.Work
 {
     /// <summary>
-    /// 为 <see cref="WechatWorkClient"/> 提供回调通知事件序列化相关的扩展方法。
+    /// 为 <see cref="WechatWorkClient"/> 提供回调通知事件的扩展方法。
     /// </summary>
-    public static class WechatWorkClientEventSerializationExtensions
+    public static class WechatWorkClientEventExtensions
     {
         private class EncryptedWechatWorkEvent
         {
@@ -46,11 +46,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work
                 if (string.IsNullOrEmpty(encryptedEvent.EncryptedData))
                     throw new Exceptions.WechatWorkEventSerializationException("Encrypt event failed, because of empty encrypted data.");
 
-                callbackJson = Utilities.WxBizMsgCryptor.AESDecrypt(
-                    cipherText: encryptedEvent.EncryptedData,
-                    encodingAESKey: client.Credentials.PushEncodingAESKey!,
-                    out _
-                );
+                callbackJson = Utilities.WxBizMsgCryptor.AESDecrypt(cipherText: encryptedEvent.EncryptedData, encodingAESKey: client.Credentials.PushEncodingAESKey!, out _);
 
                 return client.JsonSerializer.Deserialize<TEvent>(callbackJson);
             }
@@ -72,9 +68,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work
 
             try
             {
-                if (!Utilities.WxBizMsgCryptor.TryParseXml(callbackXml, out callbackXml!))
+                if (!Utilities.WxBizMsgCryptor.TryParseXml(callbackXml, out string? encryptedXml))
                     throw new Exceptions.WechatWorkEventSerializationException("Encrypt event failed, because of empty encrypted data.");
 
+                callbackXml = Utilities.WxBizMsgCryptor.AESDecrypt(cipherText: encryptedXml!, encodingAESKey: client.Credentials.PushEncodingAESKey!, out _);
+
                 using var reader = new StringReader(callbackXml);
 
                 XmlSerializer xmlSerializer = new XmlSerializer(typeof(TEvent), new XmlRootAttribute("xml"));