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

fix(authn): rename config key http-server to http

This commit is contained in:
Zaiming Shi 2021-10-20 14:36:37 +02:00
parent 019b9d17f6
commit d468c21e61
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/emqx_authn/src/emqx_authn.erl
View File

@ -28,8 +28,7 @@ providers() ->
, {{'password-based', postgresql}, emqx_authn_pgsql} , {{'password-based', postgresql}, emqx_authn_pgsql}
, {{'password-based', mongodb}, emqx_authn_mongodb} , {{'password-based', mongodb}, emqx_authn_mongodb}
, {{'password-based', redis}, emqx_authn_redis} , {{'password-based', redis}, emqx_authn_redis}
, {{'password-based', 'http-server'}, emqx_authn_http} , {{'password-based', 'http'}, emqx_authn_http}
, {{'password-based', 'http'}, emqx_authn_http} %% TODO: resolve one
, {jwt, emqx_authn_jwt} , {jwt, emqx_authn_jwt}
, {{scram, 'built-in-database'}, emqx_enhanced_authn_scram_mnesia} , {{scram, 'built-in-database'}, emqx_enhanced_authn_scram_mnesia}
]. ].

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

@ -43,7 +43,7 @@
}}). }}).
-define(EXAMPLE_2, #{mechanism => <<"password-based">>, -define(EXAMPLE_2, #{mechanism => <<"password-based">>,
backend => <<"http-server">>, backend => <<"http">>,
method => <<"post">>, method => <<"post">>,
url => <<"http://localhost:80/login">>, url => <<"http://localhost:80/login">>,
headers => #{ headers => #{
@ -90,7 +90,7 @@
-define(INSTANCE_EXAMPLE_1, maps:merge(?EXAMPLE_1, #{id => <<"password-based:built-in-database">>, -define(INSTANCE_EXAMPLE_1, maps:merge(?EXAMPLE_1, #{id => <<"password-based:built-in-database">>,
enable => true})). enable => true})).
-define(INSTANCE_EXAMPLE_2, maps:merge(?EXAMPLE_2, #{id => <<"password-based:http-server">>, -define(INSTANCE_EXAMPLE_2, maps:merge(?EXAMPLE_2, #{id => <<"password-based:http">>,
connect_timeout => "5s", connect_timeout => "5s",
enable_pipelining => true, enable_pipelining => true,
headers => #{ headers => #{
@ -1506,8 +1506,8 @@ definitions() ->
}, },
backend => #{ backend => #{
type => string, type => string,
enum => [<<"http-server">>], enum => [<<"http">>],
example => <<"http-server">> example => <<"http">>
}, },
method => #{ method => #{
type => string, type => string,

4
apps/emqx_authn/src/simple_authn/emqx_authn_http.erl
View File

@ -61,8 +61,8 @@ fields(post) ->
] ++ common_fields(). ] ++ common_fields().
common_fields() -> common_fields() ->
[ {mechanism, {enum, ['password-based']}} [ {mechanism, 'password-based'}
, {backend, {enum, ['http-server', 'http']}} %% TODO: delete http , {backend, 'http'}
, {url, fun url/1} , {url, fun url/1}
, {body, fun body/1} , {body, fun body/1}
, {request_timeout, fun request_timeout/1} , {request_timeout, fun request_timeout/1}