Skip to content

Commit 8b8b611

Browse files
Refactor constant and remove log statements
1 parent 63af182 commit 8b8b611

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

deps/rabbitmq_management/include/rabbit_mgmt.hrl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@
1414

1515
-define(MANAGEMENT_DEFAULT_HTTP_MAX_BODY_SIZE, 20000000).
1616

17-
-define(OAUTH2_ACCESS_TOKEN_COOKIE, <<"access_token">>).
17+
-define(OAUTH2_ACCESS_TOKEN_COOKIE_NAME, <<"access_token">>).
18+
-define(OAUTH2_ACCESS_TOKEN_COOKIE_PATH, "/js/oidc-oauth/bootstrap.js").

deps/rabbitmq_management/src/rabbit_mgmt_login.erl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,12 @@ login(<<"POST">>, Req0=#{scheme := Scheme}, State) ->
2424
{true, Req1, _} ->
2525
CookieSettings = #{
2626
http_only => true,
27-
path => "/js/oidc-oauth/bootstrap.js",
27+
path => ?OAUTH2_ACCESS_TOKEN_COOKIE_PATH,
2828
max_age => 30,
2929
expires => os:system_time(millisecond) + 30000,
3030
same_site => strict
3131
},
32-
rabbit_log:debug("Setting access_token in cookie: ~p", [AccessToken]),
33-
SetCookie = cowboy_req:set_resp_cookie(?OAUTH2_ACCESS_TOKEN_COOKIE, AccessToken, Req1,
32+
SetCookie = cowboy_req:set_resp_cookie(?OAUTH2_ACCESS_TOKEN_COOKIE_NAME, AccessToken, Req1,
3433
case Scheme of
3534
<<"https">> -> CookieSettings#{ secure => true};
3635
_ -> CookieSettings

deps/rabbitmq_management/src/rabbit_mgmt_oauth_bootstrap.erl

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,23 +37,21 @@ set_token_auth(AuthSettings, Req0) ->
3737
true ->
3838
case cowboy_req:parse_header(<<"authorization">>, Req0) of
3939
{bearer, Token} ->
40-
rabbit_log:debug("Request contained token in authorization header"),
4140
{
4241
Req0,
4342
["set_token_auth('", Token, "');"]
4443
};
4544
_ ->
4645
Cookies = cowboy_req:parse_cookies(Req0),
47-
case lists:keyfind(?OAUTH2_ACCESS_TOKEN_COOKIE, 1, Cookies) of
46+
case lists:keyfind(?OAUTH2_ACCESS_TOKEN_COOKIE_NAME, 1, Cookies) of
4847
{_, Token} ->
49-
rabbit_log:debug("Request contained token in cookie: ~p", [Token]),
5048
{
5149
cowboy_req:set_resp_cookie(
52-
?OAUTH2_ACCESS_TOKEN_COOKIE, <<"">>, Req0, #{
50+
?OAUTH2_ACCESS_TOKEN_COOKIE_NAME, <<"">>, Req0, #{
5351
max_age => 0,
5452
expires => os:system_time(millisecond) - 30000,
5553
http_only => true,
56-
path => "/js/oidc-oauth/bootstrap.js",
54+
path => ?OAUTH2_ACCESS_TOKEN_COOKIE_PATH,
5755
same_site => strict
5856
}),
5957
["set_token_auth('", Token, "');"]

0 commit comments

Comments
 (0)