rabbitmq-auth-backend-oauth2: correctly map additional_scopes_key

(cherry picked from commit 0d799a5)
(cherry picked from commit 0d51ee9)

# Conflicts:
#	deps/rabbitmq_auth_backend_oauth2/src/rabbit_oauth2_schema.erl
#	deps/rabbitmq_auth_backend_oauth2/test/rabbit_oauth2_schema_SUITE.erl

Author: Hathoute

deps/rabbitmq_auth_backend_oauth2/src/rabbit_oauth2_schema.erl

@@ -14,6 +14,15 @@
     translate_signing_keys/1
 ]).
 
+-define(RESOURCE_SERVERS_SYNONYMS, #{
+  "additional_scopes_key" => "extra_scopes_source"
+}).
+
+resource_servers_key_synonym(Name) ->
+  case maps:find(Name, ?RESOURCE_SERVERS_SYNONYMS) of {ok, Synonym} -> Synonym;
+    error -> Name
+  end.
+
 extract_key_as_binary({Name,_}) -> list_to_binary(Name).
 extract_value({_Name,V}) -> V.
 
@@ -99,8 +108,13 @@ extract_resource_server_properties(Settings) ->
     KeyFun = fun extract_key_as_binary/1,
     ValueFun = fun extract_value/1,
 
+<<<<<<< HEAD
     OAuthProviders = [{Name, {list_to_atom(Key), list_to_binary(V)}}
         || {["auth_oauth2","resource_servers", Name, Key], V} <- Settings ],
+=======
+    OAuthProviders = [{Name, {list_to_atom(resource_servers_key_synonym(Key)), list_to_binary(V)}}
+        || {[?AUTH_OAUTH2, ?RESOURCE_SERVERS, Name, Key], V} <- Settings ],
+>>>>>>> 0d51ee9ec0 (rabbitmq-auth-backend-oauth2: correctly map additional_scopes_key)
     maps:groups_from_list(KeyFun, ValueFun, OAuthProviders).
 
 mapOauthProviderProperty({Key, Value}) ->

deps/rabbitmq_auth_backend_oauth2/test/rabbit_oauth2_schema_SUITE.erl

@@ -81,26 +81,55 @@ test_oauth_providers_attributes(_) ->
     } = sort_settings(rabbit_oauth2_schema:translate_oauth_providers(Conf)).
 
 test_resource_servers_attributes(_) ->
+<<<<<<< HEAD
     Conf = [{["auth_oauth2","resource_servers","rabbitmq1","id"],"rabbitmq1xxx"},
             {["auth_oauth2","resource_servers","rabbitmq1","scope_prefix"],"somescope."},
             {["auth_oauth2","resource_servers","rabbitmq1","additional_scopes_key"],"roles"},
             {["auth_oauth2","resource_servers","rabbitmq1","preferred_username_claims","1"],"userid"},
             {["auth_oauth2","resource_servers","rabbitmq1","preferred_username_claims","2"],"groupid"}
             ],
     #{<<"rabbitmq1xxx">> := [{additional_scopes_key, <<"roles">>},
+=======
+    Conf = [
+        {["auth_oauth2","resource_servers","rabbitmq1","id"],
+            "rabbitmq1xxx"},
+        {["auth_oauth2","resource_servers","rabbitmq1","scope_prefix"],
+            "somescope."},
+        {["auth_oauth2","resource_servers","rabbitmq1","additional_scopes_key"],
+            "roles"},
+        {["auth_oauth2","resource_servers","rabbitmq1","preferred_username_claims","1"],
+            "userid"},
+        {["auth_oauth2","resource_servers","rabbitmq1","preferred_username_claims","2"],
+            "groupid"}
+    ],
+    #{<<"rabbitmq1xxx">> := [{extra_scopes_source, <<"roles">>},
+>>>>>>> 0d51ee9ec0 (rabbitmq-auth-backend-oauth2: correctly map additional_scopes_key)
                           {id, <<"rabbitmq1xxx">>},
                           {preferred_username_claims, [<<"userid">>, <<"groupid">>]},
                           {scope_prefix, <<"somescope.">>}
                         ]
     } = sort_settings(rabbit_oauth2_schema:translate_resource_servers(Conf)),
 
     Conf2 = [
+<<<<<<< HEAD
             {["auth_oauth2","resource_servers","rabbitmq1","scope_prefix"],"somescope."},
             {["auth_oauth2","resource_servers","rabbitmq1","additional_scopes_key"],"roles"},
             {["auth_oauth2","resource_servers","rabbitmq1","preferred_username_claims","1"],"userid"},
             {["auth_oauth2","resource_servers","rabbitmq1","preferred_username_claims","2"],"groupid"}
             ],
     #{<<"rabbitmq1">> := [{additional_scopes_key, <<"roles">>},
+=======
+        {["auth_oauth2","resource_servers","rabbitmq1","scope_prefix"],
+            "somescope."},
+        {["auth_oauth2","resource_servers","rabbitmq1","additional_scopes_key"],
+            "roles"},
+        {["auth_oauth2","resource_servers","rabbitmq1","preferred_username_claims","1"],
+            "userid"},
+        {["auth_oauth2","resource_servers","rabbitmq1","preferred_username_claims","2"],
+            "groupid"}
+    ],
+    #{<<"rabbitmq1">> := [{extra_scopes_source, <<"roles">>},
+>>>>>>> 0d51ee9ec0 (rabbitmq-auth-backend-oauth2: correctly map additional_scopes_key)
                           {id, <<"rabbitmq1">>},
                           {preferred_username_claims, [<<"userid">>, <<"groupid">>]},
                           {scope_prefix, <<"somescope.">>}