Merge pull request #1236 from brave/contribution-nonverified

Adds new contribution flow for unverified publishers

browser/extensions/api/brave_rewards_api.cc

@@ -138,22 +138,30 @@ ExtensionFunction::ResponseAction BraveRewardsGetGrantFunction::Run() {
   return RespondNow(NoArguments());
 }
 
-BraveRewardsGetNonVerifiedSettingsFunction::
-~BraveRewardsGetNonVerifiedSettingsFunction() {
+BraveRewardsGetPendingContributionsTotalFunction::
+~BraveRewardsGetPendingContributionsTotalFunction() {
 }
 
 ExtensionFunction::ResponseAction
-BraveRewardsGetNonVerifiedSettingsFunction::Run() {
+BraveRewardsGetPendingContributionsTotalFunction::Run() {
   Profile* profile = Profile::FromBrowserContext(browser_context());
   RewardsService* rewards_service_ =
     RewardsServiceFactory::GetForProfile(profile);
-  bool non_verified = true;
 
-  if (rewards_service_) {
-    non_verified = rewards_service_->GetPublisherAllowNonVerified();
+  if (!rewards_service_) {
+    return RespondNow(OneArgument(
+          std::make_unique<base::Value>(0.0)));
   }
 
-  return RespondNow(OneArgument(std::make_unique<base::Value>(non_verified)));
+  rewards_service_->GetPendingContributionsTotal(base::Bind(
+        &BraveRewardsGetPendingContributionsTotalFunction::OnGetPendingTotal,
+        this));
+  return RespondLater();
+}
+
+void BraveRewardsGetPendingContributionsTotalFunction::OnGetPendingTotal(
+    double amount) {
+  Respond(OneArgument(std::make_unique<base::Value>(amount)));
 }
 
 }  // namespace api

browser/extensions/api/brave_rewards_api.h

@@ -81,14 +81,17 @@ class BraveRewardsGetGrantFunction : public UIThreadExtensionFunction {
   ResponseAction Run() override;
 };
 
-class BraveRewardsGetNonVerifiedSettingsFunction : public UIThreadExtensionFunction {
+class BraveRewardsGetPendingContributionsTotalFunction : public UIThreadExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("braveRewards.getNonVerifiedSettings", UNKNOWN)
+  DECLARE_EXTENSION_FUNCTION("braveRewards.getPendingContributionsTotal", UNKNOWN)
 
  protected:
-  ~BraveRewardsGetNonVerifiedSettingsFunction() override;
+  ~BraveRewardsGetPendingContributionsTotalFunction() override;
 
   ResponseAction Run() override;
+
+ private:
+  void OnGetPendingTotal(double amount);
 };
 
 }  // namespace api

browser/ui/webui/brave_rewards_ui.cc

@@ -67,6 +67,8 @@ class RewardsDOMHandler : public WebUIMessageHandler,
   void UpdateTipsList(const base::ListValue* args);
   void GetContributionList(const base::ListValue* args);
   void CheckImported(const base::ListValue* args);
+  void GetPendingContributionsTotal(const base::ListValue* args);
+  void OnGetPendingContributionsTotal(double amount);
 
   // RewardsServiceObserver implementation
   void OnWalletInitialized(brave_rewards::RewardsService* rewards_service,
@@ -191,6 +193,9 @@ void RewardsDOMHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback("brave_rewards.checkImported",
                                     base::BindRepeating(&RewardsDOMHandler::CheckImported,
                                                         base::Unretained(this)));
+  web_ui()->RegisterMessageCallback("brave_rewards.getPendingContributionsTotal",
+                                    base::BindRepeating(&RewardsDOMHandler::GetPendingContributionsTotal,
+                                                        base::Unretained(this)));
 }
 
 void RewardsDOMHandler::Init() {
@@ -675,6 +680,22 @@ void RewardsDOMHandler::CheckImported(const base::ListValue *args) {
   }
 }
 
+void RewardsDOMHandler::GetPendingContributionsTotal(
+    const base::ListValue* args) {
+  if (rewards_service_) {
+    rewards_service_->GetPendingContributionsTotal(base::Bind(
+          &RewardsDOMHandler::OnGetPendingContributionsTotal,
+          weak_factory_.GetWeakPtr()));
+  }
+}
+
+void RewardsDOMHandler::OnGetPendingContributionsTotal(double amount) {
+  if (web_ui()->CanCallJavascript()) {
+    web_ui()->CallJavascriptFunctionUnsafe(
+        "brave_rewards.pendingContributionTotal", base::Value(amount));
+  }
+}
+
 }  // namespace
 
 BraveRewardsUI::BraveRewardsUI(content::WebUI* web_ui, const std::string& name)

browser/ui/webui/brave_webui_source.cc

@@ -347,6 +347,8 @@ void CustomizeWebUIHTMLSource(const std::string &name, content::WebUIDataSource*
         { "recurringDonation", IDS_BRAVE_UI_RECURRING_DONATION },
         { "recurringDonations", IDS_BRAVE_UI_RECURRING_DONATIONS },
         { "remove", IDS_BRAVE_UI_REMOVE },
+        { "reservedAmountText", IDS_BRAVE_UI_RESERVED_AMOUNT_TEXT },
+        { "reservedMoreLink", IDS_BRAVE_UI_RESERVED_MORE_LINK },
         { "restore", IDS_BRAVE_UI_RESTORE },
         { "restoreAll", IDS_BRAVE_UI_RESTORE_ALL },
         { "reviewSitesMsg", IDS_BRAVE_UI_REVIEW_SITE_MSG },

common/extensions/api/brave_rewards.json

@@ -258,17 +258,17 @@
         "parameters": []
       },
       {
-        "name": "getNonVerifiedSettings",
+        "name": "getPendingContributionsTotal",
         "type": "function",
-        "description": "Gets auto contribute settings",
+        "description": "Gets pending contributions total",
         "parameters": [
           {
             "type": "function",
             "name": "callback",
             "parameters": [
               {
-                "name": "nonVerified",
-                "type": "boolean"
+                "name": "amount",
+                "type": "number"
               }
             ]
           }

components/brave_rewards/browser/pending_contribution.cc

@@ -0,0 +1,16 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+#include "brave/components/brave_rewards/browser/pending_contribution.h"
+
+namespace brave_rewards {
+
+PendingContribution::PendingContribution() :
+  amount(0),
+  added_date(0),
+  reconcile_date(0) {
+}
+
+PendingContribution::~PendingContribution() { }
+
+}  // namespace brave_rewards

components/brave_rewards/browser/pending_contribution.h

@@ -0,0 +1,27 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef BRAVE_BROWSER_PAYMENTS_PENDING_CONTRIBUTION_
+#define BRAVE_BROWSER_PAYMENTS_PENDING_CONTRIBUTION_
+
+#include <string>
+
+namespace brave_rewards {
+
+struct PendingContribution {
+  PendingContribution();
+  ~PendingContribution();
+  PendingContribution(const PendingContribution& data) = default;
+
+  std::string publisher_key;
+  double amount = 0;
+  uint32_t added_date = 0;
+  uint32_t reconcile_date = 0;
+};
+
+using PendingContributionList = std::vector<PendingContribution>;
+
+}  // namespace brave_rewards
+
+#endif //BRAVE_BROWSER_PAYMENTS_PENDING_CONTRIBUTION_

components/brave_rewards/browser/publisher_info_database.cc

@@ -22,7 +22,7 @@ namespace brave_rewards {
 
 namespace {
 
-const int kCurrentVersionNumber = 2;
+const int kCurrentVersionNumber = 3;
 const int kCompatibleVersionNumber = 1;
 
 }  // namespace
@@ -56,12 +56,14 @@ bool PublisherInfoDatabase::Init() {
       !CreateContributionInfoTable() ||
       !CreateActivityInfoTable() ||
       !CreateMediaPublisherInfoTable() ||
-      !CreateRecurringDonationTable())
+      !CreateRecurringDonationTable() ||
+      !CreatePendingContributionsTable())
     return false;
 
   CreateContributionInfoIndex();
   CreateActivityInfoIndex();
   CreateRecurringDonationIndex();
+  CreatePendingContributionsIndex();
 
   // Version check.
   sql::InitStatus version_status = EnsureCurrentVersion();
@@ -664,6 +666,97 @@ bool PublisherInfoDatabase::RemoveRecurring(const std::string& publisher_key) {
   return statement.Run();
 }
 
+bool PublisherInfoDatabase::CreatePendingContributionsTable() {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+
+  const char* name = "pending_contribution";
+  if (GetDB().DoesTableExist(name)) {
+    return true;
+  }
+
+  std::string sql;
+  sql.append("CREATE TABLE ");
+  sql.append(name);
+  sql.append(
+      "("
+      "publisher_id LONGVARCHAR NOT NULL,"
+      "amount DOUBLE DEFAULT 0 NOT NULL,"
+      "added_date INTEGER DEFAULT 0 NOT NULL,"
+      "viewing_id LONGVARCHAR NOT NULL,"
+      "category INTEGER NOT NULL,"
+      "CONSTRAINT fk_pending_contribution_publisher_id"
+      "    FOREIGN KEY (publisher_id)"
+      "    REFERENCES publisher_info (publisher_id)"
+      "    ON DELETE CASCADE)");
+  return GetDB().Execute(sql.c_str());
+}
+
+bool PublisherInfoDatabase::CreatePendingContributionsIndex() {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+
+  return GetDB().Execute(
+      "CREATE INDEX IF NOT EXISTS pending_contribution_publisher_id_index "
+      "ON pending_contribution (publisher_id)");
+}
+
+bool PublisherInfoDatabase::InsertPendingContribution
+(const ledger::PendingContributionList& list) {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+
+  bool initialized = Init();
+  DCHECK(initialized);
+
+  if (!initialized) {
+    return false;
+  }
+
+  base::Time now = base::Time::Now();
+  double now_seconds = now.ToDoubleT();
+
+  sql::Transaction transaction(&GetDB());
+  if (!transaction.Begin()) {
+    return false;
+  }
+
+  for (const auto& item : list.list_) {
+    sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
+      "INSERT INTO pending_contribution "
+      "(publisher_id, amount, added_date, viewing_id, category) "
+      "VALUES (?, ?, ?, ?, ?)"));
+
+    statement.BindString(0, item.publisher_key);
+    statement.BindDouble(1, item.amount);
+    statement.BindInt64(2, now_seconds);
+    statement.BindString(3, item.viewing_id);
+    statement.BindInt(4, item.category);
+    statement.Run();
+  }
+
+  return transaction.Commit();
+}
+
+double PublisherInfoDatabase::GetReservedAmount() {
+   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+
+  bool initialized = Init();
+  DCHECK(initialized);
+
+  double amount = 0.0;
+
+  if (!initialized) {
+    return amount;
+  }
+
+  sql::Statement info_sql(
+      db_.GetUniqueStatement("SELECT sum(amount) FROM pending_contribution"));
+
+  if (info_sql.Step()) {
+    amount = info_sql.ColumnDouble(0);
+  }
+
+  return amount;
+}
+
 // static
 int PublisherInfoDatabase::GetCurrentVersion() {
   return kCurrentVersionNumber;
@@ -751,6 +844,16 @@ bool PublisherInfoDatabase::MigrateV1toV2() {
   return CreateRecurringDonationIndex();
 }
 
+bool PublisherInfoDatabase::MigrateV2toV3() {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+
+  if (!CreatePendingContributionsTable()) {
+    return false;
+  }
+
+  return CreatePendingContributionsIndex();
+}
+
 sql::InitStatus PublisherInfoDatabase::EnsureCurrentVersion() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
@@ -763,15 +866,21 @@ sql::InitStatus PublisherInfoDatabase::EnsureCurrentVersion() {
   const int old_version = meta_table_.GetVersionNumber();
   const int cur_version = GetCurrentVersion();
 
-  // Migration from version 1 to version 2
-  if (old_version == 1 && cur_version == 2) {
+  // to version 2
+  if (old_version < 2 && cur_version < 3) {
     if (!MigrateV1toV2()) {
       LOG(ERROR) << "DB: Error with MigrateV1toV2";
     }
+  }
 
-    meta_table_.SetVersionNumber(cur_version);
+  // to version 3
+  if (old_version < 3 && cur_version < 4) {
+    if (!MigrateV2toV3()) {
+      LOG(ERROR) << "DB: Error with MigrateV2toV3";
+    }
   }
 
+  meta_table_.SetVersionNumber(cur_version);
   return sql::INIT_OK;
 }
 

components/brave_rewards/browser/publisher_info_database.h

@@ -14,7 +14,9 @@
 #include "base/memory/memory_pressure_listener.h"
 #include "base/sequence_checker.h"
 #include "bat/ledger/publisher_info.h"
+#include "bat/ledger/pending_contribution.h"
 #include "brave/components/brave_rewards/browser/contribution_info.h"
+#include "brave/components/brave_rewards/browser/pending_contribution.h"
 #include "brave/components/brave_rewards/browser/recurring_donation.h"
 #include "build/build_config.h"
 #include "sql/database.h"
@@ -50,6 +52,8 @@ class PublisherInfoDatabase {
   void GetRecurringDonations(ledger::PublisherInfoList* list);
   void GetTips(ledger::PublisherInfoList* list, ledger::PUBLISHER_MONTH month, int year);
   bool RemoveRecurring(const std::string& publisher_key);
+  bool InsertPendingContribution(const ledger::PendingContributionList& list);
+  double GetReservedAmount();
 
   // Returns the current version of the publisher info database
   static int GetCurrentVersion();
@@ -72,6 +76,8 @@ class PublisherInfoDatabase {
   bool CreateActivityInfoIndex();
   bool CreateRecurringDonationTable();
   bool CreateRecurringDonationIndex();
+  bool CreatePendingContributionsTable();
+  bool CreatePendingContributionsIndex();
 
   std::string BuildClauses(int start,
                            int limit,
@@ -84,6 +90,7 @@ class PublisherInfoDatabase {
 
   sql::InitStatus EnsureCurrentVersion();
   bool MigrateV1toV2();
+  bool MigrateV2toV3();
 
   sql::Database db_;
   sql::MetaTable meta_table_;

components/brave_rewards/browser/recurring_donation.h

@@ -7,8 +7,6 @@
 
 #include <string>
 
-#include "brave/components/brave_rewards/browser/content_site.h"
-
 namespace brave_rewards {
   struct RecurringDonation {
     RecurringDonation();