From dca292f5387e621676aae0acc241e323c8271eb8 Mon Sep 17 00:00:00 2001
From: Feng Lee <feng@emqx.io>
Date: Mon, 27 Aug 2018 15:54:41 +0800
Subject: [PATCH] Replace 'Client' with 'Credentials' map

---
 src/emqx_access_control.erl | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/emqx_access_control.erl b/src/emqx_access_control.erl
index 3bb31057e..bd35d7ebc 100644
--- a/src/emqx_access_control.erl
+++ b/src/emqx_access_control.erl
@@ -32,8 +32,6 @@
 -define(TAB, ?MODULE).
 -define(SERVER, ?MODULE).
 
--record(state, {}).
-
 %%------------------------------------------------------------------------------
 %% API
 %%------------------------------------------------------------------------------
@@ -104,6 +102,15 @@ check_acl(Credentials, PubSub, Topic, AclMods, true) ->
             AclResult
     end.
 
+do_check_acl(#{zone := Zone}, _PubSub, _Topic, []) ->
+    emqx_zone:get_env(Zone, acl_nomatch, deny);
+do_check_acl(Credentials, PubSub, Topic, [{Mod, State, _Seq}|AclMods]) ->
+    case Mod:check_acl({Credentials, PubSub, Topic}, State) of
+        allow  -> allow;
+        deny   -> deny;
+        ignore -> do_check_acl(Credentials, PubSub, Topic, AclMods)
+    end.
+
 -spec(reload_acl() -> list(ok | {error, term()})).
 reload_acl() ->
     [Mod:reload_acl(State) || {Mod, State, _Seq} <- lookup_mods(acl)].
@@ -143,7 +150,7 @@ stop() ->
 
 init([]) ->
     _ = emqx_tables:new(?TAB, [set, protected, {read_concurrency, true}]),
-    {ok, #state{}}.
+    {ok, #{}}.
 
 handle_call({register_mod, Type, Mod, Opts, Seq}, _From, State) ->
     Mods = lookup_mods(Type),
@@ -194,15 +201,6 @@ terminate(_Reason, _State) ->
 code_change(_OldVsn, State, _Extra) ->
     {ok, State}.
 
-do_check_acl(#client{zone = Zone}, _PubSub, _Topic, []) ->
-    emqx_zone:get_env(Zone, acl_nomatch, deny);
-do_check_acl(Client, PubSub, Topic, [{Mod, State, _Seq}|AclMods]) ->
-    case Mod:check_acl({Client, PubSub, Topic}, State) of
-        allow  -> allow;
-        deny   -> deny;
-        ignore -> do_check_acl(Client, PubSub, Topic, AclMods)
-    end.
-
 %%--------------------------------------------------------------------
 %% Internal functions
 %%--------------------------------------------------------------------