Skip to content

Commit

Permalink
Fixing user format in error
Browse files Browse the repository at this point in the history
  • Loading branch information
Janusz Jakubiec authored and Janusz Jakubiec committed Dec 7, 2022
1 parent bd452b1 commit fddaa0b
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ execute(_Ctx, _Obj, <<"setPrivate">>, #{<<"user">> := CallerJID,
<<"elementString">> := Element}) ->
case mod_private_api:private_set(CallerJID, Element) of
{ok, _} = Result -> Result;
Error -> make_error(Error, #{user => CallerJID, element => Element})
Error -> make_error(Error, #{user => jid:to_binary(CallerJID), element => Element})
end.
3 changes: 2 additions & 1 deletion src/graphql/admin/mongoose_graphql_private_admin_query.erl
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ execute(_Ctx, _Obj, <<"getPrivate">>, #{<<"user">> := CallerJID,
case mod_private_api:private_get(CallerJID, Element, SubElement) of
{ok, _} = Result -> Result;
Error ->
make_error(Error, #{user => CallerJID, element => Element, subElement => SubElement})
make_error(Error, #{user => jid:to_binary(CallerJID), element => Element,
subElement => SubElement})
end.
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
execute(#{user := CallerJID}, _Obj, <<"setPrivate">>, #{<<"elementString">> := Element}) ->
case mod_private_api:private_set(CallerJID, Element) of
{ok, _} = Result -> Result;
Error -> make_error(Error, #{user => CallerJID, element => Element})
Error -> make_error(Error, #{user => jid:to_binary(CallerJID), element => Element})
end.
3 changes: 2 additions & 1 deletion src/graphql/user/mongoose_graphql_private_user_query.erl
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ execute(#{user := CallerJID}, _Obj, <<"getPrivate">>,
case mod_private_api:private_get(CallerJID, Element, SubElement) of
{ok, _} = Result -> Result;
Error ->
make_error(Error, #{user => CallerJID, element => Element, subElement => SubElement})
make_error(Error, #{user => jid:to_binary(CallerJID), element => Element,
subElement => SubElement})
end.
2 changes: 1 addition & 1 deletion src/mod_private_api.erl
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
-export([private_get/3, private_set/2]).

-spec private_get(jid:jid(), binary(), binary()) -> {ok, exml:element()} | {Error, string()} when
Error :: not_found | parsing_error | element_does_not_exist_error.
Error :: not_found.
private_get(JID, Element, Ns) ->
case ejabberd_auth:does_user_exist(JID) of
true ->
Expand Down

0 comments on commit fddaa0b

Please sign in to comment.