| Index: components/autofill/content/browser/wallet/wallet_service_url.cc
|
| diff --git a/components/autofill/content/browser/wallet/wallet_service_url.cc b/components/autofill/content/browser/wallet/wallet_service_url.cc
|
| index 68cbd8f4f1f9115614f044125d0b64ef107ff5db..78aad22c34b71e9bea9c1620e7f05d746344da6d 100644
|
| --- a/components/autofill/content/browser/wallet/wallet_service_url.cc
|
| +++ b/components/autofill/content/browser/wallet/wallet_service_url.cc
|
| @@ -25,9 +25,6 @@ namespace {
|
|
|
| const char kProdWalletServiceUrl[] = "https://wallet.google.com/";
|
|
|
| -const char kSandboxWalletServiceUrl[] =
|
| - "https://wallet-web.sandbox.google.com/";
|
| -
|
| const char kSandboxWalletSecureServiceUrl[] =
|
| "https://wallet-web.sandbox.google.com/";
|
|
|
| @@ -52,27 +49,6 @@ bool IsWalletProductionEnabled() {
|
| #endif
|
| }
|
|
|
| -GURL GetWalletHostUrl() {
|
| - const base::CommandLine& command_line =
|
| - *base::CommandLine::ForCurrentProcess();
|
| - std::string wallet_service_hostname =
|
| - command_line.GetSwitchValueASCII(switches::kWalletServiceUrl);
|
| - if (!wallet_service_hostname.empty())
|
| - return GURL(wallet_service_hostname);
|
| - if (IsWalletProductionEnabled())
|
| - return GURL(kProdWalletServiceUrl);
|
| - return GURL(kSandboxWalletServiceUrl);
|
| -}
|
| -
|
| -GURL GetBaseWalletUrl(size_t user_index) {
|
| - std::string path = base::StringPrintf("online/v2/u/%" PRIuS "/", user_index);
|
| - return GetWalletHostUrl().Resolve(path);
|
| -}
|
| -
|
| -GURL GetBaseAutocheckoutUrl(size_t user_index) {
|
| - return GetBaseWalletUrl(user_index).Resolve("wallet/autocheckout/v1/");
|
| -}
|
| -
|
| GURL GetBaseSecureUrl() {
|
| const base::CommandLine& command_line =
|
| *base::CommandLine::ForCurrentProcess();
|
| @@ -85,31 +61,10 @@ GURL GetBaseSecureUrl() {
|
| return GURL(kSandboxWalletSecureServiceUrl);
|
| }
|
|
|
| -GURL GetBaseEncryptedFrontendUrl(size_t user_index) {
|
| - const base::CommandLine& command_line =
|
| - *base::CommandLine::ForCurrentProcess();
|
| - GURL base_url = IsWalletProductionEnabled() ||
|
| - command_line.HasSwitch(switches::kWalletServiceUrl) ?
|
| - GetWalletHostUrl() : GetBaseSecureUrl();
|
| - std::string path =
|
| - base::StringPrintf("online-secure/v2/u/%" PRIuS "/autocheckout/v1/",
|
| - user_index);
|
| - return base_url.Resolve(path);
|
| -}
|
| -
|
| } // namespace
|
|
|
| namespace wallet {
|
|
|
| -GURL GetGetWalletItemsUrl(size_t user_index) {
|
| - return GetBaseAutocheckoutUrl(user_index).Resolve("getWalletItemsJwtless");
|
| -}
|
| -
|
| -GURL GetGetFullWalletUrl(size_t user_index) {
|
| - return GetBaseEncryptedFrontendUrl(user_index)
|
| - .Resolve("getFullWalletJwtless?s7e=otp");
|
| -}
|
| -
|
| GURL GetManageInstrumentsUrl(size_t user_index) {
|
| std::string path =
|
| base::StringPrintf("manage/w/%" PRIuS "/paymentMethods", user_index);
|
| @@ -122,101 +77,5 @@ GURL GetManageAddressesUrl(size_t user_index) {
|
| return GetBaseSecureUrl().Resolve(path);
|
| }
|
|
|
| -GURL GetPrivacyNoticeUrl() {
|
| - return GetWalletHostUrl().Resolve("legaldocument?family=0.privacynotice");
|
| -}
|
| -
|
| -GURL GetAcceptLegalDocumentsUrl(size_t user_index) {
|
| - return GetBaseAutocheckoutUrl(user_index).Resolve("acceptLegalDocument");
|
| -}
|
| -
|
| -GURL GetAuthenticateInstrumentUrl(size_t user_index) {
|
| - return GetBaseEncryptedFrontendUrl(user_index)
|
| - .Resolve("authenticateInstrument?s7e=cvn");
|
| -}
|
| -
|
| -GURL GetSaveToWalletNoEscrowUrl(size_t user_index) {
|
| - return GetBaseAutocheckoutUrl(user_index).Resolve("saveToWallet");
|
| -}
|
| -
|
| -GURL GetSaveToWalletUrl(size_t user_index) {
|
| - return GetBaseEncryptedFrontendUrl(user_index)
|
| - .Resolve("saveToWallet?s7e=card_number%3Bcvn");
|
| -}
|
| -
|
| -GURL GetPassiveAuthUrl(size_t user_index) {
|
| - return GetBaseWalletUrl(user_index)
|
| - .Resolve("passiveauth?isChromePayments=true");
|
| -}
|
| -
|
| -GURL GetAddAccountUrl() {
|
| - GURL url(GaiaUrls::GetInstance()->add_account_url());
|
| - url = net::AppendQueryParameter(url, "nui", "1");
|
| - // Prevents promos from showing (see http://crbug.com/235227).
|
| - url = net::AppendQueryParameter(url, "sarp", "1");
|
| - url = net::AppendQueryParameter(url,
|
| - "continue",
|
| - GetSignInContinueUrl().spec());
|
| - return url;
|
| -}
|
| -
|
| -GURL GetSignInUrl(size_t user_index) {
|
| - GURL url(GaiaUrls::GetInstance()->service_login_url());
|
| - url = net::AppendQueryParameter(
|
| - url, "authuser", base::SizeTToString(user_index));
|
| - // Prevents promos from showing (see http://crbug.com/235227).
|
| - url = net::AppendQueryParameter(url, "sarp", "1");
|
| - url =
|
| - net::AppendQueryParameter(url, "continue", GetSignInContinueUrl().spec());
|
| - return url;
|
| -}
|
| -
|
| -// The continue url portion of the sign-in URL. This URL is used as a milestone
|
| -// to determine that the sign-in process is finished. It has to be a Google
|
| -// domain, use https://, and do almost nothing, but otherwise it's not too
|
| -// important what the URL actually is: it's not important that this URL has the
|
| -// ability to generate a gdToken.
|
| -GURL GetSignInContinueUrl() {
|
| - return GetPassiveAuthUrl(0);
|
| -}
|
| -
|
| -bool IsSignInContinueUrl(const GURL& url, size_t* user_index) {
|
| - GURL final_url = GetSignInContinueUrl();
|
| - if (url.scheme() != final_url.scheme() ||
|
| - url.host() != final_url.host() ||
|
| - url.path() != final_url.path()) {
|
| - return false;
|
| - }
|
| -
|
| - *user_index = 0;
|
| - std::string query_str = url.query();
|
| - url::Component query(0, query_str.length());
|
| - url::Component key, value;
|
| - const char kUserIndexKey[] = "authuser";
|
| - while (url::ExtractQueryKeyValue(query_str.c_str(), &query, &key, &value)) {
|
| - if (key.is_nonempty() &&
|
| - query_str.substr(key.begin, key.len) == kUserIndexKey) {
|
| - base::StringToSizeT(query_str.substr(value.begin, value.len), user_index);
|
| - break;
|
| - }
|
| - }
|
| -
|
| - return true;
|
| -}
|
| -
|
| -bool IsSignInRelatedUrl(const GURL& url) {
|
| - size_t unused;
|
| - // Origins are host names which are canonicalized, so case-sensitive is OK.
|
| - GURL origin = url.GetOrigin();
|
| - return origin == GetAddAccountUrl().GetOrigin() ||
|
| - base::StartsWith(origin.host(), "accounts.",
|
| - base::CompareCase::SENSITIVE) ||
|
| - IsSignInContinueUrl(url, &unused);
|
| -}
|
| -
|
| -bool IsUsingProd() {
|
| - return GetWalletHostUrl() == GURL(kProdWalletServiceUrl);
|
| -}
|
| -
|
| } // namespace wallet
|
| } // namespace autofill
|
|
|