From f682bfe6e0b198c085b9af4ab93b175f25cac785 Mon Sep 17 00:00:00 2001
From: Turtle <deng@emqx.io>
Date: Fri, 4 Jun 2021 19:41:57 +0800
Subject: [PATCH] fix(api): fix ee call module api 404

---
 .../src/emqx_management.appup.src             | 30 +++----------------
 apps/emqx_management/src/emqx_mgmt_http.erl   |  6 ++++
 2 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/apps/emqx_management/src/emqx_management.appup.src b/apps/emqx_management/src/emqx_management.appup.src
index 57afdf029..06945afad 100644
--- a/apps/emqx_management/src/emqx_management.appup.src
+++ b/apps/emqx_management/src/emqx_management.appup.src
@@ -1,34 +1,12 @@
 %% -*- mode: erlang -*-
 {VSN,
- [ {"4.3.2",
-    [ {load_module, emqx_mgmt, brutal_purge, soft_purge, []}
-    , {load_module, emqx_mgmt_api_data, brutal_purge, soft_purge, []}
-    , {load_module, emqx_mgmt_api, brutal_purge, soft_purge, []}
-    , {load_module, emqx_mgmt_api_clients, brutal_purge, soft_purge, []}
-    ]},
-   {<<"4.3.[0-1]">>,
-    [ {load_module, emqx_mgmt_data_backup, brutal_purge, soft_purge, []}
-    , {load_module, emqx_mgmt_cli, brutal_purge, soft_purge, []}
-    , {load_module, emqx_mgmt, brutal_purge, soft_purge, []}
-    , {load_module, emqx_mgmt_api_data, brutal_purge, soft_purge, []}
-    , {load_module, emqx_mgmt_api, brutal_purge, soft_purge, []}
-    , {load_module, emqx_mgmt_api_clients, brutal_purge, soft_purge, []}
+ [ {<<"4.3.[0-2]">>,
+    [ {restart_application, emqx_management}
     ]},
    {<<".*">>, []}
  ],
- [ {"4.3.2",
-    [ {load_module, emqx_mgmt, brutal_purge, soft_purge, []}
-    , {load_module, emqx_mgmt_api_data, brutal_purge, soft_purge, []}
-    , {load_module, emqx_mgmt_api, brutal_purge, soft_purge, []}
-    , {load_module, emqx_mgmt_api_clients, brutal_purge, soft_purge, []}
-    ]},
-   {<<"4.3.[0-1]">>,
-    [ {load_module, emqx_mgmt_data_backup, brutal_purge, soft_purge, []}
-    , {load_module, emqx_mgmt_cli, brutal_purge, soft_purge, []}
-    , {load_module, emqx_mgmt, brutal_purge, soft_purge, []}
-    , {load_module, emqx_mgmt_api_data, brutal_purge, soft_purge, []}
-    , {load_module, emqx_mgmt_api, brutal_purge, soft_purge, []}
-    , {load_module, emqx_mgmt_api_clients, brutal_purge, soft_purge, []}
+ [ {<<"4.3.[0-2]">>,
+    [ {restart_application, emqx_management}
     ]},
    {<<".*">>, []}
  ]
diff --git a/apps/emqx_management/src/emqx_mgmt_http.erl b/apps/emqx_management/src/emqx_mgmt_http.erl
index a037da37f..da5a75027 100644
--- a/apps/emqx_management/src/emqx_mgmt_http.erl
+++ b/apps/emqx_management/src/emqx_mgmt_http.erl
@@ -119,12 +119,18 @@ authorize_appid(Req) ->
          _  -> false
     end.
 
+-ifdef(EMQX_ENTERPRISE).
+filter(_) ->
+    true.
+-else.
 filter(#{app := emqx_modules}) -> true;
 filter(#{app := App}) ->
     case emqx_plugins:find_plugin(App) of
         false -> false;
         Plugin -> Plugin#plugin.active
     end.
+-endif.
+
 
 format(Port) when is_integer(Port) ->
     io_lib:format("0.0.0.0:~w", [Port]);