Moved /GetOAuthToken (OAuth1) GAIA request to accounts.google.com.

google_apis/gaia/gaia_urls.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "google_apis/gaia/gaia_urls.h"
 
 #include "base/command_line.h"
 #include "google_apis/gaia/gaia_switches.h"
 #include "google_apis/google_api_keys.h"
 
 namespace {
 
 // Gaia service constants
 const char kDefaultGaiaBaseUrl[] = "accounts.google.com";
-
-// Gaia service constants
-const char kDefaultGaiaOAuthBaseUrl[] = "www.google.com";
-
 const char kCaptchaUrlPrefixSuffix[] = "/";
 const char kClientLoginUrlSuffix[] = "/ClientLogin";
 const char kServiceLoginUrlSuffix[] = "/ServiceLogin";
 const char kIssueAuthTokenUrlSuffix[] = "/IssueAuthToken";
 const char kGetUserInfoUrlSuffix[] = "/GetUserInfo";
 const char kTokenAuthUrlSuffix[] = "/TokenAuth";
 const char kMergeSessionUrlSuffix[] = "/MergeSession";
 
 const char kOAuthGetAccessTokenUrlSuffix[] = "/OAuthGetAccessToken";
 const char kOAuthWrapBridgeUrlSuffix[] = "/OAuthWrapBridge";
 const char kOAuth1LoginUrlSuffix[] = "/OAuthLogin";
 const char kOAuthRevokeTokenUrlSuffix[] = "/AuthSubRevokeToken";
 
 // Federated login constants
 const char kDefaultFederatedLoginHost[] = "www.google.com";
 const char kDefaultFederatedLoginPath[] = "/accounts";
-const char kGetOAuthTokenUrlSuffix[] = "/o8/GetOAuthToken";
+const char kGetOAuthTokenUrlSuffix[] = "/o/oauth/GetOAuthToken/";
 
 const char kClientLoginToOAuth2Url[] =
     "https://accounts.google.com/o/oauth2/programmatic_auth";
 const char kOAuth2TokenUrl[] =
     "https://accounts.google.com/o/oauth2/token";
 const char kOAuth2IssueTokenUrl[] =
     "https://www.googleapis.com/oauth2/v2/IssueToken";
 const char kOAuth1LoginScope[] =
     "https://www.google.com/accounts/OAuthLogin";
 
@@ skipping 33 matching lines @@
       gaia_url_base.append(path);
     }
   }
 
   client_login_url_ = gaia_url_base + kClientLoginUrlSuffix;
   service_login_url_ = gaia_url_base + kServiceLoginUrlSuffix;
   issue_auth_token_url_ = gaia_url_base + kIssueAuthTokenUrlSuffix;
   get_user_info_url_ = gaia_url_base + kGetUserInfoUrlSuffix;
   token_auth_url_ = gaia_url_base + kTokenAuthUrlSuffix;
   merge_session_url_ = gaia_url_base + kMergeSessionUrlSuffix;
-
-  // Federated login is not part of Gaia and has its own endpoints.
-  std::string oauth_host_base;
-  GetSwitchValueWithDefault(switches::kGaiaOAuthHost,
-                            kDefaultFederatedLoginHost,
-                            &oauth_host_base);
-
-  std::string gaia_oauth_url_base = "https://"+oauth_host_base;
-  if (command_line->HasSwitch(switches::kGaiaOAuthUrlPath)) {
-    std::string path =
-        command_line->GetSwitchValueASCII(switches::kGaiaOAuthUrlPath);
-    if (!path.empty()) {
-      if (path[0] != '/')
-        gaia_oauth_url_base.append("/");
-
-      gaia_oauth_url_base.append(path);
-    }
-  } else {
-    gaia_oauth_url_base.append(kDefaultFederatedLoginPath);
-  }
-  get_oauth_token_url_ = gaia_oauth_url_base +
-                         kGetOAuthTokenUrlSuffix;
-
+  get_oauth_token_url_ = gaia_url_base + kGetOAuthTokenUrlSuffix;
   oauth_get_access_token_url_ = gaia_url_base +
                                 kOAuthGetAccessTokenUrlSuffix;
   oauth_wrap_bridge_url_ = gaia_url_base + kOAuthWrapBridgeUrlSuffix;
   oauth_revoke_token_url_ = gaia_url_base + kOAuthRevokeTokenUrlSuffix;
   oauth1_login_url_ = gaia_url_base + kOAuth1LoginUrlSuffix;
 
   GetSwitchValueWithDefault(switches::kOAuth1LoginScope,
                             kOAuth1LoginScope,
                             &oauth1_login_scope_);
 
@@ skipping 111 matching lines @@
 }
 
 const std::string& GaiaUrls::oauth2_issue_token_url() {
   return oauth2_issue_token_url_;
 }
 
 
 const std::string& GaiaUrls::gaia_login_form_realm() {
   return gaia_login_form_realm_;
 }