commit 0444c602b2435a8393a2f56c6503da640db9b485
author Alex Vakulenko <avakulenko@chromium.org> Fri May 22 10:57:09 2015 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Fri May 22 21:27:43 2015 +0000
tree 17b9019f5e2be5edc4cbbbd5fcd35b7d7584a0fc
parent 6e3c30e823a0ee72dc7aa1ccf9f8b71aa9d99ab4

buffet: XMPP client should be looking for X-OAUTH2 auth method

We are using OAuth2 for as SASL method in XMPP, however the state
machine code was explicitly looking for X-GOOGLE-TOKEN which is wrong.

Since we are using OAuth2 we should be looking for X-OAUTH2 method.

BUG=None
TEST=`FEATURES=test emerge-link buffet`

Change-Id: I5c3822ecb9b369d144075bebc0e08420bdb89e6f
Reviewed-on: https://chromium-review.googlesource.com/272911
Reviewed-by: Vitaly Buka <vitalybuka@chromium.org>
Trybot-Ready: Alex Vakulenko <avakulenko@chromium.org>
Tested-by: Alex Vakulenko <avakulenko@chromium.org>
Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>

buffet/notification/xmpp_channel.cc

diff --git a/buffet/notification/xmpp_channel.cc b/buffet/notification/xmpp_channel.cc
index 75c8004..e2839c5 100644
--- a/buffet/notification/xmpp_channel.cc
+++ b/buffet/notification/xmpp_channel.cc
@@ -158,7 +158,7 @@
       if (stanza->name() == "stream:features") {
         auto children = stanza->FindChildren("mechanisms/mechanism", false);
         for (const auto& child : children) {
-          if (child->text() == "X-GOOGLE-TOKEN") {
+          if (child->text() == "X-OAUTH2") {
             state_ = XmppState::kAuthenticationStarted;
             SendMessage(BuildXmppAuthenticateCommand(account_, access_token_));
             return;