refactor:decrypt message

Sources/Chat/Conversation.swift

@@ -25,24 +25,29 @@ extension PushChat {
     }
   }
 
-  public static func Latest(threadHash: String, pgpPrivateKey: String, env: ENV) async throws
+  public static func Latest(threadHash: String, pgpPrivateKey: String, toDecrypt: Bool, env: ENV)
+    async throws
     -> Message
   {
     return try await History(
-      threadHash: threadHash, limit: 1, pgpPrivateKey: pgpPrivateKey, env: env
+      threadHash: threadHash, limit: 1, pgpPrivateKey: pgpPrivateKey, toDecrypt: toDecrypt, env: env
     ).first!
   }
 
-  public static func History(threadHash: String, limit: Int, pgpPrivateKey: String, env: ENV)
+  public static func History(
+    threadHash: String, limit: Int, pgpPrivateKey: String, toDecrypt: Bool, env: ENV
+  )
     async throws -> [Message]
   {
     do {
       var messages = try await getMessagesService(threadHash: threadHash, limit: limit, env: env)
 
-      for i in 0..<messages.count {
-        let decryptedMsg = try decryptMessage(
-          message: messages[i], privateKeyArmored: pgpPrivateKey)
-        messages[i].messageContent = decryptedMsg
+      if toDecrypt {
+        for i in 0..<messages.count {
+          let decryptedMsg = try decryptMessage(
+            message: messages[i], privateKeyArmored: pgpPrivateKey)
+          messages[i].messageContent = decryptedMsg
+        }
       }
 
       return messages
@@ -78,11 +83,25 @@ extension PushChat {
       if message.encType != "pgp" {
         return message.messageContent
       }
+      return try decryptMessage(
+        message.messageContent, encryptedSecret: message.encryptedSecret,
+        privateKeyArmored: privateKeyArmored)
+    } catch {
+      return "Unable to decrypt message"
+    }
+  }
+
+  public static func decryptMessage(
+    _ message: String,
+    encryptedSecret: String,
+    privateKeyArmored: String
+  ) throws -> String {
+    do {
 
       let secretKey = try Pgp.pgpDecrypt(
-        cipherText: message.encryptedSecret, toPrivateKeyArmored: privateKeyArmored)
+        cipherText: encryptedSecret, toPrivateKeyArmored: privateKeyArmored)
 
-      let userMsg = AESCBCHelper.decrypt(cipherText: message.messageContent, secretKey: secretKey)!
+      let userMsg = AESCBCHelper.decrypt(cipherText: message, secretKey: secretKey)!
       let userMsgStr = String(data: userMsg, encoding: .utf8)
 
       if userMsgStr == nil {
@@ -94,5 +113,4 @@ extension PushChat {
       return "Unable to decrypt message"
     }
   }
-
 }

Tests/Chat/GetChatsTests.swift

@@ -40,7 +40,8 @@ class GetChatsTests: XCTestCase {
       conversationId: "0x4D5bE92D510300ceF50a2FC03534A95b60028950", account: userAddress)!
 
     let messages = try await PushChat.History(
-      threadHash: converationHash, limit: 5, pgpPrivateKey: pgpPrivateKey, env: .STAGING)
+      threadHash: converationHash, limit: 5, pgpPrivateKey: pgpPrivateKey, toDecrypt: true,
+      env: .STAGING)
 
     for msg in messages {
       XCTAssert(msg.messageContent.count > 0)

Tests/Chat/SendTests.swift

@@ -30,7 +30,7 @@ class SendChatsTests: XCTestCase {
     let threadHash = try await PushChat.ConversationHash(
       conversationId: recipientAddress, account: senderAddress)!
     let latestMessage = try await PushChat.History(
-      threadHash: threadHash, limit: 1, pgpPrivateKey: senderPgpPk, env: .STAGING
+      threadHash: threadHash, limit: 1, pgpPrivateKey: senderPgpPk, toDecrypt: true, env: .STAGING
     ).first!.messageContent
 
     XCTAssertEqual(latestMessage, messageToSen)
@@ -55,7 +55,7 @@ class SendChatsTests: XCTestCase {
     let threadHash = try await PushChat.ConversationHash(
       conversationId: recipientAddress, account: senderAddress)!
     let latestMessage = try await PushChat.History(
-      threadHash: threadHash, limit: 1, pgpPrivateKey: senderPgpPk, env: .STAGING
+      threadHash: threadHash, limit: 1, pgpPrivateKey: senderPgpPk, toDecrypt: true, env: .STAGING
     ).first!.messageContent
 
     XCTAssertEqual(latestMessage, messageToSen)
@@ -81,7 +81,7 @@ class SendChatsTests: XCTestCase {
     let threadHash = try await PushChat.ConversationHash(
       conversationId: recipientAddress, account: senderAddress)!
     let latestMessage1 = try await PushChat.History(
-      threadHash: threadHash, limit: 1, pgpPrivateKey: senderPgpPk, env: .STAGING
+      threadHash: threadHash, limit: 1, pgpPrivateKey: senderPgpPk, toDecrypt: true, env: .STAGING
     ).first!.messageContent
 
     let _ = try await Push.PushChat.send(
@@ -96,7 +96,7 @@ class SendChatsTests: XCTestCase {
     let threadHash2 = try await PushChat.ConversationHash(
       conversationId: recipientAddress, account: senderAddress)!
     let latestMessage2 = try await PushChat.History(
-      threadHash: threadHash2, limit: 1, pgpPrivateKey: senderPgpPk, env: .STAGING
+      threadHash: threadHash2, limit: 1, pgpPrivateKey: senderPgpPk, toDecrypt: true, env: .STAGING
     ).first!.messageContent
 
     XCTAssertEqual(latestMessage1, messageToSen1)