yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore(authn rename): rename emqx_authn to authentication

This commit is contained in:
zhouzb 2021-08-03 09:21:07 +08:00
parent a0699ff853
commit fb716ae8b2
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx_authn/etc/emqx_authn.conf
View File

@ -1,4 +1,4 @@
emqx_authn: { authentication: {
enable: false enable: false
authenticators: [ authenticators: [
# { # {

4
apps/emqx_authn/src/emqx_authn_api.erl
View File

@ -1158,12 +1158,12 @@ authentication(post, Request) ->
authenticators(post, Request) -> authenticators(post, Request) ->
{ok, Body, _} = cowboy_req:read_body(Request), {ok, Body, _} = cowboy_req:read_body(Request),
AuthenticatorConfig = emqx_json:decode(Body, [return_maps]), AuthenticatorConfig = emqx_json:decode(Body, [return_maps]),
Config = #{<<"emqx_authn">> => #{ Config = #{<<"authentication">> => #{
<<"authenticators">> => [AuthenticatorConfig] <<"authenticators">> => [AuthenticatorConfig]
}}, }},
NConfig = hocon_schema:check_plain(emqx_authn_schema, Config, NConfig = hocon_schema:check_plain(emqx_authn_schema, Config,
#{nullable => true}), #{nullable => true}),
#{emqx_authn := #{authenticators := [NAuthenticatorConfig]}} = emqx_map_lib:unsafe_atom_key_map(NConfig), #{authentication := #{authenticators := [NAuthenticatorConfig]}} = emqx_map_lib:unsafe_atom_key_map(NConfig),
case emqx_authn:create_authenticator(?CHAIN, NAuthenticatorConfig) of case emqx_authn:create_authenticator(?CHAIN, NAuthenticatorConfig) of
{ok, Authenticator2} -> {ok, Authenticator2} ->
{201, Authenticator2}; {201, Authenticator2};

2
apps/emqx_authn/src/emqx_authn_app.erl
View File

@ -36,7 +36,7 @@ stop(_State) ->
ok. ok.
initialize() -> initialize() ->
AuthNConfig = emqx_config:get([emqx_authn], #{enable => false, AuthNConfig = emqx_config:get([authentication], #{enable => false,
authenticators => []}), authenticators => []}),
initialize(AuthNConfig). initialize(AuthNConfig).

4
apps/emqx_authn/src/emqx_authn_schema.erl
View File

@ -28,9 +28,9 @@
-export([ authenticator_name/1 -export([ authenticator_name/1
]). ]).
structs() -> [ "emqx_authn" ]. structs() -> [ "authentication" ].
fields("emqx_authn") -> fields("authentication") ->
[ {enable, fun enable/1} [ {enable, fun enable/1}
, {authenticators, fun authenticators/1} , {authenticators, fun authenticators/1}
]. ].

2
extension_schemas.config
View File

@ -5,7 +5,7 @@
%% %%
[ {"emqx_data_bridge", emqx_data_bridge_schema} [ {"emqx_data_bridge", emqx_data_bridge_schema}
, {"emqx_retainer", emqx_retainer_schema} , {"emqx_retainer", emqx_retainer_schema}
, {"emqx_authn", emqx_authn_schema} , {"authentication", emqx_authn_schema}
, {"authorization", emqx_authz_schema} , {"authorization", emqx_authz_schema}
, {"emqx_bridge_mqtt", emqx_bridge_mqtt_schema} , {"emqx_bridge_mqtt", emqx_bridge_mqtt_schema}
, {"emqx_management", emqx_management_schema} , {"emqx_management", emqx_management_schema}