Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes sku contribution flow for unblinded tokens (uplift to 1.10.x) #5682

Merged
merged 1 commit into from Jun 1, 2020
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Uplift of #5671 (squashed) to beta

  • Loading branch information
brave-browser-releases committed May 28, 2020
commit 5c256f842412c7a3502210cbae98b3603effef20
@@ -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;
@@ -382,7 +385,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;
}

@@ -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
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.