New encryption/escrow endpoints for Wallet

chrome/browser/ui/autofill/autofill_dialog_controller_impl.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 "chrome/browser/ui/autofill/autofill_dialog_controller_impl.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 
@@ skipping 1719 matching lines @@
                     DialogAutocheckoutStep(AUTOCHECKOUT_STEP_PROXY_CARD,
                                            AUTOCHECKOUT_STEP_UNSTARTED));
     }
   }
 
   SetIsSubmitting(true);
   if (IsSubmitPausedOn(wallet::VERIFY_CVV)) {
     DCHECK(!active_instrument_id_.empty());
     GetWalletClient()->AuthenticateInstrument(
         active_instrument_id_,
-        UTF16ToUTF8(view_->GetCvc()),
-        wallet_items_->obfuscated_gaia_id());
+        UTF16ToUTF8(view_->GetCvc()));
   } else if (IsPayingWithWallet()) {
     // TODO(dbeam): disallow interacting with the dialog while submitting.
     // http://crbug.com/230932
     AcceptLegalDocuments();
   } else {
     FinishSubmit();
   }
 }
 
 Profile* AutofillDialogControllerImpl::profile() {
@@ skipping 221 matching lines @@
 void AutofillDialogControllerImpl::OnDidGetWalletItems(
     scoped_ptr<wallet::WalletItems> wallet_items) {
   legal_documents_text_.clear();
   legal_document_link_ranges_.clear();
   has_accepted_legal_documents_ = false;
 
   wallet_items_ = wallet_items.Pass();
   OnWalletOrSigninUpdate();
 }
 
-void AutofillDialogControllerImpl::OnDidSaveAddress(
+void AutofillDialogControllerImpl::OnDidSaveToWallet(
+    const std::string& instrument_id,
     const std::string& address_id,
     const std::vector<wallet::RequiredAction>& required_actions,
     const std::vector<wallet::FormFieldError>& form_field_errors) {
-  DCHECK(is_submitting_ && IsPayingWithWallet());
-
   if (required_actions.empty()) {
-    active_address_id_ = address_id;
+    if (active_address_id_.empty() && !address_id.empty())

[Raman Kakilate, 2013/07/01 19:37:56]

Is this good?

Address ID's change on every edit right?, then this check will not update the
active address id?

[ahutter, 2013/07/01 21:37:45]

Done.

+      active_address_id_ = address_id;
+    if (active_instrument_id_.empty() && !instrument_id.empty())
+        active_instrument_id_ = instrument_id;
     GetFullWalletIfReady();
   } else {
     OnWalletFormFieldError(form_field_errors);
-    HandleSaveOrUpdateRequiredActions(required_actions);
-  }
-}
-
-void AutofillDialogControllerImpl::OnDidSaveInstrument(
-    const std::string& instrument_id,
-    const std::vector<wallet::RequiredAction>& required_actions,
-    const std::vector<wallet::FormFieldError>& form_field_errors) {
-  DCHECK(is_submitting_ && IsPayingWithWallet());
-
-  if (required_actions.empty()) {
-    active_instrument_id_ = instrument_id;
-    GetFullWalletIfReady();
-  } else {
-    OnWalletFormFieldError(form_field_errors);
     HandleSaveOrUpdateRequiredActions(required_actions);
   }
 }
 
-void AutofillDialogControllerImpl::OnDidSaveInstrumentAndAddress(
-    const std::string& instrument_id,
-    const std::string& address_id,
-    const std::vector<wallet::RequiredAction>& required_actions,
-    const std::vector<wallet::FormFieldError>& form_field_errors) {
-  OnDidSaveInstrument(instrument_id, required_actions, form_field_errors);
-  // |is_submitting_| can change while in |OnDidSaveInstrument()|.
-  if (is_submitting_)
-    OnDidSaveAddress(address_id, required_actions, form_field_errors);
-}
-
-void AutofillDialogControllerImpl::OnDidUpdateAddress(
-    const std::string& address_id,
-    const std::vector<wallet::RequiredAction>& required_actions,
-    const std::vector<wallet::FormFieldError>& form_field_errors) {
-  OnDidSaveAddress(address_id, required_actions, form_field_errors);
-}
-
-void AutofillDialogControllerImpl::OnDidUpdateInstrument(
-    const std::string& instrument_id,
-    const std::vector<wallet::RequiredAction>& required_actions,
-    const std::vector<wallet::FormFieldError>& form_field_errors) {
-  OnDidSaveInstrument(instrument_id, required_actions, form_field_errors);
-}
-
 void AutofillDialogControllerImpl::OnWalletError(
     wallet::WalletClient::ErrorType error_type) {
   DisableWallet(error_type);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PersonalDataManagerObserver implementation.
 
 void AutofillDialogControllerImpl::OnPersonalDataChanged() {
   if (is_submitting_)
@@ skipping 743 matching lines @@
     autocheckout_state_ = AUTOCHECKOUT_IN_PROGRESS;
     if (view_) {
       view_->UpdateButtonStrip();
       view_->UpdateAutocheckoutStepsArea();
       view_->UpdateDetailArea();
     }
   }
 
   scoped_ptr<wallet::Instrument> inputted_instrument =
       CreateTransientInstrument();
-  scoped_ptr<wallet::WalletClient::UpdateInstrumentRequest> update_request =
-      CreateUpdateInstrumentRequest(
-          inputted_instrument.get(),
-          !IsEditingExistingData(SECTION_CC_BILLING) ? std::string() :
-              active_instrument->object_id());
+  if (inputted_instrument && IsEditingExistingData(SECTION_CC_BILLING)) {
+    inputted_instrument->set_object_id(active_instrument->object_id());
+    DCHECK(!inputted_instrument->object_id().empty());
+  }
 
   scoped_ptr<wallet::Address> inputted_address;
   if (active_address_id_.empty()) {
     if (ShouldUseBillingForShipping()) {
       const wallet::Address& address = inputted_instrument ?
-          inputted_instrument->address() : active_instrument->address();
+          *inputted_instrument->address() : active_instrument->address();
       // Try to find an exact matched shipping address and use it for shipping,
       // otherwise save it as a new shipping address. http://crbug.com/225442
       const wallet::Address* duplicated_address =
           FindDuplicateAddress(wallet_items_->addresses(), address);
       if (duplicated_address) {
         active_address_id_ = duplicated_address->object_id();
         DCHECK(!active_address_id_.empty());
       } else {
         inputted_address.reset(new wallet::Address(address));
         DCHECK(inputted_address->object_id().empty());
       }
     } else {
       inputted_address = CreateTransientAddress();
       if (IsEditingExistingData(SECTION_SHIPPING)) {
         inputted_address->set_object_id(active_address->object_id());
         DCHECK(!inputted_address->object_id().empty());
       }
     }
   }
 
   // If there's neither an address nor instrument to save, |GetFullWallet()|
   // is called when the risk fingerprint is loaded.
   if (!active_instrument_id_.empty() && !active_address_id_.empty()) {
     GetFullWallet();
     return;
   }
 
-  // If instrument and address aren't based off of any existing data, save both.
-  if (inputted_instrument && inputted_address && !update_request &&
-      inputted_address->object_id().empty()) {
-    GetWalletClient()->SaveInstrumentAndAddress(
-        *inputted_instrument,
-        *inputted_address,
-        wallet_items_->obfuscated_gaia_id(),
-        source_url_);
-    return;
-  }
-
-  if (inputted_instrument) {
-    if (update_request) {
-      scoped_ptr<wallet::Address> billing_address(
-          new wallet::Address(inputted_instrument->address()));
-      GetWalletClient()->UpdateInstrument(*update_request,
-                                          billing_address.Pass());
-    } else {
-      GetWalletClient()->SaveInstrument(*inputted_instrument,
-                                        wallet_items_->obfuscated_gaia_id(),
-                                        source_url_);
-    }
-  }
-
-  if (inputted_address) {
-    if (!inputted_address->object_id().empty())
-      GetWalletClient()->UpdateAddress(*inputted_address, source_url_);
-    else
-      GetWalletClient()->SaveAddress(*inputted_address, source_url_);
-  }
+  GetWalletClient()->SaveToWallet(
+      inputted_instrument.Pass(),
+      inputted_address.Pass(),
+      source_url_);
 }
 
 scoped_ptr<wallet::Instrument> AutofillDialogControllerImpl::
     CreateTransientInstrument() {
   if (!active_instrument_id_.empty())
     return scoped_ptr<wallet::Instrument>();
 
   DetailOutputMap output;
   view_->GetUserInput(SECTION_CC_BILLING, &output);
 
   CreditCard card;
   AutofillProfile profile;
   string16 cvc;
   GetBillingInfoFromOutputs(output, &card, &cvc, &profile);
 
   return scoped_ptr<wallet::Instrument>(
       new wallet::Instrument(card, cvc, profile));
 }
 
-scoped_ptr<wallet::WalletClient::UpdateInstrumentRequest>
-    AutofillDialogControllerImpl::CreateUpdateInstrumentRequest(
-        const wallet::Instrument* instrument,
-        const std::string& instrument_id) {
-  if (!instrument || instrument_id.empty())
-    return scoped_ptr<wallet::WalletClient::UpdateInstrumentRequest>();
-
-  scoped_ptr<wallet::WalletClient::UpdateInstrumentRequest> update_request(
-      new wallet::WalletClient::UpdateInstrumentRequest(
-          instrument_id, source_url_));
-  update_request->expiration_month = instrument->expiration_month();
-  update_request->expiration_year = instrument->expiration_year();
-  update_request->card_verification_number =
-      UTF16ToUTF8(instrument->card_verification_number());
-  update_request->obfuscated_gaia_id = wallet_items_->obfuscated_gaia_id();
-  return update_request.Pass();
-}
-
 scoped_ptr<wallet::Address>AutofillDialogControllerImpl::
     CreateTransientAddress() {
   // If not using billing for shipping, just scrape the view.
   DetailOutputMap output;
   view_->GetUserInput(SECTION_SHIPPING, &output);
 
   AutofillProfile profile;
   FillFormGroupFromOutputs(output, &profile);
 
   return scoped_ptr<wallet::Address>(new wallet::Address(profile));
@@ skipping 278 matching lines @@
         AutofillMetrics::DIALOG_USER_SIGNED_IN_NO_WALLET_NO_AUTOFILL;
   }
 
   // Has Wallet items.
   return has_autofill_profiles ?
       AutofillMetrics::DIALOG_USER_SIGNED_IN_HAS_WALLET_HAS_AUTOFILL :
       AutofillMetrics::DIALOG_USER_SIGNED_IN_HAS_WALLET_NO_AUTOFILL;
 }
 
 }  // namespace autofill