format_result supports the new API error format

esl · Nov 7, 2022 · a050f10 · a050f10
1 parent d25f84a
commit a050f10
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/big_tests/tests/graphql_account_SUITE.erl b/big_tests/tests/graphql_account_SUITE.erl
@@ -307,7 +307,7 @@ admin_register_user(Config) ->
     Resp2 = register_user(Domain, Username, Password, Config),
     ?assertNotEqual(nomatch, binary:match(get_err_msg(Resp2), <<"already registered">>)),
     % Try to register a user without any name
-    Resp3 = register_user(Domain, <<"">>, Password, Config),
+    Resp3 = register_user(Domain, <<>>, Password, Config),
     ?assertNotEqual(nomatch, binary:match(get_err_msg(Resp3), <<"Invalid JID">>)).
 
 admin_register_random_user(Config) ->

diff --git a/src/auth/ejabberd_auth.erl b/src/auth/ejabberd_auth.erl
@@ -203,12 +203,7 @@ set_password(#jid{luser = LUser, lserver = LServer}, Password) ->
     Opts = #{default => {error, not_allowed}},
     case ejabberd_auth:does_user_exist(jid:make(LUser, LServer, <<>>)) of
         true ->
-            case call_auth_modules_for_domain(LServer, F, Opts) of
-                {ok, Result} ->
-                    {ok, Result};
-                Error ->
-                    Error
-            end;
+            call_auth_modules_for_domain(LServer, F, Opts);
         false ->
             {error, not_allowed}
     end.

diff --git a/src/ejabberd_ctl.erl b/src/ejabberd_ctl.erl
@@ -426,7 +426,11 @@ format_error(Error) ->
 -spec format_result(In :: tuple() | atom() | integer() | string() | binary(),
                     {_, 'atom'|'integer'|'string'|'binary'}
                     ) -> string() | {string(), _}.
-format_result({error, Error}, _) ->
+format_result(Code, {_Name, rescode}) ->
+    {"", make_status(Code)};
+format_result({Code, Text}, {_Name, restuple}) ->
+    {io_lib:format("~s", [Text]), make_status(Code)};
+format_result({Atom, Error}, _) when Atom =/= ok ->
     {io_lib:format("Error: ~ts", [format_error(Error)]), make_status(error)};
 format_result(Atom, {_Name, atom}) ->
     io_lib:format("~p", [Atom]);
@@ -436,10 +440,6 @@ format_result(String, {_Name, string}) ->
     io_lib:format("~s", [String]);
 format_result(Binary, {_Name, binary}) ->
     io_lib:format("~s", [Binary]);
-format_result(Code, {_Name, rescode}) ->
-    {"", make_status(Code)};
-format_result({Code, Text}, {_Name, restuple}) ->
-    {io_lib:format("~s", [Text]), make_status(Code)};
 %% The result is a list of something: [something()]
 format_result([], {_Name, {list, _ElementsDef}}) ->
     "";