Merge pull request #404 from brave-intl/master

2020-05-21 RC

Author: husobee

payment/credentials.go

@@ -55,6 +55,21 @@ type CredentialBinding struct {
 	Signature     string `json:"signature" valid:"base64"`
 }
 
+// DeduplicateCredentialBindings - given a list of tokens return a deduplicated list
+func DeduplicateCredentialBindings(tokens ...CredentialBinding) []CredentialBinding {
+	var (
+		seen   = map[string]bool{}
+		result = []CredentialBinding{}
+	)
+	for _, t := range tokens {
+		if !seen[t.TokenPreimage] {
+			seen[t.TokenPreimage] = true
+			result = append(result, t)
+		}
+	}
+	return result
+}
+
 // Issuer includes information about a particular credential issuer
 type Issuer struct {
 	ID         uuid.UUID `json:"id" db:"id"`
@@ -177,6 +192,9 @@ func (service *Service) SignOrderCreds(ctx context.Context, orderID uuid.UUID, i
 
 // generateCredentialRedemptions - helper to create credential redemptions from cred bindings
 var generateCredentialRedemptions = func(ctx context.Context, cb []CredentialBinding) ([]cbr.CredentialRedemption, error) {
+	// deduplicate credential bindings
+	cb = DeduplicateCredentialBindings(cb...)
+
 	var (
 		requestCredentials = make([]cbr.CredentialRedemption, len(cb))
 		issuers            = make(map[string]*Issuer)

payment/credentials_test.go

@@ -5,6 +5,39 @@ import (
 	"testing"
 )
 
+func TestDeduplicateCredentialBindings(t *testing.T) {
+
+	var tokens = []CredentialBinding{
+		{
+			TokenPreimage: "totally_random",
+		},
+		{
+			TokenPreimage: "totally_random_1",
+		},
+		{
+			TokenPreimage: "totally_random",
+		},
+		{
+			TokenPreimage: "totally_random_2",
+		},
+	}
+	var seen = []CredentialBinding{}
+
+	var result = DeduplicateCredentialBindings(tokens...)
+	if len(result) > len(tokens) {
+		t.Error("result should be less than number of tokens")
+	}
+
+	for _, v := range result {
+		for _, vv := range seen {
+			if v == vv {
+				t.Error("Deduplication of tokens didn't work")
+			}
+			seen = append(seen, v)
+		}
+	}
+}
+
 func TestIssuerID(t *testing.T) {
 
 	cases := []struct {

promotion/suggestions.go

@@ -30,6 +30,21 @@ type CredentialBinding struct {
 	Signature     string `json:"signature" valid:"base64"`
 }
 
+// DeduplicateCredentialBindings - given a list of tokens return a deduplicated list
+func DeduplicateCredentialBindings(tokens ...CredentialBinding) []CredentialBinding {
+	var (
+		seen   = map[string]bool{}
+		result = []CredentialBinding{}
+	)
+	for _, t := range tokens {
+		if !seen[t.TokenPreimage] {
+			seen[t.TokenPreimage] = true
+			result = append(result, t)
+		}
+	}
+	return result
+}
+
 // Suggestion encapsulates information from the user about where /how they want to contribute
 type Suggestion struct {
 	Type    string     `json:"type" valid:"in(auto-contribute|oneoff-tip|recurring-tip|payment)"`
@@ -124,6 +139,10 @@ type SuggestionWorker interface {
 
 // GetCredentialRedemptions as well as total and funding sources from a list of credential bindings
 func (service *Service) GetCredentialRedemptions(ctx context.Context, credentials []CredentialBinding) (total decimal.Decimal, requestCredentials []cbr.CredentialRedemption, fundingSources map[string]FundingSource, promotions map[string]*Promotion, err error) {
+
+	// deduplicate the bindings before anything
+	credentials = DeduplicateCredentialBindings(credentials...)
+
 	total = decimal.Zero
 	requestCredentials = make([]cbr.CredentialRedemption, len(credentials))
 	fundingSources = make(map[string]FundingSource)

promotion/suggestions_test.go

@@ -7,6 +7,39 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
+func TestDeduplicateCredentialBindings(t *testing.T) {
+
+	var tokens = []CredentialBinding{
+		{
+			TokenPreimage: "totally_random",
+		},
+		{
+			TokenPreimage: "totally_random_1",
+		},
+		{
+			TokenPreimage: "totally_random",
+		},
+		{
+			TokenPreimage: "totally_random_2",
+		},
+	}
+	var seen = []CredentialBinding{}
+
+	var result = DeduplicateCredentialBindings(tokens...)
+	if len(result) > len(tokens) {
+		t.Error("result should be less than number of tokens")
+	}
+
+	for _, v := range result {
+		for _, vv := range seen {
+			if v == vv {
+				t.Error("Deduplication of tokens didn't work")
+			}
+			seen = append(seen, v)
+		}
+	}
+}
+
 func TestUnmarshalText(t *testing.T) {
 	encoded := "eyJ0eXBlIjogImF1dG8tY29udHJpYnV0ZSIsICJjaGFubmVsIjogImJyYXZlLmNvbSJ9"
 	var expected, d Suggestion