Adds promotion guards for UI triggers

Resolves brave/brave-browser#9662
brave · May 10, 2020 · 58b4231 · 58b4231
1 parent c411ce4
commit 58b4231
Show file tree

Hide file tree

Showing 20 changed files with 115 additions and 24 deletions.
diff --git a/browser/extensions/api/brave_rewards_api.cc b/browser/extensions/api/brave_rewards_api.cc
@@ -480,11 +480,13 @@ ExtensionFunction::ResponseAction BraveRewardsClaimPromotionFunction::Run() {
  data->SetIntKey("result", 1);
  return RespondNow(OneArgument(std::move(data)));
  }
+
  rewards_service->ClaimPromotion(
+ params->promotion_id,
  base::BindOnce(
- &BraveRewardsClaimPromotionFunction::OnClaimPromotion,
- this,
- params->promotion_id));
+  &BraveRewardsClaimPromotionFunction::OnClaimPromotion,
+  this,
+  params->promotion_id));
  return RespondLater();
 }
 

diff --git a/browser/ui/webui/brave_rewards_page_ui.cc b/browser/ui/webui/brave_rewards_page_ui.cc
@@ -630,6 +630,7 @@ void RewardsDOMHandler::ClaimPromotion(const base::ListValue* args) {
 
 #if !defined(OS_ANDROID)
  rewards_service_->ClaimPromotion(
+ promotion_id,
  base::Bind(&RewardsDOMHandler::OnClaimPromotion,
  weak_factory_.GetWeakPtr(),
  promotion_id));

diff --git a/components/brave_ads/browser/ads_service_impl_unittest.cc b/components/brave_ads/browser/ads_service_impl_unittest.cc
@@ -47,7 +47,8 @@ class MockRewardsService : public RewardsService {
  MOCK_METHOD1(GetExcludedList,
  void(const brave_rewards::GetContentSiteListCallback&));
  MOCK_METHOD0(FetchPromotions, void());
- MOCK_METHOD1(ClaimPromotion, void(brave_rewards::ClaimPromotionCallback));
+ MOCK_METHOD1(ClaimPromotion, void(const std::string&,
+ brave_rewards::ClaimPromotionCallback));
  MOCK_METHOD2(ClaimPromotion, void(const std::string&,
  brave_rewards::AttestPromotionCallback));
  MOCK_METHOD3(AttestPromotion, void(const std::string&,

diff --git a/components/brave_rewards/browser/rewards_service.h b/components/brave_rewards/browser/rewards_service.h
@@ -139,7 +139,9 @@ class RewardsService : public KeyedService {
  virtual void GetExcludedList(const GetContentSiteListCallback& callback) = 0;
  virtual void FetchPromotions() = 0;
  // Used by desktop
- virtual void ClaimPromotion(ClaimPromotionCallback callback) = 0;
+ virtual void ClaimPromotion(
+ const std::string& promotion_id,
+ ClaimPromotionCallback callback) = 0;
  // Used by Android
  virtual void ClaimPromotion(
  const std::string& promotion_id,

diff --git a/components/brave_rewards/browser/rewards_service_browsertest_utils.cc b/components/brave_rewards/browser/rewards_service_browsertest_utils.cc
@@ -394,6 +394,4 @@ void IsMediaTipsInjected(content::WebContents* context, bool should_appear) {
  WaitForElementToAppear(context, ".action-brave-tip", should_appear);
 }
 
-
-
 } // namespace rewards_service_browsertest_utils
diff --git a/components/brave_rewards/browser/rewards_service_impl.cc b/components/brave_rewards/browser/rewards_service_impl.cc
@@ -1344,6 +1344,7 @@ void RewardsServiceImpl::OnAttestationAndroid(
 }
 
 void RewardsServiceImpl::ClaimPromotion(
+ const std::string& promotion_id,
  ClaimPromotionCallback callback) {
  if (!Connected()) {
  return;
@@ -1353,7 +1354,7 @@ void RewardsServiceImpl::ClaimPromotion(
  AsWeakPtr(),
  std::move(callback));
 
- bat_ledger_->ClaimPromotion("", std::move(claim_callback));
+ bat_ledger_->ClaimPromotion(promotion_id, "", std::move(claim_callback));
 }
 
 void RewardsServiceImpl::ClaimPromotion(
@@ -1368,7 +1369,7 @@ void RewardsServiceImpl::ClaimPromotion(
  promotion_id,
  std::move(callback));
 
- bat_ledger_->ClaimPromotion("", std::move(claim_callback));
+ bat_ledger_->ClaimPromotion(promotion_id, "", std::move(claim_callback));
 }
 
 void RewardsServiceImpl::GetWalletPassphrase(

diff --git a/components/brave_rewards/browser/rewards_service_impl.h b/components/brave_rewards/browser/rewards_service_impl.h
@@ -114,7 +114,9 @@ class RewardsServiceImpl : public RewardsService,
  void CreateWallet(CreateWalletCallback callback) override;
  void FetchWalletProperties() override;
  void FetchPromotions() override;
- void ClaimPromotion(ClaimPromotionCallback callback) override;
+ void ClaimPromotion(
+ const std::string& promotion_id,
+ ClaimPromotionCallback callback) override;
  void ClaimPromotion(
  const std::string& promotion_id,
  AttestPromotionCallback callback) override;

diff --git a/components/services/bat_ledger/bat_ledger_impl.cc b/components/services/bat_ledger/bat_ledger_impl.cc
@@ -238,12 +238,14 @@ void BatLedgerImpl::OnClaimPromotion(
  delete holder;
 }
 void BatLedgerImpl::ClaimPromotion(
+ const std::string& promotion_id,
  const std::string& payload,
  ClaimPromotionCallback callback) {
  // deleted in OnClaimPromotion
  auto* holder = new CallbackHolder<ClaimPromotionCallback>(
  AsWeakPtr(), std::move(callback));
  ledger_->ClaimPromotion(
+ promotion_id,
  payload,
  std::bind(BatLedgerImpl::OnClaimPromotion, holder, _1, _2));
 }

diff --git a/components/services/bat_ledger/bat_ledger_impl.h b/components/services/bat_ledger/bat_ledger_impl.h
@@ -71,6 +71,7 @@ class BatLedgerImpl : public mojom::BatLedger,
 
  void FetchPromotions(FetchPromotionsCallback callback) override;
  void ClaimPromotion(
+ const std::string& promotion_id,
  const std::string& payload,
  ClaimPromotionCallback callback) override;
  void AttestPromotion(

diff --git a/components/services/bat_ledger/public/interfaces/bat_ledger.mojom b/components/services/bat_ledger/public/interfaces/bat_ledger.mojom
@@ -59,7 +59,7 @@ interface BatLedger {
  SetPublisherExclude(string publisher_key, ledger.mojom.PublisherExclude exclude) => (ledger.mojom.Result result);
  RestorePublishers() => (ledger.mojom.Result result);
  FetchPromotions() => (ledger.mojom.Result result, array<ledger.mojom.Promotion> promotion);
- ClaimPromotion(string payload) => (ledger.mojom.Result result, string response);
+ ClaimPromotion(string promotion_id, string payload) => (ledger.mojom.Result result, string response);
  AttestPromotion(string promotion_id, string solution) => (ledger.mojom.Result result, ledger.mojom.Promotion? promotion);
  GetWalletPassphrase() => (string wallet_passphrase);
  RecoverWallet(string passPhrase) => (ledger.mojom.Result result, double balance);

diff --git a/vendor/bat-native-ledger/include/bat/ledger/ledger.h b/vendor/bat-native-ledger/include/bat/ledger/ledger.h
@@ -181,6 +181,7 @@ class LEDGER_EXPORT Ledger {
  // desktop: { "captchaImage": "{{captchaImage}}", "hint": "{{hint}}" }
  // iOS and Android: { "nonce": "{{nonce}}" }
  virtual void ClaimPromotion(
+ const std::string& promotion_id,
  const std::string& payload,
  ClaimPromotionCallback callback) const = 0;
 

diff --git a/vendor/bat-native-ledger/include/bat/ledger/public/interfaces/ledger.mojom b/vendor/bat-native-ledger/include/bat/ledger/public/interfaces/ledger.mojom
@@ -249,7 +249,8 @@ enum Result {
  RETRY = 29,
  RETRY_SHORT = 30,
  RETRY_LONG = 31,
- CONTINUE = 32
+ CONTINUE = 32,
+ IN_PROGRESS= 33
 };
 
 enum PublisherStatus {

diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_impl.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_impl.cc
@@ -819,9 +819,10 @@ void LedgerImpl::FetchWalletProperties(
 }
 
 void LedgerImpl::ClaimPromotion(
+ const std::string& promotion_id,
  const std::string& payload,
  ledger::ClaimPromotionCallback callback) const {
- bat_promotion_->Claim(payload, std::move(callback));
+ bat_promotion_->Claim(promotion_id, payload, std::move(callback));
 }
 
 void LedgerImpl::AttestPromotion(

diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_impl.h b/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_impl.h
@@ -208,6 +208,7 @@ class LedgerImpl : public ledger::Ledger {
  void FetchPromotions(ledger::FetchPromotionCallback callback) const override;
 
  void ClaimPromotion(
+ const std::string& promotion_id,
  const std::string& payload,
  ledger::ClaimPromotionCallback callback) const override;
 

diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_impl_mock.h b/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_impl_mock.h
@@ -167,8 +167,10 @@ class MockLedgerImpl : public LedgerImpl {
  MOCK_CONST_METHOD1(FetchPromotions,
  void(ledger::FetchPromotionCallback));
 
- MOCK_CONST_METHOD2(ClaimPromotion,
- void(const std::string&, const ledger::ClaimPromotionCallback));
+ MOCK_CONST_METHOD3(ClaimPromotion, void(
+ const std::string&,
+ const std::string&,
+ const ledger::ClaimPromotionCallback));
 
  MOCK_CONST_METHOD3(AttestPromotion,
  void(const std::string&,

diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/promotion/promotion.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/promotion/promotion.cc
@@ -182,9 +182,13 @@ void Promotion::OnGetAllPromotions(
  HandleExpiredPromotions(ledger_, &promotions);
 
  ledger::PromotionList list;
- ledger::Result success = ParseFetchResponse(response, &list);
+ std::vector<std::string> corrupted_promotions;
+ ledger::Result result = ParseFetchResponse(
+ response,
+ &list,
+ &corrupted_promotions);
 
- if (success == ledger::Result::LEDGER_ERROR) {
+ if (result == ledger::Result::LEDGER_ERROR) {
  BLOG(ledger_, ledger::LogLevel::LOG_ERROR) << "Failed to parse promotions";
  ProcessFetchedPromotions(
  ledger::Result::LEDGER_ERROR,
@@ -195,9 +199,10 @@ void Promotion::OnGetAllPromotions(
 
  // even though that some promotions are corrupted
  // we should display non corrupted ones either way
- if (success == ledger::Result::CORRUPTED_DATA) {
+ if (result == ledger::Result::CORRUPTED_DATA) {
  BLOG(ledger_, ledger::LogLevel::LOG_ERROR) <<
- "Some promotions are not formatted correctly";
+ "Promotions are not correct: " <<
+ base::JoinString(corrupted_promotions, ", ");
  }
 
  for (auto & item : list) {
@@ -258,24 +263,71 @@ void Promotion::LegacyClaimedSaved(
 }
 
 void Promotion::Claim(
+ const std::string& promotion_id,
  const std::string& payload,
  ledger::ClaimPromotionCallback callback) {
+ auto promotion_callback = std::bind(&Promotion::OnClaimPromotion,
+ this,
+ _1,
+ payload,
+ callback);
+
+ ledger_->GetPromotion(promotion_id, promotion_callback);
+}
+
+void Promotion::OnClaimPromotion(
+ ledger::PromotionPtr promotion,
+ const std::string& payload,
+ ledger::ClaimPromotionCallback callback) {
+ if (!promotion) {
+ callback(ledger::Result::LEDGER_ERROR, "");
+ return;
+ }
+
+ if (promotion->status != ledger::PromotionStatus::ACTIVE) {
+ callback(ledger::Result::IN_PROGRESS, "");
+ return;
+ }
+
  attestation_->Start(payload, callback);
 }
 
 void Promotion::Attest(
  const std::string& promotion_id,
  const std::string& solution,
  ledger::AttestPromotionCallback callback) {
- auto confirm_callback = std::bind(&Promotion::OnAttestPromotion,
+ auto promotion_callback = std::bind(&Promotion::OnAttestPromotion,
  this,
  _1,
- promotion_id,
+ solution,
  callback);
- attestation_->Confirm(solution, confirm_callback);
+
+ ledger_->GetPromotion(promotion_id, promotion_callback);
 }
 
 void Promotion::OnAttestPromotion(
+ ledger::PromotionPtr promotion,
+ const std::string& solution,
+ ledger::AttestPromotionCallback callback) {
+ if (!promotion) {
+ callback(ledger::Result::LEDGER_ERROR, nullptr);
+ return;
+ }
+
+ if (promotion->status != ledger::PromotionStatus::ACTIVE) {
+ callback(ledger::Result::IN_PROGRESS, nullptr);
+ return;
+ }
+
+ auto confirm_callback = std::bind(&Promotion::OnAttestedPromotion,
+ this,
+ _1,
+ promotion->id,
+ callback);
+ attestation_->Confirm(solution, confirm_callback);
+}
+
+void Promotion::OnAttestedPromotion(
  const ledger::Result result,
  const std::string& promotion_id,
  ledger::AttestPromotionCallback callback) {

diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/promotion/promotion.h b/vendor/bat-native-ledger/src/bat/ledger/internal/promotion/promotion.h
@@ -34,6 +34,7 @@ class Promotion {
  void Fetch(ledger::FetchPromotionCallback callback);
 
  void Claim(
+ const std::string& promotion_id,
  const std::string& payload,
  ledger::ClaimPromotionCallback callback);
 
@@ -66,7 +67,17 @@ class Promotion {
  const ledger::Result result,
  const std::string& promotion_string);
 
+ void OnClaimPromotion(
+ ledger::PromotionPtr promotion,
+ const std::string& payload,
+ ledger::ClaimPromotionCallback callback);
+
  void OnAttestPromotion(
+ ledger::PromotionPtr promotion,
+ const std::string& solution,
+ ledger::AttestPromotionCallback callback);
+
+ void OnAttestedPromotion(
  const ledger::Result result,
  const std::string& promotion_id,
  ledger::AttestPromotionCallback callback);

diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/promotion/promotion_util.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/promotion/promotion_util.cc
@@ -87,7 +87,9 @@ ledger::ReportType ConvertPromotionTypeToReportType(
 
 ledger::Result ParseFetchResponse(
  const std::string& response,
- ledger::PromotionList* list) {
+ ledger::PromotionList* list,
+ std::vector<std::string>* corrupted_promotions) {
+ DCHECK(corrupted_promotions);
  if (!list) {
  return ledger::Result::LEDGER_ERROR;
  }
@@ -116,32 +118,38 @@ ledger::Result ParseFetchResponse(
 
  const auto version = item.FindIntKey("version");
  if (!version) {
+ corrupted_promotions->push_back(promotion->id);
  continue;
  }
  promotion->version = *version;
 
  const auto* type = item.FindStringKey("type");
  if (!type) {
+ corrupted_promotions->push_back(promotion->id);
  continue;
  }
  promotion->type = ConvertStringToPromotionType(*type);
 
  const auto suggestions = item.FindIntKey("suggestionsPerGrant");
  if (!suggestions) {
+ corrupted_promotions->push_back(promotion->id);
  continue;
  }
  promotion->suggestions = *suggestions;
 
  const auto* approximate_value = item.FindStringKey("approximateValue");
  if (!approximate_value) {
+ corrupted_promotions->push_back(promotion->id);
  continue;
  }
  promotion->approximate_value = std::stod(*approximate_value);
 
  const auto available = item.FindBoolKey("available");
  if (!available) {
+ corrupted_promotions->push_back(promotion->id);
  continue;
  }
+
  if (*available) {
  promotion->status = ledger::PromotionStatus::ACTIVE;
  } else {
@@ -150,6 +158,7 @@ ledger::Result ParseFetchResponse(
 
  auto* expires_at = item.FindStringKey("expiresAt");
  if (!expires_at) {
+ corrupted_promotions->push_back(promotion->id);
  continue;
  }
 
@@ -161,6 +170,7 @@ ledger::Result ParseFetchResponse(
 
  auto* public_keys = item.FindListKey("publicKeys");
  if (!public_keys || public_keys->GetList().empty()) {
+ corrupted_promotions->push_back(promotion->id);
  continue;
  }
 

diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/promotion/promotion_util.h b/vendor/bat-native-ledger/src/bat/ledger/internal/promotion/promotion_util.h
@@ -25,7 +25,8 @@ ledger::ReportType ConvertPromotionTypeToReportType(
 
 ledger::Result ParseFetchResponse(
  const std::string& response,
- ledger::PromotionList* list);
+ ledger::PromotionList* list,
+ std::vector<std::string>* corrupted_promotions);
 
 std::vector<ledger::PromotionType> GetEligiblePromotions();
 

diff --git a/vendor/brave-ios/Ledger/BATBraveLedger.mm b/vendor/brave-ios/Ledger/BATBraveLedger.mm
@@ -949,6 +949,7 @@ - (void)claimPromotion:(NSString *)deviceCheckPublicKey completion:(void (^)(BAT
  BLOG(ledger::LogLevel::LOG_ERROR) << "Missing JSON payload while attempting to claim promotion" << std::endl;
  return;
  }
+ // TODO we need to put promotion id in
  const auto jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
  ledger->ClaimPromotion(jsonString.UTF8String, ^(const ledger::Result result, const std::string& json) {
  const auto jsonData = [[NSString stringWithUTF8String:json.c_str()] dataUsingEncoding:NSUTF8StringEncoding];