Fixing CR issues

esl · Nov 8, 2022 · 4d4a0e0 · 4d4a0e0
1 parent 9671306
commit 4d4a0e0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/graphql/mongoose_graphql_cowboy_handler.erl b/src/graphql/mongoose_graphql_cowboy_handler.erl
@@ -50,7 +50,8 @@ config_spec() ->
                  <<"schema_endpoint">> => #option{type = atom,
                                                   validate = {enum, [admin, domain_admin, user]}},
                  <<"allowed_categories">> => #list{items = #option{type = binary,
-                     validate = {enum, allowed_schemas()}}}},
+                                                                   validate = {enum, allowed_categories()}},
+                                                   validate = unique_non_empty}},
         format_items = map,
         required = [<<"schema_endpoint">>],
         process = fun ?MODULE:process_config/1}.
@@ -275,7 +276,7 @@ reply_error(Msg, Req, State) ->
     Reply = cowboy_req:reply(Code, Req2),
     {stop, Reply, State}.
 
-allowed_schemas() ->
+allowed_categories() ->
     [<<"checkAuth">>, <<"account">>, <<"domain">>, <<"last">>, <<"muc">>, <<"muc_light">>,
      <<"session">>, <<"stanza">>, <<"roster">>, <<"vcard">>, <<"private">>, <<"metric">>,
      <<"stat">>, <<"gdpr">>, <<"mnesia">>, <<"server">>, <<"inbox">>, <<"http_upload">>,

diff --git a/src/graphql/mongoose_graphql_errors.erl b/src/graphql/mongoose_graphql_errors.erl
@@ -68,10 +68,6 @@ format_error(internal_crash) ->
     Msg = #{message => <<"GraphQL Internal Server Error">>,
             extensions => #{code => internal_server_error}},
     {500, Msg};
-format_error({category_disabled, Category}) ->
-    Message = iolist_to_binary(io_lib:format("~p", [
-        #{message => <<"Category disabled">>, extensions => #{category => Category}}])),
-    {400, #{message => Message, extensions => #{code => category_disabled}}};
 format_error(Err) ->
     Msg = #{extensions => #{code => uncategorized},
             message => iolist_to_binary(io_lib:format("~p", [Err]))},