From 1886aa8bff3924ca8301221f26380d94b8ffe695 Mon Sep 17 00:00:00 2001
From: Rory Z <rory-z@outlook.com>
Date: Thu, 19 Aug 2021 11:43:00 +0800
Subject: [PATCH] chore: fix dialyzer error

---
 apps/emqx/src/emqx_channel.erl                     | 13 ++++---------
 apps/emqx_gateway/src/stomp/emqx_stomp_channel.erl |  2 +-
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/apps/emqx/src/emqx_channel.erl b/apps/emqx/src/emqx_channel.erl
index 3bfe6bbf0..59c6447ab 100644
--- a/apps/emqx/src/emqx_channel.erl
+++ b/apps/emqx/src/emqx_channel.erl
@@ -1419,7 +1419,6 @@ check_pub_alias(_Packet, _Channel) -> ok.
 check_pub_authz(#mqtt_packet{variable = #mqtt_packet_publish{topic_name = Topic}},
               #channel{clientinfo = ClientInfo}) ->
     case emqx_access_control:authorize(ClientInfo, publish, Topic) of
-        false -> ok;
         allow -> ok;
         deny  -> {error, ?RC_NOT_AUTHORIZED}
     end.
@@ -1440,8 +1439,10 @@ check_pub_caps(#mqtt_packet{header = #mqtt_packet_header{qos    = QoS,
 check_sub_authzs(TopicFilters, Channel) ->
     check_sub_authzs(TopicFilters, Channel, []).
 
-check_sub_authzs([ TopicFilter = {Topic, _} | More] , Channel, Acc) ->
-    case check_sub_authz(Topic, Channel) of
+check_sub_authzs([ TopicFilter = {Topic, _} | More],
+                 Channel = #channel{clientinfo = ClientInfo},
+                 Acc) ->
+    case emqx_access_control:authorize(ClientInfo, subscribe, Topic) of
         allow ->
             check_sub_authzs(More, Channel, [ {TopicFilter, 0} | Acc]);
         deny ->
@@ -1450,12 +1451,6 @@ check_sub_authzs([ TopicFilter = {Topic, _} | More] , Channel, Acc) ->
 check_sub_authzs([], _Channel, Acc) ->
     lists:reverse(Acc).
 
-check_sub_authz(TopicFilter, #channel{clientinfo = ClientInfo}) ->
-    case emqx_access_control:authorize(ClientInfo, subscribe, TopicFilter) of
-        false  -> allow;
-        Result -> Result
-    end.
-
 %%--------------------------------------------------------------------
 %% Check Sub Caps
 
diff --git a/apps/emqx_gateway/src/stomp/emqx_stomp_channel.erl b/apps/emqx_gateway/src/stomp/emqx_stomp_channel.erl
index fa7b2a357..b1a74375d 100644
--- a/apps/emqx_gateway/src/stomp/emqx_stomp_channel.erl
+++ b/apps/emqx_gateway/src/stomp/emqx_stomp_channel.erl
@@ -649,7 +649,7 @@ handle_call(discard, Channel) ->
 
 handle_call(list_authz_cache, Channel) ->
     %% This won't work
-    {reply, emqx_authz_cache:list_authz_cache(default), Channel};
+    {reply, emqx_authz_cache:list_authz_cache(), Channel};
 
 %% XXX: No Quota Now
 % handle_call({quota, Policy}, Channel) ->