fix(Communities): Introduce request id for checking community permiss…

…ions

Close 14376

src/app/modules/main/chat_section/controller.nim

@@ -92,14 +92,14 @@ proc getMySectionId*(self: Controller): string =
 proc asyncCheckPermissionsToJoin*(self: Controller) =
   if self.delegate.getPermissionsToJoinCheckOngoing():
     return
-  self.communityService.asyncCheckPermissionsToJoin(self.getMySectionId(), addresses = @[])
+  self.communityService.asyncCheckPermissionsToJoin(self.getMySectionId(), addresses = @[], CommunityPermissionsCheckRequestID.GeneralCommunity)
   self.delegate.setPermissionsToJoinCheckOngoing(true)
 
 proc asyncCheckAllChannelsPermissions*(self: Controller) =
   if self.allChannelsPermissionCheckOngoing:
     return
   self.allChannelsPermissionCheckOngoing = true
-  self.chatService.asyncCheckAllChannelsPermissions(self.getMySectionId(), addresses = @[])
+  self.chatService.asyncCheckAllChannelsPermissions(self.getMySectionId(), addresses = @[], CommunityPermissionsCheckRequestID.GeneralCommunity)
   self.delegate.setChannelsPermissionsCheckOngoing(true)
 
 proc asyncCheckChannelPermissions*(self: Controller, communityId: string, chatId: string) =

src/app/modules/main/communities/controller.nim

@@ -407,11 +407,11 @@ proc authenticate*(self: Controller) =
 proc getCommunityPublicKeyFromPrivateKey*(self: Controller, communityPrivateKey: string): string =
   result = self.communityService.getCommunityPublicKeyFromPrivateKey(communityPrivateKey)
 
-proc asyncCheckPermissionsToJoin*(self: Controller, communityId: string, addressesToShare: seq[string]) =
-  self.communityService.asyncCheckPermissionsToJoin(communityId, addressesToShare)
+proc asyncCheckPermissionsToJoin*(self: Controller, communityId: string, addressesToShare: seq[string], requestId: CommunityPermissionsCheckRequestID) =
+  self.communityService.asyncCheckPermissionsToJoin(communityId, addressesToShare, requestId)
 
-proc asyncCheckAllChannelsPermissions*(self: Controller, communityId: string, sharedAddresses: seq[string]) =
-  self.chatService.asyncCheckAllChannelsPermissions(communityId, sharedAddresses)
+proc asyncCheckAllChannelsPermissions*(self: Controller, communityId: string, sharedAddresses: seq[string], requestId: CommunityPermissionsCheckRequestID) =
+  self.chatService.asyncCheckAllChannelsPermissions(communityId, sharedAddresses, requestId)
 
 proc asyncGetRevealedAccountsForMember*(self: Controller, communityId, memberPubkey: string) =
   self.communityService.asyncGetRevealedAccountsForMember(communityId, memberPubkey)

src/app/modules/main/communities/io_interface.nim

@@ -242,7 +242,7 @@ method prepareTokenModelForCommunity*(self: AccessInterface, communityId: string
 method getCommunityPublicKeyFromPrivateKey*(self: AccessInterface, communityPrivateKey: string): string {.base.} =
   raise newException(ValueError, "No implementation available")
 
-method checkPermissions*(self: AccessInterface, communityId: string, sharedAddresses: seq[string]) {.base.} =
+method checkPermissions*(self: AccessInterface, communityId: string, sharedAddresses: seq[string], temporary: bool) {.base.} =
   raise newException(ValueError, "No implementation available")
 
 method onCommunityCheckPermissionsToJoinResponse*(self: AccessInterface, communityId: string, checkPermissionsToJoinResponse: CheckPermissionsToJoinResponseDto) {.base.} =

src/app/modules/main/communities/module.nim

@@ -863,13 +863,15 @@ method joinCommunityOrEditSharedAddresses*(self: Module) =
 method getCommunityPublicKeyFromPrivateKey*(self: Module, communityPrivateKey: string): string =
   result = self.controller.getCommunityPublicKeyFromPrivateKey(communityPrivateKey)
 
-method checkPermissions*(self: Module, communityId: string, sharedAddresses: seq[string]) =
+method checkPermissions*(self: Module, communityId: string, sharedAddresses: seq[string], temporary: bool) =
   self.joiningCommunityDetails.communityIdForPermissions = communityId
 
-  self.controller.asyncCheckPermissionsToJoin(communityId, sharedAddresses)
+  let requestId = if temporary: CommunityPermissionsCheckRequestID.SharedAddressesCheck else: CommunityPermissionsCheckRequestID.GeneralCommunity
+
+  self.controller.asyncCheckPermissionsToJoin(communityId, sharedAddresses, requestId)
   self.checkingPermissionToJoinInProgress = true
 
-  self.controller.asyncCheckAllChannelsPermissions(communityId, sharedAddresses)
+  self.controller.asyncCheckAllChannelsPermissions(communityId, sharedAddresses, requestId)
   self.checkingAllChannelPermissionsInProgress = true
 
   self.view.setCheckingPermissionsInProgress(inProgress = true)
@@ -887,7 +889,7 @@ method prepareTokenModelForCommunity*(self: Module, communityId: string) =
     tokenPermissionsItems.add(tokenPermissionItem)
 
   self.view.spectatedCommunityPermissionModel.setItems(tokenPermissionsItems)
-  self.checkPermissions(communityId, @[])
+  self.checkPermissions(communityId, @[], false)
 
 proc applyPermissionResponse*(self: Module, communityId: string, permissions: Table[string, CheckPermissionsResultDto]) =
   let community = self.controller.getCommunityById(communityId)

src/app/modules/main/communities/view.nim

@@ -351,10 +351,10 @@ QtObject:
   proc joinCommunityOrEditSharedAddresses*(self: View) {.slot.} =
     self.delegate.joinCommunityOrEditSharedAddresses()
 
-  proc checkPermissions*(self: View, communityId: string, addressesToShare: string) {.slot.} =
+  proc checkPermissions*(self: View, communityId: string, addressesToShare: string, temporary: bool) {.slot.} =
     try:
       let sharedAddresses = map(parseJson(addressesToShare).getElems(), proc(x:JsonNode):string = x.getStr())
-      self.delegate.checkPermissions(communityId, sharedAddresses)
+      self.delegate.checkPermissions(communityId, sharedAddresses, temporary)
     except Exception as e:
       echo "Error updating token model with addresses: ", e.msg
 

src/app_service/service/chat/async_tasks.nim

@@ -45,6 +45,7 @@ type
   AsyncCheckAllChannelsPermissionsTaskArg = ref object of QObjectTaskArg
     communityId: string
     addresses: seq[string]
+    requestId: CommunityPermissionsCheckRequestID
 
 const asyncCheckAllChannelsPermissionsTask: Task = proc(argEncoded: string) {.gcsafe, nimcall.} =
   let arg = decode[AsyncCheckAllChannelsPermissionsTaskArg](argEncoded)
@@ -53,10 +54,12 @@ const asyncCheckAllChannelsPermissionsTask: Task = proc(argEncoded: string) {.gc
     arg.finish(%* {
       "response": response,
       "communityId": arg.communityId,
+      "requestId": arg.requestId,
       "error": "",
     })
   except Exception as e:
     arg.finish(%* {
       "communityId": arg.communityId,
+      "requestId": arg.requestId,
       "error": e.msg,
     })

src/app_service/service/chat/service.nim

@@ -94,6 +94,7 @@ type
     checkChannelPermissionsResponse*: CheckChannelPermissionsResponseDto
 
   CheckAllChannelsPermissionsResponseArgs* = ref object of Args
+    requestId*: CommunityPermissionsCheckRequestID
     communityId*: string
     checkAllChannelsPermissionsResponse*: CheckAllChannelsPermissionsResponseDto
 
@@ -848,19 +849,28 @@ QtObject:
       let errMsg = e.msg
       error "error checking all channel permissions: ", errMsg
 
-  proc asyncCheckAllChannelsPermissions*(self: Service, communityId: string, addresses: seq[string]) =
+  proc asyncCheckAllChannelsPermissions*(self: Service, communityId: string, addresses: seq[string], requestId: CommunityPermissionsCheckRequestID) =
     let arg = AsyncCheckAllChannelsPermissionsTaskArg(
       tptr: cast[ByteAddress](asyncCheckAllChannelsPermissionsTask),
       vptr: cast[ByteAddress](self.vptr),
       slot: "onAsyncCheckAllChannelsPermissionsDone",
       communityId: communityId,
       addresses: addresses,
+      requestId: requestId
     )
     self.threadpool.start(arg)
 
   proc onAsyncCheckAllChannelsPermissionsDone*(self: Service, rpcResponse: string) {.slot.} =
     let rpcResponseObj = rpcResponse.parseJson
     let communityId = rpcResponseObj{"communityId"}.getStr()
+
+    var requestId: CommunityPermissionsCheckRequestID
+    var requestIdInt: int
+    if (rpcResponseObj.getProp("requestId", requestIdInt) and 
+      (requestIdInt >= ord(low(CommunityPermissionsCheckRequestID)) and
+      requestIdInt <= ord(high(CommunityPermissionsCheckRequestID)))):
+      requestId = CommunityPermissionsCheckRequestID(requestIdInt)
+
     try:
       if rpcResponseObj{"error"}.kind != JNull and rpcResponseObj{"error"}.getStr != "":
         raise newException(CatchableError, rpcResponseObj["error"].getStr)
@@ -871,7 +881,11 @@ QtObject:
 
       let checkAllChannelsPermissionsResponse = rpcResponseObj["response"]["result"].toCheckAllChannelsPermissionsResponseDto()
       self.channelGroups[communityId].channelPermissions = checkAllChannelsPermissionsResponse
-      self.events.emit(SIGNAL_CHECK_ALL_CHANNELS_PERMISSIONS_RESPONSE, CheckAllChannelsPermissionsResponseArgs(communityId: communityId, checkAllChannelsPermissionsResponse: checkAllChannelsPermissionsResponse))
+      self.events.emit(SIGNAL_CHECK_ALL_CHANNELS_PERMISSIONS_RESPONSE, CheckAllChannelsPermissionsResponseArgs(
+        communityId: communityId,
+        checkAllChannelsPermissionsResponse: checkAllChannelsPermissionsResponse,
+        requestId: requestId
+      ))
     except Exception as e:
       let errMsg = e.msg
       error "error checking all channels permissions: ", errMsg

src/app_service/service/community/async_tasks.nim

@@ -207,6 +207,7 @@ type
   AsyncCheckPermissionsToJoinTaskArg = ref object of QObjectTaskArg
     communityId: string
     addresses: seq[string]
+    requestId: CommunityPermissionsCheckRequestID
 
 const asyncCheckPermissionsToJoinTask: Task = proc(argEncoded: string) {.gcsafe, nimcall.} =
   let arg = decode[AsyncCheckPermissionsToJoinTaskArg](argEncoded)
@@ -215,11 +216,13 @@ const asyncCheckPermissionsToJoinTask: Task = proc(argEncoded: string) {.gcsafe,
     arg.finish(%* {
       "response": response,
       "communityId": arg.communityId,
+      "requestId": arg.requestId,
       "error": "",
     })
   except Exception as e:
     arg.finish(%* {
       "communityId": arg.communityId,
+      "requestId": arg.requestId,
       "error": e.msg,
     })
 

src/app_service/service/community/dto/community.nim

@@ -43,6 +43,11 @@ type
     KickPending,
     BannedWithAllMessagesDelete
 
+type
+  CommunityPermissionsCheckRequestID* = enum
+    GeneralCommunity = 0,
+    SharedAddressesCheck
+
 proc isBanned*(state: CommunityMemberPendingBanOrKick): bool =
   return state == CommunityMemberPendingBanOrKick.Banned or state == CommunityMemberPendingBanOrKick.BannedWithAllMessagesDelete
 

src/app_service/service/community/service.nim

@@ -138,6 +138,7 @@ type
     currentChunk*: int
 
   CheckPermissionsToJoinResponseArgs* = ref object of Args
+    requestId*: CommunityPermissionsCheckRequestID
     communityId*: string
     checkPermissionsToJoinResponse*: CheckPermissionsToJoinResponseDto
 
@@ -1601,19 +1602,28 @@ QtObject:
     self.events.emit(SIGNAL_COMMUNITY_DATA_IMPORTED, CommunityArgs(community: community))
     self.events.emit(SIGNAL_COMMUNITIES_UPDATE, CommunitiesArgs(communities: @[community]))
 
-  proc asyncCheckPermissionsToJoin*(self: Service, communityId: string, addresses: seq[string]) =
+  proc asyncCheckPermissionsToJoin*(self: Service, communityId: string, addresses: seq[string], requestId: CommunityPermissionsCheckRequestID) =
     let arg = AsyncCheckPermissionsToJoinTaskArg(
       tptr: cast[ByteAddress](asyncCheckPermissionsToJoinTask),
       vptr: cast[ByteAddress](self.vptr),
       slot: "onAsyncCheckPermissionsToJoinDone",
       communityId: communityId,
-      addresses: addresses
+      addresses: addresses,
+      requestId: requestId
     )
     self.threadpool.start(arg)
 
   proc onAsyncCheckPermissionsToJoinDone*(self: Service, rpcResponse: string) {.slot.} =
     let rpcResponseObj = rpcResponse.parseJson
     let communityId = rpcResponseObj{"communityId"}.getStr()
+
+    var requestId: CommunityPermissionsCheckRequestID
+    var requestIdInt: int
+    if (rpcResponseObj.getProp("requestId", requestIdInt) and 
+      (requestIdInt >= ord(low(CommunityPermissionsCheckRequestID)) and
+      requestIdInt <= ord(high(CommunityPermissionsCheckRequestID)))):
+      requestId = CommunityPermissionsCheckRequestID(requestIdInt)
+
     try:
       if rpcResponseObj{"error"}.kind != JNull and rpcResponseObj{"error"}.getStr != "":
         raise newException(CatchableError, rpcResponseObj["error"].getStr)
@@ -1625,7 +1635,8 @@ QtObject:
       let checkPermissionsToJoinResponse = rpcResponseObj["response"]["result"].toCheckPermissionsToJoinResponseDto
       self.events.emit(SIGNAL_CHECK_PERMISSIONS_TO_JOIN_RESPONSE, CheckPermissionsToJoinResponseArgs(
         communityId: communityId,
-        checkPermissionsToJoinResponse: checkPermissionsToJoinResponse
+        checkPermissionsToJoinResponse: checkPermissionsToJoinResponse,
+        requestId: requestId
       ))
     except Exception as e:
       let errMsg = e.msg

ui/app/AppLayouts/Chat/stores/RootStore.qml

@@ -696,6 +696,6 @@ QtObject {
     }
 
     function updatePermissionsModel(communityId, sharedAddresses) {
-        communitiesModuleInst.checkPermissions(communityId, JSON.stringify(sharedAddresses))
+        communitiesModuleInst.checkPermissions(communityId, JSON.stringify(sharedAddresses), false)
     }
 }

ui/app/AppLayouts/stores/RootStore.qml

@@ -269,7 +269,7 @@ QtObject {
     }
 
     function updatePermissionsModel(communityId, sharedAddresses) {
-        communitiesModuleInst.checkPermissions(communityId, JSON.stringify(sharedAddresses))
+        communitiesModuleInst.checkPermissions(communityId, JSON.stringify(sharedAddresses), false)
     }
 
     function promoteSelfToControlNode(communityId) {