Skip to content

Commit 9435fe9

Browse files
Fix test case
1 parent baa36af commit 9435fe9

File tree

3 files changed

+9
-22
lines changed

3 files changed

+9
-22
lines changed

deps/oauth2_client/include/types.hrl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
-record(proxy_options, {
2424
https :: boolean(),
25-
hostname :: uri_string:uri_string(),
25+
host :: uri_string:uri_string(),
2626
port :: integer(),
2727
username :: option(string() | binary()),
2828
password :: option(string() | binary())

deps/oauth2_client/src/oauth2_client.erl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -409,15 +409,15 @@ lookup_root_oauth_provider() ->
409409
extract_proxy_options_from_url(URL) when is_binary(URL) ->
410410
extract_proxy_options_from_url(binary_to_list(URL));
411411
extract_proxy_options_from_url(URL) when is_list(URL) ->
412-
Parsed = uri_string:parse(URL),
412+
#{host := Host, port := Port, scheme := Scheme} = uri_string:parse(URL),
413413
#proxy_options{
414414
https =
415-
case maps:get("scheme", Parsed, "http") of
415+
case Scheme of
416416
"http" -> false;
417417
"https" -> true
418418
end,
419-
hostname = maps:get("host", Parsed, undefined),
420-
port = maps:get("port", Parsed, undefined)
419+
host = Host,
420+
port = Port
421421
}.
422422

423423
-spec extract_proxy_options(#{atom() => any()}|list()) -> proxy_options() | undefined.
@@ -583,7 +583,7 @@ get_proxy_if_any(ProxyOptions) ->
583583
undefined ->
584584
[];
585585
Proxy ->
586-
P = {Proxy#proxy_options.hostname, Proxy#proxy_options.port},
586+
P = {Proxy#proxy_options.host, Proxy#proxy_options.port},
587587
case Proxy#proxy_options.https of
588588
true -> [{https_proxy, P}];
589589
false -> [{proxy, P}]
@@ -705,7 +705,7 @@ format_proxy_options(ProxyOptions) ->
705705
lists:flatten(io_lib:format("{https: ~p, hostname: ~p, port: ~p, username: ~p, " ++
706706
"password: ~p }", [
707707
ProxyOptions#proxy_options.https,
708-
ProxyOptions#proxy_options.hostname,
708+
ProxyOptions#proxy_options.host,
709709
ProxyOptions#proxy_options.port,
710710
ProxyOptions#proxy_options.username,
711711
ProxyOptions#proxy_options.password])).

deps/rabbitmq_auth_backend_oauth2/test/rabbit_oauth2_provider_SUITE.erl

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -474,23 +474,13 @@ get_oauth_provider_has_jwks_uri(Config) ->
474474
get_oauth_provider_has_proxy(Config) ->
475475
{ok, OAuthProvider} = get_oauth_provider(
476476
?config(oauth_provider_id, Config), [jwks_uri]),
477-
ct:log("key_config: ~p",
478-
[ application:get_all_env(rabbitmq_auth_backend_oauth2)]),
479-
ct:log("oauthprovider: ~p", [OAuthProvider]),
480477
?assertEqual(false,
481478
OAuthProvider#oauth_provider.proxy_options#proxy_options.https),
482479

483-
ct:log("Parsed : ~p", [uri_string:parse("http://idp:8080")]),
484-
485-
Options = oauth2_client:extract_proxy_options_from_url("http://idp:8080"),
486-
ct:log("Options1: ~p", [Options]),
487-
Options2 = oauth2_client:extract_proxy_options_from_url(<<"http://idp:8080">>),
488-
ct:log("Options2: ~p", [Options2]),
489-
490480
?assertEqual(?config(proxy_port, Config),
491481
OAuthProvider#oauth_provider.proxy_options#proxy_options.port),
492482
?assertEqual(?config(proxy_hostname, Config),
493-
OAuthProvider#oauth_provider.proxy_options#proxy_options.hostname),
483+
OAuthProvider#oauth_provider.proxy_options#proxy_options.host),
494484
?assertEqual(?config(proxy_username, Config),
495485
OAuthProvider#oauth_provider.proxy_options#proxy_options.username),
496486
?assertEqual(?config(proxy_password, Config),
@@ -500,16 +490,13 @@ get_oauth_provider_has_proxy(Config) ->
500490
get_oauth_provider_has_https_proxy(Config) ->
501491
{ok, OAuthProvider} = get_oauth_provider(
502492
?config(oauth_provider_id, Config), [jwks_uri]),
503-
ct:log("key_config: ~p",
504-
[ application:get_all_env(rabbitmq_auth_backend_oauth2)]),
505-
ct:log("oauthprovider: ~p", [OAuthProvider]),
506493
?assertEqual(true,
507494
OAuthProvider#oauth_provider.proxy_options#proxy_options.https),
508495

509496
?assertEqual(?config(proxy_port, Config),
510497
OAuthProvider#oauth_provider.proxy_options#proxy_options.port),
511498
?assertEqual(?config(proxy_hostname, Config),
512-
OAuthProvider#oauth_provider.proxy_options#proxy_options.hostname),
499+
OAuthProvider#oauth_provider.proxy_options#proxy_options.host),
513500
?assertEqual(?config(proxy_username, Config),
514501
OAuthProvider#oauth_provider.proxy_options#proxy_options.username),
515502
?assertEqual(?config(proxy_password, Config),

0 commit comments

Comments
 (0)