Resolve conflicts

Author: MarcialRosales

deps/rabbitmq_management/src/rabbit_mgmt_login.erl

@@ -70,7 +70,7 @@ login(<<"GET">>, Req, State) ->
                 _ -> {ok, cowboy_req:reply(405, Req), State}
             end;
         {Type, Value} ->
-            redirect_to_home_with_cookie(Type, Value, Req, State)
+            redirect_to_home_with_cookie(?OAUTH2_BOOTSTRAP_PATH, Type, Value, Req, State)
     end;
 
 login(_, Req0, State) ->
@@ -82,7 +82,7 @@ handleStrictOrPreferredAuthMechanism(Req, Body, State) ->
             {ok, cowboy_req:reply(302, #{<<"Location">> => iolist_to_binary(get_home_uri(Req))}, 
                                         <<>>, Req), State};
         {Type, Value} ->
-            redirect_to_home_with_cookie(Type, Value, Req, State)
+            redirect_to_home_with_cookie(?OAUTH2_BOOTSTRAP_PATH, Type, Value, Req, State)
     end.
 
 get_auth_mechanism(Req, Body) ->
@@ -113,7 +113,8 @@ get_param_or_header(ParamName, Req, Body) ->
 handleAccessToken(Req0, AccessToken, State) ->
    case rabbit_mgmt_util:is_authorized_user(Req0, #context{}, <<"">>, AccessToken, false) of
         {true, Req1, _} ->
-            redirect_to_home_with_cookie(?OAUTH2_ACCESS_TOKEN,
+            redirect_to_home_with_cookie(?OAUTH2_BOOTSTRAP_PATH,
+                                         ?OAUTH2_ACCESS_TOKEN,
                                          AccessToken,
                                          Req1, State);
         {false, ReqData1, Reason} ->

deps/rabbitmq_management/src/rabbit_mgmt_util.erl

@@ -46,11 +46,7 @@
 -export([direct_request/6]).
 -export([qs_val/2]).
 -export([get_path_prefix/0]).
-<<<<<<< HEAD
--export([get_oauth2_bootstrap_cookie_path/0]).
-=======
 -export([set_session_cookie/1, clear_session_cookie/1]).
->>>>>>> 6397423289 (Consolidate cookies mgt to the server)
 -export([catch_no_such_user_or_vhost/2]).
 -export([method_not_allowed/3]).