From 0ca725ff25841938afc3726c5b2cf7b4592ef9b1 Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Tue, 15 Aug 2023 11:22:55 +0800
Subject: [PATCH] fix: deprecated `share` in `subopts`

---
 apps/emqx/src/emqx_types.erl                      | 1 -
 apps/emqx_exhook/priv/protos/exhook.proto         | 5 ++++-
 apps/emqx_exhook/src/emqx_exhook_handler.erl      | 2 +-
 apps/emqx_exhook/test/props/prop_exhook_hooks.erl | 4 +---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/emqx/src/emqx_types.erl b/apps/emqx/src/emqx_types.erl
index dbd788c04..1a4825736 100644
--- a/apps/emqx/src/emqx_types.erl
+++ b/apps/emqx/src/emqx_types.erl
@@ -214,7 +214,6 @@
     rap := 0 | 1,
     nl := 0 | 1,
     qos := qos(),
-    share => binary(),
     atom() => term()
 }.
 -type reason_code() :: 0..16#FF.
diff --git a/apps/emqx_exhook/priv/protos/exhook.proto b/apps/emqx_exhook/priv/protos/exhook.proto
index 928e9b20b..e5d7b3606 100644
--- a/apps/emqx_exhook/priv/protos/exhook.proto
+++ b/apps/emqx_exhook/priv/protos/exhook.proto
@@ -460,8 +460,11 @@ message SubOpts {
   // The QoS level
   uint32 qos = 1;
 
+  // deprecated
+  reserved 2;
+  reserved "share";
   // The group name for shared subscription
-  string share = 2;
+  // string share = 2;
 
   // The Retain Handling option (MQTT v5.0)
   //
diff --git a/apps/emqx_exhook/src/emqx_exhook_handler.erl b/apps/emqx_exhook/src/emqx_exhook_handler.erl
index 64061de3d..2bcb91b12 100644
--- a/apps/emqx_exhook/src/emqx_exhook_handler.erl
+++ b/apps/emqx_exhook/src/emqx_exhook_handler.erl
@@ -192,7 +192,7 @@ on_session_subscribed(ClientInfo, Topic, SubOpts) ->
     Req = #{
         clientinfo => clientinfo(ClientInfo),
         topic => emqx_topic:maybe_format_share(Topic),
-        subopts => maps:with([qos, share, rh, rap, nl], SubOpts)
+        subopts => maps:with([qos, rh, rap, nl], SubOpts)
     },
     cast('session.subscribed', Req).
 
diff --git a/apps/emqx_exhook/test/props/prop_exhook_hooks.erl b/apps/emqx_exhook/test/props/prop_exhook_hooks.erl
index 10462d210..cf48fff80 100644
--- a/apps/emqx_exhook/test/props/prop_exhook_hooks.erl
+++ b/apps/emqx_exhook/test/props/prop_exhook_hooks.erl
@@ -546,9 +546,7 @@ subopts(SubOpts) ->
         qos => maps:get(qos, SubOpts, 0),
         rh => maps:get(rh, SubOpts, 0),
         rap => maps:get(rap, SubOpts, 0),
-        nl => maps:get(nl, SubOpts, 0),
-        %% TOOD: FIXME for share-sub refactored
-        share => maps:get(share, SubOpts, <<>>)
+        nl => maps:get(nl, SubOpts, 0)
     }.
 
 authresult_to_bool(AuthResult) ->