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

refactor(authn): use hocon enum type for user_id_type

This commit is contained in:
Zaiming (Stone) Shi 2022-05-11 09:02:55 +02:00
parent 57c1c418d6
commit 60ca1cb2a5
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/emqx_authn/src/simple_authn/emqx_authn_mnesia.erl
View File

@ -53,7 +53,6 @@
group_match_spec/1 group_match_spec/1
]). ]).
-type user_id_type() :: clientid | username.
-type user_group() :: binary(). -type user_group() :: binary().
-type user_id() :: binary(). -type user_id() :: binary().
@ -64,8 +63,6 @@
is_superuser :: boolean() is_superuser :: boolean()
}). }).
-reflect_type([user_id_type/0]).
-export([mnesia/1]). -export([mnesia/1]).
-boot_mnesia({mnesia, [boot]}). -boot_mnesia({mnesia, [boot]}).
@ -115,7 +112,7 @@ desc(?CONF_NS) ->
desc(_) -> desc(_) ->
undefined. undefined.
user_id_type(type) -> typerefl:alias("string", user_id_type()); user_id_type(type) -> hoconsc:enum([clientid, username]);
user_id_type(desc) -> ?DESC(?FUNCTION_NAME); user_id_type(desc) -> ?DESC(?FUNCTION_NAME);
user_id_type(default) -> <<"username">>; user_id_type(default) -> <<"username">>;
user_id_type(required) -> true; user_id_type(required) -> true;

3
apps/emqx_dashboard/src/emqx_dashboard_swagger.erl
View File

@ -580,9 +580,6 @@ hocon_schema_to_spec(?UNION(Types), LocalModule) ->
hocon_schema_to_spec(Atom, _LocalModule) when is_atom(Atom) -> hocon_schema_to_spec(Atom, _LocalModule) when is_atom(Atom) ->
{#{type => string, enum => [Atom]}, []}. {#{type => string, enum => [Atom]}, []}.
%% todo: Find a way to fetch enum value from user_id_type().
typename_to_spec("user_id_type()", _Mod) ->
#{type => string, enum => [clientid, username]};
typename_to_spec("term()", _Mod) -> typename_to_spec("term()", _Mod) ->
#{type => string, example => <<"any">>}; #{type => string, example => <<"any">>};
typename_to_spec("boolean()", _Mod) -> typename_to_spec("boolean()", _Mod) ->