Fix schema test cases

Author: MarcialRosales

deps/oauth2_client/src/oauth2_client.erl

@@ -423,11 +423,14 @@ get_opaque_token_signing_key() ->
 
 -spec get_opaque_token_signing_key(string()|binary()) -> {ok, signing_key()} | {error, any()}.
 get_opaque_token_signing_key(KeyId) -> 
-    List = get_env(opaque_token_signing_key),
-    case proplists:get_value(id, List, undefined) of 
+    case get_env(opaque_token_signing_key) of 
         undefined -> {error, missing_opaque_token_signing_key};
-        KeyId -> parse_signing_key_configuration(List);
-        _ -> {error, missing_opaque_token_signing_key}
+        List ->
+            case proplists:get_value(id, List, undefined) of 
+                undefined -> {error, missing_opaque_token_signing_key};
+                KeyId -> parse_signing_key_configuration(List);
+                _ -> {error, missing_opaque_token_signing_key}
+            end
     end.
 
 parse_signing_key_configuration(List) ->

deps/rabbitmq_auth_backend_oauth2/priv/schema/rabbitmq_auth_backend_oauth2.schema

@@ -183,11 +183,11 @@
       "rabbitmq_auth_backend_oauth2.key_config.opaque_token_signing_key.cert_pem_file",
       [{datatype, file}, {validators, ["file_accessible"]}]}.
 
-{translation,
- "rabbitmq_auth_backend_oauth2.opaque_token_signing_key",
- fun(Conf) ->
-    rabbit_oauth2_schema:translate_opaque_token_signing_key(Conf)
- end}.
+%%{translation,
+%% "rabbitmq_auth_backend_oauth2.opaque_token_signing_key",
+%% fun(Conf) ->
+%%    rabbit_oauth2_schema:translate_opaque_token_signing_key(Conf)
+%% end}.
 
 %% ID of the default signing key
 %%

deps/rabbitmq_auth_backend_oauth2/src/rabbit_oauth2_provider.erl

@@ -146,15 +146,17 @@ get_signing_keys(OauthProviderId) ->
     end.
 
 get_signing_key(KeyId) ->
+    get_signing_key(KeyId, root).
+
+get_signing_key(KeyId, OAuthProviderId) ->
     case maps:get(KeyId, get_signing_keys(root), undefined) of 
-        undefined -> oauth2_client:get_opaque_token_signing_key(KeyId);
+        undefined -> 
+            case oauth2_client:get_opaque_token_signing_key(KeyId) of 
+                {error, _} -> undefined;
+                {ok, SK} -> SK
+            end;
         V -> V 
     end.
-get_signing_key(KeyId, OAuthProviderId) ->
-    case maps:get(KeyId, get_signing_keys(OAuthProviderId), undefined) of 
-        undefined -> oauth2_client:get_opaque_token_signing_key(KeyId);
-        V -> V
-    end.
 
 -spec get_default_key(oauth_provider_id()) -> binary() | undefined.
 get_default_key(root) ->

deps/rabbitmq_auth_backend_oauth2/test/config_schema_SUITE_data/rabbitmq_auth_backend_oauth2.snippets

@@ -46,6 +46,7 @@
                       <<"id2">> => {pem, <<"I'm not a certificate">>}
                   }
               },
+              {opaque_token_signing_key,[]},
               {jwks_url, "https://my-jwt-issuer/jwks.json"},
               {cacertfile, "test/config_schema_SUITE_data/certs/cacert.pem"},
               {peer_verification, verify_none},
@@ -363,5 +364,22 @@
             }}                       
         ]}
        ], []
+  },
+  {opaque_token_signing_key, 
+      "auth_oauth2.resource_server_id = new_resource_server_id
+       auth_oauth2.opaque_token_signing_key.id = opaque-id
+       auth_oauth2.opaque_token_signing_key.type = hs256
+       auth_oauth2.opaque_token_signing_key.key = opaque-signing-key-value",
+       [
+        {rabbitmq_auth_backend_oauth2, [
+            {resource_server_id, <<"new_resource_server_id">>},
+            {opaque_token_signing_key, [
+              {id, <<"opaque-id">>},
+              {type, hs256},
+              {key, <<"opaque-signing-key-value">>}
+            ]}                       
+        ]}
+       ], []
   }
+  
 ].