Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(288)

Unified Diff: chrome/browser/autofill/wallet/wallet_items.cc

Issue 11293078: Integrating Online Wallet into Chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes from latest code review Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/autofill/wallet/wallet_items.cc
diff --git a/chrome/browser/autofill/wallet/wallet_items.cc b/chrome/browser/autofill/wallet/wallet_items.cc
new file mode 100644
index 0000000000000000000000000000000000000000..351b856039e698c78cfb2551586b6c2b8b8859e4
--- /dev/null
+++ b/chrome/browser/autofill/wallet/wallet_items.cc
@@ -0,0 +1,355 @@
+// 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.
+
+#include "chrome/browser/autofill/wallet/wallet_items.h"
+
+#include "base/logging.h"
+#include "base/values.h"
+
+namespace wallet {
+
+WalletItems::MaskedInstrument::MaskedInstrument(
+ const std::string& descriptive_name,
+ const WalletItems::MaskedInstrument::Type& type,
+ std::vector<std::string> supported_currencies,
+ const std::string& last_four_digits,
+ int expiration_month,
+ int expiration_year,
+ const std::string& brand,
+ Address* address,
+ const WalletItems::MaskedInstrument::Status& status,
+ const std::string& object_id)
+ : descriptive_name_(descriptive_name),
+ type_(type),
+ supported_currencies_(supported_currencies),
+ last_four_digits_(last_four_digits),
+ expiration_month_(expiration_month),
+ expiration_year_(expiration_year),
+ brand_(brand),
+ address_(address),
+ status_(status),
+ object_id_(object_id) {
+ DCHECK(address_);
+}
+
+WalletItems::MaskedInstrument::~MaskedInstrument() {}
+
+WalletItems::MaskedInstrument*
+ WalletItems::MaskedInstrument::CreateMaskedInstrument(
+ const base::DictionaryValue& dictionary) {
+ std::string descriptive_name;
+ if (!dictionary.GetString("descriptive_name", &descriptive_name))
+ DVLOG(1) << "Response from Google Wallet missing descriptive name";
+
+ std::string type_string;
+ Type type;
+ if (dictionary.GetString("type", &type_string)) {
+ type = TypeFromString(type_string);
+ } else {
+ DLOG(ERROR) << "Response from Google Wallet missing card type";
+ return NULL;
Dan Beam 2012/12/06 21:59:24 nit: I'd personally group all critical failures at
Dan Beam 2012/12/06 22:00:14 whooops! I meant group all critical failures at th
ahutter 2012/12/06 22:44:19 Done.
+ }
+
+ std::vector<std::string> supported_currencies;
+ const ListValue* supported_currency_list;
+ if (dictionary.GetList("supported_currency", &supported_currency_list)) {
+ for (size_t i = 0; i < supported_currency_list->GetSize(); i++) {
+ std::string currency;
+ if (supported_currency_list->GetString(i, &currency))
+ supported_currencies.push_back(currency);
+ }
+ } else {
+ DVLOG(1) << "Response from Google Wallet missing supported currency";
+ }
+
+ std::string last_four_digits;
+ if (!dictionary.GetString("last_four_digits", &last_four_digits)) {
+ DLOG(ERROR) << "Response from Google Wallet missing last four digits";
+ return NULL;
+ }
+
+ int expiration_month;
+ if (!dictionary.GetInteger("expiration_month", &expiration_month))
+ DVLOG(1) << "Response from Google Wallet missing expiration month";
+
+ int expiration_year;
+ if (!dictionary.GetInteger("expiration_year", &expiration_year))
+ DVLOG(1) << "Response from Google Wallet missing expiration year";
+
+ std::string brand;
+ if (!dictionary.GetString("brand", &brand))
+ DVLOG(1) << "Response from Google Wallet missing brand";
+
+ std::string status_string;
+ Status status;
+ if (dictionary.GetString("status", &status_string)) {
+ status = StatusFromString(status_string);
+ } else {
+ DLOG(ERROR) << "Response from Google Wallet missing status";
+ return NULL;
+ }
+
+ std::string object_id;
+ if (!dictionary.GetString("object_id", &object_id)) {
+ DLOG(ERROR) << "Response from Google Wallet missing object id";
+ return NULL;
+ }
+
+ const DictionaryValue* address_dict;
+ if (!dictionary.GetDictionary("billing_address", &address_dict)) {
+ DLOG(ERROR) << "Response from Google wallet missing address";
+ return NULL;
+ }
+ Address* address = Address::CreateDisplayAddress(*address_dict);
+
+ if (!address) {
+ DLOG(ERROR) << "Response from Google wallet contained malformed address";
+ return NULL;
+ }
+
+ return new MaskedInstrument(descriptive_name,
+ type,
+ supported_currencies,
+ last_four_digits,
+ expiration_month,
+ expiration_year,
+ brand,
+ address,
+ status,
+ object_id);
+}
+
+bool WalletItems::MaskedInstrument::operator==(
+ const WalletItems::MaskedInstrument& other) const {
+ if (descriptive_name_ != other.descriptive_name_)
+ return false;
+ if (type_ != other.type_)
+ return false;
+ if (supported_currencies_ != other.supported_currencies_)
+ return false;
+ if (last_four_digits_ != other.last_four_digits_)
+ return false;
+ if (expiration_month_ != other.expiration_month_)
+ return false;
+ if (expiration_year_ != other.expiration_year_)
+ return false;
+ if (brand_ != other.brand_)
+ return false;
+ if (address_.get()) {
+ if (other.address_.get()) {
+ if (*address_.get() != *other.address_.get())
+ return false;
+ } else {
+ return false;
+ }
+ } else if (other.address_.get()) {
+ return false;
+ }
+ if (status_ != other.status_)
+ return false;
+ if (object_id_ != other.object_id_)
+ return false;
+ return true;
+}
+
+bool WalletItems::MaskedInstrument::operator!=(
+ const WalletItems::MaskedInstrument& other) const {
+ return !(*this == other);
+}
+
+WalletItems::MaskedInstrument::Type
+ WalletItems::MaskedInstrument::TypeFromString(
+ const std::string& type_string) {
+ if (type_string == "VISA")
+ return VISA;
+ if (type_string == "MASTER_CARD")
+ return MASTER_CARD;
+ if (type_string == "AMEX")
+ return AMEX;
+ if (type_string == "DISCOVER")
+ return DISCOVER;
+ if (type_string == "SOLO")
+ return SOLO;
+ if (type_string == "MAESTRO")
+ return MAESTRO;
+ if (type_string == "SWITCH")
+ return SWITCH;
+ return UNKNOWN;
+}
+
+WalletItems::MaskedInstrument::Status
+ WalletItems::MaskedInstrument::StatusFromString(
+ const std::string& status_string) {
+ if (status_string == "PENDING")
+ return PENDING;
+ if (status_string == "VALID")
+ return VALID;
+ if (status_string == "DECLINED")
+ return DECLINED;
+ if (status_string == "UNSUPPORTED_COUNTRY")
+ return UNSUPPORTED_COUNTRY;
+ if (status_string == "EXPIRED")
+ return EXPIRED;
+ if (status_string == "BILLING_INCOMPLETE")
+ return BILLING_INCOMPLETE;
+ return INAPPLICABLE;
+}
+
+WalletItems::LegalDocument::LegalDocument(const std::string& document_id,
+ const std::string& display_name,
+ const std::string& document_body)
+ : document_id_(document_id),
+ display_name_(display_name),
+ document_body_(document_body) {}
+
+WalletItems::LegalDocument::~LegalDocument() {}
+
+WalletItems::LegalDocument* WalletItems::LegalDocument::CreateLegalDocument(
+ const base::DictionaryValue& dictionary) {
+ std::string document_id;
+ if (!dictionary.GetString("legal_document_id", &document_id)) {
+ DLOG(ERROR) << "Response from Google Wallet missing legal document id";
+ return NULL;
+ }
+
+ std::string display_name;
+ if (!dictionary.GetString("display_name", &display_name)) {
+ DLOG(ERROR) << "Response from Google Wallet missing display name";
+ return NULL;
+ }
+
+ std::string document_body;
+ if (!dictionary.GetString("document", &document_body)) {
+ DLOG(ERROR) << "Response from Google Wallet missing document body";
+ return NULL;
+ }
+
+ return new WalletItems::LegalDocument(document_id,
+ display_name,
+ document_body);
+}
+
+bool WalletItems::LegalDocument::operator==(const LegalDocument& other) const {
+ return document_id_ == other.document_id_ &&
+ display_name_ == other.display_name_ &&
+ document_body_ == other.document_body_;
+}
+
+bool WalletItems::LegalDocument::operator!=(const LegalDocument& other) const {
+ return !(*this == other);
+}
+
+WalletItems::WalletItems(const std::vector<std::string>& required_actions,
+ const std::string& google_transaction_id,
+ const std::string& default_instrument_id,
+ const std::string& default_address_id)
+ : required_actions_(required_actions),
+ google_transaction_id_(google_transaction_id),
+ default_instrument_id_(default_instrument_id),
+ default_address_id_(default_address_id) {}
+
+WalletItems::~WalletItems() {}
+
+WalletItems* WalletItems::CreateWalletItems(
+ const base::DictionaryValue& dictionary) {
+ std::vector<std::string> required_action;
+ const ListValue* required_action_list;
+ if (dictionary.GetList("required_action", &required_action_list)) {
+ for (size_t i = 0; i < required_action_list->GetSize(); i++) {
+ std::string action;
+ if (required_action_list->GetString(i, &action))
+ required_action.push_back(action);
+ }
+ } else {
+ DVLOG(1) << "Response from Google wallet missing required actions";
+ }
+
+ std::string google_transaction_id;
+ if (!dictionary.GetString("google_transaction_id", &google_transaction_id)) {
+ DLOG(ERROR) << "Response from Google wallet missing google transaction id";
+ return NULL;
+ }
+
+ std::string default_instrument_id;
+ if (!dictionary.GetString("default_instrument_id", &default_instrument_id))
+ DVLOG(1) << "Response from Google wallet missing default instrument id";
+
+ std::string default_address_id;
+ if (!dictionary.GetString("default_address_id", &default_address_id))
+ DVLOG(1) << "Response from Google wallet missing default_address_id";
+
+ scoped_ptr<WalletItems> wallet_items(new WalletItems(required_action,
+ google_transaction_id,
+ default_instrument_id,
+ default_address_id));
+
+ const ListValue* instruments;
+ if (dictionary.GetList("instrument", &instruments)) {
+ for (size_t i = 0; i < instruments->GetSize(); i++) {
+ const DictionaryValue* instrument_dict;
+ if (instruments->GetDictionary(i, &instrument_dict)) {
+ scoped_ptr<MaskedInstrument> instrument(
+ MaskedInstrument::CreateMaskedInstrument(*instrument_dict));
+ if (instrument.get())
+ wallet_items->AddInstrument(instrument.release());
+ else
+ DLOG(ERROR) << "Malformed instrument in response from Google Wallet";
+ }
+ }
+ } else {
+ DVLOG(1) << "Response from Google wallet missing instruments";
+ }
+
+ const ListValue* addresses;
+ if (dictionary.GetList("address", &addresses)) {
+ for (size_t i = 0; i < addresses->GetSize(); i++) {
+ const DictionaryValue* address_dict;
+ if (addresses->GetDictionary(i, &address_dict)) {
+ scoped_ptr<Address> address(
+ Address::CreateAddressWithID(*address_dict));
+ if (address.get())
+ wallet_items->AddAddress(address.release());
+ else
+ DLOG(ERROR) << "Malformed address in response from Google Wallet";
+ }
+ }
+ } else {
+ DVLOG(1) << "Response from Google wallet missing addresses";
+ }
+
+ const ListValue* legal_docs;
+ if (dictionary.GetList("required_legal_document", &legal_docs)) {
+ for (size_t i = 0; i < legal_docs->GetSize(); i++) {
+ const DictionaryValue* legal_doc_dict;
+ if (legal_docs->GetDictionary(i, &legal_doc_dict)) {
+ scoped_ptr<LegalDocument> legal_doc(
+ LegalDocument::CreateLegalDocument(*legal_doc_dict));
+ if (legal_doc.get()) {
+ wallet_items->AddLegalDocument(legal_doc.release());
+ } else {
+ DLOG(ERROR) << "Malformed legal document in response from "
+ "Google wallet";
+ return NULL;
+ }
+ }
+ }
+ } else {
+ DVLOG(1) << "Response from Google wallet missing legal docs";
+ }
+
+ return wallet_items.release();
+}
+
+bool WalletItems::operator==(const WalletItems& other) const {
+ // TODO(ahutter): Check scoped vector equality.
+ return google_transaction_id_ == other.google_transaction_id_ &&
+ default_instrument_id_ == other.default_instrument_id_ &&
+ default_address_id_ == other.default_address_id_ &&
+ required_actions_ == required_actions_;
+}
+bool WalletItems::operator!=(const WalletItems& other) const {
+ return !(*this == other);
+}
+
+} // end wallet namespace

Powered by Google App Engine
This is Rietveld 408576698