Remove access_token_format

Rather than configuring the type of token, the
server is able to detect if the token is jwt or not

Author: MarcialRosales

deps/rabbitmq_auth_backend_oauth2/include/oauth2.hrl

@@ -49,8 +49,7 @@
   additional_scopes_key :: binary() | undefined,
   preferred_username_claims :: list(),
   scope_aliases :: map() | undefined,
-  oauth_provider_id :: oauth_provider_id(),
-  access_token_format :: jwt | opaque | undefined
+  oauth_provider_id :: oauth_provider_id()
  }).
 
 -type resource_server() :: #resource_server{}.

deps/rabbitmq_auth_backend_oauth2/priv/schema/rabbitmq_auth_backend_oauth2.schema

@@ -153,11 +153,6 @@
     rabbit_oauth2_schema:translate_signing_keys(Conf)
  end}.
 
-{mapping, 
- "auth_oauth2.access_token_format", 
- "rabbitmq_auth_backend_oauth2.access_token_format",
- [{datatype, {enum, [jwt, opaque]}}]}.
-
 %% basic_authorization -> Authorization: Basic base64(client_id, client_secret)
 %% post_request_param -> &client_id=<client_id>&client_secret=<client_secret>
 {mapping, 
@@ -468,11 +463,6 @@
  "rabbitmq_auth_backend_oauth2.resource_servers",
  [{datatype, string}]}.
 
-{mapping, 
- "auth_oauth2.resource_servers.$name.access_token_format", 
- "rabbitmq_auth_backend_oauth2.resource_servers",
- [{datatype, {enum, [jwt, opaque]}}]}.
-
 {translation, "rabbitmq_auth_backend_oauth2.resource_servers",
  fun(Conf) ->
     rabbit_oauth2_schema:translate_resource_servers(Conf)

deps/rabbitmq_auth_backend_oauth2/src/rabbit_oauth2_resource_server.erl

@@ -24,8 +24,7 @@ new_resource_server(ResourceServerId) ->
         additional_scopes_key = undefined,
         preferred_username_claims = ?DEFAULT_PREFERRED_USERNAME_CLAIMS,
         scope_aliases = undefined,
-        oauth_provider_id = root,
-        access_token_format = jwt
+        oauth_provider_id = root
     }.
 
 -spec resolve_resource_server_from_audience(binary() | list() | none) ->
@@ -86,8 +85,6 @@ get_root_resource_server() ->
         end,
     ScopePrefix =
         get_env(scope_prefix, DefaultScopePrefix),
-    AccessTokenFormat =
-        get_env(access_token_format, jwt),
     OAuthProviderId =
         case get_env(default_oauth_provider) of
             undefined -> root;
@@ -102,7 +99,6 @@ get_root_resource_server() ->
         additional_scopes_key = AdditionalScopesKey,
         preferred_username_claims = PreferredUsernameClaims,
         scope_aliases = ScopeAliases,
-        access_token_format = AccessTokenFormat,
         oauth_provider_id = OAuthProviderId
     }.
 
@@ -147,9 +143,6 @@ get_resource_server(ResourceServerId, RootResourseServer) when
                 undefined -> erlang:iolist_to_binary([ResourceServerId, <<".">>]);
                 Prefix -> Prefix
             end),
-    AccessTokenFormat =
-        proplists:get_value(access_token_format, ResourceServerProps,
-            RootResourseServer#resource_server.access_token_format),
     OAuthProviderId =
         proplists:get_value(oauth_provider_id, ResourceServerProps,
             RootResourseServer#resource_server.oauth_provider_id),
@@ -162,8 +155,7 @@ get_resource_server(ResourceServerId, RootResourseServer) when
         additional_scopes_key = AdditionalScopesKey,
         preferred_username_claims = PreferredUsernameClaims,
         scope_aliases = ScopeAliases,
-        oauth_provider_id = OAuthProviderId,
-        access_token_format = AccessTokenFormat
+        oauth_provider_id = OAuthProviderId
     }.
 
 -spec find_audience(binary() | list(), list()) ->

deps/rabbitmq_auth_backend_oauth2/test/config_schema_SUITE_data/rabbitmq_auth_backend_oauth2.snippets

@@ -330,13 +330,11 @@
   {token_introspection, 
       "auth_oauth2.resource_server_id = new_resource_server_id
        auth_oauth2.introspection_endpoint = https://introspect
-       auth_oauth2.access_token_format = jwt
        auth_oauth2.introspection_client_auth_method = basic
        auth_oauth2.introspection_client_id = rabbit
        auth_oauth2.introspection_client_secret = rabbit_secret",
        [
         {rabbitmq_auth_backend_oauth2, [
-            {access_token_format, jwt},
             {introspection_client_auth_method, basic },
             {introspection_client_id, <<"rabbit">> },
             {introspection_client_secret, <<"rabbit_secret">> },
@@ -348,14 +346,12 @@
    },
    {token_introspection_via_oauth_providers, 
       "auth_oauth2.resource_server_id = new_resource_server_id
-       auth_oauth2.access_token_format = jwt
        auth_oauth2.oauth_providers.p.introspection_endpoint = https://introspect
        auth_oauth2.oauth_providers.p.introspection_client_id = rabbit
        auth_oauth2.oauth_providers.p.introspection_client_auth_method = basic
        auth_oauth2.oauth_providers.p.introspection_client_secret = rabbit_secret",
        [
         {rabbitmq_auth_backend_oauth2, [
-            {access_token_format, jwt},
             {resource_server_id, <<"new_resource_server_id">>},
             {oauth_providers, #{
               <<"p">> => [