Initial refactoring complete

chrome/common/net/gaia/gaia_auth_fetcher.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_COMMON_NET_GAIA_GAIA_AUTH_FETCHER_H_
 #define CHROME_COMMON_NET_GAIA_GAIA_AUTH_FETCHER_H_
 #pragma once
 
 #include <string>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/common/net/gaia/gaia_auth_consumer.h"
-#include "chrome/common/net/url_fetcher.h"
+#include "chrome/common/net/gaia/authentication_fetcher.h"
 #include "googleurl/src/gurl.h"
 
 // Authenticate a user against the Google Accounts ClientLogin API
 // with various capabilities and return results to a GaiaAuthConsumer.
 //
 // In the future, we will also issue auth tokens from this class.
 // This class should be used on a single thread, but it can be whichever thread
 // that you like.
 //
 // This class can handle one request at a time. To parallelize requests,
 // create multiple GaiaAuthFetcher's.
 
 class GaiaAuthFetcherTest;
 
-class GaiaAuthFetcher : public URLFetcher::Delegate {
+class GaiaAuthFetcher : public AuthenticationFetcher {
  public:
-  enum HostedAccountsSetting {
-    HostedAccountsAllowed,
-    HostedAccountsNotAllowed
-  };
-
   // The URLs for different calls in the Google Accounts programmatic login API.
   static const char kClientLoginUrl[];
   static const char kIssueAuthTokenUrl[];
   static const char kGetUserInfoUrl[];
 
   // Magic string indicating that, while a second factor is still
   // needed to complete authentication, the user provided the right password.
   static const char kSecondFactor[];
 
   // This will later be hidden behind an auth service which caches
   // tokens.
   GaiaAuthFetcher(GaiaAuthConsumer* consumer,
                   const std::string& source,
                   net::URLRequestContextGetter* getter);
   virtual ~GaiaAuthFetcher();
 
+  virtual void StartAuthentication(const std::string& username,
+                                   const std::string& password,
+                                   const char* const service,
+                                   const std::string& login_token,
+                                   const std::string& login_captcha,
+                                   HostedAccountsSetting allow_hosted_accounts);
+
   // GaiaAuthConsumer will be called on the original thread
   // after results come back. This class is thread agnostic.
   // You can't make more than request at a time.
   void StartClientLogin(const std::string& username,
                         const std::string& password,
                         const char* const service,
                         const std::string& login_token,
                         const std::string& login_captcha,
                         HostedAccountsSetting allow_hosted_accounts);
 
   // GaiaAuthConsumer will be called on the original thread
   // after results come back. This class is thread agnostic.
   // You can't make more than one request at a time.
-  void StartIssueAuthToken(const std::string& sid,
-                           const std::string& lsid,
-                           const char* const service);
+  virtual void StartIssueAuthToken(
+      const AuthenticationConsumer::AuthenticationResult& credentials,
+      const char* const service);
 
   // Start a request to get a particular key from user info.
   // GaiaAuthConsumer will be called back on the same thread when
   // results come back.
   // You can't make more than one request at a time.
-  void StartGetUserInfo(const std::string& lsid,
-                        const std::string& info_key);
+  virtual void StartGetUserInfo(const std::string& lsid,
+                                const std::string& info_key);
 
   // Implementation of URLFetcher::Delegate
   virtual void OnURLFetchComplete(const URLFetcher* source,
                                   const GURL& url,
                                   const net::URLRequestStatus& status,
                                   int response_code,
                                   const ResponseCookies& cookies,
                                   const std::string& data);
 
-  // StartClientLogin been called && results not back yet?
-  bool HasPendingFetch();
-
-  // Stop any URL fetches in progress.
-  void CancelRequest();
-
  private:
   // ClientLogin body constants that don't change
   static const char kCookiePersistence[];
   static const char kAccountTypeHostedOrGoogle[];
   static const char kAccountTypeGoogle[];
 
   // The format of the POST body for ClientLogin.
   static const char kClientLoginFormat[];
   // The format of said POST body when CAPTCHA token & answer are specified.
   static const char kClientLoginCaptchaFormat[];
   // The format of the POST body for IssueAuthToken.
   static const char kIssueAuthTokenFormat[];
   // The format of the POSt body for GetUserInfo.
   static const char kGetUserInfoFormat[];
 
   // Constants for parsing ClientLogin errors.
   static const char kAccountDeletedError[];
   static const char kAccountDisabledError[];
   static const char kBadAuthenticationError[];
   static const char kCaptchaError[];
   static const char kServiceUnavailableError[];
   static const char kErrorParam[];
   static const char kErrorUrlParam[];
   static const char kCaptchaUrlParam[];
   static const char kCaptchaTokenParam[];
   static const char kCaptchaUrlPrefix[];
 
+  // Process the results of a Authentication fetch.
+  virtual void OnAuthenticationFetched(const std::string& data,
+                                       const net::URLRequestStatus& status,
+                                       int response_code);
+
   // Process the results of a ClientLogin fetch.
   void OnClientLoginFetched(const std::string& data,
                             const net::URLRequestStatus& status,
                             int response_code);
 
   void OnIssueAuthTokenFetched(const std::string& data,
                                const net::URLRequestStatus& status,
                                int response_code);
 
+  void OnIssueTokenFetched(const std::string& data,
+                           const net::URLRequestStatus& status,
+                           int response_code);
+
   void OnGetUserInfoFetched(const std::string& data,
                             const net::URLRequestStatus& status,
                             int response_code);
 
   // Tokenize the results of a ClientLogin fetch.
   static void ParseClientLoginResponse(const std::string& data,
                                        std::string* sid,
                                        std::string* lsid,
                                        std::string* token);
 
@@ skipping 17 matching lines @@
   static std::string MakeClientLoginBody(
       const std::string& username,
       const std::string& password,
       const std::string& source,
       const char* const service,
       const std::string& login_token,
       const std::string& login_captcha,
       HostedAccountsSetting allow_hosted_accounts);
   // Supply the sid / lsid returned from ClientLogin in order to
   // request a long lived auth token for a service.
-  static std::string MakeIssueAuthTokenBody(const std::string& sid,
-                                            const std::string& lsid,
-                                            const char* const service);
+  static std::string MakeIssueAuthTokenBody(
+      const AuthenticationConsumer::AuthenticationResult& credentials,
+      const char* const service);
   // Supply the lsid returned from ClientLogin in order to fetch
   // user information.
   static std::string MakeGetUserInfoBody(const std::string& lsid);
 
   // Create a fetcher useable for making any Gaia request.
   static URLFetcher* CreateGaiaFetcher(net::URLRequestContextGetter* getter,
                                        const std::string& body,
                                        const GURL& gaia_gurl_,
                                        URLFetcher::Delegate* delegate);
-
-
   // These fields are common to GaiaAuthFetcher, same every request
-  GaiaAuthConsumer* const consumer_;
-  net::URLRequestContextGetter* const getter_;
-  std::string source_;
   const GURL client_login_gurl_;
   const GURL issue_auth_token_gurl_;
   const GURL get_user_info_gurl_;
 
   // While a fetch is going on:
   scoped_ptr<URLFetcher> fetcher_;
   std::string request_body_;
   std::string requested_service_;   // Currently tracked for IssueAuthToken only
   std::string requested_info_key_;  // Currently tracked for GetUserInfo only
-  bool fetch_pending_;
 
   friend class GaiaAuthFetcherTest;
   FRIEND_TEST_ALL_PREFIXES(GaiaAuthFetcherTest, CaptchaParse);
   FRIEND_TEST_ALL_PREFIXES(GaiaAuthFetcherTest, AccountDeletedError);
   FRIEND_TEST_ALL_PREFIXES(GaiaAuthFetcherTest, AccountDisabledError);
   FRIEND_TEST_ALL_PREFIXES(GaiaAuthFetcherTest, BadAuthenticationError);
   FRIEND_TEST_ALL_PREFIXES(GaiaAuthFetcherTest, IncomprehensibleError);
   FRIEND_TEST_ALL_PREFIXES(GaiaAuthFetcherTest, ServiceUnavailableError);
   FRIEND_TEST_ALL_PREFIXES(GaiaAuthFetcherTest, CheckNormalErrorCode);
   FRIEND_TEST_ALL_PREFIXES(GaiaAuthFetcherTest, CheckTwoFactorResponse);
   FRIEND_TEST_ALL_PREFIXES(GaiaAuthFetcherTest, LoginNetFailure);
 
   DISALLOW_COPY_AND_ASSIGN(GaiaAuthFetcher);
 };
 
 #endif  // CHROME_COMMON_NET_GAIA_GAIA_AUTH_FETCHER_H_