Fix test cases

(cherry picked from commit 175ee2c)

Author: MarcialRosales

deps/oauth2_client/src/oauth2_client.erl

@@ -328,7 +328,7 @@ extract_ssl_options_as_list(Map) ->
 % Replace peer_verification with verify to make it more consistent with other
 % ssl_options in RabbitMQ and Erlang's ssl options
 % Eventually, peer_verification will be removed. For now, both are allowed
--spec get_verify_or_peer_verification(#{atom() => any()}, any()) -> proplists:proplist().
+-spec get_verify_or_peer_verification(#{atom() => any()}, verify_none | verify_peer ) -> verify_none | verify_peer.
 get_verify_or_peer_verification(Ssl_options, Default) ->
     case maps:get(verify, Ssl_options, undefined) of
         undefined ->
@@ -437,14 +437,13 @@ map_to_oauth_provider(Map) when is_map(Map) ->
         jwks_uri = maps:get(?RESPONSE_JWKS_URI, Map, undefined)
     };
 
-map_to_oauth_provider(PropList) when is_list(PropList) ->
+map_to_oauth_provider(PropList) when is_list(PropList) ->    
     #oauth_provider{
         issuer = proplists:get_value(issuer, PropList),
         token_endpoint = proplists:get_value(token_endpoint, PropList),
         authorization_endpoint = proplists:get_value(authorization_endpoint, PropList, undefined),
         jwks_uri = proplists:get_value(jwks_uri, PropList, undefined),
-        ssl_options = extract_ssl_options_as_list(maps:from_list(
-            proplists:get_value(https, PropList, [])))
+        ssl_options = extract_ssl_options_as_list(maps:from_list(proplists:get_value(https, PropList, [])))
     }.
 
 

deps/oauth2_client/test/system_SUITE.erl

@@ -177,7 +177,7 @@ groups() ->
     ssl_connection_error,
     {group, with_all_oauth_provider_settings},
     {group, without_all_oauth_providers_settings}
-  ]} 
+  ]}
 ].
 
 init_per_suite(Config) ->
@@ -463,8 +463,14 @@ build_https_oauth_provider(CaCertFile) ->
   }.
 oauth_provider_to_proplist(#oauth_provider{ issuer = Issuer, token_endpoint = TokenEndpoint,
   ssl_options = SslOptions, jwks_uri = Jwks_url}) ->
-  [ { issuer, Issuer}, {token_endpoint, TokenEndpoint},
-    { https, SslOptions}, {jwks_url, Jwks_url} ].
+  [ { issuer, Issuer},
+    {token_endpoint, TokenEndpoint},
+    { https,
+        case SslOptions of
+            undefined -> [];
+            Value -> Value
+        end}, 
+    {jwks_url, Jwks_url} ].
 
 start_http_oauth_server(Port, Expectations) when is_list(Expectations) ->
   Dispatch = cowboy_router:compile([