Remove management.oauth_metadata_url

Author: MarcialRosales

deps/rabbitmq_auth_backend_oauth2/priv/schema/rabbitmq_auth_backend_oauth2.schema

@@ -144,8 +144,8 @@
  [{datatype, string}, {validators, ["uri", "https_uri"]}]}.
 
 {mapping,
- "auth_oauth2.jwks_url",
- "rabbitmq_auth_backend_oauth2.key_config.jwks_url",
+ "auth_oauth2.jwks_uri",
+ "rabbitmq_auth_backend_oauth2.key_config.jwks_uri",
  [{datatype, string}, {validators, ["uri", "https_uri"]}]}.
 
 {mapping,

deps/rabbitmq_management/priv/schema/rabbitmq_management.schema

@@ -496,11 +496,6 @@ end}.
 {mapping, "management.oauth_scopes", "rabbitmq_management.oauth_scopes",
       [{datatype, string}]}.
 
-%% The URL of the OIDC discovery url where the provider is listening on
-%% by default it is <oauth_provider_url>/.well-known/openid-configuration which is the
-%% default OIDC discovery endpoint
-{mapping, "management.oauth_metadata_url", "rabbitmq_management.oauth_metadata_url",
-      [{datatype, string}]}.
 
 %% Configure the OAuth 2 type allowed for the end users to logon to the management UI
 %% Default type is sp_initiated meaning the standard OAuth 2.0 mode where users come without any token
@@ -557,12 +552,6 @@ end}.
   [{datatype, string}]
 }.
 
-{mapping,
-  "management.oauth_resource_servers.$name.oauth_metadata_url",
-  "rabbitmq_management.oauth_resource_servers",
-  [{datatype, string}]
-}.
-
 {mapping,
   "management.oauth_resource_servers.$name.oauth_initiated_logon_type",
     "rabbitmq_management.oauth_resource_servers",

deps/rabbitmq_management/src/rabbit_mgmt_wm_auth.erl

@@ -34,7 +34,7 @@ merge_property(Key, List, MapIn) ->
 extract_oauth_provider_info_props_as_map(ManagementProps) ->
   lists:foldl(fun(K, Acc) ->
     merge_property(K, ManagementProps, Acc) end, #{}, [oauth_provider_url,
-      oauth_metadata_url, oauth_authorization_endpoint_params,
+      oauth_authorization_endpoint_params,
       oauth_token_endpoint_params]).
 
 merge_oauth_provider_info(OAuthResourceServer, MgtResourceServer, ManagementProps) ->
@@ -55,8 +55,8 @@ oauth_provider_to_map(OAuthProvider) ->
   Map0 = case OAuthProvider#oauth_provider.issuer of
     undefined -> #{};
     Issuer -> #{ oauth_provider_url => Issuer,
-                oauth_metadata_url => OAuthProvider#oauth_provider.discovery_endpoint
-              }
+                 oauth_metadata_url => OAuthProvider#oauth_provider.discovery_endpoint
+               }
   end,
   case OAuthProvider#oauth_provider.end_session_endpoint of
     undefined -> Map0;

deps/rabbitmq_management/test/rabbit_mgmt_wm_auth_SUITE.erl

@@ -96,10 +96,7 @@ groups() ->
                 should_return_mgt_oauth_metadata_url_url1,
                 {with_mgt_oauth_provider_url_url0, [], [
                   should_return_mgt_oauth_provider_url_url0,
-                  should_return_mgt_oauth_metadata_url_url1,
-                  {with_mgt_oauth_metadata_url_url0, [], [
-                    should_return_mgt_oauth_metadata_url_url0
-                  ]}
+                  should_return_mgt_oauth_metadata_url_url1                  
                 ]}
               ]}
             ]}
@@ -205,10 +202,7 @@ groups() ->
                     should_return_oauth_resource_server_a_with_oauth_metadata_url_url1,
                     {with_mgt_oauth_resource_server_a_with_oauth_provider_url_url1, [], [
                       should_return_oauth_resource_server_rabbit_with_oauth_provider_url_url0,
-                      should_return_oauth_resource_server_a_with_oauth_provider_url_url1,
-                      {with_mgt_oauth_resource_server_a_with_oauth_metadata_url_url0, [], [
-                        should_return_oauth_resource_server_a_with_oauth_metadata_url_url0
-                      ]}
+                      should_return_oauth_resource_server_a_with_oauth_provider_url_url1                      
                     ]}
                   ]}
                 ]}
@@ -409,9 +403,6 @@ init_per_group(with_mgt_oauth_client_secret_q, Config) ->
 init_per_group(with_mgt_oauth_provider_url_url0, Config) ->
   set_env(rabbitmq_management, oauth_provider_url, ?config(url0, Config)),
   Config;
-init_per_group(with_mgt_oauth_metadata_url_url0, Config) ->
-  set_env(rabbitmq_management, oauth_metadata_url, ?config(meta_url0, Config)),
-  Config;
 init_per_group(with_root_issuer_url1, Config) ->
   set_env(rabbitmq_auth_backend_oauth2, issuer, ?config(url1, Config)),
   Config;
@@ -460,10 +451,6 @@ init_per_group(with_mgt_oauth_resource_server_a_with_oauth_provider_url_url1, Co
   set_attribute_in_entry_for_env_variable(rabbitmq_management, oauth_resource_servers,
     ?config(a, Config), oauth_provider_url, ?config(url1, Config)),
   Config;
-init_per_group(with_mgt_oauth_resource_server_a_with_oauth_metadata_url_url0, Config) ->
-  set_attribute_in_entry_for_env_variable(rabbitmq_management, oauth_resource_servers,
-    ?config(a, Config), oauth_metadata_url, ?config(meta_url0, Config)),
-  Config;
 init_per_group(with_mgt_resource_server_a_with_client_id_x, Config) ->
   set_attribute_in_entry_for_env_variable(rabbitmq_management, oauth_resource_servers,
     ?config(a, Config), oauth_client_id, ?config(x, Config)),
@@ -538,9 +525,6 @@ end_per_group(with_resource_server_id_rabbit, Config) ->
 end_per_group(with_mgt_oauth_provider_url_url0, Config) ->
   unset_env(rabbitmq_management, oauth_provider_url),
   Config;
-end_per_group(with_mgt_oauth_metadata_url_url0, Config) ->
-  unset_env(rabbitmq_management, oauth_metadata_url),
-  Config;
 end_per_group(with_root_issuer_url1, Config) ->
   unset_env(rabbitmq_auth_backend_oauth2, issuer),
   unset_env(rabbitmq_auth_backend_oauth2, discovery_endpoint),
@@ -574,10 +558,6 @@ end_per_group(with_mgt_oauth_resource_server_a_with_oauth_provider_url_url1, Con
   remove_attribute_from_entry_from_env_variable(rabbitmq_management, oauth_resource_servers,
     ?config(a, Config), oauth_provider_url),
   Config;
-end_per_group(with_mgt_oauth_resource_server_a_with_oauth_metadata_url_url0, Config) ->
-  remove_attribute_from_entry_from_env_variable(rabbitmq_management, oauth_resource_servers,
-    ?config(a, Config), oauth_metadata_url),
-  Config;
 end_per_group(with_mgt_resource_server_a_with_oauth_initiated_logon_type_sp_initiated, Config) ->
   remove_attribute_from_entry_from_env_variable(rabbitmq_management, oauth_resource_servers,
     ?config(a, Config), oauth_initiated_logon_type),
@@ -705,10 +685,6 @@ should_return_oauth_resource_server_a_with_oauth_metadata_url_url1(Config) ->
   assertEqual_on_attribute_for_oauth_resource_server(authSettings(),
     Config, a, oauth_metadata_url, meta_url1).
 
-should_return_oauth_resource_server_a_with_oauth_metadata_url_url0(Config) ->
-  assertEqual_on_attribute_for_oauth_resource_server(authSettings(),
-    Config, a, oauth_metadata_url, meta_url0).
-
 should_return_oauth_resource_server_a_with_oauth_provider_url_url0(Config) ->
   assertEqual_on_attribute_for_oauth_resource_server(authSettings(),
     Config, a, oauth_provider_url, url0).