Additional OAuth2 tests

google_apis/gaia/fake_gaia.h

 // Copyright (c) 2013 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_FAKE_GAIA_H_
 #define GOOGLE_APIS_GAIA_FAKE_GAIA_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 28 matching lines @@
 
     std::string token;
     std::string issued_to;
     std::string audience;
     std::string user_id;
     ScopeSet scopes;
     int expires_in;
     std::string email;
   };
 
+  // Cookies and tokens for /MergeSession call seqeunce.
+  struct MergeSessionParams {
+    // Values of SID and LSID cookie that are set by
+    std::string auth_sid_cookie;
+    std::string auth_lsid_cookie;
+
+    // auth_code cookie value response for /o/oauth2/programmatic_auth call.
+    std::string auth_code;
+
+    // OAuth2 refresh and access token generated by /o/oauth2/token call
+    // with "...&grant_type=authorization_code".
+    std::string refresh_token;
+    std::string access_token;
+
+    // Uber token response from /OAuthLogin call.
+    std::string gaia_uber_token;
+
+    // Values of SID and LSID cookie generated from /MergeSession call.
+    std::string session_sid_cookie;
+    std::string session_lsid_cookie;
+  };
+
   FakeGaia();
   ~FakeGaia();
 
   // Sets the initial value of tokens and cookies.
-  void SetAuthTokens(const std::string& auth_code,
-                     const std::string& refresh_token,
-                     const std::string& access_token,
-                     const std::string& gaia_uber_token,
-                     const std::string& session_sid_cookie,
-                     const std::string& session_lsid_cookie);
+  void SetMergeSessionParams(const MergeSessionParams& params);
 
   // Initializes HTTP request handlers. Should be called after switches
   // for tweaking GaiaUrls are in place.
   void Initialize();
 
   // Handles a request and returns a response if the request was recognized as a
   // GAIA request. Note that this respects the switches::kGaiaUrl and friends so
   // that this can used with EmbeddedTestServer::RegisterRequestHandler().
   scoped_ptr<net::test_server::HttpResponse> HandleRequest(
       const net::test_server::HttpRequest& request);
@@ skipping 40 matching lines @@
 
   // Returns the access token associated with |auth_token| that matches the
   // given |client_id| and |scope_string|. If |scope_string| is empty, the first
   // token satisfying the other criteria is returned. Returns NULL if no token
   // matches.
   const AccessTokenInfo* FindAccessTokenInfo(const std::string& auth_token,
                                              const std::string& client_id,
                                              const std::string& scope_string)
       const;
 
-  // Extracts the |access_token| from authorization header of |request|.
-  static bool GetAccessToken(const net::test_server::HttpRequest& request,
-                             const char* auth_token_prefix,
-                             std::string* access_token);
-
-  // Extracts the parameter named |key| from |query| and places it in |value|.
-  // Returns false if no parameter is found.
-  static bool GetQueryParameter(const std::string& query,
-                                const std::string& key,
-                                std::string* value);

[xiyuan, 2013/12/17 17:12:57]

My SAMLTest CL uses GetQueryParameter to extract form param in FakeSamlIdp.

[zel, 2013/12/17 17:23:15]

I will expose this method once I merge everything. 

-
-  // auth_code cookie value response for /o/oauth2/programmatic_auth call.
-  std::string fake_auth_code_;
-
-  // refresh_token field value response for the initial /o/oauth2/token call
-  // with ...&grant_type=authorization_code.
-  std::string fake_refresh_token_;
-  std::string fake_access_token_;
-  std::string fake_gaia_uber_token_;
-  std::string fake_session_sid_cookie_;
-  std::string fake_session_lsid_cookie_;
-
+  MergeSessionParams merge_session_params_;
   AccessTokenInfoMap access_token_info_map_;
   RequestHandlerMap request_handlers_;
   std::string service_login_response_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeGaia);
 };
 
 #endif  // GOOGLE_APIS_GAIA_FAKE_GAIA_H_