mirror of
https://github.com/processone/ejabberd.git
synced 2024-12-22 17:28:25 +01:00
Return 409 conflict error code on register if user already exists
This commit is contained in:
parent
42e6f72ee9
commit
fb2603d3cd
@ -382,7 +382,7 @@ register(User, Host, Password) ->
|
|||||||
{atomic, exists} ->
|
{atomic, exists} ->
|
||||||
String = io_lib:format("User ~s@~s already registered at node ~p",
|
String = io_lib:format("User ~s@~s already registered at node ~p",
|
||||||
[User, Host, node()]),
|
[User, Host, node()]),
|
||||||
{exists, String};
|
{conflict, String};
|
||||||
{error, Reason} ->
|
{error, Reason} ->
|
||||||
String = io_lib:format("Can't register user ~s@~s at node ~p: ~p",
|
String = io_lib:format("Can't register user ~s@~s at node ~p: ~p",
|
||||||
[User, Host, node(), Reason]),
|
[User, Host, node(), Reason]),
|
||||||
|
@ -448,8 +448,10 @@ format_command_result(Cmd, Auth, Result, Version) ->
|
|||||||
{200, 0};
|
{200, 0};
|
||||||
{{_, rescode}, _} ->
|
{{_, rescode}, _} ->
|
||||||
{200, 1};
|
{200, 1};
|
||||||
{{_, restuple}, {V1, Text1}} when V1 == true; V1 == ok ->
|
{{_, restuple}, {V, Text}} when V == true; V == ok ->
|
||||||
{200, iolist_to_binary(Text1)};
|
{200, iolist_to_binary(Text)};
|
||||||
|
{{_, restuple}, {V, Text}} when V == conflict ->
|
||||||
|
{409, iolist_to_binary(Text)};
|
||||||
{{_, restuple}, {_, Text2}} ->
|
{{_, restuple}, {_, Text2}} ->
|
||||||
{500, iolist_to_binary(Text2)};
|
{500, iolist_to_binary(Text2)};
|
||||||
{{_, {list, _}}, _V} ->
|
{{_, {list, _}}, _V} ->
|
||||||
|
Loading…
Reference in New Issue
Block a user