Commit a6b2e3f6 authored by David Roger's avatar David Roger Committed by Commit Bot

[signin] Update OAuth multilogin parameter name

The parameter has changed on the Gaia server from mlreuse to
reuseCookies.

Fixed: 1072463
Change-Id: I5d1d889b14c3229f55d1638dbb4f2f07bc7622df
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2249958Reviewed-by: default avatarMonica Basta <msalama@chromium.org>
Commit-Queue: David Roger <droger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#779740}
parent 04cbcd9d
...@@ -205,12 +205,12 @@ class OAuthMultiloginHelperTest ...@@ -205,12 +205,12 @@ class OAuthMultiloginHelperTest
std::string multilogin_url() const { std::string multilogin_url() const {
return GaiaUrls::GetInstance()->oauth_multilogin_url().spec() + return GaiaUrls::GetInstance()->oauth_multilogin_url().spec() +
"?source=ChromiumBrowser&mlreuse=0"; "?source=ChromiumBrowser&reuseCookies=0";
} }
std::string multilogin_url_with_external_cc_result() const { std::string multilogin_url_with_external_cc_result() const {
return GaiaUrls::GetInstance()->oauth_multilogin_url().spec() + return GaiaUrls::GetInstance()->oauth_multilogin_url().spec() +
"?source=ChromiumBrowser&mlreuse=0&externalCcResult=" + "?source=ChromiumBrowser&reuseCookies=0&externalCcResult=" +
kExternalCcResult; kExternalCcResult;
} }
......
...@@ -117,7 +117,7 @@ class AccountsCookieMutatorTest ...@@ -117,7 +117,7 @@ class AccountsCookieMutatorTest
GetTestURLLoaderFactory()->AddResponse( GetTestURLLoaderFactory()->AddResponse(
GaiaUrls::GetInstance() GaiaUrls::GetInstance()
->oauth_multilogin_url() ->oauth_multilogin_url()
.Resolve(base::StringPrintf("?source=%s&mlreuse=0", .Resolve(base::StringPrintf("?source=%s&reuseCookies=0",
GaiaConstants::kChromeSource)) GaiaConstants::kChromeSource))
.spec(), .spec(),
std::string(kTestOAuthMultiLoginResponse), net::HTTP_OK); std::string(kTestOAuthMultiLoginResponse), net::HTTP_OK);
......
...@@ -803,7 +803,7 @@ void GaiaAuthFetcher::StartOAuthMultilogin( ...@@ -803,7 +803,7 @@ void GaiaAuthFetcher::StartOAuthMultilogin(
std::string source_string = net::EscapeUrlEncodedData(source_, true); std::string source_string = net::EscapeUrlEncodedData(source_, true);
std::string parameters = base::StringPrintf( std::string parameters = base::StringPrintf(
"?source=%s&mlreuse=%i", source_string.c_str(), "?source=%s&reuseCookies=%i", source_string.c_str(),
mode == gaia::MultiloginMode::MULTILOGIN_PRESERVE_COOKIE_ACCOUNTS_ORDER mode == gaia::MultiloginMode::MULTILOGIN_PRESERVE_COOKIE_ACCOUNTS_ORDER
? 1 ? 1
: 0); : 0);
......
...@@ -355,7 +355,7 @@ TEST_F(GaiaAuthFetcherTest, MultiloginRequestFormat) { ...@@ -355,7 +355,7 @@ TEST_F(GaiaAuthFetcherTest, MultiloginRequestFormat) {
std::string header; std::string header;
request0.headers.GetHeader("Authorization", &header); request0.headers.GetHeader("Authorization", &header);
EXPECT_EQ("MultiBearer id1:token1,id2:token2", header); EXPECT_EQ("MultiBearer id1:token1,id2:token2", header);
EXPECT_EQ("source=ChromiumBrowser&mlreuse=0&externalCcResult=cc_result", EXPECT_EQ("source=ChromiumBrowser&reuseCookies=0&externalCcResult=cc_result",
request0.url.query()); request0.url.query());
auth.TestOnURLLoadCompleteInternal(net::OK, net::HTTP_OK, std::string()); auth.TestOnURLLoadCompleteInternal(net::OK, net::HTTP_OK, std::string());
...@@ -367,7 +367,7 @@ TEST_F(GaiaAuthFetcherTest, MultiloginRequestFormat) { ...@@ -367,7 +367,7 @@ TEST_F(GaiaAuthFetcherTest, MultiloginRequestFormat) {
ASSERT_TRUE(auth.HasPendingFetch()); ASSERT_TRUE(auth.HasPendingFetch());
const network::ResourceRequest& request1 = received_requests_.at(1); const network::ResourceRequest& request1 = received_requests_.at(1);
EXPECT_EQ("source=ChromiumBrowser&mlreuse=1&externalCcResult=cc_result", EXPECT_EQ("source=ChromiumBrowser&reuseCookies=1&externalCcResult=cc_result",
request1.url.query()); request1.url.query());
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment