fix(emqx_authn): fix create api

This commit is contained in:
EMQ-YangM 2022-02-11 17:33:41 +08:00
parent d8819559f7
commit 580901b678
7 changed files with 9 additions and 7 deletions

View File

@ -35,3 +35,5 @@
-define(CONF_NS_BINARY, ?EMQX_AUTHENTICATION_CONFIG_ROOT_NAME_BINARY). -define(CONF_NS_BINARY, ?EMQX_AUTHENTICATION_CONFIG_ROOT_NAME_BINARY).
-endif. -endif.
-define(RESOURCE_GROUP, <<"emqx_authn">>).

View File

@ -17,6 +17,7 @@
-module(emqx_authn_utils). -module(emqx_authn_utils).
-include_lib("emqx/include/emqx_placeholder.hrl"). -include_lib("emqx/include/emqx_placeholder.hrl").
-include_lib("emqx_authn.hrl").
-export([ check_password_from_selected_map/3 -export([ check_password_from_selected_map/3
, parse_deep/1 , parse_deep/1
@ -32,8 +33,6 @@
, make_resource_id/1 , make_resource_id/1
]). ]).
-define(RESOURCE_GROUP, <<"emqx_authn">>).
-define(AUTHN_PLACEHOLDERS, [?PH_USERNAME, -define(AUTHN_PLACEHOLDERS, [?PH_USERNAME,
?PH_CLIENTID, ?PH_CLIENTID,
?PH_PASSWORD, ?PH_PASSWORD,
@ -120,7 +119,7 @@ cleanup_resources() ->
make_resource_id(Name) -> make_resource_id(Name) ->
NameBin = bin(Name), NameBin = bin(Name),
emqx_resource:generate_id(?RESOURCE_GROUP, NameBin). emqx_resource:generate_id(NameBin).
%%------------------------------------------------------------------------------ %%------------------------------------------------------------------------------
%% Internal functions %% Internal functions

View File

@ -134,6 +134,7 @@ create(#{method := Method,
request_timeout => RequestTimeout, request_timeout => RequestTimeout,
resource_id => ResourceId}, resource_id => ResourceId},
case emqx_resource:create_local(ResourceId, case emqx_resource:create_local(ResourceId,
?RESOURCE_GROUP,
emqx_connector_http, emqx_connector_http,
Config#{base_url => maps:remove(query, URIMap), Config#{base_url => maps:remove(query, URIMap),
pool_type => random}) of pool_type => random}) of

View File

@ -112,7 +112,7 @@ create(#{selector := Selector} = Config) ->
NState = State#{ NState = State#{
selector_template => SelectorTemplate, selector_template => SelectorTemplate,
resource_id => ResourceId}, resource_id => ResourceId},
case emqx_resource:create_local(ResourceId, emqx_connector_mongo, Config) of case emqx_resource:create_local(ResourceId, ?RESOURCE_GROUP, emqx_connector_mongo, Config) of
{ok, already_created} -> {ok, already_created} ->
{ok, NState}; {ok, NState};
{ok, _} -> {ok, _} ->

View File

@ -82,7 +82,7 @@ create(#{password_hash_algorithm := Algorithm,
placeholders => PlaceHolders, placeholders => PlaceHolders,
query_timeout => QueryTimeout, query_timeout => QueryTimeout,
resource_id => ResourceId}, resource_id => ResourceId},
case emqx_resource:create_local(ResourceId, emqx_connector_mysql, Config) of case emqx_resource:create_local(ResourceId, ?RESOURCE_GROUP, emqx_connector_mysql, Config) of
{ok, already_created} -> {ok, already_created} ->
{ok, State}; {ok, State};
{ok, _} -> {ok, _} ->

View File

@ -79,7 +79,7 @@ create(#{query := Query0,
State = #{placeholders => PlaceHolders, State = #{placeholders => PlaceHolders,
password_hash_algorithm => Algorithm, password_hash_algorithm => Algorithm,
resource_id => ResourceId}, resource_id => ResourceId},
case emqx_resource:create_local(ResourceId, emqx_connector_pgsql, Config#{named_queries => #{ResourceId => Query}}) of case emqx_resource:create_local(ResourceId, ?RESOURCE_GROUP, emqx_connector_pgsql, Config#{named_queries => #{ResourceId => Query}}) of
{ok, already_created} -> {ok, already_created} ->
{ok, State}; {ok, State};
{ok, _} -> {ok, _} ->

View File

@ -91,7 +91,7 @@ create(#{cmd := Cmd,
NState = State#{ NState = State#{
cmd => NCmd, cmd => NCmd,
resource_id => ResourceId}, resource_id => ResourceId},
case emqx_resource:create_local(ResourceId, emqx_connector_redis, Config) of case emqx_resource:create_local(ResourceId, ?RESOURCE_GROUP, emqx_connector_redis, Config) of
{ok, already_created} -> {ok, already_created} ->
{ok, NState}; {ok, NState};
{ok, _} -> {ok, _} ->