Added support for other authentication mechanisms in jingle. This will allow ...

jingle/notifier/communicator/gaia_token_pre_xmpp_auth.cc

 // Copyright (c) 2010 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 "jingle/notifier/communicator/gaia_token_pre_xmpp_auth.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "talk/base/socketaddress.h"
@@ skipping 34 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GaiaCookieMechanism);
 };
 
 }  // namespace
 
 GaiaTokenPreXmppAuth::GaiaTokenPreXmppAuth(
     const std::string& username,
     const std::string& token,
-    const std::string& token_service)
+    const std::string& token_service,
+    const std::string& auth_mechanism)
     : username_(username),
       token_(token),
-      token_service_(token_service) { }
+      token_service_(token_service),
+      auth_mechanism_(auth_mechanism) {
+  // For backward compatibility, default to kGaiaAuthMechanism if a mechanism

[akalin, 2011/03/08 23:45:56]

Hmm, I'd rather expose the default gaia auth mechanism as a variable and have
clients explicitly set that

[sanjeevr, 2011/03/09 00:54:44]

Done.

+  // is not specified.
+  if (auth_mechanism_.empty())
+    auth_mechanism_ = kGaiaAuthMechanism;
+}
 
 GaiaTokenPreXmppAuth::~GaiaTokenPreXmppAuth() { }
 
 void GaiaTokenPreXmppAuth::StartPreXmppAuth(
     const buzz::Jid& jid,
     const talk_base::SocketAddress& server,
     const talk_base::CryptString& pass,
     const std::string& auth_cookie) {
   SignalAuthDone();
 }
@@ skipping 18 matching lines @@
   return buzz::CaptchaChallenge();
 }
 
 std::string GaiaTokenPreXmppAuth::GetAuthCookie() const {
   return std::string();
 }
 
 std::string GaiaTokenPreXmppAuth::ChooseBestSaslMechanism(
     const std::vector<std::string> & mechanisms, bool encrypted) {
   return (std::find(mechanisms.begin(),
-                    mechanisms.end(), kGaiaAuthMechanism) !=
-          mechanisms.end()) ? kGaiaAuthMechanism : "";
+                    mechanisms.end(), auth_mechanism_) !=
+          mechanisms.end()) ? auth_mechanism_ : "";
 }
 
 buzz::SaslMechanism* GaiaTokenPreXmppAuth::CreateSaslMechanism(
     const std::string& mechanism) {
-  if (mechanism != kGaiaAuthMechanism)
-    return NULL;
-  return new GaiaCookieMechanism(
-      kGaiaAuthMechanism, username_, token_, token_service_);
+  if (mechanism == auth_mechanism_)
+    return new GaiaCookieMechanism(
+        mechanism, username_, token_, token_service_);
+  return NULL;
 }
 
 }  // namespace notifier