From b32156bd68283394e381271ddf566aea445779d2 Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Wed, 31 Jul 2019 08:08:11 +0800 Subject: [PATCH] Rename the type 'credentials' to 'client' --- src/emqx_access_rule.erl | 2 +- src/emqx_banned.erl | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/emqx_access_rule.erl b/src/emqx_access_rule.erl index b9d166030..dbde32984 100644 --- a/src/emqx_access_rule.erl +++ b/src/emqx_access_rule.erl @@ -86,7 +86,7 @@ bin(B) when is_binary(B) -> B. %% @doc Match access rule --spec(match(emqx_types:credentials(), emqx_types:topic(), rule()) +-spec(match(emqx_types:client(), emqx_types:topic(), rule()) -> {matched, allow} | {matched, deny} | nomatch). match(_Client, _Topic, {AllowDeny, all}) when ?ALLOW_DENY(AllowDeny) -> {matched, AllowDeny}; diff --git a/src/emqx_banned.erl b/src/emqx_banned.erl index 1cee38098..c38552bd7 100644 --- a/src/emqx_banned.erl +++ b/src/emqx_banned.erl @@ -68,7 +68,7 @@ mnesia(copy) -> start_link() -> gen_server:start_link({local, ?MODULE}, ?MODULE, [], []). --spec(check(emqx_types:credentials()) -> boolean()). +-spec(check(emqx_types:client()) -> boolean()). check(#{client_id := ClientId, username := Username, peername := {IPAddr, _}}) -> ets:member(?BANNED_TAB, {client_id, ClientId}) orelse ets:member(?BANNED_TAB, {username, Username}) @@ -78,11 +78,10 @@ check(#{client_id := ClientId, username := Username, peername := {IPAddr, _}}) - add(Banned) when is_record(Banned, banned) -> mnesia:dirty_write(?BANNED_TAB, Banned). --spec(delete({client_id, emqx_types:client_id()} - | {username, emqx_types:username()} - | {peername, emqx_types:peername()}) -> ok). -delete(Key) -> - mnesia:dirty_delete(?BANNED_TAB, Key). +-spec(delete({client_id, emqx_types:client_id()} | + {username, emqx_types:username()} | + {peername, emqx_types:peername()}) -> ok). +delete(Key) -> mnesia:dirty_delete(?BANNED_TAB, Key). %%-------------------------------------------------------------------- %% gen_server callbacks