Promotion expiration

Resolves brave/brave-browser#6947
brave · Nov 27, 2019 · 6a35358 · 6a35358
1 parent 7fe7fe2
commit 6a35358
Show file tree

Hide file tree

Showing 17 changed files with 174 additions and 7 deletions.
diff --git a/components/brave_rewards/browser/database/database_unblinded_token.cc b/components/brave_rewards/browser/database/database_unblinded_token.cc
@@ -16,6 +16,13 @@
 
 namespace brave_rewards {
 
+namespace  {
+
+const char* table_name_ = "unblinded_tokens";
+const int minimum_version_ = 10;
+
+}  // namespace
+
 DatabaseUnblindedToken::DatabaseUnblindedToken(
     int current_db_version) :
     DatabaseTable(current_db_version) {
@@ -154,4 +161,22 @@ bool DatabaseUnblindedToken::DeleteRecord(
   return statement.Run();
 }
 
+// static
+bool DatabaseUnblindedToken::DeleteRecordsForPromotion(
+    sql::Database* db,
+    const std::string& promotion_id) {
+  if (promotion_id.empty()) {
+    return false;
+  }
+
+  const std::string query = base::StringPrintf(
+      "DELETE FROM %s WHERE promotion_id = '%s'",
+      table_name_,
+      promotion_id.c_str());
+
+  sql::Statement statement(db->GetUniqueStatement(query.c_str()));
+
+  return statement.Run();
+}
+
 }  // namespace brave_rewards
diff --git a/components/brave_rewards/browser/database/database_unblinded_token.h b/components/brave_rewards/browser/database/database_unblinded_token.h
@@ -33,9 +33,9 @@ class DatabaseUnblindedToken: public DatabaseTable {
 
   bool DeleteRecord(sql::Database* db, const std::vector<std::string>& id_list);
 
- private:
-  const char* table_name_ = "unblinded_tokens";
-  const int minimum_version_ = 10;
+  static bool DeleteRecordsForPromotion(
+      sql::Database* db,
+      const std::string& promotion_id);
 };
 
 }  // namespace brave_rewards

diff --git a/components/brave_rewards/browser/database/publisher_info_database.cc b/components/brave_rewards/browser/database/publisher_info_database.cc
@@ -1196,6 +1196,22 @@ bool PublisherInfoDatabase::DeleteUnblindedToken(
   return unblinded_token_->DeleteRecord(&GetDB(), id_list);
 }
 
+bool PublisherInfoDatabase::DeleteUnblindedTokensForPromotion(
+    const std::string& promotion_id) {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+
+  bool initialized = Init();
+  DCHECK(initialized);
+
+  if (!initialized) {
+    return false;
+  }
+
+  return DatabaseUnblindedToken::DeleteRecordsForPromotion(
+      &GetDB(),
+      promotion_id);
+}
+
 // Other -------------------------------------------------------------------
 
 void PublisherInfoDatabase::RecordP3AStats(bool auto_contributions_on) {

diff --git a/components/brave_rewards/browser/database/publisher_info_database.h b/components/brave_rewards/browser/database/publisher_info_database.h
@@ -126,6 +126,9 @@ class PublisherInfoDatabase {
 
   bool DeleteUnblindedToken(const std::vector<std::string>& id_list);
 
+  bool DeleteUnblindedTokensForPromotion(
+      const std::string& promotion_id);
+
   void RecordP3AStats(bool auto_contributions_on);
 
   // Returns the current version of the publisher info database

diff --git a/components/brave_rewards/browser/rewards_service_impl.cc b/components/brave_rewards/browser/rewards_service_impl.cc
@@ -4336,6 +4336,32 @@ void RewardsServiceImpl::DeleteUnblindedToken(
         callback));
 }
 
+ledger::Result DeleteUnblindedTokensForPromotionOnFileTaskRunner(
+    PublisherInfoDatabase* backend,
+    const std::string& promotion_id) {
+  if (!backend) {
+    return ledger::Result::LEDGER_ERROR;
+  }
+
+  const bool result = backend->DeleteUnblindedTokensForPromotion(promotion_id);
+
+  return result ? ledger::Result::LEDGER_OK : ledger::Result::LEDGER_ERROR;
+}
+
+void RewardsServiceImpl::DeleteUnblindedTokensForPromotion(
+    const std::string& promotion_id,
+    ledger::ResultCallback callback) {
+  base::PostTaskAndReplyWithResult(
+    file_task_runner_.get(),
+    FROM_HERE,
+    base::BindOnce(&DeleteUnblindedTokensForPromotionOnFileTaskRunner,
+        publisher_info_backend_.get(),
+        promotion_id),
+    base::BindOnce(&RewardsServiceImpl::OnResult,
+        AsWeakPtr(),
+        callback));
+}
+
 ledger::ClientInfoPtr GetDesktopClientInfo() {
   auto info = ledger::ClientInfo::New();
   info->platform = ledger::Platform::DESKTOP;

diff --git a/components/brave_rewards/browser/rewards_service_impl.h b/components/brave_rewards/browser/rewards_service_impl.h
@@ -728,6 +728,10 @@ class RewardsServiceImpl : public RewardsService,
     const std::vector<std::string>& id_list,
     ledger::ResultCallback callback) override;
 
+  void DeleteUnblindedTokensForPromotion(
+    const std::string& promotion_id,
+    ledger::ResultCallback callback) override;
+
   ledger::ClientInfoPtr GetClientInfo() override;
 
   void UnblindedTokensReady() override;

diff --git a/components/services/bat_ledger/bat_ledger_client_mojo_proxy.cc b/components/services/bat_ledger/bat_ledger_client_mojo_proxy.cc
@@ -1028,6 +1028,14 @@ void BatLedgerClientMojoProxy::DeleteUnblindedToken(
       base::BindOnce(&OnResultCallback, std::move(callback)));
 }
 
+void BatLedgerClientMojoProxy::DeleteUnblindedTokensForPromotion(
+    const std::string& promotion_id,
+    ledger::ResultCallback callback) {
+  bat_ledger_client_->DeleteUnblindedTokensForPromotion(
+      promotion_id,
+      base::BindOnce(&OnResultCallback, std::move(callback)));
+}
+
 ledger::ClientInfoPtr BatLedgerClientMojoProxy::GetClientInfo() {
   auto info = ledger::ClientInfo::New();
   bat_ledger_client_->GetClientInfo(&info);

diff --git a/components/services/bat_ledger/bat_ledger_client_mojo_proxy.h b/components/services/bat_ledger/bat_ledger_client_mojo_proxy.h
@@ -229,6 +229,10 @@ class BatLedgerClientMojoProxy : public ledger::LedgerClient,
       const std::vector<std::string>& id_list,
       ledger::ResultCallback callback) override;
 
+  void DeleteUnblindedTokensForPromotion(
+      const std::string& promotion_id,
+      ledger::ResultCallback callback) override;
+
   ledger::ClientInfoPtr GetClientInfo() override;
 
   void UnblindedTokensReady() override;

diff --git a/components/services/bat_ledger/public/cpp/ledger_client_mojo_proxy.cc b/components/services/bat_ledger/public/cpp/ledger_client_mojo_proxy.cc
@@ -1174,6 +1174,30 @@ void LedgerClientMojoProxy::DeleteUnblindedToken(
                 _1));
 }
 
+// static
+void LedgerClientMojoProxy::OnDeleteUnblindedTokensForPromotion(
+    CallbackHolder<DeleteUnblindedTokensForPromotionCallback>* holder,
+    const ledger::Result result) {
+  DCHECK(holder);
+  if (holder->is_valid()) {
+    std::move(holder->get()).Run(result);
+  }
+  delete holder;
+}
+
+void LedgerClientMojoProxy::DeleteUnblindedTokensForPromotion(
+    const std::string& promotion_id,
+    DeleteUnblindedTokensForPromotionCallback callback) {
+  auto* holder = new CallbackHolder<DeleteUnblindedTokensForPromotionCallback>(
+      AsWeakPtr(),
+      std::move(callback));
+  ledger_client_->DeleteUnblindedTokensForPromotion(
+      promotion_id,
+      std::bind(LedgerClientMojoProxy::OnDeleteUnblindedTokensForPromotion,
+                holder,
+                _1));
+}
+
 void LedgerClientMojoProxy::GetClientInfo(
     GetClientInfoCallback callback) {
   auto info = ledger_client_->GetClientInfo();

diff --git a/components/services/bat_ledger/public/cpp/ledger_client_mojo_proxy.h b/components/services/bat_ledger/public/cpp/ledger_client_mojo_proxy.h
@@ -249,6 +249,10 @@ class LedgerClientMojoProxy : public mojom::BatLedgerClient,
       const std::vector<std::string>& id_list,
       DeleteUnblindedTokenCallback callback) override;
 
+  void DeleteUnblindedTokensForPromotion(
+    const std::string& promotion_id,
+    DeleteUnblindedTokensForPromotionCallback callback) override;
+
   void GetClientInfo(
       GetClientInfoCallback callback) override;
 
@@ -455,8 +459,12 @@ class LedgerClientMojoProxy : public mojom::BatLedgerClient,
     ledger::UnblindedTokenList list);
 
   static void OnDeleteUnblindedToken(
-    CallbackHolder<DeleteUnblindedTokenCallback>* holder,
-    const ledger::Result result);
+      CallbackHolder<DeleteUnblindedTokenCallback>* holder,
+      const ledger::Result result);
+
+  static void OnDeleteUnblindedTokensForPromotion(
+      CallbackHolder<DeleteUnblindedTokensForPromotionCallback>* holder,
+      const ledger::Result result);
 
   ledger::LedgerClient* ledger_client_;
 

diff --git a/components/services/bat_ledger/public/interfaces/bat_ledger.mojom b/components/services/bat_ledger/public/interfaces/bat_ledger.mojom
@@ -296,6 +296,7 @@ interface BatLedgerClient {
   InsertOrUpdateUnblindedToken(ledger.mojom.UnblindedToken info) => (ledger.mojom.Result result);
   GetAllUnblindedTokens() => (array<ledger.mojom.UnblindedToken> info);
   DeleteUnblindedToken(array<string> id_list) => (ledger.mojom.Result result);
+  DeleteUnblindedTokensForPromotion(string promotion_id) => (ledger.mojom.Result result);
   [Sync]
   GetClientInfo() => (ledger.mojom.ClientInfo info);
   UnblindedTokensReady();

diff --git a/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_client_mock.h b/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_client_mock.h
@@ -372,6 +372,10 @@ class MockConfirmationsClient : public ConfirmationsClient {
     const std::vector<std::string>& id_list,
     ledger::ResultCallback callback));
 
+  MOCK_METHOD2(DeleteUnblindedTokensForPromotion, void(
+    const std::string& promotion_id,
+    ledger::ResultCallback callback));
+
   MOCK_METHOD0(GetClientInfo, ledger::ClientInfoPtr());
 
   MOCK_METHOD0(UnblindedTokensReady, void());

diff --git a/vendor/bat-native-ledger/include/bat/ledger/ledger_client.h b/vendor/bat-native-ledger/include/bat/ledger/ledger_client.h
@@ -314,8 +314,12 @@ class LEDGER_EXPORT LedgerClient {
     ledger::GetAllUnblindedTokensCallback callback) = 0;
 
   virtual void DeleteUnblindedToken(
-    const std::vector<std::string>& id_list,
-    ledger::ResultCallback callback) = 0;
+      const std::vector<std::string>& id_list,
+      ledger::ResultCallback callback) = 0;
+
+  virtual void DeleteUnblindedTokensForPromotion(
+      const std::string& promotion_id,
+      ledger::ResultCallback callback) = 0;
 
   virtual ledger::ClientInfoPtr GetClientInfo() = 0;
 

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
@@ -1559,6 +1559,12 @@ void LedgerImpl::DeleteUnblindedToken(
   ledger_client_->DeleteUnblindedToken(id_list, callback);
 }
 
+void LedgerImpl::DeleteUnblindedTokensForPromotion(
+    const std::string& promotion_id,
+    ledger::ResultCallback callback) {
+  ledger_client_->DeleteUnblindedTokensForPromotion(promotion_id, callback);
+}
+
 ledger::ClientInfoPtr LedgerImpl::GetClientInfo() {
   return ledger_client_->GetClientInfo();
 }

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
@@ -596,6 +596,10 @@ class LedgerImpl : public ledger::Ledger,
     const std::vector<std::string>& id_list,
     ledger::ResultCallback callback);
 
+  void DeleteUnblindedTokensForPromotion(
+      const std::string& promotion_id,
+      ledger::ResultCallback callback);
+
   ledger::ClientInfoPtr GetClientInfo();
 
   void UnblindedTokensReady();

diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/promotion.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/promotion.cc
@@ -40,6 +40,31 @@ using challenge_bypass_ristretto::UnblindedToken;
 
 namespace braveledger_promotion {
 
+namespace {
+
+void HandleExpiredPromotions(
+    bat_ledger::LedgerImpl* ledger,
+    ledger::PromotionMap* promotions) {
+  DCHECK(promotions);
+  if (!promotions) {
+    return;
+  }
+
+  const uint64_t current_time =
+      static_cast<uint64_t>(base::Time::Now().ToDoubleT());
+
+  for (auto& item : *promotions) {
+    if (item.second->expires_at <= current_time)  {
+      item.second->status = ledger::PromotionStatus::OVER;
+
+      ledger->DeleteUnblindedTokensForPromotion(item.second->id,
+          [](const ledger::Result _){});
+    }
+  }
+}
+
+}  // namespace
+
 Promotion::Promotion(bat_ledger::LedgerImpl* ledger) :
     attestation_(std::make_unique<braveledger_attestation::AttestationImpl>
         (ledger)),
@@ -367,6 +392,8 @@ void Promotion::OnGetAllPromotions(
     ledger::PromotionMap promotions,
     const std::string& response,
     ledger::FetchPromotionCallback callback) {
+  HandleExpiredPromotions(ledger_, &promotions);
+
   ledger::PromotionList list;
   bool success = ParseFetchResponse(response, &list);
 
@@ -523,6 +550,8 @@ void Promotion::OnTimer(const uint32_t timer_id) {
 }
 
 void Promotion::Retry(ledger::PromotionMap promotions) {
+  HandleExpiredPromotions(ledger_, &promotions);
+
   for (auto & promotion : promotions) {
     if (promotion.second->status == ledger::PromotionStatus::CLAIMED) {
       FetchSignedTokens(

diff --git a/vendor/brave-ios/Ledger/Generated/NativeLedgerClient.h b/vendor/brave-ios/Ledger/Generated/NativeLedgerClient.h
@@ -94,6 +94,7 @@ class NativeLedgerClient : public ledger::LedgerClient {
   void InsertOrUpdateUnblindedToken(ledger::UnblindedTokenPtr info, ledger::ResultCallback callback) override;
   void GetAllUnblindedTokens(ledger::GetAllUnblindedTokensCallback callback) override;
   void DeleteUnblindedToken(const std::vector<std::string>& id_list, ledger::ResultCallback callback) override;
+  void DeleteUnblindedTokensForPromotion(const std::string& promotion_id, ledger::ResultCallback callback) override;
   ledger::ClientInfoPtr GetClientInfo() override;
   void UnblindedTokensReady() override;
 };