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

Merge pull request #5386 from tigercl/chore/authn-rename 

chore(authn rename): rename emqx_authn to authentication
This commit is contained in:
tigercl 2021-08-03 09:43:51 +08:00 committed by GitHub
parent a0699ff853 5e9ed72975
commit ccf9dd18fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 10 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
authenticators: [
# {

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

@ -1158,12 +1158,12 @@ authentication(post, Request) ->
authenticators(post, Request) ->
{ok, Body, _} = cowboy_req:read_body(Request),
AuthenticatorConfig = emqx_json:decode(Body, [return_maps]),
Config = #{<<"emqx_authn">> => #{
Config = #{<<"authentication">> => #{
<<"authenticators">> => [AuthenticatorConfig]
}},
NConfig = hocon_schema:check_plain(emqx_authn_schema, Config,
#{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
{ok, Authenticator2} ->
{201, Authenticator2};
@ -1186,12 +1186,12 @@ authenticators2(put, Request) ->
AuthenticatorID = cowboy_req:binding(id, Request),
{ok, Body, _} = cowboy_req:read_body(Request),
AuthenticatorConfig = emqx_json:decode(Body, [return_maps]),
Config = #{<<"emqx_authn">> => #{
Config = #{<<"authentication">> => #{
<<"authenticators">> => [AuthenticatorConfig]
}},
NConfig = hocon_schema:check_plain(emqx_authn_schema, Config,
#{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:update_or_create_authenticator(?CHAIN, AuthenticatorID, NAuthenticatorConfig) of
{ok, Authenticator} ->
{200, Authenticator};

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

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

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

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

2
extension_schemas.config
View File

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