Merge 176800

google_apis/gaia/gaia_auth_fetcher.h

 // 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.
 
 #ifndef GOOGLE_APIS_GAIA_GAIA_AUTH_FETCHER_H_
 #define GOOGLE_APIS_GAIA_GAIA_AUTH_FETCHER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 51 matching lines @@
   // Either OnClientLoginSuccess or OnClientLoginFailure will be
   // called on the consumer on the original thread.
   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);
 
   // Start a request to obtain service token for the the account identified by
-  // |sid| and |lsid| and the service|service|.
+  // |sid| and |lsid| and the |service|.
   //
   // Either OnIssueAuthTokenSuccess or OnIssueAuthTokenFailure will be
   // called on the consumer on the original thread.
   void StartIssueAuthToken(const std::string& sid,
                            const std::string& lsid,
                            const char* const service);
 
+  // Start a request to obtain |service| token for the the account identified by
+  // |uber_token|.
+  //
+  // Either OnIssueAuthTokenSuccess or OnIssueAuthTokenFailure will be
+  // called on the consumer on the original thread.
+  void StartTokenAuth(const std::string& uber_token,
+                      const char* const service);
+
+  // Start a request to obtain service token for the the account identified by
+  // |oauth2_access_token| and the |service|.
+  //
+  // Either OnIssueAuthTokenSuccess or OnIssueAuthTokenFailure will be
+  // called on the consumer on the original thread.
+  void StartIssueAuthTokenForOAuth2(const std::string& oauth2_access_token,
+                                    const char* const service);
+
   // Start a request to exchange an "lso" service token given by |auth_token|
   // for an OAuthLogin-scoped oauth2 token.
   //
   // Either OnClientOAuthSuccess or OnClientOAuthFailure will be
   // called on the consumer on the original thread.
   void StartLsoForOAuthLoginTokenExchange(const std::string& auth_token);
 
   // Start a request to exchange the cookies of a signed-in user session
   // for an OAuthLogin-scoped oauth2 token.  In the case of a session with
   // multiple accounts signed in, |session_index| indicate the which of accounts
@@ skipping 59 matching lines @@
   void StartClientOAuthChallengeResponse(GoogleServiceAuthError::State type,
                                          const std::string& token,
                                          const std::string& solution);
 
   // Start a request to exchange an OAuthLogin-scoped oauth2 access token for a
   // ClientLogin-style service tokens.  The response to this request is the
   // same as the response to a ClientLogin request, except that captcha
   // challenges are never issued.
   //
   // Either OnClientLoginSuccess or OnClientLoginFailure will be
-  // called on the consumer on the original thread.
+  // called on the consumer on the original thread. If |service| is empty,
+  // the call will attempt to fetch uber auth token.
   void StartOAuthLogin(const std::string& access_token,
                        const std::string& service);
 
   // Implementation of net::URLFetcherDelegate
   virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
 
   // StartClientLogin been called && results not back yet?
   bool HasPendingFetch();
 
   // Stop any URL fetches in progress.
@@ skipping 48 matching lines @@
   static const char kCaptchaTokenParam[];
 
   // Constants for parsing ClientOAuth errors.
   static const char kNeedsAdditional[];
   static const char kCaptcha[];
   static const char kTwoFactor[];
 
   // Constants for request/response for OAuth2 requests.
   static const char kAuthHeaderFormat[];
   static const char kOAuthHeaderFormat[];
+  static const char kOAuth2BearerHeaderFormat[];
   static const char kClientLoginToOAuth2CookiePartSecure[];
   static const char kClientLoginToOAuth2CookiePartHttpOnly[];
   static const char kClientLoginToOAuth2CookiePartCodePrefix[];
   static const int kClientLoginToOAuth2CookiePartCodePrefixLength;
 
   // Process the results of a ClientLogin fetch.
   void OnClientLoginFetched(const std::string& data,
                             const net::URLRequestStatus& status,
                             int response_code);
 
@@ skipping 159 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(GaiaAuthFetcherTest, ParseOAuth2TokenPairResponse);
   FRIEND_TEST_ALL_PREFIXES(GaiaAuthFetcherTest, ClientOAuthSuccess);
   FRIEND_TEST_ALL_PREFIXES(GaiaAuthFetcherTest, ClientOAuthWithQuote);
   FRIEND_TEST_ALL_PREFIXES(GaiaAuthFetcherTest, ClientOAuthChallengeSuccess);
   FRIEND_TEST_ALL_PREFIXES(GaiaAuthFetcherTest, ClientOAuthChallengeQuote);
 
   DISALLOW_COPY_AND_ASSIGN(GaiaAuthFetcher);
 };
 
 #endif  // GOOGLE_APIS_GAIA_GAIA_AUTH_FETCHER_H_