Put the validated topic into the message, this fixes retained message…

… publishing
zotonic · Jul 23, 2023 · 8172868 · 8172868
1 parent cd61698
commit 8172868
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/mqtt_sessions.erl b/src/mqtt_sessions.erl
@@ -203,9 +203,10 @@ publish(Pool, #{ type := publish, topic := Topic } = Msg, UserContext) when is_a
     case mqtt_packet_map_topic:validate_topic_publish(Topic) of
         {ok, TopicValidated} ->
             Runtime = runtime(),
-            case Runtime:is_allowed(publish, TopicValidated, Msg, UserContext) of
+            MsgValidatedTopic = Msg#{ topic => TopicValidated },
+            case Runtime:is_allowed(publish, TopicValidated, MsgValidatedTopic, UserContext) of
                 true ->
-                    case mqtt_sessions_router:publish(Pool, TopicValidated, Msg, UserContext) of
+                    case mqtt_sessions_router:publish(Pool, TopicValidated, MsgValidatedTopic, UserContext) of
                         {ok, _Pid} -> ok;
                         {error, _} = Error -> Error
                     end;