Merge pull request #3697 from esl/without-mongoose-commands

Do not use mongoose_commands in the Client REST API
esl · Jul 1, 2022 · ffc778d · ffc778d
2 parents bbdc781 + 77ca788
commit ffc778d
Show file tree

Hide file tree

Showing 9 changed files with 133 additions and 447 deletions.
diff --git a/src/mod_commands.erl b/src/mod_commands.erl
@@ -125,7 +125,6 @@ commands() ->
       {module, ?MODULE},
       {function, list_contacts},
       {action, read},
-      {security_policy, [user]},
       {args, [{caller, binary}]},
       {result, []}
      ],
@@ -136,7 +135,6 @@ commands() ->
       {module, ?MODULE},
       {function, add_contact},
       {action, create},
-      {security_policy, [user]},
       {args, [{caller, binary}, {jid, binary}]},
       {result, ok}
      ],
@@ -147,7 +145,6 @@ commands() ->
       {module, ?MODULE},
       {function, subscription},
       {action, update},
-      {security_policy, [user]},
       {identifiers, [caller, jid]},
       % caller has to be in identifiers, otherwise it breaks admin rest api
       {args, [{caller, binary}, {jid, binary}, {action, binary}]},
@@ -172,7 +169,6 @@ commands() ->
       {module, ?MODULE},
       {function, delete_contact},
       {action, delete},
-      {security_policy, [user]},
       {args, [{caller, binary}, {jid, binary}]},
       {result, ok}
      ],
@@ -184,7 +180,6 @@ commands() ->
       {module, ?MODULE},
       {function, delete_contacts},
       {action, delete},
-      {security_policy, [user]},
       {args, [{caller, binary}, {jids, [binary]}]},
       {result,  []}
      ],
@@ -195,7 +190,6 @@ commands() ->
       {module, ?MODULE},
       {function, send_message},
       {action, create},
-      {security_policy, [user]},
       {args, [{caller, binary}, {to, binary}, {body, binary}]},
       {result, ok}
      ],
@@ -216,7 +210,6 @@ commands() ->
       {module, ?MODULE},
       {function, get_recent_messages},
       {action, read},
-      {security_policy, [user]},
       {args, [{caller, binary}]},
       {optargs, [{before, integer, 0}, {limit, integer, 100}]},
       {result, []}
@@ -228,7 +221,6 @@ commands() ->
       {module, ?MODULE},
       {function, get_recent_messages},
       {action, read},
-      {security_policy, [user]},
       {args, [{caller, binary}, {with, binary}]},
       {optargs, [{before, integer, 0}, {limit, integer, 100}]},
       {result, []}
@@ -240,7 +232,6 @@ commands() ->
       {module, ?MODULE},
       {function, change_user_password},
       {action, update},
-      {security_policy, [user]},
       {identifiers, [host, user]},
       {args, [{host, binary}, {user, binary}, {newpass, binary}]},
       {result, ok}

diff --git a/src/mongoose_api_client.erl b/src/mongoose_api_client.erl
diff --git a/src/mongoose_api_common.erl b/src/mongoose_api_common.erl
@@ -66,7 +66,6 @@
 
 %% API
 -export([create_admin_url_path/1,
-         create_user_url_path/1,
          action_to_method/1,
          method_to_action/1,
          parse_request_body/1,
@@ -102,13 +101,6 @@ create_admin_url_path_iodata(Command) ->
     ["/", mongoose_commands:category(Command),
           maybe_add_bindings(Command, admin), maybe_add_subcategory(Command)].
 
--spec create_user_url_path(mongoose_commands:t()) -> ejabberd_cowboy:path().
-create_user_url_path(Command) ->
-    iolist_to_binary(create_user_url_path_iodata(Command)).
-
-create_user_url_path_iodata(Command) ->
-    ["/", mongoose_commands:category(Command), maybe_add_bindings(Command, user)].
-
 -spec process_request(Method :: method(),
                       Command :: mongoose_commands:t(),
                       Req :: cowboy_req:req() | {list(), cowboy_req:req()},
@@ -309,8 +301,6 @@ add_bindings(Args, Entity) ->
     [add_bind(A, Entity) || A <- Args].
 
 %% skip "caller" arg for frontend command
-add_bind({caller, _}, user) ->
-    "";
 add_bind({ArgName, _}, _Entity) ->
     lists:flatten(["/:", atom_to_list(ArgName)]);
 add_bind(Other, _) ->