Fix schema translation for

scope_aliases

Author: MarcialRosales

deps/rabbitmq_auth_backend_oauth2/priv/schema/rabbitmq_auth_backend_oauth2.schema

@@ -74,7 +74,12 @@
  end}.
 
 {mapping,
- "auth_oauth2.scope_aliases.$alias",
+ "auth_oauth2.scope_aliases.$index.alias",
+ "rabbitmq_auth_backend_oauth2.scope_aliases",
+ [{datatype, string}]}.
+
+{mapping,
+ "auth_oauth2.scope_aliases.$index.scope",
  "rabbitmq_auth_backend_oauth2.scope_aliases",
  [{datatype, string}]}.
 

deps/rabbitmq_auth_backend_oauth2/src/rabbit_oauth2_schema.erl

@@ -20,34 +20,28 @@ extract_key_as_binary({Name,_}) -> list_to_binary(Name).
 extract_value({_Name,V}) -> V.
 
 -spec translate_scope_aliases([{list(), binary()}]) -> map().
-translate_scope_aliases(Conf) ->
+translate_scope_aliases(Conf) ->   
     Settings = cuttlefish_variable:filter_by_prefix("auth_oauth2.scope_aliases", Conf),
-    maps:merge(extract_scope_aliases_as_a_map(Settings),
-        extract_scope_aliases_as_a_list_of_alias_scope_props(Settings)).
-
+    extract_scope_aliases_as_a_list_of_alias_scope_props(Settings).
+    
 convert_space_separated_string_to_list_of_binaries(String) ->
     [ list_to_binary(V) || V <- string:tokens(String, " ")].
 
-extract_scope_aliases_as_a_map(Settings) ->    
-    maps:from_list([{
-            list_to_binary(K), 
-            convert_space_separated_string_to_list_of_binaries(V)
-            } || {["auth_oauth2", "scope_aliases", K], V} <- Settings ]).
 extract_scope_aliases_as_a_list_of_alias_scope_props(Settings) ->    
     KeyFun = fun extract_key_as_binary/1,
     ValueFun = fun extract_value/1,
 
-    List0 = [{K, {list_to_atom(Attr), list_to_binary(V)}}
-        || {["auth_oauth2", "scope_aliases", K, Attr], V} <- Settings ],
-    List1 = maps:to_list(maps:groups_from_list(KeyFun, ValueFun, List0)),
+    List0 = [{Index, {list_to_atom(Attr), V}}
+        || {["auth_oauth2", "scope_aliases", Index, Attr], V} <- Settings ],
+    List1 = maps:to_list(maps:groups_from_list(KeyFun, ValueFun, List0)),    
     maps:from_list([ 
         extract_scope_alias_mapping(Proplist) || {_, Proplist} <- List1]).
 
 extract_scope_alias_mapping(Proplist) ->
     Alias = 
         case proplists:get_value(alias, Proplist) of 
             undefined -> {error, missing_alias_attribute};
-            A -> A
+            A -> list_to_binary(A)
         end,
     Scope = 
         case proplists:get_value(scope, Proplist) of 

deps/rabbitmq_auth_backend_oauth2/test/config_schema_SUITE_data/rabbitmq_auth_backend_oauth2.snippets

@@ -197,25 +197,6 @@
         ]}
         ],[]
   }, 
-  {scope_aliases_1, 
-      "auth_oauth2.resource_server_id = new_resource_server_id
-       auth_oauth2.scope_aliases.admin = rabbitmq.tag:administrator 
-       auth_oauth2.scope_aliases.developer = rabbitmq.tag:management rabbitmq.read:*/*",
-       [
-        {rabbitmq_auth_backend_oauth2, [
-            {resource_server_id,<<"new_resource_server_id">>},
-            {scope_aliases, #{
-              <<"admin">> => [ 
-                              <<"rabbitmq.tag:administrator">>
-                              ],
-              <<"developer">> => [ 
-                              <<"rabbitmq.tag:administrator">>,
-                              <<"rabbitmq.read:*/*">>
-                              ]                              
-            }}
-        ]}
-       ], []
-  },
   {scope_aliases_2, 
       "auth_oauth2.resource_server_id = new_resource_server_id
        auth_oauth2.scope_aliases.1.alias = admin
@@ -230,7 +211,7 @@
                               <<"rabbitmq.tag:administrator">>
                               ],
               <<"developer">> => [ 
-                              <<"rabbitmq.tag:administrator">>,
+                              <<"rabbitmq.tag:management">>,
                               <<"rabbitmq.read:*/*">>
                               ]                              
             }}