Skip to content

better bad request reporting #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stolen wants to merge 1 commit into
base: main
Choose a base branch
from
Open

better bad request reporting #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 20 additions & 19 deletions src/erf_router.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ handle_ast(API, #{callback := Callback} = Opts) ->
erl_syntax:clause(
[
erl_syntax:match_expr(
erl_syntax:variable('Request'),
erl_syntax:variable('Request0'),
erl_syntax:map_expr(
none,
[
Expand Down Expand Up @@ -286,6 +286,18 @@ handle_ast(API, #{callback := Callback} = Opts) ->
erl_syntax:variable('IsValidRequest'),
IsValidRequestAST
),
erl_syntax:match_expr(
erl_syntax:variable('Request'),
erl_syntax:map_expr(
erl_syntax:variable('Request0'),
[
erl_syntax:map_field_assoc(
erl_syntax:atom('path_parameters'),
erl_syntax:variable('PathParameters')
)
]
)
),
erl_syntax:case_expr(
erl_syntax:variable('IsValidRequest'),
[
Expand All @@ -303,36 +315,25 @@ handle_ast(API, #{callback := Callback} = Opts) ->
utf8
)
),
[
erl_syntax:map_expr(
erl_syntax:variable('Request'),
[
erl_syntax:map_field_assoc(
erl_syntax:atom('path_parameters'),
erl_syntax:variable(
'PathParameters'
)
)
]
)
]
[erl_syntax:variable('Request')]
)
]
),
erl_syntax:clause(
[
erl_syntax:tuple([
erl_syntax:atom(false),
erl_syntax:variable('_Reason')
erl_syntax:variable('Reason')
])
],
none,
[
erl_syntax:tuple(
erl_syntax:application(
erl_syntax:atom(erf_util),
erl_syntax:atom(handle_invalid_request),
[
erl_syntax:integer(400),
erl_syntax:list([]),
erl_syntax:atom(undefined)
erl_syntax:variable('Request'),
erl_syntax:variable('Reason')
]
)
Comment on lines +331 to 338
Copy link
Member

@javiergarea javiergarea May 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

 [
    erl_syntax:tuple(
        [
            erl_syntax:integer(400),
            erl_syntax:list([]),
            erl_syntax:application(
                erl_syntax:atom(io_lib),
                erl_syntax:atom(print),
                [erl_syntax:variable('Reason')]
            )
        ]
    )
]

Copy link
Member

@javiergarea javiergarea May 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would you mind moving the handle_invalid_request function to an inline check like the above?

]
Expand Down
7 changes: 6 additions & 1 deletion src/erf_util.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
%%% EXTERNAL EXPORTS
-export([
to_pascal_case/1,
to_snake_case/1
to_snake_case/1,
handle_invalid_request/2
]).

%%%-----------------------------------------------------------------------------
Expand Down Expand Up @@ -86,3 +87,7 @@ to_snake_case([_C | Rest], [$_ | _T] = Acc) ->
to_snake_case(Rest, Acc);
to_snake_case([_C | Rest], Acc) ->
to_snake_case(Rest, [$_ | Acc]).


handle_invalid_request(_Request, Reason) ->
{400, [{<<"content-type">>, <<"text/plain">>}], [io_lib:print(Reason), "\n"]}.
2 changes: 1 addition & 1 deletion test/erf_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ foo(_Conf) ->
),

?assertMatch(
{ok, {{"HTTP/1.1", 400, "Bad Request"}, _Result2Headers, <<>>}},
{ok, {{"HTTP/1.1", 400, "Bad Request"}, _Result2Headers, <<_/binary>>}},
httpc:request(
post,
{"http://localhost:8789/1/foo", [], "application/json", <<"\"foobar\"">>},
Expand Down
2 changes: 1 addition & 1 deletion test/erf_router_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ foo(_Conf) ->

meck:expect(get_foo_request_body, is_valid, fun(_Value) -> {false, reason} end),

?assertEqual({400, [], undefined}, Mod:handle(Req)),
?assertMatch({400, [{<<"content-type">>, _}], _}, Mod:handle(Req)),

NotAllowedReq = #{
path => [<<"1">>, <<"foo">>],
Expand Down