From b79bf13ae727a1521626fb57d25148cbd285d75e Mon Sep 17 00:00:00 2001
From: terry-xiaoyu <506895667@qq.com>
Date: Thu, 21 Mar 2019 22:49:02 +0800
Subject: [PATCH] Rename result -> auth_result

---
 src/emqx_access_control.erl | 8 ++++----
 src/emqx_reason_codes.erl   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/emqx_access_control.erl b/src/emqx_access_control.erl
index bb3478702..8a73e5dca 100644
--- a/src/emqx_access_control.erl
+++ b/src/emqx_access_control.erl
@@ -26,11 +26,11 @@
 -spec(authenticate(emqx_types:credentials())
       -> {ok, emqx_types:credentials()} | {error, term()}).
 authenticate(Credentials) ->
-    case emqx_hooks:run_fold('client.authenticate', [], Credentials#{result => init_result(Credentials)}) of
-        #{result := success} = NewCredentials ->
+    case emqx_hooks:run_fold('client.authenticate', [], Credentials#{auth_result => init_auth_result(Credentials)}) of
+        #{auth_result := success} = NewCredentials ->
             {ok, NewCredentials};
         NewCredentials ->
-            {error, maps:get(result, NewCredentials, unknown_error)}
+            {error, maps:get(auth_result, NewCredentials, unknown_error)}
     end.
 
 %% @doc Check ACL
@@ -61,7 +61,7 @@ do_check_acl(#{zone := Zone} = Credentials, PubSub, Topic) ->
 reload_acl() ->
     emqx_mod_acl_internal:reload_acl().
 
-init_result(Credentials) ->
+init_auth_result(Credentials) ->
     case emqx_zone:get_env(maps:get(zone, Credentials, undefined), allow_anonymous, false) of
         true -> success;
         false -> not_authorized
diff --git a/src/emqx_reason_codes.erl b/src/emqx_reason_codes.erl
index 62fa8a6c2..ebe992ffe 100644
--- a/src/emqx_reason_codes.erl
+++ b/src/emqx_reason_codes.erl
@@ -153,4 +153,4 @@ connack_error(server_unavailable) -> ?RC_SERVER_UNAVAILABLE;
 connack_error(server_busy) -> ?RC_SERVER_BUSY;
 connack_error(banned) -> ?RC_BANNED;
 connack_error(bad_authentication_method) -> ?RC_BAD_AUTHENTICATION_METHOD;
-connack_error(_) -> ?RC_NOT_AUTHORIZED.
\ No newline at end of file
+connack_error(_) -> ?RC_NOT_AUTHORIZED.