From 45f00e14a9df3a5ca889f2fc8da6fa601b0987fb Mon Sep 17 00:00:00 2001
From: Andrew Mayorov <encube.ul@gmail.com>
Date: Mon, 20 Mar 2023 15:18:25 +0300
Subject: [PATCH] feat(ft): ensure that clientid is always binary

For the sake of simplicity (e.g. transfer ids are now easier to
compare).
---
 apps/emqx_ft/src/emqx_ft.erl | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/emqx_ft/src/emqx_ft.erl b/apps/emqx_ft/src/emqx_ft.erl
index 2ccd5db15..518807d9f 100644
--- a/apps/emqx_ft/src/emqx_ft.erl
+++ b/apps/emqx_ft/src/emqx_ft.erl
@@ -51,7 +51,7 @@
 -type bytes() :: non_neg_integer().
 
 %% MQTT Client ID
--type clientid() :: emqx_types:clientid().
+-type clientid() :: binary().
 
 -type fileid() :: binary().
 -type transfer() :: {clientid(), fileid()}.
@@ -327,7 +327,7 @@ assemble(Transfer, FinalSize) ->
 
 transfer(Msg, FileId) ->
     ClientId = Msg#message.from,
-    {ClientId, FileId}.
+    {clientid_to_binary(ClientId), FileId}.
 
 on_complete(Op, {ChanPid, PacketId}, Transfer, Result) ->
     ?SLOG(debug, #{
@@ -421,3 +421,8 @@ parse_checksum(Checksum) when is_binary(Checksum) andalso byte_size(Checksum) =:
     end;
 parse_checksum(_Checksum) ->
     {error, invalid_checksum}.
+
+clientid_to_binary(A) when is_atom(A) ->
+    atom_to_binary(A);
+clientid_to_binary(B) when is_binary(B) ->
+    B.