CCPA Publisher No Sale Relationships (prebid#1465)

flux-dev-team · Sep 17, 2020 · 2a57582 · 2a57582
1 parent 4b64368
commit 2a57582
Show file tree

Hide file tree

Showing 59 changed files with 1,962 additions and 747 deletions.
diff --git a/adapters/33across/usersync_test.go b/adapters/33across/usersync_test.go
@@ -23,7 +23,7 @@ func Test33AcrossSyncer(t *testing.T) {
 			Consent: "B",
 		},
 		CCPA: ccpa.Policy{
-			Value: "C",
+			Consent: "C",
 		},
 	})
 

diff --git a/adapters/adkernel/usersync_test.go b/adapters/adkernel/usersync_test.go
@@ -23,7 +23,7 @@ func TestAdkernelAdnSyncer(t *testing.T) {
 			Consent: "BONciguONcjGKADACHENAOLS1rAHDAFAAEAASABQAMwAeACEAFw",
 		},
 		CCPA: ccpa.Policy{
-			Value: "1NYN",
+			Consent: "1NYN",
 		},
 	})
 

diff --git a/adapters/adkernelAdn/usersync_test.go b/adapters/adkernelAdn/usersync_test.go
@@ -23,7 +23,7 @@ func TestAdkernelAdnSyncer(t *testing.T) {
 			Consent: "BONciguONcjGKADACHENAOLS1rAHDAFAAEAASABQAMwAeACEAFw",
 		},
 		CCPA: ccpa.Policy{
-			Value: "1NYN",
+			Consent: "1NYN",
 		},
 	})
 

diff --git a/adapters/adman/usersync_test.go b/adapters/adman/usersync_test.go
@@ -23,7 +23,7 @@ func TestAdmanSyncer(t *testing.T) {
 			Consent: "ANDFJDS",
 		},
 		CCPA: ccpa.Policy{
-			Value: "1-YY",
+			Consent: "1-YY",
 		},
 	})
 

diff --git a/adapters/admixer/usersync_test.go b/adapters/admixer/usersync_test.go
@@ -1,12 +1,13 @@
 package admixer
 
 import (
+	"testing"
+	"text/template"
+
 	"github.com/prebid/prebid-server/privacy"
 	"github.com/prebid/prebid-server/privacy/ccpa"
 	"github.com/prebid/prebid-server/privacy/gdpr"
 	"github.com/stretchr/testify/assert"
-	"testing"
-	"text/template"
 )
 
 func TestAdmixerSyncer(t *testing.T) {
@@ -22,7 +23,7 @@ func TestAdmixerSyncer(t *testing.T) {
 			Consent: "B",
 		},
 		CCPA: ccpa.Policy{
-			Value: "C",
+			Consent: "C",
 		},
 	})
 

diff --git a/adapters/adtarget/usersync_test.go b/adapters/adtarget/usersync_test.go
@@ -2,10 +2,11 @@ package adtarget
 
 import (
 	"fmt"
-	"github.com/prebid/prebid-server/privacy/ccpa"
 	"testing"
 	"text/template"
 
+	"github.com/prebid/prebid-server/privacy/ccpa"
+
 	"github.com/prebid/prebid-server/privacy"
 	"github.com/prebid/prebid-server/privacy/gdpr"
 	"github.com/stretchr/testify/assert"
@@ -25,7 +26,7 @@ func TestAdtargetSyncer(t *testing.T) {
 			Consent: "123",
 		},
 		CCPA: ccpa.Policy{
-			Value: "1-YY",
+			Consent: "1-YY",
 		},
 	})
 

diff --git a/adapters/aja/usersync_test.go b/adapters/aja/usersync_test.go
@@ -1,10 +1,11 @@
 package aja
 
 import (
-	"github.com/prebid/prebid-server/privacy/ccpa"
 	"testing"
 	"text/template"
 
+	"github.com/prebid/prebid-server/privacy/ccpa"
+
 	"github.com/prebid/prebid-server/privacy"
 	"github.com/prebid/prebid-server/privacy/gdpr"
 	"github.com/stretchr/testify/assert"
@@ -23,7 +24,7 @@ func TestAJASyncer(t *testing.T) {
 			Consent: "BOPVK28OVJoTBABABAENBs-AAAAhuAKAANAAoACwAGgAPAAxAB0AHgAQAAiABOADkA",
 		},
 		CCPA: ccpa.Policy{
-			Value: "C",
+			Consent: "C",
 		},
 	})
 

diff --git a/adapters/avocet/usersync_test.go b/adapters/avocet/usersync_test.go
@@ -23,7 +23,7 @@ func TestAvocetSyncer(t *testing.T) {
 			Consent: "ConsentString",
 		},
 		CCPA: ccpa.Policy{
-			Value: "PrivacyString",
+			Consent: "PrivacyString",
 		},
 	})
 

diff --git a/adapters/beachfront/usersync_test.go b/adapters/beachfront/usersync_test.go
@@ -23,7 +23,7 @@ func TestBeachfrontSyncer(t *testing.T) {
 			Consent: "B",
 		},
 		CCPA: ccpa.Policy{
-			Value: "C",
+			Consent: "C",
 		},
 	})
 

diff --git a/adapters/beintoo/usersync_test.go b/adapters/beintoo/usersync_test.go
@@ -23,7 +23,7 @@ func TestBeintooSyncer(t *testing.T) {
 			Consent: "BOPVK28OVJoTBABABAENBs-AAAAhuAKAANAAoACwAGgAPAAxAB0AHgAQAAiABOADkA",
 		},
 		CCPA: ccpa.Policy{
-			Value: "1NYN",
+			Consent: "1NYN",
 		},
 	})
 

diff --git a/adapters/consumable/consumable.go b/adapters/consumable/consumable.go
@@ -3,15 +3,16 @@ package consumable
 import (
 	"encoding/json"
 	"fmt"
+	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
+
 	"github.com/mxmCherry/openrtb"
 	"github.com/prebid/prebid-server/adapters"
 	"github.com/prebid/prebid-server/errortypes"
 	"github.com/prebid/prebid-server/openrtb_ext"
 	"github.com/prebid/prebid-server/privacy/ccpa"
-	"net/http"
-	"net/url"
-	"strconv"
-	"strings"
 )
 
 type ConsumableAdapter struct {
@@ -136,9 +137,9 @@ func (a *ConsumableAdapter) MakeRequests(request *openrtb.BidRequest, reqInfo *a
 
 	gdpr := bidGdpr{}
 
-	ccpaPolicy, err := ccpa.ReadPolicy(request)
+	ccpaPolicy, err := ccpa.ReadFromRequest(request)
 	if err == nil {
-		body.CCPA = ccpaPolicy.Value
+		body.CCPA = ccpaPolicy.Consent
 	}
 
 	// TODO: Replace with gdpr.ReadPolicy when it is available

diff --git a/adapters/consumable/usersync_test.go b/adapters/consumable/usersync_test.go
@@ -23,7 +23,7 @@ func TestConsumableSyncer(t *testing.T) {
 			Consent: "B",
 		},
 		CCPA: ccpa.Policy{
-			Value: "C",
+			Consent: "C",
 		},
 	})
 

diff --git a/adapters/datablocks/usersync_test.go b/adapters/datablocks/usersync_test.go
@@ -23,7 +23,7 @@ func TestDatablocksSyncer(t *testing.T) {
 			Consent: "BONciguONcjGKADACHENAOLS1rAHDAFAAEAASABQAMwAeACEAFw",
 		},
 		CCPA: ccpa.Policy{
-			Value: "1NYN",
+			Consent: "1NYN",
 		},
 	})
 

diff --git a/adapters/emx_digital/usersync_test.go b/adapters/emx_digital/usersync_test.go
@@ -23,7 +23,7 @@ func TestEMXDigitalSyncer(t *testing.T) {
 			Consent: "BOPVK28OVJoTBABABAENBs-AAAAhuAKAANAAoACwAGgAPAAxAB0AHgAQAAiABOADkA",
 		},
 		CCPA: ccpa.Policy{
-			Value: "1NYN",
+			Consent: "1NYN",
 		},
 	})
 

diff --git a/adapters/engagebdr/usersync_test.go b/adapters/engagebdr/usersync_test.go
@@ -23,7 +23,7 @@ func TestEngageBDRSyncer(t *testing.T) {
 			Consent: "BOPVK28OVJoTBABABAENBs-AAAAhuAKAANAAoACwAGgAPAAxAB0AHgAQAAiABOADkA",
 		},
 		CCPA: ccpa.Policy{
-			Value: "1NYN",
+			Consent: "1NYN",
 		},
 	})
 

diff --git a/adapters/gamoshi/usersync_test.go b/adapters/gamoshi/usersync_test.go
@@ -18,7 +18,7 @@ func TestGamoshiSyncer(t *testing.T) {
 	syncer := NewGamoshiSyncer(syncURLTemplate)
 	syncInfo, err := syncer.GetUsersyncInfo(privacy.Policies{
 		CCPA: ccpa.Policy{
-			Value: "anyValue",
+			Consent: "anyValue",
 		},
 	})
 

diff --git a/adapters/gumgum/usersync_test.go b/adapters/gumgum/usersync_test.go
@@ -23,7 +23,7 @@ func TestGumGumSyncer(t *testing.T) {
 			Consent: "BOPVK28OVJoTBABABAENBs-AAAAhuAKAANAAoACwAGgAPAAxAB0AHgAQAAiABOADkA",
 		},
 		CCPA: ccpa.Policy{
-			Value: "1NYN",
+			Consent: "1NYN",
 		},
 	})
 

diff --git a/adapters/improvedigital/usersync_test.go b/adapters/improvedigital/usersync_test.go
@@ -23,7 +23,7 @@ func TestImprovedigitalSyncer(t *testing.T) {
 			Consent: "B",
 		},
 		CCPA: ccpa.Policy{
-			Value: "C",
+			Consent: "C",
 		},
 	})
 

diff --git a/adapters/marsmedia/usersync_test.go b/adapters/marsmedia/usersync_test.go
@@ -23,7 +23,7 @@ func TestMarsmediaSyncer(t *testing.T) {
 			Consent: "B",
 		},
 		CCPA: ccpa.Policy{
-			Value: "C",
+			Consent: "C",
 		},
 	})
 

diff --git a/adapters/nanointeractive/usersync_test.go b/adapters/nanointeractive/usersync_test.go
@@ -1,11 +1,12 @@
 package nanointeractive
 
 import (
-	"github.com/prebid/prebid-server/privacy/ccpa"
-	"github.com/prebid/prebid-server/privacy/gdpr"
 	"testing"
 	"text/template"
 
+	"github.com/prebid/prebid-server/privacy/ccpa"
+	"github.com/prebid/prebid-server/privacy/gdpr"
+
 	"github.com/prebid/prebid-server/privacy"
 	"github.com/stretchr/testify/assert"
 )
@@ -17,16 +18,15 @@ func TestNewNanoInteractiveSyncer(t *testing.T) {
 	)
 
 	userSync := NewNanoInteractiveSyncer(syncURLTemplate)
-	syncInfo, err := userSync.GetUsersyncInfo(
-		privacy.Policies{
-			GDPR: gdpr.Policy{
-				Signal:  "1",
-				Consent: "BONciguONcjGKADACHENAOLS1rAHDAFAAEAASABQAMwAeACEAFw",
-			},
-			CCPA: ccpa.Policy{
-				Value: "1NYN",
-			},
-		})
+	syncInfo, err := userSync.GetUsersyncInfo(privacy.Policies{
+		GDPR: gdpr.Policy{
+			Signal:  "1",
+			Consent: "BONciguONcjGKADACHENAOLS1rAHDAFAAEAASABQAMwAeACEAFw",
+		},
+		CCPA: ccpa.Policy{
+			Consent: "1NYN",
+		},
+	})
 
 	assert.NoError(t, err)
 	assert.Equal(t, "https://ad.audiencemanager.de/hbs/cookie_sync?gdpr=1&consent=BONciguONcjGKADACHENAOLS1rAHDAFAAEAASABQAMwAeACEAFw&us_privacy=1NYN&redirectUri=http%3A%2F%2Flocalhost%2Fsetuid%3Fbidder%3Dnanointeractive%26gdpr%3D1%26gdpr_consent%3DBONciguONcjGKADACHENAOLS1rAHDAFAAEAASABQAMwAeACEAFw%26uid%3D%24UID", syncInfo.URL)

diff --git a/adapters/pubmatic/usersync_test.go b/adapters/pubmatic/usersync_test.go
@@ -23,7 +23,7 @@ func TestPubmaticSyncer(t *testing.T) {
 			Consent: "B",
 		},
 		CCPA: ccpa.Policy{
-			Value: "C",
+			Consent: "C",
 		},
 	})
 

diff --git a/adapters/rhythmone/usersync_test.go b/adapters/rhythmone/usersync_test.go
@@ -23,7 +23,7 @@ func TestRhythmoneSyncer(t *testing.T) {
 			Consent: "BOPVK28OVJoTBABABAENBs-AAAAhuAKAANAAoACwAGgAPAAxAB0AHgAQAAiABOADkA",
 		},
 		CCPA: ccpa.Policy{
-			Value: "1NYN",
+			Consent: "1NYN",
 		},
 	})
 

diff --git a/adapters/sharethrough/butler.go b/adapters/sharethrough/butler.go
@@ -3,16 +3,17 @@ package sharethrough
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/mxmCherry/openrtb"
-	"github.com/prebid/prebid-server/adapters"
-	"github.com/prebid/prebid-server/errortypes"
-	"github.com/prebid/prebid-server/openrtb_ext"
-	"github.com/prebid/prebid-server/privacy/ccpa"
 	"net/http"
 	"net/url"
 	"regexp"
 	"strconv"
 	"time"
+
+	"github.com/mxmCherry/openrtb"
+	"github.com/prebid/prebid-server/adapters"
+	"github.com/prebid/prebid-server/errortypes"
+	"github.com/prebid/prebid-server/openrtb_ext"
+	"github.com/prebid/prebid-server/privacy/ccpa"
 )
 
 const defaultTmax = 10000 // 10 sec
@@ -97,8 +98,8 @@ func (s StrOpenRTBTranslator) requestFromOpenRTB(imp openrtb.Imp, request *openr
 	}
 
 	usPolicySignal := ""
-	if usPolicy, err := ccpa.ReadPolicy(request); err == nil {
-		usPolicySignal = usPolicy.Value
+	if usPolicy, err := ccpa.ReadFromRequest(request); err == nil {
+		usPolicySignal = usPolicy.Consent
 	}
 
 	return &adapters.RequestData{

diff --git a/adapters/smartadserver/usersync_test.go b/adapters/smartadserver/usersync_test.go
@@ -23,7 +23,7 @@ func TestSmartadserverSyncer(t *testing.T) {
 			Consent: "COyASAoOyASAoAfAAAENAfCAAAAAAAAAAAAAAAAAAAAA",
 		},
 		CCPA: ccpa.Policy{
-			Value: "1YNN",
+			Consent: "1YNN",
 		},
 	})
 

diff --git a/adapters/syncer.go b/adapters/syncer.go
@@ -46,7 +46,7 @@ func (s *Syncer) GetUsersyncInfo(privacyPolicies privacy.Policies) (*usersync.Us
 	syncURL, err := macros.ResolveMacros(*s.urlTemplate, macros.UserSyncTemplateParams{
 		GDPR:        privacyPolicies.GDPR.Signal,
 		GDPRConsent: privacyPolicies.GDPR.Consent,
-		USPrivacy:   privacyPolicies.CCPA.Value,
+		USPrivacy:   privacyPolicies.CCPA.Consent,
 	})
 	if err != nil {
 		return nil, err

diff --git a/adapters/syncer_test.go b/adapters/syncer_test.go
@@ -17,7 +17,7 @@ func TestGetUsersyncInfo(t *testing.T) {
 			Consent: "B",
 		},
 		CCPA: ccpa.Policy{
-			Value: "C",
+			Consent: "C",
 		},
 	}
 

diff --git a/adapters/unruly/usersync_test.go b/adapters/unruly/usersync_test.go
@@ -23,7 +23,7 @@ func TestUnrulySyncer(t *testing.T) {
 			Consent: "B",
 		},
 		CCPA: ccpa.Policy{
-			Value: "C",
+			Consent: "C",
 		},
 	})
 

diff --git a/adapters/valueimpression/usersync_test.go b/adapters/valueimpression/usersync_test.go
@@ -23,7 +23,7 @@ func TestValueImpressionSyncer(t *testing.T) {
 			Consent: "BOPVK28OVJoTBABABAENBs-AAAAhuAKAANAAoACwAGgAPAAxAB0AHgAQAAiABOADkA",
 		},
 		CCPA: ccpa.Policy{
-			Value: "1NYN",
+			Consent: "1NYN",
 		},
 	})
 

diff --git a/adapters/visx/usersync_test.go b/adapters/visx/usersync_test.go
@@ -23,7 +23,7 @@ func TestVisxSyncer(t *testing.T) {
 			Consent: "B",
 		},
 		CCPA: ccpa.Policy{
-			Value: "C",
+			Consent: "C",
 		},
 	})
 

diff --git a/adapters/zeroclickfraud/usersync_test.go b/adapters/zeroclickfraud/usersync_test.go
@@ -23,7 +23,7 @@ func TestZeroClickFraudSyncer(t *testing.T) {
 			Consent: "BONciguONcjGKADACHENAOLS1rAHDAFAAEAASABQAMwAeACEAFw",
 		},
 		CCPA: ccpa.Policy{
-			Value: "1NYN",
+			Consent: "1NYN",
 		},
 	})