fix: unfollow user fix

push-protocol · Jul 20, 2023 · 186e423 · 186e423
1 parent c2b23f5
commit 186e423
Show file tree

Hide file tree

Showing 3 changed files with 88 additions and 16 deletions.
diff --git a/Sources/Endpoints/PushEndpoint.swift b/Sources/Endpoints/PushEndpoint.swift
@@ -47,10 +47,17 @@ extension PushEndpoint {
   static func updateUser(
     account userAddress: String,
     env: ENV
-  ) -> URL {
+  ) -> Self {
+
+    // let endPoint = "https://" + ENV.getHost(withEnv: env) + "/apis/v2/users/\(userAddress)/profile"
+    // return URL(string: endPoint)!
 
-    let endPoint = "https://" + ENV.getHost(withEnv: env) + "/apis/v2/users/\(userAddress)/profile"
-    return URL(string: endPoint)!
+     PushEndpoint(
+      env: env,
+      path: "users/\(userAddress)/profile",
+      queryItems: [],
+      apiVersion: "v2"
+    )
   }
 
   static func getFeeds(

diff --git a/Sources/User/UpdateProfile.swift b/Sources/User/UpdateProfile.swift
@@ -63,7 +63,7 @@ extension PushUser {
   static func updateUserService(payload: UpdateUserPayload, account: String, env: ENV)
     async throws
   {
-    let url = PushEndpoint.updateUser(account: walletToPCAIP10(account: account), env: env)
+    let url = PushEndpoint.updateUser(account: walletToPCAIP10(account: account), env: env).url
     var request = URLRequest(url: url)
     request.httpMethod = "PUT"
     request.setValue("application/json", forHTTPHeaderField: "Content-Type")
@@ -83,15 +83,15 @@ extension PushUser {
 }
 
 struct UpdateUserPayload: Codable {
-  var name: String?
+  var name: String
   var desc: String
   var picture: String
   var blockedUsersList: [String]
   var verificationProof: String
 }
 
 struct UpdateUseProfile: Codable {
-  public var name: String?
+  public var name: String
   public var desc: String
   public var picture: String
   public var blockedUsersList: [String]
@@ -101,22 +101,22 @@ func getUpdateProfileHash(newProfile: PushUser.UserProfile) throws -> (
   UpdateUseProfile, String
 ) {
 
-  let _name = newProfile.name == nil ? "" : newProfile.name!
-  let _desc = newProfile.desc == nil ? "" : newProfile.desc!
+  let _name = newProfile.name == nil ? " " : newProfile.name!
+  let _desc = newProfile.desc == nil ? " " : newProfile.desc!
 
-  let name = newProfile.name == nil ? "null" : "\"\(_name)\""
-  let desc = newProfile.desc == nil ? "null" : "\"\(_desc)\""
+  let name =  "\"\(_name)\""
+  let desc = "\"\(_desc)\""
   let picture = "\"\(newProfile.picture)\""
-  let blockedUsersList = newProfile.blockedUsersList!
+  let blockedUsersList = newProfile.blockedUsersList != nil ? newProfile.blockedUsersList! : []
 
   let blockUserAddresses = flatten_address_list(addresses: newProfile.blockedUsersList!)
   let jsonString =
     "{\"name\":\(name),\"desc\":\(desc),\"picture\":\(picture),\"blockedUsersList\":\(blockUserAddresses)}"
 
   let newUserProfile = UpdateUseProfile(
-    name: name.replacingOccurrences(of: "\"", with: ""),
-    desc: desc.replacingOccurrences(of: "\"", with: ""),
-    picture: picture.replacingOccurrences(of: "\"", with: ""),
+    name: _name,
+    desc: _desc,
+    picture: newProfile.picture,
     blockedUsersList: blockedUsersList)
   let hash = generateSHA256Hash(msg: jsonString)
 

diff --git a/Tests/User/UpdateUserTests.swift b/Tests/User/UpdateUserTests.swift
@@ -28,7 +28,7 @@ class UpdateUserTests: XCTestCase {
 
   }
 
-  func testUserBlock() async throws {
+  func testUserBlockExistingUser() async throws {
     let (a1, a2, a3) = (
       generateRandomEthereumAddress(), generateRandomEthereumAddress(),
       generateRandomEthereumAddress()
@@ -41,7 +41,37 @@ class UpdateUserTests: XCTestCase {
       env: .STAGING)
   }
 
-  func testUserUnBlock() async throws {
+  func testUserBlockCreatedUser() async throws {
+    let userPk = getRandomAccount()
+    let signer = try SignerPrivateKey(
+      privateKey: userPk
+    )
+    let addrs = try await signer.getAddress()
+
+    let user = try await PushUser.create(
+      options: PushUser.CreateUserOptions(
+        env: ENV.STAGING,
+        signer: signer,
+        progressHook: nil
+      ))
+
+     let userPpgpPk = try await PushUser.DecryptPGPKey(
+      encryptedPrivateKey: user.encryptedPrivateKey, signer: signer)
+
+
+    let (a1, a2, a3) = (
+      generateRandomEthereumAddress(), generateRandomEthereumAddress(),
+      generateRandomEthereumAddress()
+    )
+
+    let usersToBlock = [a1, a2, a3]
+
+    try await PushUser.blockUsers(
+      addressesToBlock: usersToBlock, account: addrs, pgpPrivateKey: userPpgpPk,
+      env: .STAGING)
+  }
+
+  func testUserUnBlockExistingUser() async throws {
     let (a1, a2, a3) = (
       generateRandomEthereumAddress(), generateRandomEthereumAddress(),
       generateRandomEthereumAddress()
@@ -59,4 +89,39 @@ class UpdateUserTests: XCTestCase {
       env: .STAGING)
   }
 
+  func testUserUnBlockCreatedUser() async throws {
+    let userPk = getRandomAccount()
+    let signer = try SignerPrivateKey(
+      privateKey: userPk
+    )
+    let addrs = try await signer.getAddress()
+
+    let user = try await PushUser.create(
+      options: PushUser.CreateUserOptions(
+        env: ENV.STAGING,
+        signer: signer,
+        progressHook: nil
+      ))
+
+     let userPpgpPk = try await PushUser.DecryptPGPKey(
+      encryptedPrivateKey: user.encryptedPrivateKey, signer: signer)
+
+
+    let (a1, a2, a3) = (
+      generateRandomEthereumAddress(), generateRandomEthereumAddress(),
+      generateRandomEthereumAddress()
+    )
+
+    let usersToBlock = [a1, a2, a3]
+    let usersToUnBlock = [a1,a3]
+
+    try await PushUser.blockUsers(
+      addressesToBlock: usersToBlock, account: addrs, pgpPrivateKey: userPpgpPk,
+      env: .STAGING)
+
+    try await PushUser.unblockUsers(
+      addressesToUnblock: usersToUnBlock, account: UserAddress, pgpPrivateKey: UserPrivateKey,
+      env: .STAGING)
+  }
+
 }