Respect the new Online Wallet sign-in response.

components/autofill/content/browser/wallet/wallet_signin_helper.cc

 // Copyright 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.
 
 #include "components/autofill/content/browser/wallet/wallet_signin_helper.h"
 
 #include "base/callback_helpers.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "base/strings/stringprintf.h"

[Dan Beam, 2013/06/18 21:33:50]

#include "base/strings/string_util.h"

[aruslan, 2013/06/18 23:05:25]

base::StringSprintf isn't in string_util.h :)

[Dan Beam, 2013/06/19 06:53:58]

i meant for LowerCaseEqualsASCII()

 #include "base/time.h"
 #include "base/values.h"
 #include "components/autofill/content/browser/wallet/wallet_service_url.h"
 #include "components/autofill/content/browser/wallet/wallet_signin_helper_delegate.h"
 #include "google_apis/gaia/gaia_auth_fetcher.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "net/base/escape.h"
@@ skipping 185 matching lines @@
     return;
   }
 
   switch (state_) {
     case USERNAME_FETCHING_USERINFO:  /*FALLTHROUGH*/
     case PASSIVE_FETCHING_USERINFO:
       ProcessGetAccountInfoResponseAndFinish();
       break;
 
     case PASSIVE_EXECUTING_SIGNIN:
-      url_fetcher_.reset();
-      state_ = PASSIVE_FETCHING_USERINFO;
-      StartFetchingUserNameFromSession();
+      if (ParseSignInResponse()) {
+        url_fetcher_.reset();
+        state_ = PASSIVE_FETCHING_USERINFO;
+        StartFetchingUserNameFromSession();
+      }
       break;
 
     case AUTOMATIC_EXECUTING_SIGNIN:
-      state_ = IDLE;
-      url_fetcher_.reset();
-      delegate_->OnAutomaticSigninSuccess(username_);
+      if (ParseSignInResponse()) {
+        url_fetcher_.reset();
+        state_ = IDLE;
+        delegate_->OnAutomaticSigninSuccess(username_);
+      }
       break;
 
     default:
       NOTREACHED() << "unexpected state_=" << state_;
   }
 }
 
 void WalletSigninHelper::StartFetchingUserNameFromSession() {
   DCHECK(!gaia_fetcher_);
   const int random_number = static_cast<int>(base::RandUint64() % INT_MAX);
@@ skipping 26 matching lines @@
 
     case PASSIVE_FETCHING_USERINFO:
       delegate_->OnPassiveSigninSuccess(username_);
       break;
 
     default:
       NOTREACHED() << "unexpected state_=" << finishing_state;
   }
 }
 
+bool WalletSigninHelper::ParseSignInResponse() {
+  DCHECK(url_fetcher_);

[Dan Beam, 2013/06/18 21:33:50]

nit: to make local closer and reduce number of times you check url_fetcher_ in
debug mode

if (!url_fetcher_) {
  NOTREACHED();
  return;
}

std::string data;
if (!url_fetcher_->GetResponseAsString(&data)) {
  OnOtherError();
  return false;
}

[aruslan, 2013/06/18 23:05:25]

Done.

+
+  std::string data;
+  if (!url_fetcher_ || !url_fetcher_->GetResponseAsString(&data)) {
+    LOG(ERROR) << "failed to GetResponseAsString";

[Dan Beam, 2013/06/18 21:33:50]

remove or changed to DLOG(ERROR) or something

[aruslan, 2013/06/18 23:05:25]

Done.

+    OnOtherError();
+    return false;
+  }
+
+  if (data != "YES") {

[Dan Beam, 2013/06/18 21:33:50]

if (!LowerCaseEqualsASCII(data, "yes")) {

[aruslan, 2013/06/18 23:05:25]

Done.

+    OnServiceError(
+        GoogleServiceAuthError(GoogleServiceAuthError::USER_NOT_SIGNED_UP));
+    return false;
+  }
+
+  return true;
+}
+
 bool WalletSigninHelper::ParseGetAccountInfoResponse(
     const net::URLFetcher* fetcher, std::string* email) {
   DCHECK(email);
 
   std::string data;
   if (!fetcher->GetResponseAsString(&data)) {
     LOG(ERROR) << "failed to GetResponseAsString";
     return false;
   }
 
   scoped_ptr<base::Value> value(base::JSONReader::Read(data));
   if (!value.get() || value->GetType() != base::Value::TYPE_DICTIONARY) {
     LOG(ERROR) << "failed to parse JSON response";
     return false;
   }
 
   DictionaryValue* dict = static_cast<DictionaryValue*>(value.get());
   if (!dict->GetStringWithoutPathExpansion("email", email)) {
     LOG(ERROR) << "no email in JSON response";
     return false;
   }
 
   return !email->empty();
 }
 
 }  // namespace wallet
 }  // namespace autofill