rabbit_oauth2_schema: naming, formatting

Author: michaelklishin

deps/rabbitmq_auth_backend_oauth2/src/rabbit_oauth2_schema.erl

@@ -24,36 +24,35 @@
     translate_scope_aliases/1
 ]).
 
-extract_key_as_binary({Name,_}) -> list_to_binary(Name).
-extract_value({_Name,V}) -> V.
+extract_binary_key({Name, _}) -> rabbit_data_coercion:to_binary(Name).
+extract_value({_Name, V}) -> V.
 
 -spec translate_scope_aliases([{list(), binary()}]) -> map().
 translate_scope_aliases(Conf) ->   
     Settings = cuttlefish_variable:filter_by_prefix(
         ?AUTH_OAUTH2_SCOPE_ALIASES, Conf),
     maps:merge(extract_scope_alias_as_map(Settings), 
         extract_scope_aliases_as_list_of_alias_scope_props(Settings)).
-    
-convert_space_separated_string_to_list_of_binaries(String) ->
+
+binary_tokens_from(String) ->
     [ list_to_binary(V) || V <- string:tokens(String, " ")].
 
 extract_scope_alias_as_map(Settings) ->
     maps:from_list([{
-        list_to_binary(Alias), 
-        convert_space_separated_string_to_list_of_binaries(Scope)
+        rabbit_data_coercion:to_binary(Alias),
+        binary_tokens_from(Scope)
         }
         || {[?AUTH_OAUTH2, ?SCOPE_ALIASES, Alias], Scope} <- Settings ]).
 
 extract_scope_aliases_as_list_of_alias_scope_props(Settings) ->    
-    KeyFun = fun extract_key_as_binary/1,
+    KeyFun = fun extract_binary_key/1,
     ValueFun = fun extract_value/1,
 
-    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)),    
+    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)),
     List2 = [extract_scope_alias_mapping(Proplist) || {_, Proplist} <- List1],
     maps:from_list([ V || V <- List2, V =/= {}]).
-    
+
 extract_scope_alias_mapping(Proplist) ->
     Alias = 
         case proplists:get_value(alias, Proplist) of 
@@ -63,7 +62,7 @@ extract_scope_alias_mapping(Proplist) ->
     Scope = 
         case proplists:get_value(scope, Proplist) of 
             undefined -> {error, missing_scope_attribute};
-            S -> convert_space_separated_string_to_list_of_binaries(S)
+            S -> binary_tokens_from(S)
         end,
     case {Alias, Scope} of
         {{error, _}, _} -> 
@@ -77,50 +76,49 @@ extract_scope_alias_mapping(Proplist) ->
         _ = V -> V
     end.
 
-extract_resource_server_scope_aliases_as_list_of_props(Settings) ->
-    KeyFun = fun extract_key_as_binary/1,
+extract_resource_server_scope_aliases_as_proplist(Settings) ->
+    KeyFun = fun extract_binary_key/1,
     ValueFun = fun extract_value/1,
 
     List0 = [
         {
-            Name, 
-            {Index, {list_to_atom(Attr), V}}
-        } || 
+            Name,
+            {Index, {rabbit_data_coercion:to_atom(Attr), V}}
+        } ||
         {[
             ?AUTH_OAUTH2, ?RESOURCE_SERVERS, Name, ?SCOPE_ALIASES, 
             Index, Attr
          ], V
-        } <- Settings ],
+        } <- Settings],
     Map0 = maps:groups_from_list(KeyFun, ValueFun, List0),
-     
+
     Map4 = maps:map(fun (_, L) -> 
-        Map2 = maps:map(fun (_, L2) -> extract_scope_alias_mapping(L2) end, 
+        Map2 = maps:map(fun (_, L2) -> extract_scope_alias_mapping(L2) end,
             maps:groups_from_list(KeyFun, ValueFun, L)),
         Map3 = maps:filter(fun (_,V) -> V =/= {} end, Map2),
         [{scope_aliases, maps:from_list([ V || {_, V} <- maps:to_list(Map3)])}]
         end, Map0),
-       
     Map4.
- 
+
 extract_resource_server_scope_aliases_as_map(Settings) ->
-    KeyFun = fun extract_key_as_binary/1,
+    KeyFun = fun extract_binary_key/1,
     ValueFun = fun extract_value/1,
 
     List0 = [
         {
-            Name, 
+            Name,
             {
                 list_to_binary(Alias), 
-                convert_space_separated_string_to_list_of_binaries(Scope)
-            }         
-        } || 
+                binary_tokens_from(Scope)
+            }
+        } ||
         {[
             ?AUTH_OAUTH2, ?RESOURCE_SERVERS, Name, ?SCOPE_ALIASES, 
             Alias
          ], Scope
         } <- Settings ],
     Map0 = maps:groups_from_list(KeyFun, ValueFun, List0),
-    maps:map(fun (_, L) -> [{scope_aliases, maps:from_list(L)}] end, Map0).    
+    maps:map(fun (_, L) -> [{scope_aliases, maps:from_list(L)}] end, Map0).
 
 -spec translate_resource_servers([{list(), binary()}]) -> map().
 translate_resource_servers(Conf) ->
@@ -129,7 +127,7 @@ translate_resource_servers(Conf) ->
     Map = merge_list_of_maps([
         extract_resource_server_properties(Settings),
         extract_resource_server_preferred_username_claims(Settings),
-        extract_resource_server_scope_aliases_as_list_of_props(Settings),
+        extract_resource_server_scope_aliases_as_proplist(Settings),
         extract_resource_server_scope_aliases_as_map(Settings)
     ]),
     Map0 = maps:map(fun(K,V) ->
@@ -202,7 +200,7 @@ merge_list_of_maps(ListOfMaps) ->
         fun(_K,V1,V2) -> V1 ++ V2 end, Elem, AccIn) end, #{}, ListOfMaps).
 
 extract_oauth_providers_properties(Settings) ->
-    KeyFun = fun extract_key_as_binary/1,
+    KeyFun = fun extract_binary_key/1,
     ValueFun = fun extract_value/1,
 
     OAuthProviders = [{Name, mapOauthProviderProperty(
@@ -213,7 +211,7 @@ extract_oauth_providers_properties(Settings) ->
     maps:groups_from_list(KeyFun, ValueFun, OAuthProviders).
 
 extract_resource_server_properties(Settings) ->
-    KeyFun = fun extract_key_as_binary/1,
+    KeyFun = fun extract_binary_key/1,
     ValueFun = fun extract_value/1,
 
     OAuthProviders = [{Name, {list_to_atom(Key), list_to_binary(V)}}
@@ -231,7 +229,7 @@ mapOauthProviderProperty({Key, Value}) ->
     end}.
 
 extract_oauth_providers_https(Settings) ->
-    ExtractProviderNameFun = fun extract_key_as_binary/1,
+    ExtractProviderNameFun = fun extract_binary_key/1,
 
     AttributesPerProvider = [{Name, mapHttpProperty({list_to_atom(Key), V})} ||
         {[?AUTH_OAUTH2, ?OAUTH_PROVIDERS, Name, "https", Key], V} <- Settings ],
@@ -247,7 +245,7 @@ mapHttpProperty({Key, Value}) ->
     end}.
 
 extract_oauth_providers_algorithm(Settings) ->
-    KeyFun = fun extract_key_as_binary/1,
+    KeyFun = fun extract_binary_key/1,
 
     IndexedAlgorithms = [{Name, {Index, list_to_binary(V)}} ||
         {[?AUTH_OAUTH2, ?OAUTH_PROVIDERS, Name, "algorithms", Index], V} 
@@ -259,7 +257,7 @@ extract_oauth_providers_algorithm(Settings) ->
         maps:groups_from_list(KeyFun, fun({_, V}) -> V end, Algorithms)).
 
 extract_resource_server_preferred_username_claims(Settings) ->
-    KeyFun = fun extract_key_as_binary/1,
+    KeyFun = fun extract_binary_key/1,
 
     IndexedClaims = [{Name, {Index, list_to_binary(V)}} ||
         {[?AUTH_OAUTH2, ?RESOURCE_SERVERS, Name, "preferred_username_claims", 
@@ -271,7 +269,7 @@ extract_resource_server_preferred_username_claims(Settings) ->
         maps:groups_from_list(KeyFun, fun({_, V}) -> V end, Claims)).
 
 extract_oauth_providers_signing_keys(Settings) ->
-    KeyFun = fun extract_key_as_binary/1,
+    KeyFun = fun extract_binary_key/1,
 
     IndexedSigningKeys = [{Name, {list_to_binary(Kid), list_to_binary(V)}} ||
         {[?AUTH_OAUTH2, ?OAUTH_PROVIDERS, Name, ?SIGNING_KEYS, Kid], V}