From 0b7f1ab69c1ed5b9e4540cfc8581d1f373c74849 Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Wed, 16 Mar 2022 10:25:16 +0800
Subject: [PATCH] refactor(authz_api): avoid copy paste

---
 apps/emqx_authz/src/emqx_authz.erl            |  4 ++--
 .../emqx_authz/src/emqx_authz_api_sources.erl | 23 +++++++------------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/apps/emqx_authz/src/emqx_authz.erl b/apps/emqx_authz/src/emqx_authz.erl
index 23f8fde58..b8abbbed7 100644
--- a/apps/emqx_authz/src/emqx_authz.erl
+++ b/apps/emqx_authz/src/emqx_authz.erl
@@ -108,10 +108,10 @@ lookup(Type) ->
     {Source, _Front, _Rear} = take(Type),
     Source.
 
-move(Type, {before, Before}) ->
+move(Type, ?CMD_MOVE_BEFORE(Before)) ->
     emqx_authz_utils:update_config(
       ?CONF_KEY_PATH, {?CMD_MOVE, type(Type), ?CMD_MOVE_BEFORE(type(Before))});
-move(Type, {'after', After}) ->
+move(Type, ?CMD_MOVE_AFTER(After)) ->
     emqx_authz_utils:update_config(
       ?CONF_KEY_PATH, {?CMD_MOVE, type(Type), ?CMD_MOVE_AFTER(type(After))});
 move(Type, Position) ->
diff --git a/apps/emqx_authz/src/emqx_authz_api_sources.erl b/apps/emqx_authz/src/emqx_authz_api_sources.erl
index 4c0ae5fe5..b1384b2f2 100644
--- a/apps/emqx_authz/src/emqx_authz_api_sources.erl
+++ b/apps/emqx_authz/src/emqx_authz_api_sources.erl
@@ -66,16 +66,13 @@ schema("/authorization/sources") ->
      , get =>
            #{ description => <<"List all authorization sources">>
             , responses =>
-                  #{ 200 => mk( array(hoconsc:union(
-                      [ref(?API_SCHEMA_MODULE, Type) || Type <- authz_sources_types(detailed)]))
+                  #{ 200 => mk( array(hoconsc:union(authz_sources_type_refs()))
                               , #{desc => <<"Authorization source">>})
                    }
             }
      , post =>
            #{ description => <<"Add a new source">>
-            , 'requestBody' => mk( hoconsc:union(
-                                   [ref(?API_SCHEMA_MODULE, Type)
-                                        || Type <- authz_sources_types(detailed)])
+            , 'requestBody' => mk( hoconsc:union(authz_sources_type_refs())
                                  , #{desc => <<"Source config">>})
             , responses =>
                   #{ 204 => <<"Authorization source created successfully">>
@@ -85,9 +82,7 @@ schema("/authorization/sources") ->
             }
      , put =>
            #{ description => <<"Update all sources">>
-            , 'requestBody' => mk( array(hoconsc:union(
-                                  [ref(?API_SCHEMA_MODULE, Type)
-                                       || Type <- authz_sources_types(detailed)]))
+            , 'requestBody' => mk( array(hoconsc:union(authz_sources_type_refs()))
                                  , #{desc => <<"Sources">>})
             , responses =>
                   #{ 204 => <<"Authorization source updated successfully">>
@@ -102,9 +97,7 @@ schema("/authorization/sources/:type") ->
            #{ description => <<"Get a authorization source">>
             , parameters => parameters_field()
             , responses =>
-                  #{ 200 => mk( hoconsc:union(
-                               [ref(?API_SCHEMA_MODULE, Type)
-                                   || Type <- authz_sources_types(detailed)])
+                  #{ 200 => mk( hoconsc:union(authz_sources_type_refs())
                               , #{desc => <<"Authorization source">>})
                    , 404 => emqx_dashboard_swagger:error_codes([?NOT_FOUND], <<"Not Found">>)
                    }
@@ -112,8 +105,7 @@ schema("/authorization/sources/:type") ->
      , put =>
            #{ description => <<"Update source">>
             , parameters => parameters_field()
-            , 'requestBody' => mk( hoconsc:union([ref(?API_SCHEMA_MODULE, Type)
-                                   || Type <- authz_sources_types(detailed)]))
+            , 'requestBody' => mk( hoconsc:union(authz_sources_type_refs()))
             , responses =>
                   #{ 204 => <<"Authorization source updated successfully">>
                    , 400 => emqx_dashboard_swagger:error_codes([?BAD_REQUEST], <<"Bad Request">>)
@@ -511,8 +503,9 @@ position_example() ->
            , value => #{<<"position">> => <<"after:file">>}}
      }.
 
-authz_sources_types(Type) ->
-    emqx_authz_api_schema:authz_sources_types(Type).
+authz_sources_type_refs() ->
+    [ref(?API_SCHEMA_MODULE, Type)
+     || Type <- emqx_authz_api_schema:authz_sources_types(detailed)].
 
 bin(Term) -> erlang:iolist_to_binary(io_lib:format("~p", [Term])).