|
@@ -114,7 +114,7 @@ add_user(Username, Password, Role, Desc) when is_binary(Username), is_binary(Pas
|
|
|
end.
|
|
end.
|
|
|
|
|
|
|
|
do_add_user(Username, Password, Role, Desc) ->
|
|
do_add_user(Username, Password, Role, Desc) ->
|
|
|
- Res = mria:transaction(?DASHBOARD_SHARD, fun add_user_/4, [Username, Password, Role, Desc]),
|
|
|
|
|
|
|
+ Res = mria:sync_transaction(?DASHBOARD_SHARD, fun add_user_/4, [Username, Password, Role, Desc]),
|
|
|
return(Res).
|
|
return(Res).
|
|
|
|
|
|
|
|
%% 0-9 or A-Z or a-z or $_
|
|
%% 0-9 or A-Z or a-z or $_
|
|
@@ -191,7 +191,7 @@ force_add_user(Username, Password, Role, Desc) ->
|
|
|
description = Desc
|
|
description = Desc
|
|
|
})
|
|
})
|
|
|
end,
|
|
end,
|
|
|
- case mria:transaction(?DASHBOARD_SHARD, AddFun) of
|
|
|
|
|
|
|
+ case mria:sync_transaction(?DASHBOARD_SHARD, AddFun) of
|
|
|
{atomic, ok} -> ok;
|
|
{atomic, ok} -> ok;
|
|
|
{aborted, Reason} -> {error, Reason}
|
|
{aborted, Reason} -> {error, Reason}
|
|
|
end.
|
|
end.
|
|
@@ -227,7 +227,7 @@ remove_user(Username) ->
|
|
|
_ -> mnesia:delete({?ADMIN, Username})
|
|
_ -> mnesia:delete({?ADMIN, Username})
|
|
|
end
|
|
end
|
|
|
end,
|
|
end,
|
|
|
- case return(mria:transaction(?DASHBOARD_SHARD, Trans)) of
|
|
|
|
|
|
|
+ case return(mria:sync_transaction(?DASHBOARD_SHARD, Trans)) of
|
|
|
{ok, Result} ->
|
|
{ok, Result} ->
|
|
|
_ = emqx_dashboard_token:destroy_by_username(Username),
|
|
_ = emqx_dashboard_token:destroy_by_username(Username),
|
|
|
{ok, Result};
|
|
{ok, Result};
|
|
@@ -242,7 +242,11 @@ update_user(Username, Role, Desc) ->
|
|
|
ok ->
|
|
ok ->
|
|
|
case
|
|
case
|
|
|
return(
|
|
return(
|
|
|
- mria:transaction(?DASHBOARD_SHARD, fun update_user_/3, [Username, Role, Desc])
|
|
|
|
|
|
|
+ mria:sync_transaction(
|
|
|
|
|
+ ?DASHBOARD_SHARD,
|
|
|
|
|
+ fun update_user_/3,
|
|
|
|
|
+ [Username, Role, Desc]
|
|
|
|
|
+ )
|
|
|
)
|
|
)
|
|
|
of
|
|
of
|
|
|
{ok, {true, Result}} ->
|
|
{ok, {true, Result}} ->
|
|
@@ -324,7 +328,7 @@ update_pwd(Username, Fun) ->
|
|
|
end,
|
|
end,
|
|
|
mnesia:write(Fun(User))
|
|
mnesia:write(Fun(User))
|
|
|
end,
|
|
end,
|
|
|
- return(mria:transaction(?DASHBOARD_SHARD, Trans)).
|
|
|
|
|
|
|
+ return(mria:sync_transaction(?DASHBOARD_SHARD, Trans)).
|
|
|
|
|
|
|
|
-spec lookup_user(dashboard_username()) -> [emqx_admin()].
|
|
-spec lookup_user(dashboard_username()) -> [emqx_admin()].
|
|
|
lookup_user(Username) ->
|
|
lookup_user(Username) ->
|