Merge pull request #5671 from brave/sku-tokens-contribution

Fixes sku contribution flow for unblinded tokens
brave · May 28, 2020 · 8bf0692 · 8bf0692
2 parents 8fec9f5 + 9e7a60b
commit 8bf0692
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/contribution/contribution_unblinded.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/contribution/contribution_unblinded.cc
@@ -86,10 +86,13 @@ namespace braveledger_contribution {
 
 Unblinded::Unblinded(bat_ledger::LedgerImpl* ledger) : ledger_(ledger) {
   DCHECK(ledger_);
-  credentials_ = braveledger_credentials::CredentialsFactory::Create(
+  credentials_promotion_ = braveledger_credentials::CredentialsFactory::Create(
       ledger_,
       ledger::CredsBatchType::PROMOTION);
-  DCHECK(credentials_);
+  credentials_sku_ = braveledger_credentials::CredentialsFactory::Create(
+      ledger_,
+      ledger::CredsBatchType::SKU);
+  DCHECK(credentials_promotion_ && credentials_sku_);
 }
 
 Unblinded::~Unblinded() = default;
@@ -393,7 +396,13 @@ void Unblinded::OnProcessTokens(
     redeem.token_list = token_list;
     redeem.contribution_id = contribution->contribution_id;
 
-    credentials_->RedeemTokens(redeem, redeem_callback);
+    if (redeem.processor == ledger::ContributionProcessor::UPHOLD ||
+        redeem.processor == ledger::ContributionProcessor::BRAVE_USER_FUNDS) {
+      credentials_sku_->RedeemTokens(redeem, redeem_callback);
+      return;
+    }
+
+    credentials_promotion_->RedeemTokens(redeem, redeem_callback);
     return;
   }
 

diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/contribution/contribution_unblinded.h b/vendor/bat-native-ledger/src/bat/ledger/internal/contribution/contribution_unblinded.h
@@ -111,7 +111,8 @@ class Unblinded {
       ledger::ResultCallback callback);
 
   bat_ledger::LedgerImpl* ledger_;  // NOT OWNED
-  std::unique_ptr<braveledger_credentials::Credentials> credentials_;
+  std::unique_ptr<braveledger_credentials::Credentials> credentials_promotion_;
+  std::unique_ptr<braveledger_credentials::Credentials> credentials_sku_;
 };
 
 }  // namespace braveledger_contribution