From a0cba2820400c7b3f713c758f8fc7bf0acd1dba6 Mon Sep 17 00:00:00 2001 From: vladi-mmg Date: Thu, 19 Dec 2019 21:49:50 +0200 Subject: [PATCH 01/13] Marsmedia - add new bidder (#1118) --- adapters/marsmedia/marsmedia.go | 169 ++++++++++++++++++ adapters/marsmedia/marsmedia_test.go | 11 ++ .../exemplary/simple-banner.json | 105 +++++++++++ .../marsmediatest/exemplary/simple-video.json | 85 +++++++++ .../exemplary/valid-extension.json | 85 +++++++++ .../marsmediatest/params/race/banner.json | 3 + .../marsmediatest/params/race/video.json | 3 + .../supplemental/invalid-extension.json | 31 ++++ .../supplemental/invalid-imp.json | 16 ++ .../supplemental/missing-extension.json | 22 +++ .../supplemental/missing-param.json | 34 ++++ adapters/marsmedia/params_test.go | 59 ++++++ adapters/marsmedia/usersync.go | 12 ++ adapters/marsmedia/usersync_test.go | 20 +++ config/config.go | 2 + exchange/adapter_map.go | 2 + openrtb_ext/bidders.go | 2 + openrtb_ext/imp_marsmedia.go | 6 + static/bidder-info/marsmedia.yaml | 11 ++ static/bidder-params/marsmedia.json | 13 ++ usersync/usersyncers/syncer.go | 5 +- usersync/usersyncers/syncer_test.go | 1 + 22 files changed, 696 insertions(+), 1 deletion(-) create mode 100644 adapters/marsmedia/marsmedia.go create mode 100644 adapters/marsmedia/marsmedia_test.go create mode 100644 adapters/marsmedia/marsmediatest/exemplary/simple-banner.json create mode 100644 adapters/marsmedia/marsmediatest/exemplary/simple-video.json create mode 100644 adapters/marsmedia/marsmediatest/exemplary/valid-extension.json create mode 100644 adapters/marsmedia/marsmediatest/params/race/banner.json create mode 100644 adapters/marsmedia/marsmediatest/params/race/video.json create mode 100644 adapters/marsmedia/marsmediatest/supplemental/invalid-extension.json create mode 100644 adapters/marsmedia/marsmediatest/supplemental/invalid-imp.json create mode 100644 adapters/marsmedia/marsmediatest/supplemental/missing-extension.json create mode 100644 adapters/marsmedia/marsmediatest/supplemental/missing-param.json create mode 100644 adapters/marsmedia/params_test.go create mode 100644 adapters/marsmedia/usersync.go create mode 100644 adapters/marsmedia/usersync_test.go create mode 100644 openrtb_ext/imp_marsmedia.go create mode 100644 static/bidder-info/marsmedia.yaml create mode 100644 static/bidder-params/marsmedia.json diff --git a/adapters/marsmedia/marsmedia.go b/adapters/marsmedia/marsmedia.go new file mode 100644 index 00000000000..359ebb7b8ae --- /dev/null +++ b/adapters/marsmedia/marsmedia.go @@ -0,0 +1,169 @@ +package marsmedia + +import ( + "encoding/json" + "fmt" + "net/http" + "strconv" + + "github.com/mxmCherry/openrtb" + "github.com/prebid/prebid-server/adapters" + "github.com/prebid/prebid-server/errortypes" + "github.com/prebid/prebid-server/openrtb_ext" +) + +type MarsmediaAdapter struct { + URI string +} + +func (a *MarsmediaAdapter) MakeRequests(requestIn *openrtb.BidRequest, reqInfo *adapters.ExtraRequestInfo) ([]*adapters.RequestData, []error) { + + request := *requestIn + + if len(request.Imp) == 0 { + return nil, []error{&errortypes.BadInput{ + Message: "No impression in the bid request", + }} + } + + var bidderExt adapters.ExtImpBidder + if err := json.Unmarshal(request.Imp[0].Ext, &bidderExt); err != nil { + return nil, []error{&errortypes.BadInput{ + Message: "ext.bidder not provided", + }} + } + + var marsmediaExt openrtb_ext.ExtImpMarsmedia + if err := json.Unmarshal(bidderExt.Bidder, &marsmediaExt); err != nil { + return nil, []error{&errortypes.BadInput{ + Message: "ext.bidder.zone not provided", + }} + } + + if marsmediaExt.ZoneID == "" { + return nil, []error{&errortypes.BadInput{ + Message: "Zone is empty", + }} + } + + validImpExists := false + for i := 0; i < len(request.Imp); i++ { + if request.Imp[i].Banner != nil { + bannerCopy := *requestIn.Imp[i].Banner + if len(bannerCopy.Format) > 0 { + firstFormat := bannerCopy.Format[0] + bannerCopy.W = &(firstFormat.W) + bannerCopy.H = &(firstFormat.H) + request.Imp[i].Banner = &bannerCopy + validImpExists = true + } else if bannerCopy.W != nil && bannerCopy.H != nil { + validImpExists = true + } else { + return nil, []error{&errortypes.BadInput{ + Message: "No valid banner format in the bid request", + }} + } + } else if request.Imp[i].Video != nil { + validImpExists = true + } + } + if !validImpExists { + return nil, []error{&errortypes.BadInput{ + Message: "No valid impression in the bid request", + }} + } + + request.AT = 1 //Defaulting to first price auction for all prebid requests + + reqJSON, err := json.Marshal(request) + if err != nil { + return nil, []error{&errortypes.BadInput{ + Message: fmt.Sprintf("Json not encoded. err: %s", err), + }} + } + + uri := a.URI + "&zone=" + marsmediaExt.ZoneID + headers := http.Header{} + headers.Add("Content-Type", "application/json;charset=utf-8") + headers.Add("Accept", "application/json") + headers.Add("x-openrtb-version", "2.5") + + if request.Device != nil { + addHeaderIfNonEmpty(headers, "User-Agent", request.Device.UA) + addHeaderIfNonEmpty(headers, "X-Forwarded-For", request.Device.IP) + addHeaderIfNonEmpty(headers, "Accept-Language", request.Device.Language) + if request.Device.DNT != nil { + addHeaderIfNonEmpty(headers, "DNT", strconv.Itoa(int(*request.Device.DNT))) + } + } + + return []*adapters.RequestData{{ + Method: "POST", + Uri: uri, + Body: reqJSON, + Headers: headers, + }}, []error{} +} + +func (a *MarsmediaAdapter) MakeBids(internalRequest *openrtb.BidRequest, externalRequest *adapters.RequestData, response *adapters.ResponseData) (*adapters.BidderResponse, []error) { + + if response.StatusCode == http.StatusNoContent { + return nil, nil + } + + if response.StatusCode == http.StatusBadRequest { + return nil, []error{&errortypes.BadInput{ + Message: fmt.Sprintf("Unexpected status code: %d. ", response.StatusCode), + }} + } + + if response.StatusCode != http.StatusOK { + return nil, []error{&errortypes.BadServerResponse{ + Message: fmt.Sprintf("Unexpected status code: %d. Run with request.debug = 1 for more info", response.StatusCode), + }} + } + + var bidResp openrtb.BidResponse + if err := json.Unmarshal(response.Body, &bidResp); err != nil { + return nil, []error{&errortypes.BadServerResponse{ + Message: fmt.Sprintf("Bad server response: %d. ", err), + }} + } + + bidResponse := adapters.NewBidderResponseWithBidsCapacity(len(bidResp.SeatBid[0].Bid)) + sb := bidResp.SeatBid[0] + for i := 0; i < len(sb.Bid); i++ { + bid := sb.Bid[i] + bidResponse.Bids = append(bidResponse.Bids, &adapters.TypedBid{ + Bid: &bid, + BidType: getMediaTypeForImp(bid.ImpID, internalRequest.Imp), + }) + } + return bidResponse, nil +} + +func addHeaderIfNonEmpty(headers http.Header, headerName string, headerValue string) { + if len(headerValue) > 0 { + headers.Add(headerName, headerValue) + } +} + +// getMediaTypeForImp figures out which media type this bid is for. +func getMediaTypeForImp(impId string, imps []openrtb.Imp) openrtb_ext.BidType { + mediaType := openrtb_ext.BidTypeBanner //default type + for _, imp := range imps { + if imp.ID == impId { + if imp.Video != nil { + mediaType = openrtb_ext.BidTypeVideo + } + return mediaType + } + } + return mediaType +} + +func NewMarsmediaBidder(endpoint string) *MarsmediaAdapter { + return &MarsmediaAdapter{ + URI: endpoint, + } +} diff --git a/adapters/marsmedia/marsmedia_test.go b/adapters/marsmedia/marsmedia_test.go new file mode 100644 index 00000000000..ce96d882608 --- /dev/null +++ b/adapters/marsmedia/marsmedia_test.go @@ -0,0 +1,11 @@ +package marsmedia + +import ( + "testing" + + "github.com/prebid/prebid-server/adapters/adapterstest" +) + +func TestJsonSamples(t *testing.T) { + adapterstest.RunJSONBidderTest(t, "marsmediatest", NewMarsmediaBidder("http://bid306.rtbsrv.com/bidder/?bid=f3xtet")) +} diff --git a/adapters/marsmedia/marsmediatest/exemplary/simple-banner.json b/adapters/marsmedia/marsmediatest/exemplary/simple-banner.json new file mode 100644 index 00000000000..17f2c038cb0 --- /dev/null +++ b/adapters/marsmedia/marsmediatest/exemplary/simple-banner.json @@ -0,0 +1,105 @@ +{ + "mockBidRequest": { + "id": "test-request-id", + "imp": [ + { + "id": "test-imp-id", + "at" : 1, + "banner": { + "format": [ + { + "w": 300, + "h": 250 + } + ] + }, + "ext": { + "bidder": { + "zone": "9999" + } + } + } + ] + }, + + "httpCalls": [ + { + "expectedRequest": { + "uri": "http://bid306.rtbsrv.com/bidder/?bid=f3xtet&zone=9999", + "body": { + "id": "test-request-id", + "at" : 1, + "imp": [ + { + "id": "test-imp-id", + "banner": { + "format": [ + { + "w": 300, + "h": 250 + } + ], + "w": 300, + "h": 250 + }, + "ext": { + "bidder": { + "zone": "9999" + } + } + } + ] + } + }, + "mockResponse": { + "status": 200, + "body": { + "id": "test-request-id", + "seatbid": [ + { + "seat": "marsmedia", + "bid": [{ + "id": "1", + "impid": "test-imp-id", + "price": 1.1, + "adid": "17586", + "adm": "some-test-ad", + "nurl" : "some-test-nurl", + "iurl" : "some-test-iurl", + "adomain": ["wooga.com"], + "cid": "17586", + "crid": "17586", + "h": 250, + "w": 300 + }] + } + ], + "bidid": "5778926625248726496", + "cur": "USD" + } + } + } + ], + + "expectedBids": [ + { + "bid": { + "id": "7706636740145184841", + "impid": "test-imp-id", + "price": 0.5, + "adm": "some-test-ad", + "adid": "29681110", + "adomain": ["yahoo.com"], + "cid": "958", + "crid": "29681110", + "h": 250, + "w": 300 + }, + "ext": { + "prebid": { + "type": "banner" + } + } + } + ] +} diff --git a/adapters/marsmedia/marsmediatest/exemplary/simple-video.json b/adapters/marsmedia/marsmediatest/exemplary/simple-video.json new file mode 100644 index 00000000000..3a636374563 --- /dev/null +++ b/adapters/marsmedia/marsmediatest/exemplary/simple-video.json @@ -0,0 +1,85 @@ +{ + "mockBidRequest": { + "id": "test-request-id", + "imp": [ + { + "id": "test-imp-id", + "video": { + "mimes": ["video/mp4"], + "protocols": [2, 5], + "w": 1024, + "h": 576 + }, + "ext":{ + "bidder":{ + "zone": "9999" + } + } + } + ] + }, + + "httpCalls": [ + { + "expectedRequest": { + "uri": "http://bid306.rtbsrv.com/bidder/?bid=f3xtet&zone=9999", + "body": { + "id": "test-request-id", + "at":1, + "imp": [ + { + "id": "test-imp-id", + "video": { + "mimes": ["video/mp4"], + "protocols": [2, 5], + "w": 1024, + "h": 576 + }, + "ext": { + "bidder": { + "zone": "9999" + } + } + } + ] + } + }, + "mockResponse": { + "status": 200, + "body": { + "id": "test-request-id", + "cur": "USD", + "seatbid": [ + { + "seat": "Marsmedia", + "bid": [{ + "id": "8ee514f1-b2b8-4abb-89fd-084437d1e800", + "impid": "test-imp-id", + "price": 0.500000, + "adm": "some-test-ad", + "crid": "crid_10", + "w": 1024, + "h": 576 + }] + } + ] + } + } + } + ], + + "expectedBids": [ + { + "bid": { + "id": "8ee514f1-b2b8-4abb-89fd-084437d1e800", + "impid": "test-imp-id", + "price": 0.5, + "adm": "some-test-ad", + "crid": "crid_10", + "w": 1024, + "h": 576 + }, + "type": "video" + } + ] +} diff --git a/adapters/marsmedia/marsmediatest/exemplary/valid-extension.json b/adapters/marsmedia/marsmediatest/exemplary/valid-extension.json new file mode 100644 index 00000000000..38bacb19d6b --- /dev/null +++ b/adapters/marsmedia/marsmediatest/exemplary/valid-extension.json @@ -0,0 +1,85 @@ +{ + "mockBidRequest": { + "id": "test-request-id", + "imp": [ + { + "id": "test-imp-id", + "video": { + "mimes": ["video/mp4"], + "protocols": [2, 5], + "w": 1024, + "h": 576 + }, + "ext":{ + "bidder":{ + "zone": "9999" + } + } + } + ] + }, + + "httpCalls": [ + { + "expectedRequest": { + "uri": "http://bid306.rtbsrv.com/bidder/?bid=f3xtet&zone=9999", + "body": { + "id": "test-request-id", + "at":1, + "imp": [ + { + "id": "test-imp-id", + "video": { + "mimes": ["video/mp4"], + "protocols": [2, 5], + "w": 1024, + "h": 576 + }, + "ext": { + "bidder": { + "zone": "9999" + } + } + } + ] + } + }, + "mockResponse": { + "status": 200, + "body": { + "id": "test-request-id", + "cur": "USD", + "seatbid": [ + { + "seat": "Marsmedia", + "bid": [{ + "id": "8ee514f1-b2b8-4abb-89fd-084437d1e800", + "impid": "test-imp-id", + "price": 0.500000, + "adm": "some-test-ad", + "crid": "crid_10", + "w": 1024, + "h": 576 + }] + } + ] + } + } + } + ], + + "expectedBids": [ + { + "bid": { + "id": "8ee514f1-b2b8-4abb-89fd-084437d1e800", + "impid": "test-imp-id", + "price": 0.5, + "adm": "some-test-ad", + "crid": "crid_10", + "w": 1024, + "h": 576 + }, + "type": "video" + } + ] +} diff --git a/adapters/marsmedia/marsmediatest/params/race/banner.json b/adapters/marsmedia/marsmediatest/params/race/banner.json new file mode 100644 index 00000000000..3a7279576be --- /dev/null +++ b/adapters/marsmedia/marsmediatest/params/race/banner.json @@ -0,0 +1,3 @@ +{ + "zone": "9999" +} diff --git a/adapters/marsmedia/marsmediatest/params/race/video.json b/adapters/marsmedia/marsmediatest/params/race/video.json new file mode 100644 index 00000000000..3a7279576be --- /dev/null +++ b/adapters/marsmedia/marsmediatest/params/race/video.json @@ -0,0 +1,3 @@ +{ + "zone": "9999" +} diff --git a/adapters/marsmedia/marsmediatest/supplemental/invalid-extension.json b/adapters/marsmedia/marsmediatest/supplemental/invalid-extension.json new file mode 100644 index 00000000000..4ee31fe4cbf --- /dev/null +++ b/adapters/marsmedia/marsmediatest/supplemental/invalid-extension.json @@ -0,0 +1,31 @@ +{ + "mockBidRequest": { + "id": "test-request-id", + "imp": [ + { + "id": "test-invalid-ext-id", + "banner": { + "format": [ + { + "w": 300, + "h": 250 + }, + { + "w": 300, + "h": 600 + } + ] + }, + "ext": { + } + + } + ] + }, + "expectedMakeRequestsErrors": [ + { + "value": "ext.bidder.zone not provided", + "comparison": "literal" + } + ] +} diff --git a/adapters/marsmedia/marsmediatest/supplemental/invalid-imp.json b/adapters/marsmedia/marsmediatest/supplemental/invalid-imp.json new file mode 100644 index 00000000000..641066d719f --- /dev/null +++ b/adapters/marsmedia/marsmediatest/supplemental/invalid-imp.json @@ -0,0 +1,16 @@ +{ + "mockBidRequest": { + "id": "test-request-id", + "ext": { + "bidder": { + "zone": "9999" + } + } + }, + "expectedMakeRequestsErrors": [ + { + "value": "No impression in the bid request", + "comparison": "literal" + } + ] +} diff --git a/adapters/marsmedia/marsmediatest/supplemental/missing-extension.json b/adapters/marsmedia/marsmediatest/supplemental/missing-extension.json new file mode 100644 index 00000000000..82ec775da30 --- /dev/null +++ b/adapters/marsmedia/marsmediatest/supplemental/missing-extension.json @@ -0,0 +1,22 @@ +{ + "mockBidRequest": { + "id": "test-request-id", + "imp": [ + { + "id": "test-missing-ext-id", + "video": { + "mimes": ["video/mp4"], + "protocols": [2, 5], + "w": 1024, + "h": 576 + } + } + ] + }, + "expectedMakeRequestsErrors": [ + { + "value": "ext.bidder not provided", + "comparison": "literal" + } + ] +} \ No newline at end of file diff --git a/adapters/marsmedia/marsmediatest/supplemental/missing-param.json b/adapters/marsmedia/marsmediatest/supplemental/missing-param.json new file mode 100644 index 00000000000..70117f3bcd0 --- /dev/null +++ b/adapters/marsmedia/marsmediatest/supplemental/missing-param.json @@ -0,0 +1,34 @@ +{ + "mockBidRequest": { + "id": "test-request-id", + "imp": [ + { + "id": "test-missing-req-param-id", + "banner": { + "format": [ + { + "w": 300, + "h": 250 + }, + { + "w": 300, + "h": 600 + } + ] + }, + "ext": { + "bidder": { + "zone":"" + } + } + + } + ] + }, + "expectedMakeRequestsErrors": [ + { + "value": "Zone is empty", + "comparison": "literal" + } + ] +} diff --git a/adapters/marsmedia/params_test.go b/adapters/marsmedia/params_test.go new file mode 100644 index 00000000000..43cd49c2ed3 --- /dev/null +++ b/adapters/marsmedia/params_test.go @@ -0,0 +1,59 @@ +package marsmedia + +import ( + "encoding/json" + "testing" + + "github.com/prebid/prebid-server/openrtb_ext" +) + +// This file actually intends to test static/bidder-params/marsmedia.json +// +// These also validate the format of the external API: request.imp[i].ext.marsmedia + +// TestValidParams makes sure that the Marsmedia schema accepts all imp.ext fields which we intend to support. +func TestValidParams(t *testing.T) { + validator, err := openrtb_ext.NewBidderParamsValidator("../../static/bidder-params") + if err != nil { + t.Fatalf("Failed to fetch the json-schemas. %v", err) + } + + for _, validParam := range validParams { + if err := validator.Validate(openrtb_ext.BidderMarsmedia, json.RawMessage(validParam)); err != nil { + t.Errorf("Schema rejected Marsmedia params: %s", validParam) + } + } +} + +// TestInvalidParams makes sure that the Marsmedia schema rejects all the imp.ext fields we don't support. +func TestInvalidParams(t *testing.T) { + validator, err := openrtb_ext.NewBidderParamsValidator("../../static/bidder-params") + if err != nil { + t.Fatalf("Failed to fetch the json-schemas. %v", err) + } + + for _, invalidParam := range invalidParams { + if err := validator.Validate(openrtb_ext.BidderMarsmedia, json.RawMessage(invalidParam)); err == nil { + t.Errorf("Schema allowed unexpected params: %s", invalidParam) + } + } +} + +var validParams = []string{ + `{"zone": "9999"}`, +} + +var invalidParams = []string{ + `{"zone": 100}`, + `{"headerbidding": false}`, + `{"zone": true}`, + `{"zoneId": 123, "headerbidding": true}`, + `{"zoneID": "1"}`, + ``, + `null`, + `true`, + `9`, + `1.2`, + `[]`, + `{}`, +} diff --git a/adapters/marsmedia/usersync.go b/adapters/marsmedia/usersync.go new file mode 100644 index 00000000000..50996f325ac --- /dev/null +++ b/adapters/marsmedia/usersync.go @@ -0,0 +1,12 @@ +package marsmedia + +import ( + "text/template" + + "github.com/prebid/prebid-server/adapters" + "github.com/prebid/prebid-server/usersync" +) + +func NewMarsmediaSyncer(temp *template.Template) usersync.Usersyncer { + return adapters.NewSyncer("marsmedia", 0, temp, adapters.SyncTypeRedirect) +} diff --git a/adapters/marsmedia/usersync_test.go b/adapters/marsmedia/usersync_test.go new file mode 100644 index 00000000000..0e50e2bcec9 --- /dev/null +++ b/adapters/marsmedia/usersync_test.go @@ -0,0 +1,20 @@ +package marsmedia + +import ( + "testing" + "text/template" + + "github.com/prebid/prebid-server/privacy" + "github.com/stretchr/testify/assert" +) + +func TestMarsmediaSyncer(t *testing.T) { + temp := template.Must(template.New("sync-template").Parse("http://dmp.rtbsrv.com/dmp/profiles/cm?p_id=179&gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&redirect=localhost:8000%2Fsetuid%3Fbidder%3Dmarsmedia%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24%7BUUID%7D")) + syncer := NewMarsmediaSyncer(temp) + syncInfo, err := syncer.GetUsersyncInfo(privacy.Policies{}) + assert.NoError(t, err) + assert.Equal(t, "http://dmp.rtbsrv.com/dmp/profiles/cm?p_id=179&gdpr=&gdpr_consent=&redirect=localhost:8000%2Fsetuid%3Fbidder%3Dmarsmedia%26gdpr%3D%26gdpr_consent%3D%26uid%3D%24%7BUUID%7D", syncInfo.URL) + assert.Equal(t, "redirect", syncInfo.Type) + assert.EqualValues(t, 0, syncer.GDPRVendorID()) + assert.Equal(t, false, syncInfo.SupportCORS) +} diff --git a/config/config.go b/config/config.go index a6be698191f..1c7ef66eaa7 100644 --- a/config/config.go +++ b/config/config.go @@ -509,6 +509,7 @@ func (cfg *Configuration) setDerivedDefaults() { setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderIx, "https://ssum.casalemedia.com/usermatchredir?s=184932&cb="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dix%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D") setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderLifestreet, "https://ads.lfstmedia.com/idsync/137062?synced=1&ttl=1s&rurl="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dlifestreet%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24%24visitor_cookie%24%24") setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderLockerDome, "https://lockerdome.com/usync/prebidserver?pid="+cfg.Adapters["lockerdome"].PlatformID+"&gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&redirect="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dlockerdome%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%7B%7Buid%7D%7D") + setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderMarsmedia, "https://dmp.rtbsrv.com/dmp/profiles/cm?p_id=179&gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&redirect="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dmarsmedia%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24%7BUUID%7D") setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderMgid, "https://cm.mgid.com/m?cdsp=363893&adu="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dmgid%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%7Bmuidn%7D") setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderOpenx, "https://rtb.openx.net/sync/prebid?r="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dopenx%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24%7BUID%7D") setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderPubmatic, "https://ads.pubmatic.com/AdServer/js/user_sync.html?predirect="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dpubmatic%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D") @@ -688,6 +689,7 @@ func SetupViper(v *viper.Viper, filename string) { v.SetDefault("adapters.kubient.endpoint", "http://kbntx.ch/prebid") v.SetDefault("adapters.lifestreet.endpoint", "https://prebid.s2s.lfstmedia.com/adrequest") v.SetDefault("adapters.lockerdome.endpoint", "https://lockerdome.com/ladbid/prebidserver/openrtb2") + v.SetDefault("adapters.marsmedia.endpoint", "https://bid306.rtbsrv.com/bidder/?bid=f3xtet") v.SetDefault("adapters.mgid.endpoint", "https://prebid.mgid.com/prebid/") v.SetDefault("adapters.openx.endpoint", "http://rtb.openx.net/prebid") v.SetDefault("adapters.pubmatic.endpoint", "http://hbopenbid.pubmatic.com/translator?source=prebid-server") diff --git a/exchange/adapter_map.go b/exchange/adapter_map.go index 429e885c86b..d5e205378f1 100644 --- a/exchange/adapter_map.go +++ b/exchange/adapter_map.go @@ -33,6 +33,7 @@ import ( "github.com/prebid/prebid-server/adapters/ix" "github.com/prebid/prebid-server/adapters/lifestreet" "github.com/prebid/prebid-server/adapters/lockerdome" + "github.com/prebid/prebid-server/adapters/marsmedia" "github.com/prebid/prebid-server/adapters/mgid" "github.com/prebid/prebid-server/adapters/openx" "github.com/prebid/prebid-server/adapters/pubmatic" @@ -90,6 +91,7 @@ func newAdapterMap(client *http.Client, cfg *config.Configuration, infos adapter openrtb_ext.BidderImprovedigital: improvedigital.NewImprovedigitalBidder(cfg.Adapters[string(openrtb_ext.BidderImprovedigital)].Endpoint), openrtb_ext.BidderKubient: kubient.NewKubientBidder(cfg.Adapters[string(openrtb_ext.BidderKubient)].Endpoint), openrtb_ext.BidderLockerDome: lockerdome.NewLockerDomeBidder(cfg.Adapters[string(openrtb_ext.BidderLockerDome)].Endpoint), + openrtb_ext.BidderMarsmedia: marsmedia.NewMarsmediaBidder(cfg.Adapters[string(openrtb_ext.BidderMarsmedia)].Endpoint), openrtb_ext.BidderMgid: mgid.NewMgidBidder(cfg.Adapters[string(openrtb_ext.BidderMgid)].Endpoint), openrtb_ext.BidderOpenx: openx.NewOpenxBidder(cfg.Adapters[string(openrtb_ext.BidderOpenx)].Endpoint), openrtb_ext.BidderPubmatic: pubmatic.NewPubmaticBidder(client, cfg.Adapters[string(openrtb_ext.BidderPubmatic)].Endpoint), diff --git a/openrtb_ext/bidders.go b/openrtb_ext/bidders.go index eb8fef81c33..386eb93d2f0 100644 --- a/openrtb_ext/bidders.go +++ b/openrtb_ext/bidders.go @@ -46,6 +46,7 @@ const ( BidderKubient BidderName = "kubient" BidderLifestreet BidderName = "lifestreet" BidderLockerDome BidderName = "lockerdome" + BidderMarsmedia BidderName = "marsmedia" BidderMgid BidderName = "mgid" BidderOpenx BidderName = "openx" BidderPubmatic BidderName = "pubmatic" @@ -97,6 +98,7 @@ var BidderMap = map[string]BidderName{ "kubient": BidderKubient, "lifestreet": BidderLifestreet, "lockerdome": BidderLockerDome, + "marsmedia": BidderMarsmedia, "mgid": BidderMgid, "openx": BidderOpenx, "pubmatic": BidderPubmatic, diff --git a/openrtb_ext/imp_marsmedia.go b/openrtb_ext/imp_marsmedia.go new file mode 100644 index 00000000000..39bc433d661 --- /dev/null +++ b/openrtb_ext/imp_marsmedia.go @@ -0,0 +1,6 @@ +package openrtb_ext + +// ExtImpMarsmedia defines the contract for bidrequest.imp[i].ext.marsmedia +type ExtImpMarsmedia struct { + ZoneID string `json:"zone"` +} diff --git a/static/bidder-info/marsmedia.yaml b/static/bidder-info/marsmedia.yaml new file mode 100644 index 00000000000..e0267205a27 --- /dev/null +++ b/static/bidder-info/marsmedia.yaml @@ -0,0 +1,11 @@ +maintainer: + email: "prebid@mars.media" +capabilities: + app: + mediaTypes: + - banner + - video + site: + mediaTypes: + - banner + - video diff --git a/static/bidder-params/marsmedia.json b/static/bidder-params/marsmedia.json new file mode 100644 index 00000000000..208a42e8474 --- /dev/null +++ b/static/bidder-params/marsmedia.json @@ -0,0 +1,13 @@ +{ + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "Marsmedia Adapter Params", + "description": "A schema which validates params accepted by the Marsmedia adapter", + "type": "object", + "properties": { + "zone": { + "type": "string", + "description": "Zone ID to use." + } + }, + "required": ["zone"] +} diff --git a/usersync/usersyncers/syncer.go b/usersync/usersyncers/syncer.go index 2db827cb6e7..6277993238a 100644 --- a/usersync/usersyncers/syncer.go +++ b/usersync/usersyncers/syncer.go @@ -1,10 +1,11 @@ package usersyncers import ( - "github.com/prebid/prebid-server/adapters/adpone" "strings" "text/template" + "github.com/prebid/prebid-server/adapters/adpone" + "github.com/golang/glog" ttx "github.com/prebid/prebid-server/adapters/33across" "github.com/prebid/prebid-server/adapters/adform" @@ -30,6 +31,7 @@ import ( "github.com/prebid/prebid-server/adapters/ix" "github.com/prebid/prebid-server/adapters/lifestreet" "github.com/prebid/prebid-server/adapters/lockerdome" + "github.com/prebid/prebid-server/adapters/marsmedia" "github.com/prebid/prebid-server/adapters/mgid" "github.com/prebid/prebid-server/adapters/openx" "github.com/prebid/prebid-server/adapters/pubmatic" @@ -85,6 +87,7 @@ func NewSyncerMap(cfg *config.Configuration) map[openrtb_ext.BidderName]usersync insertIntoMap(cfg, syncers, openrtb_ext.BidderIx, ix.NewIxSyncer) insertIntoMap(cfg, syncers, openrtb_ext.BidderLifestreet, lifestreet.NewLifestreetSyncer) insertIntoMap(cfg, syncers, openrtb_ext.BidderLockerDome, lockerdome.NewLockerDomeSyncer) + insertIntoMap(cfg, syncers, openrtb_ext.BidderMarsmedia, marsmedia.NewMarsmediaSyncer) insertIntoMap(cfg, syncers, openrtb_ext.BidderMgid, mgid.NewMgidSyncer) insertIntoMap(cfg, syncers, openrtb_ext.BidderOpenx, openx.NewOpenxSyncer) insertIntoMap(cfg, syncers, openrtb_ext.BidderPubmatic, pubmatic.NewPubmaticSyncer) diff --git a/usersync/usersyncers/syncer_test.go b/usersync/usersyncers/syncer_test.go index 54a59434045..7917f81cc40 100644 --- a/usersync/usersyncers/syncer_test.go +++ b/usersync/usersyncers/syncer_test.go @@ -39,6 +39,7 @@ func TestNewSyncerMap(t *testing.T) { string(openrtb_ext.BidderIx): syncConfig, string(openrtb_ext.BidderLifestreet): syncConfig, string(openrtb_ext.BidderLockerDome): syncConfig, + string(openrtb_ext.BidderMarsmedia): syncConfig, string(openrtb_ext.BidderMgid): syncConfig, string(openrtb_ext.BidderOpenx): syncConfig, string(openrtb_ext.BidderPubmatic): syncConfig, From d31c0721c65824a3e61a0b7c9b6f3ceed98c98cd Mon Sep 17 00:00:00 2001 From: Aleksei Lin Date: Sat, 4 Jan 2020 00:36:38 +0300 Subject: [PATCH 02/13] Add Applogy adapter (#1151) --- adapters/applogy/applogy.go | 160 +++++++++++++++ adapters/applogy/applogy_test.go | 11 ++ .../applogytest/exemplary/simple-banner.json | 170 ++++++++++++++++ .../applogytest/exemplary/simple-native.json | 164 ++++++++++++++++ .../applogytest/exemplary/simple-video.json | 182 ++++++++++++++++++ .../applogytest/supplemental/all-failed.json | 16 ++ .../supplemental/invalid-params.json | 133 +++++++++++++ .../applogytest/supplemental/status-204.json | 41 ++++ .../applogytest/supplemental/status-400.json | 45 +++++ .../applogytest/supplemental/status-502.json | 45 +++++ config/config.go | 1 + exchange/adapter_map.go | 2 + openrtb_ext/bidders.go | 2 + openrtb_ext/imp_applogy.go | 5 + static/bidder-info/applogy.yaml | 13 ++ static/bidder-params/applogy.json | 13 ++ usersync/usersyncers/syncer_test.go | 1 + 17 files changed, 1004 insertions(+) create mode 100644 adapters/applogy/applogy.go create mode 100644 adapters/applogy/applogy_test.go create mode 100644 adapters/applogy/applogytest/exemplary/simple-banner.json create mode 100644 adapters/applogy/applogytest/exemplary/simple-native.json create mode 100644 adapters/applogy/applogytest/exemplary/simple-video.json create mode 100644 adapters/applogy/applogytest/supplemental/all-failed.json create mode 100644 adapters/applogy/applogytest/supplemental/invalid-params.json create mode 100644 adapters/applogy/applogytest/supplemental/status-204.json create mode 100644 adapters/applogy/applogytest/supplemental/status-400.json create mode 100644 adapters/applogy/applogytest/supplemental/status-502.json create mode 100644 openrtb_ext/imp_applogy.go create mode 100644 static/bidder-info/applogy.yaml create mode 100644 static/bidder-params/applogy.json diff --git a/adapters/applogy/applogy.go b/adapters/applogy/applogy.go new file mode 100644 index 00000000000..a1215e24940 --- /dev/null +++ b/adapters/applogy/applogy.go @@ -0,0 +1,160 @@ +package applogy + +import ( + "encoding/json" + "errors" + "net/http" + "strconv" + + "github.com/mxmCherry/openrtb" + "github.com/prebid/prebid-server/adapters" + "github.com/prebid/prebid-server/errortypes" + "github.com/prebid/prebid-server/openrtb_ext" +) + +type ApplogyAdapter struct { + endpoint string +} + +func (a *ApplogyAdapter) MakeRequests(request *openrtb.BidRequest, _ *adapters.ExtraRequestInfo) ([]*adapters.RequestData, []error) { + headers := http.Header{} + headers.Add("Content-Type", "application/json;charset=utf-8") + headers.Add("Accept", "application/json") + impressions := request.Imp + result := make([]*adapters.RequestData, 0, len(impressions)) + errs := make([]error, 0, len(impressions)) + + for i, impression := range impressions { + if impression.Banner == nil && impression.Video == nil && impression.Native == nil { + errs = append(errs, &errortypes.BadInput{ + Message: "Applogy only supports banner, video or native ads", + }) + continue + } + if impression.Banner != nil { + banner := impression.Banner + if banner.W == nil || banner.H == nil || *banner.W == 0 || *banner.H == 0 { + if len(banner.Format) == 0 { + errs = append(errs, &errortypes.BadInput{ + Message: "banner size information missing", + }) + continue + } + format := banner.Format[0] + banner.W = &format.W + banner.H = &format.H + } + } + if len(impression.Ext) == 0 { + errs = append(errs, errors.New("impression extensions required")) + continue + } + var bidderExt adapters.ExtImpBidder + err := json.Unmarshal(impression.Ext, &bidderExt) + if err != nil { + errs = append(errs, err) + continue + } + if len(bidderExt.Bidder) == 0 { + errs = append(errs, errors.New("bidder required")) + continue + } + var impressionExt openrtb_ext.ExtImpApplogy + err = json.Unmarshal(bidderExt.Bidder, &impressionExt) + if err != nil { + errs = append(errs, err) + continue + } + if impressionExt.Token == "" { + errs = append(errs, errors.New("Applogy token required")) + continue + } + request.Imp = impressions[i : i+1] + body, err := json.Marshal(request) + if err != nil { + errs = append(errs, err) + continue + } + result = append(result, &adapters.RequestData{ + Method: "POST", + Uri: a.endpoint + "/" + impressionExt.Token, + Body: body, + Headers: headers, + }) + } + + request.Imp = impressions + + if len(result) == 0 { + return nil, errs + } + return result, errs +} + +func (a *ApplogyAdapter) MakeBids(request *openrtb.BidRequest, _ *adapters.RequestData, responseData *adapters.ResponseData) (*adapters.BidderResponse, []error) { + var errs []error + + switch responseData.StatusCode { + case http.StatusNoContent: + return nil, nil + case http.StatusBadRequest: + return nil, []error{&errortypes.BadInput{ + Message: "unexpected status code: " + strconv.Itoa(responseData.StatusCode), + }} + case http.StatusOK: + break + default: + return nil, []error{&errortypes.BadServerResponse{ + Message: "unexpected status code: " + strconv.Itoa(responseData.StatusCode), + }} + } + + var bidResponse openrtb.BidResponse + err := json.Unmarshal(responseData.Body, &bidResponse) + if err != nil { + return nil, []error{&errortypes.BadServerResponse{ + Message: err.Error(), + }} + } + + response := adapters.NewBidderResponseWithBidsCapacity(len(request.Imp)) + + for _, seatBid := range bidResponse.SeatBid { + for _, bid := range seatBid.Bid { + bid := bid // pin https://github.com/kyoh86/scopelint#whats-this + var bidType openrtb_ext.BidType + for _, impression := range request.Imp { + if impression.ID != bid.ImpID { + continue + } + switch { + case impression.Banner != nil: + bidType = openrtb_ext.BidTypeBanner + case impression.Video != nil: + bidType = openrtb_ext.BidTypeVideo + case impression.Native != nil: + bidType = openrtb_ext.BidTypeNative + } + break + } + if bidType == "" { + errs = append(errs, &errortypes.BadServerResponse{ + Message: "ignoring bid id=" + bid.ID + ", request doesn't contain any valid impression with id=" + bid.ImpID, + }) + continue + } + response.Bids = append(response.Bids, &adapters.TypedBid{ + Bid: &bid, + BidType: bidType, + }) + } + } + + return response, errs +} + +func NewApplogyBidder(endpoint string) *ApplogyAdapter { + return &ApplogyAdapter{ + endpoint: endpoint, + } +} diff --git a/adapters/applogy/applogy_test.go b/adapters/applogy/applogy_test.go new file mode 100644 index 00000000000..8883db5786a --- /dev/null +++ b/adapters/applogy/applogy_test.go @@ -0,0 +1,11 @@ +package applogy + +import ( + "testing" + + "github.com/prebid/prebid-server/adapters/adapterstest" +) + +func TestJsonSamples(t *testing.T) { + adapterstest.RunJSONBidderTest(t, "applogytest", NewApplogyBidder("http://example.com/prebid")) +} diff --git a/adapters/applogy/applogytest/exemplary/simple-banner.json b/adapters/applogy/applogytest/exemplary/simple-banner.json new file mode 100644 index 00000000000..a3926dea623 --- /dev/null +++ b/adapters/applogy/applogytest/exemplary/simple-banner.json @@ -0,0 +1,170 @@ +{ + "mockBidRequest": { + "id": "test-request-id", + "imp": [{ + "id": "test-impression-id-1", + "banner": { + "format": [{ + "h": 250, + "w": 300 + }] + }, + "ext": { + "bidder": { + "token": "test-token-1" + } + } + }, { + "id": "test-impression-id-2", + "banner": { + "w": 300, + "h": 250 + }, + "ext": { + "bidder": { + "token": "test-token-1" + } + } + }, { + "id": "test-impression-id-3", + "banner": { + "w": 300, + "h": 250 + }, + "ext": { + "bidder": { + "token": "test-token-2" + } + } + }] + }, + "httpCalls": [{ + "expectedRequest": { + "uri": "http://example.com/prebid/test-token-1", + "body": { + "id": "test-request-id", + "imp": [{ + "id": "test-impression-id-1", + "banner": { + "format": [{ + "h": 250, + "w": 300 + }], + "h": 250, + "w": 300 + }, + "ext": { + "bidder": { + "token": "test-token-1" + } + } + }] + } + }, + "mockResponse": { + "status": 200, + "body": { + "id": "test-response-id", + "seatbid": [{ + "bid": [{ + "id": "test-bid-id-1", + "impid": "test-impression-id-1", + "price": 1 + }] + }] + } + } + }, { + "expectedRequest": { + "uri": "http://example.com/prebid/test-token-1", + "body": { + "id": "test-request-id", + "imp": [{ + "id": "test-impression-id-2", + "banner": { + "h": 250, + "w": 300 + }, + "ext": { + "bidder": { + "token": "test-token-1" + } + } + }] + } + }, + "mockResponse": { + "status": 200, + "body": { + "id": "test-response-id-2", + "seatbid": [{ + "bid": [{ + "id": "test-bid-id-2", + "impid": "test-impression-id-2", + "price": 2 + }] + }] + } + } + }, { + "expectedRequest": { + "uri": "http://example.com/prebid/test-token-2", + "body": { + "id": "test-request-id", + "imp": [{ + "id": "test-impression-id-3", + "banner": { + "h": 250, + "w": 300 + }, + "ext": { + "bidder": { + "token": "test-token-2" + } + } + }] + } + }, + "mockResponse": { + "status": 200, + "body": { + "id": "test-response-id-3", + "seatbid": [{ + "bid": [{ + "id": "test-bid-id-3", + "impid": "test-impression-id-3", + "price": 3 + }] + }] + } + } + }], + "expectedBidResponses": [{ + "bids": [{ + "bid": { + "id": "test-bid-id-1", + "impid": "test-impression-id-1", + "price": 1 + }, + "type": "banner" + }] + }, { + "bids": [{ + "bid": { + "id": "test-bid-id-2", + "impid": "test-impression-id-2", + "price": 2 + }, + "type": "banner" + }] + }, { + "bids": [{ + "bid": { + "id": "test-bid-id-3", + "impid": "test-impression-id-3", + "price": 3 + }, + "type": "banner" + }] + }] +} diff --git a/adapters/applogy/applogytest/exemplary/simple-native.json b/adapters/applogy/applogytest/exemplary/simple-native.json new file mode 100644 index 00000000000..84565ec5575 --- /dev/null +++ b/adapters/applogy/applogytest/exemplary/simple-native.json @@ -0,0 +1,164 @@ +{ + "mockBidRequest": { + "id": "test-request-id", + "imp": [{ + "id": "test-impression-id-1", + "native": { + "request": "{\"ver\":\"1.1\",\"context\":1,\"contextsubtype\":11,\"plcmttype\":4,\"plcmtcnt\":1,\"assets\":[{\"id\":1,\"required\":1,\"title\":{\"len\":500}},{\"id\":2,\"required\":1,\"img\":{\"type\":3,\"wmin\":1,\"hmin\":1}},{\"id\":3,\"required\":0,\"data\":{\"type\":1,\"len\":200}},{\"id\":4,\"required\":0,\"data\":{\"type\":2,\"len\":15000}},{\"id\":5,\"required\":0,\"data\":{\"type\":6,\"len\":40}},{\"id\":6,\"required\":0,\"data\":{\"type\":500}}]}", + "ver": "1.1" + }, + "ext": { + "bidder": { + "token": "test-token-1" + } + } + }, { + "id": "test-impression-id-2", + "native": { + "request": "{\"ver\":\"1.1\",\"context\":1,\"contextsubtype\":11,\"plcmttype\":4,\"plcmtcnt\":1,\"assets\":[{\"id\":1,\"required\":1,\"title\":{\"len\":500}},{\"id\":2,\"required\":1,\"img\":{\"type\":3,\"wmin\":1,\"hmin\":1}},{\"id\":3,\"required\":0,\"data\":{\"type\":1,\"len\":200}},{\"id\":4,\"required\":0,\"data\":{\"type\":2,\"len\":15000}},{\"id\":5,\"required\":0,\"data\":{\"type\":6,\"len\":40}},{\"id\":6,\"required\":0,\"data\":{\"type\":500}}]}", + "ver": "1.1" + }, + "ext": { + "bidder": { + "token": "test-token-1" + } + } + }, { + "id": "test-impression-id-3", + "native": { + "request": "{\"ver\":\"1.1\",\"context\":1,\"contextsubtype\":11,\"plcmttype\":4,\"plcmtcnt\":1,\"assets\":[{\"id\":1,\"required\":1,\"title\":{\"len\":500}},{\"id\":2,\"required\":1,\"img\":{\"type\":3,\"wmin\":1,\"hmin\":1}},{\"id\":3,\"required\":0,\"data\":{\"type\":1,\"len\":200}},{\"id\":4,\"required\":0,\"data\":{\"type\":2,\"len\":15000}},{\"id\":5,\"required\":0,\"data\":{\"type\":6,\"len\":40}},{\"id\":6,\"required\":0,\"data\":{\"type\":500}}]}", + "ver": "1.1" + }, + "ext": { + "bidder": { + "token": "test-token-2" + } + } + }] + }, + "httpCalls": [{ + "expectedRequest": { + "uri": "http://example.com/prebid/test-token-1", + "body": { + "id": "test-request-id", + "imp": [{ + "id": "test-impression-id-1", + "native": { + "request": "{\"ver\":\"1.1\",\"context\":1,\"contextsubtype\":11,\"plcmttype\":4,\"plcmtcnt\":1,\"assets\":[{\"id\":1,\"required\":1,\"title\":{\"len\":500}},{\"id\":2,\"required\":1,\"img\":{\"type\":3,\"wmin\":1,\"hmin\":1}},{\"id\":3,\"required\":0,\"data\":{\"type\":1,\"len\":200}},{\"id\":4,\"required\":0,\"data\":{\"type\":2,\"len\":15000}},{\"id\":5,\"required\":0,\"data\":{\"type\":6,\"len\":40}},{\"id\":6,\"required\":0,\"data\":{\"type\":500}}]}", + "ver": "1.1" + }, + "ext": { + "bidder": { + "token": "test-token-1" + } + } + }] + } + }, + "mockResponse": { + "status": 200, + "body": { + "id": "test-response-id", + "seatbid": [{ + "bid": [{ + "id": "test-bid-id-1", + "impid": "test-impression-id-1", + "price": 1 + }] + }] + } + } + }, { + "expectedRequest": { + "uri": "http://example.com/prebid/test-token-1", + "body": { + "id": "test-request-id", + "imp": [{ + "id": "test-impression-id-2", + "native": { + "request": "{\"ver\":\"1.1\",\"context\":1,\"contextsubtype\":11,\"plcmttype\":4,\"plcmtcnt\":1,\"assets\":[{\"id\":1,\"required\":1,\"title\":{\"len\":500}},{\"id\":2,\"required\":1,\"img\":{\"type\":3,\"wmin\":1,\"hmin\":1}},{\"id\":3,\"required\":0,\"data\":{\"type\":1,\"len\":200}},{\"id\":4,\"required\":0,\"data\":{\"type\":2,\"len\":15000}},{\"id\":5,\"required\":0,\"data\":{\"type\":6,\"len\":40}},{\"id\":6,\"required\":0,\"data\":{\"type\":500}}]}", + "ver": "1.1" + }, + "ext": { + "bidder": { + "token": "test-token-1" + } + } + }] + } + }, + "mockResponse": { + "status": 200, + "body": { + "id": "test-response-id-2", + "seatbid": [{ + "bid": [{ + "id": "test-bid-id-2", + "impid": "test-impression-id-2", + "price": 2 + }] + }] + } + } + }, { + "expectedRequest": { + "uri": "http://example.com/prebid/test-token-2", + "body": { + "id": "test-request-id", + "imp": [{ + "id": "test-impression-id-3", + "native": { + "request": "{\"ver\":\"1.1\",\"context\":1,\"contextsubtype\":11,\"plcmttype\":4,\"plcmtcnt\":1,\"assets\":[{\"id\":1,\"required\":1,\"title\":{\"len\":500}},{\"id\":2,\"required\":1,\"img\":{\"type\":3,\"wmin\":1,\"hmin\":1}},{\"id\":3,\"required\":0,\"data\":{\"type\":1,\"len\":200}},{\"id\":4,\"required\":0,\"data\":{\"type\":2,\"len\":15000}},{\"id\":5,\"required\":0,\"data\":{\"type\":6,\"len\":40}},{\"id\":6,\"required\":0,\"data\":{\"type\":500}}]}", + "ver": "1.1" + }, + "ext": { + "bidder": { + "token": "test-token-2" + } + } + }] + } + }, + "mockResponse": { + "status": 200, + "body": { + "id": "test-response-id-3", + "seatbid": [{ + "bid": [{ + "id": "test-bid-id-3", + "impid": "test-impression-id-3", + "price": 3 + }] + }] + } + } + }], + "expectedBidResponses": [{ + "bids": [{ + "bid": { + "id": "test-bid-id-1", + "impid": "test-impression-id-1", + "price": 1 + }, + "type": "native" + }] + }, { + "bids": [{ + "bid": { + "id": "test-bid-id-2", + "impid": "test-impression-id-2", + "price": 2 + }, + "type": "native" + }] + }, { + "bids": [{ + "bid": { + "id": "test-bid-id-3", + "impid": "test-impression-id-3", + "price": 3 + }, + "type": "native" + }] + }] +} diff --git a/adapters/applogy/applogytest/exemplary/simple-video.json b/adapters/applogy/applogytest/exemplary/simple-video.json new file mode 100644 index 00000000000..30237cccd10 --- /dev/null +++ b/adapters/applogy/applogytest/exemplary/simple-video.json @@ -0,0 +1,182 @@ +{ + "mockBidRequest": { + "id": "test-request-id", + "imp": [{ + "id": "test-impression-id-1", + "video": { + "w": 900, + "h": 250, + "mimes": [ + "video/mp4" + ] + }, + "ext": { + "bidder": { + "token": "test-token-1" + } + } + }, { + "id": "test-impression-id-2", + "video": { + "w": 900, + "h": 250, + "mimes": [ + "video/mp4" + ] + }, + "ext": { + "bidder": { + "token": "test-token-1" + } + } + }, { + "id": "test-impression-id-3", + "video": { + "w": 900, + "h": 250, + "mimes": [ + "video/mp4" + ] + }, + "ext": { + "bidder": { + "token": "test-token-2" + } + } + }] + }, + "httpCalls": [{ + "expectedRequest": { + "uri": "http://example.com/prebid/test-token-1", + "body": { + "id": "test-request-id", + "imp": [{ + "id": "test-impression-id-1", + "video": { + "w": 900, + "h": 250, + "mimes": [ + "video/mp4" + ] + }, + "ext": { + "bidder": { + "token": "test-token-1" + } + } + }] + } + }, + "mockResponse": { + "status": 200, + "body": { + "id": "test-response-id", + "seatbid": [{ + "bid": [{ + "id": "test-bid-id-1", + "impid": "test-impression-id-1", + "price": 1 + }] + }] + } + } + }, { + "expectedRequest": { + "uri": "http://example.com/prebid/test-token-1", + "body": { + "id": "test-request-id", + "imp": [{ + "id": "test-impression-id-2", + "video": { + "w": 900, + "h": 250, + "mimes": [ + "video/mp4" + ] + }, + "ext": { + "bidder": { + "token": "test-token-1" + } + } + }] + } + }, + "mockResponse": { + "status": 200, + "body": { + "id": "test-response-id-2", + "seatbid": [{ + "bid": [{ + "id": "test-bid-id-2", + "impid": "test-impression-id-2", + "price": 2 + }] + }] + } + } + }, { + "expectedRequest": { + "uri": "http://example.com/prebid/test-token-2", + "body": { + "id": "test-request-id", + "imp": [{ + "id": "test-impression-id-3", + "video": { + "w": 900, + "h": 250, + "mimes": [ + "video/mp4" + ] + }, + "ext": { + "bidder": { + "token": "test-token-2" + } + } + }] + } + }, + "mockResponse": { + "status": 200, + "body": { + "id": "test-response-id-3", + "seatbid": [{ + "bid": [{ + "id": "test-bid-id-3", + "impid": "test-impression-id-3", + "price": 3 + }] + }] + } + } + }], + "expectedBidResponses": [{ + "bids": [{ + "bid": { + "id": "test-bid-id-1", + "impid": "test-impression-id-1", + "price": 1 + }, + "type": "video" + }] + }, { + "bids": [{ + "bid": { + "id": "test-bid-id-2", + "impid": "test-impression-id-2", + "price": 2 + }, + "type": "video" + }] + }, { + "bids": [{ + "bid": { + "id": "test-bid-id-3", + "impid": "test-impression-id-3", + "price": 3 + }, + "type": "video" + }] + }] +} diff --git a/adapters/applogy/applogytest/supplemental/all-failed.json b/adapters/applogy/applogytest/supplemental/all-failed.json new file mode 100644 index 00000000000..7f0244afcfb --- /dev/null +++ b/adapters/applogy/applogytest/supplemental/all-failed.json @@ -0,0 +1,16 @@ +{ + "mockBidRequest": { + "id": "test-request-id", + "imp": [{ + "id": "test-impression-id-1", + "banner": { + "w": 300, + "h": 250 + } + }] + }, + "expectedMakeRequestsErrors": [{ + "value": "impression extensions required", + "comparison": "literal" + }] +} diff --git a/adapters/applogy/applogytest/supplemental/invalid-params.json b/adapters/applogy/applogytest/supplemental/invalid-params.json new file mode 100644 index 00000000000..6b5d5e3224d --- /dev/null +++ b/adapters/applogy/applogytest/supplemental/invalid-params.json @@ -0,0 +1,133 @@ +{ + "mockBidRequest": { + "id": "test-request-id", + "imp": [{ + "id": "test-impression-id-1", + "banner": {} + }, { + "id": "test-impression-id-2", + "banner": { + "w": 300, + "h": 250 + } + }, { + "id": "test-impression-id-3", + "banner": { + "w": 300, + "h": 250 + }, + "ext": {} + }, { + "id": "test-impression-id-4" + }, { + "id": "test-impression-id-5", + "banner": { + "w": 300, + "h": 250 + }, + "ext": { + "bidder": { + "token": "test-token-5" + } + } + }, { + "id": "test-impression-id-0", + "banner": { + "w": 300, + "h": 250 + }, + "ext": { + "bidder": "invalid bidder" + } + }, { + "id": "test-impression-id-0", + "banner": { + "w": 300, + "h": 250 + }, + "ext": { + "bidder": {} + } + }, { + "id": "test-impression-id-0", + "banner": { + "w": 300, + "h": 250 + }, + "ext": "invalid ext" + }] + }, + "httpCalls": [{ + "expectedRequest": { + "uri": "http://example.com/prebid/test-token-5", + "body": { + "id": "test-request-id", + "imp": [{ + "id": "test-impression-id-5", + "banner": { + "h": 250, + "w": 300 + }, + "ext": { + "bidder": { + "token": "test-token-5" + } + } + }] + } + }, + "mockResponse": { + "status": 200, + "body": { + "id": "test-response-id", + "seatbid": [{ + "bid": [{ + "id": "test-bid-id-5", + "impid": "test-impression-id-5", + "price": 5 + }, { + "id": "test-bid-id-6", + "impid": "test-impression-id-6", + "price": 6 + }] + }] + } + } + }], + "expectedBidResponses": [{ + "bids": [{ + "bid": { + "id": "test-bid-id-5", + "impid": "test-impression-id-5", + "price": 5 + }, + "type": "banner" + }] + }], + "expectedMakeRequestsErrors": [{ + "value": "banner size information missing", + "comparison": "literal" + }, { + "value": "impression extensions required", + "comparison": "literal" + }, { + "value": "bidder required", + "comparison": "literal" + }, { + "value": "Applogy only supports banner, video or native ads", + "comparison": "literal" + }, { + "value": "json: cannot unmarshal string into Go value of type openrtb_ext.ExtImpApplogy", + "comparison": "literal" + }, { + "value": "Applogy token required", + "comparison": "literal" + }, { + "value": "json: cannot unmarshal string into Go value of type adapters.ExtImpBidder", + "comparison": "literal" + }], + "expectedMakeBidsErrors": [{ + "value": "ignoring bid id=test-bid-id-6, request doesn't contain any valid impression with id=test-impression-id-6", + "comparison": "literal" + }] +} diff --git a/adapters/applogy/applogytest/supplemental/status-204.json b/adapters/applogy/applogytest/supplemental/status-204.json new file mode 100644 index 00000000000..c3516b184b5 --- /dev/null +++ b/adapters/applogy/applogytest/supplemental/status-204.json @@ -0,0 +1,41 @@ +{ + "mockBidRequest": { + "id": "test-request-id", + "imp": [{ + "id": "test-impression-id-1", + "banner": { + "w": 300, + "h": 250 + }, + "ext": { + "bidder": { + "token": "test-token-1" + } + } + }] + }, + "httpCalls": [{ + "expectedRequest": { + "uri": "http://example.com/prebid/test-token-1", + "body": { + "id": "test-request-id", + "imp": [{ + "id": "test-impression-id-1", + "banner": { + "h": 250, + "w": 300 + }, + "ext": { + "bidder": { + "token": "test-token-1" + } + } + }] + } + }, + "mockResponse": { + "status": 204, + "body": {} + } + }] +} diff --git a/adapters/applogy/applogytest/supplemental/status-400.json b/adapters/applogy/applogytest/supplemental/status-400.json new file mode 100644 index 00000000000..95e271bae8e --- /dev/null +++ b/adapters/applogy/applogytest/supplemental/status-400.json @@ -0,0 +1,45 @@ +{ + "mockBidRequest": { + "id": "test-request-id", + "imp": [{ + "id": "test-impression-id-1", + "banner": { + "w": 300, + "h": 250 + }, + "ext": { + "bidder": { + "token": "test-token-1" + } + } + }] + }, + "httpCalls": [{ + "expectedRequest": { + "uri": "http://example.com/prebid/test-token-1", + "body": { + "id": "test-request-id", + "imp": [{ + "id": "test-impression-id-1", + "banner": { + "h": 250, + "w": 300 + }, + "ext": { + "bidder": { + "token": "test-token-1" + } + } + }] + } + }, + "mockResponse": { + "status": 400, + "body": {} + } + }], + "expectedMakeBidsErrors": [{ + "value": "unexpected status code: 400", + "comparison": "literal" + }] +} diff --git a/adapters/applogy/applogytest/supplemental/status-502.json b/adapters/applogy/applogytest/supplemental/status-502.json new file mode 100644 index 00000000000..c0b1641653a --- /dev/null +++ b/adapters/applogy/applogytest/supplemental/status-502.json @@ -0,0 +1,45 @@ +{ + "mockBidRequest": { + "id": "test-request-id", + "imp": [{ + "id": "test-impression-id-1", + "banner": { + "w": 300, + "h": 250 + }, + "ext": { + "bidder": { + "token": "test-token-1" + } + } + }] + }, + "httpCalls": [{ + "expectedRequest": { + "uri": "http://example.com/prebid/test-token-1", + "body": { + "id": "test-request-id", + "imp": [{ + "id": "test-impression-id-1", + "banner": { + "h": 250, + "w": 300 + }, + "ext": { + "bidder": { + "token": "test-token-1" + } + } + }] + } + }, + "mockResponse": { + "status": 502, + "body": {} + } + }], + "expectedMakeBidsErrors": [{ + "value": "unexpected status code: 502", + "comparison": "literal" + }] +} diff --git a/config/config.go b/config/config.go index 1c7ef66eaa7..59f41e9131f 100644 --- a/config/config.go +++ b/config/config.go @@ -670,6 +670,7 @@ func SetupViper(v *viper.Viper, filename string) { v.SetDefault("adapters.adpone.endpoint", "http://rtb.adpone.com/bid-request?src=prebid_server") v.SetDefault("adapters.adtelligent.endpoint", "http://hb.adtelligent.com/auction") v.SetDefault("adapters.advangelists.endpoint", "http://nep.advangelists.com/xp/get?pubid={{.PublisherID}}") + v.SetDefault("adapters.applogy.endpoint", "http://rtb.applogy.com/v1/prebid") v.SetDefault("adapters.appnexus.endpoint", "http://ib.adnxs.com/openrtb2") // Docs: https://wiki.appnexus.com/display/supply/Incoming+Bid+Request+from+SSPs v.SetDefault("adapters.appnexus.platform_id", "5") v.SetDefault("adapters.beachfront.endpoint", "https://display.bfmio.com/prebid_display") diff --git a/exchange/adapter_map.go b/exchange/adapter_map.go index d5e205378f1..30a31727d6b 100644 --- a/exchange/adapter_map.go +++ b/exchange/adapter_map.go @@ -15,6 +15,7 @@ import ( "github.com/prebid/prebid-server/adapters/adpone" "github.com/prebid/prebid-server/adapters/adtelligent" "github.com/prebid/prebid-server/adapters/advangelists" + "github.com/prebid/prebid-server/adapters/applogy" "github.com/prebid/prebid-server/adapters/appnexus" "github.com/prebid/prebid-server/adapters/audienceNetwork" "github.com/prebid/prebid-server/adapters/beachfront" @@ -71,6 +72,7 @@ func newAdapterMap(client *http.Client, cfg *config.Configuration, infos adapter openrtb_ext.BidderAdpone: adpone.NewAdponeBidder(cfg.Adapters[string(openrtb_ext.BidderAdpone)].Endpoint), openrtb_ext.BidderAdtelligent: adtelligent.NewAdtelligentBidder(cfg.Adapters[string(openrtb_ext.BidderAdtelligent)].Endpoint), openrtb_ext.BidderAdvangelists: advangelists.NewAdvangelistsBidder(cfg.Adapters[string(openrtb_ext.BidderAdvangelists)].Endpoint), + openrtb_ext.BidderApplogy: applogy.NewApplogyBidder(cfg.Adapters[string(openrtb_ext.BidderApplogy)].Endpoint), openrtb_ext.BidderAppnexus: appnexus.NewAppNexusBidder(client, cfg.Adapters[string(openrtb_ext.BidderAppnexus)].Endpoint, cfg.Adapters[string(openrtb_ext.BidderAppnexus)].PlatformID), // TODO #615: Update the config setup so that the Beachfront URLs can be configured, and use those in TestRaceIntegration in exchange_test.go openrtb_ext.BidderBeachfront: beachfront.NewBeachfrontBidder(), diff --git a/openrtb_ext/bidders.go b/openrtb_ext/bidders.go index 386eb93d2f0..9621b23dc81 100644 --- a/openrtb_ext/bidders.go +++ b/openrtb_ext/bidders.go @@ -27,6 +27,7 @@ const ( BidderAdpone BidderName = "adpone" BidderAdtelligent BidderName = "adtelligent" BidderAdvangelists BidderName = "advangelists" + BidderApplogy BidderName = "applogy" BidderAppnexus BidderName = "appnexus" BidderBeachfront BidderName = "beachfront" BidderBrightroll BidderName = "brightroll" @@ -79,6 +80,7 @@ var BidderMap = map[string]BidderName{ "adpone": BidderAdpone, "adtelligent": BidderAdtelligent, "advangelists": BidderAdvangelists, + "applogy": BidderApplogy, "appnexus": BidderAppnexus, "beachfront": BidderBeachfront, "brightroll": BidderBrightroll, diff --git a/openrtb_ext/imp_applogy.go b/openrtb_ext/imp_applogy.go new file mode 100644 index 00000000000..45774a05afb --- /dev/null +++ b/openrtb_ext/imp_applogy.go @@ -0,0 +1,5 @@ +package openrtb_ext + +type ExtImpApplogy struct { + Token string `json:"token"` +} diff --git a/static/bidder-info/applogy.yaml b/static/bidder-info/applogy.yaml new file mode 100644 index 00000000000..bb908c94e70 --- /dev/null +++ b/static/bidder-info/applogy.yaml @@ -0,0 +1,13 @@ +maintainer: + email: work@applogy.com +capabilities: + app: + mediaTypes: + - banner + - video + - native + site: + mediaTypes: + - banner + - video + - native diff --git a/static/bidder-params/applogy.json b/static/bidder-params/applogy.json new file mode 100644 index 00000000000..2650640c115 --- /dev/null +++ b/static/bidder-params/applogy.json @@ -0,0 +1,13 @@ +{ + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "Applogy Adapter Params", + "description": "A schema which validates params accepted by the Applogy adapter", + "type": "object", + "properties": { + "token": { + "type": "string", + "description": "Applogy token" + } + }, + "required": ["token"] +} diff --git a/usersync/usersyncers/syncer_test.go b/usersync/usersyncers/syncer_test.go index 7917f81cc40..dd2b5b5d1e9 100644 --- a/usersync/usersyncers/syncer_test.go +++ b/usersync/usersyncers/syncer_test.go @@ -63,6 +63,7 @@ func TestNewSyncerMap(t *testing.T) { } adaptersWithoutSyncers := map[openrtb_ext.BidderName]bool{ + openrtb_ext.BidderApplogy: true, openrtb_ext.BidderTappx: true, openrtb_ext.BidderKubient: true, openrtb_ext.BidderPubnative: true, From 9ae9adc1ec0231b70e40bdbbed772876a04d0bda Mon Sep 17 00:00:00 2001 From: Aadesh Date: Mon, 6 Jan 2020 11:42:58 -0500 Subject: [PATCH 03/13] enforce video.size_id for video imps in rubicon adapter (#1101) --- adapters/rubicon/rubicon.go | 12 +++++-- adapters/rubicon/rubicon_test.go | 5 +-- .../supplemental/required-video-size-id.json | 31 +++++++++++++++++++ 3 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 adapters/rubicon/rubicontest/supplemental/required-video-size-id.json diff --git a/adapters/rubicon/rubicon.go b/adapters/rubicon/rubicon.go index 7f8de46bcfe..e7461c48f7e 100644 --- a/adapters/rubicon/rubicon.go +++ b/adapters/rubicon/rubicon.go @@ -5,13 +5,14 @@ import ( "context" "encoding/json" "fmt" - "github.com/golang/glog" - "github.com/prebid/prebid-server/pbs" "io/ioutil" "net/http" "net/url" "strings" + "github.com/golang/glog" + "github.com/prebid/prebid-server/pbs" + "golang.org/x/net/context/ctxhttp" "github.com/mxmCherry/openrtb" @@ -685,6 +686,13 @@ func (a *RubiconAdapter) MakeRequests(request *openrtb.BidRequest, reqInfo *adap isVideo := isVideo(thisImp) if isVideo { + if rubiconExt.Video.VideoSizeID == 0 { + errs = append(errs, &errortypes.BadInput{ + Message: fmt.Sprintf("imp[%d].ext.bidder.rubicon.video.size_id must be defined for video impression", i), + }) + continue + } + videoCopy := *thisImp.Video videoExt := rubiconVideoExt{Skip: rubiconExt.Video.Skip, SkipDelay: rubiconExt.Video.SkipDelay, RP: rubiconVideoExtRP{SizeID: rubiconExt.Video.VideoSizeID}} videoCopy.Ext, err = json.Marshal(&videoExt) diff --git a/adapters/rubicon/rubicon_test.go b/adapters/rubicon/rubicon_test.go index bc3d2e8ae9e..dd9cea62bc7 100644 --- a/adapters/rubicon/rubicon_test.go +++ b/adapters/rubicon/rubicon_test.go @@ -1244,8 +1244,9 @@ func TestOpenRTBRequestWithVideoImpEvenIfImpHasBannerButAllRequiredVideoFields(t "zoneId": 8394, "siteId": 283282, "accountId": 7891, - "inventory": {"key1" : "val1"}, - "visitor": {"key2" : "val2"} + "inventory": {"key1": "val1"}, + "visitor": {"key2": "val2"}, + "video": {"size_id": 1} }}`), }}, } diff --git a/adapters/rubicon/rubicontest/supplemental/required-video-size-id.json b/adapters/rubicon/rubicontest/supplemental/required-video-size-id.json new file mode 100644 index 00000000000..cf0a594e13c --- /dev/null +++ b/adapters/rubicon/rubicontest/supplemental/required-video-size-id.json @@ -0,0 +1,31 @@ +{ + "mockBidRequest": { + "id": "test-req-id", + "imp": [ + { + "id": "test-imp-1", + "video": { + "w": 640, + "h": 480, + "linearity": 1 + }, + "ext": { + "bidder": { + "accountId": 1001, + "siteId":113932, + "zoneId":535510 + } + } + } + ], + "site": { + "page": "prebid.org" + } + }, + "expectedMakeRequestsErrors": [ + { + "value": "imp[0].ext.bidder.rubicon.video.size_id must be defined for video impression", + "comparison": "literal" + } + ] +} From e27b5b3f9a0540cfb6c4444d8be357c9731eceb1 Mon Sep 17 00:00:00 2001 From: PubMatic-OpenWrap Date: Thu, 9 Jan 2020 21:43:03 +0530 Subject: [PATCH 04/13] Updated PubMatic endpoint to use https (#1155) --- adapters/pubmatic/pubmatic_test.go | 2 +- adapters/pubmatic/pubmatictest/exemplary/simple-banner.json | 2 +- adapters/pubmatic/pubmatictest/exemplary/video.json | 2 +- adapters/pubmatic/pubmatictest/supplemental/app.json | 2 +- adapters/pubmatic/pubmatictest/supplemental/multiplemedia.json | 2 +- config/config.go | 2 +- config/config_test.go | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/adapters/pubmatic/pubmatic_test.go b/adapters/pubmatic/pubmatic_test.go index 4eb66d25430..be086f5adf1 100644 --- a/adapters/pubmatic/pubmatic_test.go +++ b/adapters/pubmatic/pubmatic_test.go @@ -23,7 +23,7 @@ import ( ) func TestJsonSamples(t *testing.T) { - adapterstest.RunJSONBidderTest(t, "pubmatictest", NewPubmaticBidder(nil, "http://hbopenbid.pubmatic.com/translator?source=prebid-server")) + adapterstest.RunJSONBidderTest(t, "pubmatictest", NewPubmaticBidder(nil, "https://hbopenbid.pubmatic.com/translator?source=prebid-server")) } // ---------------------------------------------------------------------------- diff --git a/adapters/pubmatic/pubmatictest/exemplary/simple-banner.json b/adapters/pubmatic/pubmatictest/exemplary/simple-banner.json index e669bce8826..1eb8a212bff 100644 --- a/adapters/pubmatic/pubmatictest/exemplary/simple-banner.json +++ b/adapters/pubmatic/pubmatictest/exemplary/simple-banner.json @@ -43,7 +43,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "http://hbopenbid.pubmatic.com/translator?source=prebid-server", + "uri": "https://hbopenbid.pubmatic.com/translator?source=prebid-server", "body": { "id": "test-request-id", "imp": [ diff --git a/adapters/pubmatic/pubmatictest/exemplary/video.json b/adapters/pubmatic/pubmatictest/exemplary/video.json index f9cfc2976ea..25ed366ee05 100644 --- a/adapters/pubmatic/pubmatictest/exemplary/video.json +++ b/adapters/pubmatic/pubmatictest/exemplary/video.json @@ -49,7 +49,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "http://hbopenbid.pubmatic.com/translator?source=prebid-server", + "uri": "https://hbopenbid.pubmatic.com/translator?source=prebid-server", "body": { "id": "test-video-request", "imp": [ diff --git a/adapters/pubmatic/pubmatictest/supplemental/app.json b/adapters/pubmatic/pubmatictest/supplemental/app.json index a2b737f0aa2..636433ca1f5 100644 --- a/adapters/pubmatic/pubmatictest/supplemental/app.json +++ b/adapters/pubmatic/pubmatictest/supplemental/app.json @@ -43,7 +43,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "http://hbopenbid.pubmatic.com/translator?source=prebid-server", + "uri": "https://hbopenbid.pubmatic.com/translator?source=prebid-server", "body": { "id": "app-request", "imp": [ diff --git a/adapters/pubmatic/pubmatictest/supplemental/multiplemedia.json b/adapters/pubmatic/pubmatictest/supplemental/multiplemedia.json index faf71fec1b6..a576abe6198 100644 --- a/adapters/pubmatic/pubmatictest/supplemental/multiplemedia.json +++ b/adapters/pubmatic/pubmatictest/supplemental/multiplemedia.json @@ -29,7 +29,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "http://hbopenbid.pubmatic.com/translator?source=prebid-server", + "uri": "https://hbopenbid.pubmatic.com/translator?source=prebid-server", "body": { "id": "multiple-media-request", "imp": [ diff --git a/config/config.go b/config/config.go index 59f41e9131f..d586021fd14 100644 --- a/config/config.go +++ b/config/config.go @@ -693,7 +693,7 @@ func SetupViper(v *viper.Viper, filename string) { v.SetDefault("adapters.marsmedia.endpoint", "https://bid306.rtbsrv.com/bidder/?bid=f3xtet") v.SetDefault("adapters.mgid.endpoint", "https://prebid.mgid.com/prebid/") v.SetDefault("adapters.openx.endpoint", "http://rtb.openx.net/prebid") - v.SetDefault("adapters.pubmatic.endpoint", "http://hbopenbid.pubmatic.com/translator?source=prebid-server") + v.SetDefault("adapters.pubmatic.endpoint", "https://hbopenbid.pubmatic.com/translator?source=prebid-server") v.SetDefault("adapters.pubnative.endpoint", "http://dsp.pubnative.net/bid/v1/request") v.SetDefault("adapters.pulsepoint.endpoint", "http://bid.contextweb.com/header/s/ortb/prebid-s2s") v.SetDefault("adapters.rhythmone.endpoint", "http://tag.1rx.io/rmp") diff --git a/config/config_test.go b/config/config_test.go index cd143c61a5c..24008980a86 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -27,7 +27,7 @@ func TestDefaults(t *testing.T) { cmpInts(t, "host_cookie.ttl_days", int(cfg.HostCookie.TTL), 90) cmpInts(t, "host_cookie.max_cookie_size_bytes", cfg.HostCookie.MaxCookieSizeBytes, 0) cmpStrings(t, "datacache.type", cfg.DataCache.Type, "dummy") - cmpStrings(t, "adapters.pubmatic.endpoint", cfg.Adapters[string(openrtb_ext.BidderPubmatic)].Endpoint, "http://hbopenbid.pubmatic.com/translator?source=prebid-server") + cmpStrings(t, "adapters.pubmatic.endpoint", cfg.Adapters[string(openrtb_ext.BidderPubmatic)].Endpoint, "https://hbopenbid.pubmatic.com/translator?source=prebid-server") cmpInts(t, "currency_converter.fetch_interval_seconds", cfg.CurrencyConverter.FetchIntervalSeconds, 1800) cmpStrings(t, "currency_converter.fetch_url", cfg.CurrencyConverter.FetchURL, "https://cdn.jsdelivr.net/gh/prebid/currency-file@1/latest.json") cmpBools(t, "account_required", cfg.AccountRequired, false) From eaed1c99ec9a57a8755773dee8bcf96c83b05731 Mon Sep 17 00:00:00 2001 From: Scott Kay Date: Thu, 9 Jan 2020 16:27:07 -0500 Subject: [PATCH 05/13] Update Example AppNexus Placement ID (#1160) --- .../adtelligenttest/supplemental/audio.json | 2 +- .../adtelligenttest/supplemental/native.json | 2 +- .../exemplary/simple-auction.json | 4 ++-- .../appnexusplatformtest/video/simple-video.json | 4 ++-- .../appnexus/appnexustest/amp/simple-banner.json | 4 ++-- adapters/appnexus/appnexustest/amp/simple-video.json | 4 ++-- .../appnexustest/exemplary/simple-banner.json | 4 ++-- .../appnexustest/exemplary/simple-video.json | 4 ++-- .../exemplary/video-invalid-category.json | 4 ++-- .../appnexus/appnexustest/params/race/banner.json | 2 +- .../appnexus/appnexustest/params/race/video.json | 2 +- .../supplemental/displaymanager-test.json | 4 ++-- .../supplemental/explicit-dimensions.json | 4 ++-- .../appnexustest/supplemental/multi-bid.json | 4 ++-- docs/developers/stored-requests.md | 4 ++-- endpoints/openrtb2/amp_auction_test.go | 2 +- endpoints/openrtb2/auction_benchmark_test.go | 4 ++-- endpoints/openrtb2/auction_test.go | 4 ++-- endpoints/openrtb2/interstitial_test.go | 2 +- .../sample-requests/account-required/no-acct.json | 2 +- .../sample-requests/account-required/with-acct.json | 2 +- .../openrtb2/sample-requests/aliased/simple.json | 2 +- endpoints/openrtb2/sample-requests/aliased/site.json | 4 ++-- .../blacklisted/blacklisted-acct.json | 2 +- .../sample-requests/blacklisted/blacklisted-app.json | 2 +- .../sample-requests/disabled/bad/bad-alias.json | 2 +- .../sample-requests/disabled/bad/bad-bidder.json | 2 +- .../sample-requests/disabled/good/partial.json | 2 +- .../invalid-stored/bad_incoming_1.json | 2 +- .../invalid-stored/bad_incoming_2.json | 2 +- .../invalid-whole/alias-bidder-self.json | 2 +- .../invalid-whole/alias-unknown-core.json | 2 +- .../sample-requests/invalid-whole/app-bad-ext.json | 2 +- .../sample-requests/invalid-whole/banner-h-only.json | 2 +- .../sample-requests/invalid-whole/banner-h-zero.json | 2 +- .../sample-requests/invalid-whole/banner-w-only.json | 2 +- .../sample-requests/invalid-whole/banner-w-zero.json | 2 +- .../invalid-whole/bid-adjustment-invalid-bidder.json | 2 +- .../invalid-whole/bid-adjustment-negative.json | 2 +- .../sample-requests/invalid-whole/cache-nothing.json | 2 +- .../sample-requests/invalid-whole/digitrust.json | 2 +- .../invalid-whole/format-empty-array.json | 2 +- .../invalid-whole/imp-id-duplicates.json | 2 +- .../invalid-whole/interstital-bad-perc.json | 2 +- .../invalid-whole/interstitial-empty.json | 2 +- .../invalid-whole/no-site-or-app.json | 2 +- .../invalid-whole/regs-ext-gdpr-invalid.json | 2 +- .../invalid-whole/regs-ext-gdpr-string.json | 2 +- .../invalid-whole/regs-ext-malformed.json | 2 +- .../sample-requests/invalid-whole/site-app-both.json | 2 +- .../sample-requests/invalid-whole/site-empty.json | 2 +- .../sample-requests/invalid-whole/site-ext-amp.json | 2 +- .../invalid-whole/storedrequest-id-int.json | 2 +- .../invalid-whole/unknown-bidder.json | 2 +- .../invalid-whole/user-ext-consent-int.json | 2 +- .../invalid-whole/user-ext-eids-eids-uids-empty.json | 2 +- .../invalid-whole/user-ext-eids-empty.json | 2 +- .../invalid-whole/user-ext-eids-id-uids-empty.json | 2 +- .../invalid-whole/user-ext-eids-source-empty.json | 2 +- .../invalid-whole/user-ext-eids-source-unique.json | 2 +- .../invalid-whole/user-ext-eids-uids-id-empty.json | 2 +- .../user-ext-prebid-buyeruids-empty.json | 2 +- .../user-ext-prebid-buyeruids-unknown.json | 2 +- .../invalid-whole/user-ext-prebid-empty.json | 2 +- .../invalid-whole/user-gdpr-badtype.json | 2 +- .../invalid-whole/user-gdpr-invalid.json | 2 +- .../valid-whole/exemplary/all-ext.json | 2 +- .../valid-whole/exemplary/prebid-test-ad.json | 2 +- .../valid-whole/supplementary/aliased-buyeruids.json | 2 +- .../valid-whole/supplementary/aliases.json | 2 +- .../valid-whole/supplementary/app.json | 2 +- .../valid-whole/supplementary/bid-adjustments.json | 2 +- .../valid-whole/supplementary/cache-bids.json | 2 +- .../valid-whole/supplementary/cache-vast.json | 2 +- .../valid-whole/supplementary/ccpa-invalid.json | 2 +- .../valid-whole/supplementary/digitrust.json | 2 +- .../supplementary/gdpr-no-consentstring.json | 2 +- .../valid-whole/supplementary/gdpr.json | 2 +- .../supplementary/interstitial-device-only.json | 2 +- .../supplementary/interstitial-no-extension.json | 2 +- .../valid-whole/supplementary/interstitial.json | 2 +- .../valid-whole/supplementary/site-amp.json | 2 +- .../valid-whole/supplementary/site.json | 2 +- .../valid-whole/supplementary/timeout.json | 2 +- .../valid-whole/supplementary/user.json | 2 +- exchange/exchange_test.go | 12 ++++++------ exchange/utils_test.go | 4 ++-- pbs/pbsrequest_test.go | 2 +- 88 files changed, 108 insertions(+), 108 deletions(-) diff --git a/adapters/adtelligent/adtelligenttest/supplemental/audio.json b/adapters/adtelligent/adtelligenttest/supplemental/audio.json index aa9a40bcc99..d8904251e11 100644 --- a/adapters/adtelligent/adtelligenttest/supplemental/audio.json +++ b/adapters/adtelligent/adtelligenttest/supplemental/audio.json @@ -9,7 +9,7 @@ }, "ext": { "bidder": { - "placementId": 10433394 + "placementId": 1 } } } diff --git a/adapters/adtelligent/adtelligenttest/supplemental/native.json b/adapters/adtelligent/adtelligenttest/supplemental/native.json index 90ddff2f679..00fb3984bc7 100644 --- a/adapters/adtelligent/adtelligenttest/supplemental/native.json +++ b/adapters/adtelligent/adtelligenttest/supplemental/native.json @@ -9,7 +9,7 @@ }, "ext": { "bidder": { - "placementId": 10433394 + "placementId": 1 } } } diff --git a/adapters/appnexus/appnexusplatformtest/exemplary/simple-auction.json b/adapters/appnexus/appnexusplatformtest/exemplary/simple-auction.json index 8e4f52951b8..03c3f4c5880 100644 --- a/adapters/appnexus/appnexusplatformtest/exemplary/simple-auction.json +++ b/adapters/appnexus/appnexusplatformtest/exemplary/simple-auction.json @@ -14,7 +14,7 @@ }, "ext": { "bidder": { - "placement_id": 10433394 + "placement_id": 1 } } } @@ -46,7 +46,7 @@ }, "ext": { "appnexus": { - "placement_id": 10433394 + "placement_id": 1 } } } diff --git a/adapters/appnexus/appnexusplatformtest/video/simple-video.json b/adapters/appnexus/appnexusplatformtest/video/simple-video.json index 3c28b48a083..85960427d81 100644 --- a/adapters/appnexus/appnexusplatformtest/video/simple-video.json +++ b/adapters/appnexus/appnexusplatformtest/video/simple-video.json @@ -14,7 +14,7 @@ }, "ext": { "bidder": { - "placement_id": 10433394 + "placement_id": 1 } } } @@ -46,7 +46,7 @@ }, "ext": { "appnexus": { - "placement_id": 10433394 + "placement_id": 1 } } } diff --git a/adapters/appnexus/appnexustest/amp/simple-banner.json b/adapters/appnexus/appnexustest/amp/simple-banner.json index b5ea656c822..646359b4267 100644 --- a/adapters/appnexus/appnexustest/amp/simple-banner.json +++ b/adapters/appnexus/appnexustest/amp/simple-banner.json @@ -18,7 +18,7 @@ }, "ext": { "bidder": { - "placement_id": 10433394 + "placement_id": 1 } } } @@ -58,7 +58,7 @@ }, "ext": { "appnexus": { - "placement_id": 10433394 + "placement_id": 1 } } } diff --git a/adapters/appnexus/appnexustest/amp/simple-video.json b/adapters/appnexus/appnexustest/amp/simple-video.json index f44ed06605c..a6f96be34b8 100644 --- a/adapters/appnexus/appnexustest/amp/simple-video.json +++ b/adapters/appnexus/appnexustest/amp/simple-video.json @@ -14,7 +14,7 @@ }, "ext": { "bidder": { - "placement_id": 10433394 + "placement_id": 1 } } } @@ -48,7 +48,7 @@ }, "ext": { "appnexus": { - "placement_id": 10433394 + "placement_id": 1 } } } diff --git a/adapters/appnexus/appnexustest/exemplary/simple-banner.json b/adapters/appnexus/appnexustest/exemplary/simple-banner.json index 976f35b208a..e5bd311648f 100644 --- a/adapters/appnexus/appnexustest/exemplary/simple-banner.json +++ b/adapters/appnexus/appnexustest/exemplary/simple-banner.json @@ -18,7 +18,7 @@ }, "ext": { "bidder": { - "placement_id": 10433394 + "placement_id": 1 } } } @@ -56,7 +56,7 @@ }, "ext": { "appnexus": { - "placement_id": 10433394 + "placement_id": 1 } } } diff --git a/adapters/appnexus/appnexustest/exemplary/simple-video.json b/adapters/appnexus/appnexustest/exemplary/simple-video.json index 5afef01fa64..15755c7de37 100644 --- a/adapters/appnexus/appnexustest/exemplary/simple-video.json +++ b/adapters/appnexus/appnexustest/exemplary/simple-video.json @@ -14,7 +14,7 @@ }, "ext": { "bidder": { - "placement_id": 10433394 + "placement_id": 1 } } } @@ -46,7 +46,7 @@ }, "ext": { "appnexus": { - "placement_id": 10433394 + "placement_id": 1 } } } diff --git a/adapters/appnexus/appnexustest/exemplary/video-invalid-category.json b/adapters/appnexus/appnexustest/exemplary/video-invalid-category.json index 283f13cf111..d3686af00a9 100644 --- a/adapters/appnexus/appnexustest/exemplary/video-invalid-category.json +++ b/adapters/appnexus/appnexustest/exemplary/video-invalid-category.json @@ -14,7 +14,7 @@ }, "ext": { "bidder": { - "placement_id": 10433394 + "placement_id": 1 } } } @@ -46,7 +46,7 @@ }, "ext": { "appnexus": { - "placement_id": 10433394 + "placement_id": 1 } } } diff --git a/adapters/appnexus/appnexustest/params/race/banner.json b/adapters/appnexus/appnexustest/params/race/banner.json index 2e2b39e9429..a37e0036357 100644 --- a/adapters/appnexus/appnexustest/params/race/banner.json +++ b/adapters/appnexus/appnexustest/params/race/banner.json @@ -1,5 +1,5 @@ { - "placement_id": 10433394, + "placement_id": 1, "reserve": 20, "position": "below", "traffic_source_code": "trafficSource", diff --git a/adapters/appnexus/appnexustest/params/race/video.json b/adapters/appnexus/appnexustest/params/race/video.json index 2e2b39e9429..a37e0036357 100644 --- a/adapters/appnexus/appnexustest/params/race/video.json +++ b/adapters/appnexus/appnexustest/params/race/video.json @@ -1,5 +1,5 @@ { - "placement_id": 10433394, + "placement_id": 1, "reserve": 20, "position": "below", "traffic_source_code": "trafficSource", diff --git a/adapters/appnexus/appnexustest/supplemental/displaymanager-test.json b/adapters/appnexus/appnexustest/supplemental/displaymanager-test.json index a1602ff9a74..d5c981c6945 100644 --- a/adapters/appnexus/appnexustest/supplemental/displaymanager-test.json +++ b/adapters/appnexus/appnexustest/supplemental/displaymanager-test.json @@ -26,7 +26,7 @@ }, "ext": { "bidder": { - "placement_id": 10433394 + "placement_id": 1 } } } @@ -73,7 +73,7 @@ "displaymanagerver": "prebid-mobile-1.0.0", "ext": { "appnexus": { - "placement_id": 10433394 + "placement_id": 1 } } } diff --git a/adapters/appnexus/appnexustest/supplemental/explicit-dimensions.json b/adapters/appnexus/appnexustest/supplemental/explicit-dimensions.json index 11b5d887187..06e7724a23b 100644 --- a/adapters/appnexus/appnexustest/supplemental/explicit-dimensions.json +++ b/adapters/appnexus/appnexustest/supplemental/explicit-dimensions.json @@ -16,7 +16,7 @@ }, "ext": { "bidder": { - "placementId": 10433394 + "placementId": 1 } } } @@ -49,7 +49,7 @@ }, "ext": { "appnexus": { - "placement_id": 10433394 + "placement_id": 1 } } } diff --git a/adapters/appnexus/appnexustest/supplemental/multi-bid.json b/adapters/appnexus/appnexustest/supplemental/multi-bid.json index 1e3089b1e71..7234551ea3f 100644 --- a/adapters/appnexus/appnexustest/supplemental/multi-bid.json +++ b/adapters/appnexus/appnexustest/supplemental/multi-bid.json @@ -18,7 +18,7 @@ }, "ext": { "bidder": { - "placement_id": 10433394 + "placement_id": 1 } } } @@ -56,7 +56,7 @@ }, "ext": { "appnexus": { - "placement_id": 10433394 + "placement_id": 1 } } } diff --git a/docs/developers/stored-requests.md b/docs/developers/stored-requests.md index 4b54b4e945f..8b7177160c3 100644 --- a/docs/developers/stored-requests.md +++ b/docs/developers/stored-requests.md @@ -34,7 +34,7 @@ Add the file `stored_requests/data/by_id/stored_imps/{id}.json` and populate it }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } @@ -88,7 +88,7 @@ You can also store _part_ of the Imp on the server. For example: }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/amp_auction_test.go b/endpoints/openrtb2/amp_auction_test.go index 0eafaa05b12..c62a6a710d5 100644 --- a/endpoints/openrtb2/amp_auction_test.go +++ b/endpoints/openrtb2/amp_auction_test.go @@ -966,7 +966,7 @@ func getTestBidRequest(nilUser bool, nilExt bool, consentString string, digitrus Imp: []openrtb.Imp{ { ID: "/19968336/header-bid-tag-0", - Ext: json.RawMessage(`{"appnexus": { "placementId":10433394 }}`), + Ext: json.RawMessage(`{"appnexus": { "placementId":12883451 }}`), Banner: &openrtb.Banner{ Format: []openrtb.Format{ { diff --git a/endpoints/openrtb2/auction_benchmark_test.go b/endpoints/openrtb2/auction_benchmark_test.go index 430b0361eb6..93d7575e865 100644 --- a/endpoints/openrtb2/auction_benchmark_test.go +++ b/endpoints/openrtb2/auction_benchmark_test.go @@ -21,7 +21,7 @@ import ( // dummyServer returns the header bidding test ad. This response was scraped from a real appnexus server response. func dummyServer(w http.ResponseWriter, r *http.Request) { - w.Write([]byte(`{"id":"some-request-id","seatbid":[{"bid":[{"id":"4625436751433509010","impid":"my-imp-id","price":0.5,"adm":"\u003cscript type=\"application/javascript\" src=\"http://nym1-ib.adnxs.com/ab?e=wqT_3QKABqAAAwAAAwDWAAUBCM-OiNAFELuV09Pqi86EVRj6t-7QyLin_REqLQkAAAECCOA_EQEHNAAA4D8ZAAAAgOtR4D8hERIAKREJoDDy5vwEOL4HQL4HSAJQ1suTDljhgEhgAGiRQHixhQSAAQGKAQNVU0SSBQbwUpgBrAKgAfoBqAEBsAEAuAECwAEDyAEC0AEA2AEA4AEB8AEAigI6dWYoJ2EnLCA0OTQ0NzIsIDE1MTAwODIzODMpO3VmKCdyJywgMjk2ODExMTAsMh4A8JySAvkBIVR6WGNkQWk2MEljRUVOYkxrdzRZQUNEaGdFZ3dBRGdBUUFSSXZnZFE4dWI4QkZnQVlQX19fXzhQYUFCd0FYZ0JnQUVCaUFFQmtBRUJtQUVCb0FFQnFBRURzQUVBdVFFcGk0aURBQURnUDhFQktZdUlnd0FBNERfSkFTZlJKRUdtbi00XzJRRUFBQUFBQUFEd1AtQUJBUFVCBQ8oSmdDQUtBQ0FMVUMFEARMMAkI8ExNQUNBY2dDQWRBQ0FkZ0NBZUFDQU9nQ0FQZ0NBSUFEQVpBREFKZ0RBYWdEdXRDSEJMb0RDVTVaVFRJNk16STNOdy4umgItITh3aENuZzb8ALg0WUJJSUFRb0FEb0pUbGxOTWpvek1qYzPYAugH4ALH0wHyAhAKBkFEVl9JRBIGNCV1HPICEQoGQ1BHARMcBzE5Nzc5MzMBJwgFQ1AFE_B-ODUxMzU5NIADAYgDAZADAJgDFKADAaoDAMADrALIAwDYAwDgAwDoAwD4AwCABACSBAkvb3BlbnJ0YjKYBACoBACyBAwIABAAGAAgADAAOAC4BADABADIBADSBAlOWU0yOjMyNzfaBAIIAeAEAPAE1suTDogFAZgFAKAF_____wUDXAGqBQ9zb21lLXJlcXVlc3QtaWTABQDJBUmbTPA_0gUJCQAAAAAAAAAA2AUB4AUB\u0026s=61dc0e8770543def5a3a77b4589830d1274b26f1\u0026test=1\u0026pp=${AUCTION_PRICE}\u0026\"\u003e\u003c/script\u003e","adid":"29681110","adomain":["appnexus.com"],"iurl":"http://nym1-ib.adnxs.com/cr?id=29681110","cid":"958","crid":"29681110","w":300,"h":250,"ext":{"bidder":{"appnexus":{"brand_id":1,"auction_id":6127490747252132539,"bidder_id":2}}}}],"seat":"appnexus"}],"ext":{"debug":{"httpcalls":{"appnexus":[{"uri":"http://ib.adnxs.com/openrtb2","requestbody":"{\"id\":\"some-request-id\",\"imp\":[{\"id\":\"my-imp-id\",\"banner\":{\"format\":[{\"w\":300,\"h\":250},{\"w\":300,\"h\":600}]},\"ext\":{\"appnexus\":{\"placement_id\":10433394}}}],\"test\":1,\"tmax\":500}","responsebody":"{\"id\":\"some-request-id\",\"seatbid\":[{\"bid\":[{\"id\":\"4625436751433509010\",\"impid\":\"my-imp-id\",\"price\": 0.500000,\"adid\":\"29681110\",\"adm\":\"\u003cscript type=\\\"application/javascript\\\" src=\\\"http://nym1-ib.adnxs.com/ab?e=wqT_3QKABqAAAwAAAwDWAAUBCM-OiNAFELuV09Pqi86EVRj6t-7QyLin_REqLQkAAAECCOA_EQEHNAAA4D8ZAAAAgOtR4D8hERIAKREJoDDy5vwEOL4HQL4HSAJQ1suTDljhgEhgAGiRQHixhQSAAQGKAQNVU0SSBQbwUpgBrAKgAfoBqAEBsAEAuAECwAEDyAEC0AEA2AEA4AEB8AEAigI6dWYoJ2EnLCA0OTQ0NzIsIDE1MTAwODIzODMpO3VmKCdyJywgMjk2ODExMTAsMh4A8JySAvkBIVR6WGNkQWk2MEljRUVOYkxrdzRZQUNEaGdFZ3dBRGdBUUFSSXZnZFE4dWI4QkZnQVlQX19fXzhQYUFCd0FYZ0JnQUVCaUFFQmtBRUJtQUVCb0FFQnFBRURzQUVBdVFFcGk0aURBQURnUDhFQktZdUlnd0FBNERfSkFTZlJKRUdtbi00XzJRRUFBQUFBQUFEd1AtQUJBUFVCBQ8oSmdDQUtBQ0FMVUMFEARMMAkI8ExNQUNBY2dDQWRBQ0FkZ0NBZUFDQU9nQ0FQZ0NBSUFEQVpBREFKZ0RBYWdEdXRDSEJMb0RDVTVaVFRJNk16STNOdy4umgItITh3aENuZzb8ALg0WUJJSUFRb0FEb0pUbGxOTWpvek1qYzPYAugH4ALH0wHyAhAKBkFEVl9JRBIGNCV1HPICEQoGQ1BHARMcBzE5Nzc5MzMBJwgFQ1AFE_B-ODUxMzU5NIADAYgDAZADAJgDFKADAaoDAMADrALIAwDYAwDgAwDoAwD4AwCABACSBAkvb3BlbnJ0YjKYBACoBACyBAwIABAAGAAgADAAOAC4BADABADIBADSBAlOWU0yOjMyNzfaBAIIAeAEAPAE1suTDogFAZgFAKAF_____wUDXAGqBQ9zb21lLXJlcXVlc3QtaWTABQDJBUmbTPA_0gUJCQAAAAAAAAAA2AUB4AUB\u0026s=61dc0e8770543def5a3a77b4589830d1274b26f1\u0026test=1\u0026pp=${AUCTION_PRICE}\u0026\\\"\u003e\u003c/script\u003e\",\"adomain\":[\"appnexus.com\"],\"iurl\":\"http://nym1-ib.adnxs.com/cr?id=29681110\",\"cid\":\"958\",\"crid\":\"29681110\",\"h\": 250,\"w\": 300,\"ext\":{\"appnexus\":{\"brand_id\": 1,\"auction_id\": 6127490747252132539,\"bidder_id\": 2}}}],\"seat\":\"958\"}],\"bidid\":\"8271358638249766712\",\"cur\":\"USD\"}","status":200}]}},"responsetimemillis":{"appnexus":42}}}`)) + w.Write([]byte(`{"id":"some-request-id","seatbid":[{"bid":[{"id":"4625436751433509010","impid":"my-imp-id","price":0.5,"adm":"\u003cscript type=\"application/javascript\" src=\"http://nym1-ib.adnxs.com/ab?e=wqT_3QKABqAAAwAAAwDWAAUBCM-OiNAFELuV09Pqi86EVRj6t-7QyLin_REqLQkAAAECCOA_EQEHNAAA4D8ZAAAAgOtR4D8hERIAKREJoDDy5vwEOL4HQL4HSAJQ1suTDljhgEhgAGiRQHixhQSAAQGKAQNVU0SSBQbwUpgBrAKgAfoBqAEBsAEAuAECwAEDyAEC0AEA2AEA4AEB8AEAigI6dWYoJ2EnLCA0OTQ0NzIsIDE1MTAwODIzODMpO3VmKCdyJywgMjk2ODExMTAsMh4A8JySAvkBIVR6WGNkQWk2MEljRUVOYkxrdzRZQUNEaGdFZ3dBRGdBUUFSSXZnZFE4dWI4QkZnQVlQX19fXzhQYUFCd0FYZ0JnQUVCaUFFQmtBRUJtQUVCb0FFQnFBRURzQUVBdVFFcGk0aURBQURnUDhFQktZdUlnd0FBNERfSkFTZlJKRUdtbi00XzJRRUFBQUFBQUFEd1AtQUJBUFVCBQ8oSmdDQUtBQ0FMVUMFEARMMAkI8ExNQUNBY2dDQWRBQ0FkZ0NBZUFDQU9nQ0FQZ0NBSUFEQVpBREFKZ0RBYWdEdXRDSEJMb0RDVTVaVFRJNk16STNOdy4umgItITh3aENuZzb8ALg0WUJJSUFRb0FEb0pUbGxOTWpvek1qYzPYAugH4ALH0wHyAhAKBkFEVl9JRBIGNCV1HPICEQoGQ1BHARMcBzE5Nzc5MzMBJwgFQ1AFE_B-ODUxMzU5NIADAYgDAZADAJgDFKADAaoDAMADrALIAwDYAwDgAwDoAwD4AwCABACSBAkvb3BlbnJ0YjKYBACoBACyBAwIABAAGAAgADAAOAC4BADABADIBADSBAlOWU0yOjMyNzfaBAIIAeAEAPAE1suTDogFAZgFAKAF_____wUDXAGqBQ9zb21lLXJlcXVlc3QtaWTABQDJBUmbTPA_0gUJCQAAAAAAAAAA2AUB4AUB\u0026s=61dc0e8770543def5a3a77b4589830d1274b26f1\u0026test=1\u0026pp=${AUCTION_PRICE}\u0026\"\u003e\u003c/script\u003e","adid":"29681110","adomain":["appnexus.com"],"iurl":"http://nym1-ib.adnxs.com/cr?id=29681110","cid":"958","crid":"29681110","w":300,"h":250,"ext":{"bidder":{"appnexus":{"brand_id":1,"auction_id":6127490747252132539,"bidder_id":2}}}}],"seat":"appnexus"}],"ext":{"debug":{"httpcalls":{"appnexus":[{"uri":"http://ib.adnxs.com/openrtb2","requestbody":"{\"id\":\"some-request-id\",\"imp\":[{\"id\":\"my-imp-id\",\"banner\":{\"format\":[{\"w\":300,\"h\":250},{\"w\":300,\"h\":600}]},\"ext\":{\"appnexus\":{\"placement_id\":12883451}}}],\"test\":1,\"tmax\":500}","responsebody":"{\"id\":\"some-request-id\",\"seatbid\":[{\"bid\":[{\"id\":\"4625436751433509010\",\"impid\":\"my-imp-id\",\"price\": 0.500000,\"adid\":\"29681110\",\"adm\":\"\u003cscript type=\\\"application/javascript\\\" src=\\\"http://nym1-ib.adnxs.com/ab?e=wqT_3QKABqAAAwAAAwDWAAUBCM-OiNAFELuV09Pqi86EVRj6t-7QyLin_REqLQkAAAECCOA_EQEHNAAA4D8ZAAAAgOtR4D8hERIAKREJoDDy5vwEOL4HQL4HSAJQ1suTDljhgEhgAGiRQHixhQSAAQGKAQNVU0SSBQbwUpgBrAKgAfoBqAEBsAEAuAECwAEDyAEC0AEA2AEA4AEB8AEAigI6dWYoJ2EnLCA0OTQ0NzIsIDE1MTAwODIzODMpO3VmKCdyJywgMjk2ODExMTAsMh4A8JySAvkBIVR6WGNkQWk2MEljRUVOYkxrdzRZQUNEaGdFZ3dBRGdBUUFSSXZnZFE4dWI4QkZnQVlQX19fXzhQYUFCd0FYZ0JnQUVCaUFFQmtBRUJtQUVCb0FFQnFBRURzQUVBdVFFcGk0aURBQURnUDhFQktZdUlnd0FBNERfSkFTZlJKRUdtbi00XzJRRUFBQUFBQUFEd1AtQUJBUFVCBQ8oSmdDQUtBQ0FMVUMFEARMMAkI8ExNQUNBY2dDQWRBQ0FkZ0NBZUFDQU9nQ0FQZ0NBSUFEQVpBREFKZ0RBYWdEdXRDSEJMb0RDVTVaVFRJNk16STNOdy4umgItITh3aENuZzb8ALg0WUJJSUFRb0FEb0pUbGxOTWpvek1qYzPYAugH4ALH0wHyAhAKBkFEVl9JRBIGNCV1HPICEQoGQ1BHARMcBzE5Nzc5MzMBJwgFQ1AFE_B-ODUxMzU5NIADAYgDAZADAJgDFKADAaoDAMADrALIAwDYAwDgAwDoAwD4AwCABACSBAkvb3BlbnJ0YjKYBACoBACyBAwIABAAGAAgADAAOAC4BADABADIBADSBAlOWU0yOjMyNzfaBAIIAeAEAPAE1suTDogFAZgFAKAF_____wUDXAGqBQ9zb21lLXJlcXVlc3QtaWTABQDJBUmbTPA_0gUJCQAAAAAAAAAA2AUB4AUB\u0026s=61dc0e8770543def5a3a77b4589830d1274b26f1\u0026test=1\u0026pp=${AUCTION_PRICE}\u0026\\\"\u003e\u003c/script\u003e\",\"adomain\":[\"appnexus.com\"],\"iurl\":\"http://nym1-ib.adnxs.com/cr?id=29681110\",\"cid\":\"958\",\"crid\":\"29681110\",\"h\": 250,\"w\": 300,\"ext\":{\"appnexus\":{\"brand_id\": 1,\"auction_id\": 6127490747252132539,\"bidder_id\": 2}}}],\"seat\":\"958\"}],\"bidid\":\"8271358638249766712\",\"cur\":\"USD\"}","status":200}]}},"responsetimemillis":{"appnexus":42}}}`)) } // newDummyRequest returns a request which fetches the header bidding test ad. @@ -45,7 +45,7 @@ func newDummyRequest() *http.Request { }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/auction_test.go b/endpoints/openrtb2/auction_test.go index c1d57e9c297..89f0fa255df 100644 --- a/endpoints/openrtb2/auction_test.go +++ b/endpoints/openrtb2/auction_test.go @@ -88,7 +88,7 @@ func TestExplicitUserId(t *testing.T) { }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } @@ -425,7 +425,7 @@ func buildNativeRequest(t *testing.T, nativeData []byte) []byte { buf := bytes.NewBuffer(nil) buf.WriteString(`{"id":"req-id","site":{"page":"some.page.com"},"tmax":500,"imp":[{"id":"some-imp","native":{"request":`) buf.Write(serialized) - buf.WriteString(`},"ext":{"appnexus":{"placementId":10433394}}}]}`) + buf.WriteString(`},"ext":{"appnexus":{"placementId":12883451}}}]}`) return buf.Bytes() } diff --git a/endpoints/openrtb2/interstitial_test.go b/endpoints/openrtb2/interstitial_test.go index e680478e63e..1c6eb2555db 100644 --- a/endpoints/openrtb2/interstitial_test.go +++ b/endpoints/openrtb2/interstitial_test.go @@ -22,7 +22,7 @@ var request = &openrtb.BidRequest{ }, }, Instl: 1, - Ext: json.RawMessage(`{"appnexus": {"placementId": 10433394}}`), + Ext: json.RawMessage(`{"appnexus": {"placementId": 12883451}}`), }, }, Device: &openrtb.Device{ diff --git a/endpoints/openrtb2/sample-requests/account-required/no-acct.json b/endpoints/openrtb2/sample-requests/account-required/no-acct.json index 4ba8dec52c3..d84d797017d 100644 --- a/endpoints/openrtb2/sample-requests/account-required/no-acct.json +++ b/endpoints/openrtb2/sample-requests/account-required/no-acct.json @@ -28,7 +28,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/account-required/with-acct.json b/endpoints/openrtb2/sample-requests/account-required/with-acct.json index d1ab715cdbe..fb4c6313051 100644 --- a/endpoints/openrtb2/sample-requests/account-required/with-acct.json +++ b/endpoints/openrtb2/sample-requests/account-required/with-acct.json @@ -29,7 +29,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/aliased/simple.json b/endpoints/openrtb2/sample-requests/aliased/simple.json index e656be43ed5..e7f6ba21b83 100644 --- a/endpoints/openrtb2/sample-requests/aliased/simple.json +++ b/endpoints/openrtb2/sample-requests/aliased/simple.json @@ -13,7 +13,7 @@ }, "ext": { "test1": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/aliased/site.json b/endpoints/openrtb2/sample-requests/aliased/site.json index 981b69b5524..cf7e9a77533 100644 --- a/endpoints/openrtb2/sample-requests/aliased/site.json +++ b/endpoints/openrtb2/sample-requests/aliased/site.json @@ -23,10 +23,10 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 }, "test1": { - "placementId": 10433394 + "placementId": 12883451 }, "test2": { "accountId": 1001, diff --git a/endpoints/openrtb2/sample-requests/blacklisted/blacklisted-acct.json b/endpoints/openrtb2/sample-requests/blacklisted/blacklisted-acct.json index 8977480de33..ee04a9464e9 100644 --- a/endpoints/openrtb2/sample-requests/blacklisted/blacklisted-acct.json +++ b/endpoints/openrtb2/sample-requests/blacklisted/blacklisted-acct.json @@ -42,7 +42,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 }, "districtm": { "placementId": 105 diff --git a/endpoints/openrtb2/sample-requests/blacklisted/blacklisted-app.json b/endpoints/openrtb2/sample-requests/blacklisted/blacklisted-app.json index 219595e409a..1ace4b53666 100644 --- a/endpoints/openrtb2/sample-requests/blacklisted/blacklisted-app.json +++ b/endpoints/openrtb2/sample-requests/blacklisted/blacklisted-app.json @@ -39,7 +39,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 }, "districtm": { "placementId": 105 diff --git a/endpoints/openrtb2/sample-requests/disabled/bad/bad-alias.json b/endpoints/openrtb2/sample-requests/disabled/bad/bad-alias.json index 8299f96ce6b..096c028cfe9 100644 --- a/endpoints/openrtb2/sample-requests/disabled/bad/bad-alias.json +++ b/endpoints/openrtb2/sample-requests/disabled/bad/bad-alias.json @@ -15,7 +15,7 @@ }, "ext": { "test1": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/disabled/bad/bad-bidder.json b/endpoints/openrtb2/sample-requests/disabled/bad/bad-bidder.json index f0313824456..1fa21b203e3 100644 --- a/endpoints/openrtb2/sample-requests/disabled/bad/bad-bidder.json +++ b/endpoints/openrtb2/sample-requests/disabled/bad/bad-bidder.json @@ -15,7 +15,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/disabled/good/partial.json b/endpoints/openrtb2/sample-requests/disabled/good/partial.json index 0f6bf1dd005..fe0c492be2d 100644 --- a/endpoints/openrtb2/sample-requests/disabled/good/partial.json +++ b/endpoints/openrtb2/sample-requests/disabled/good/partial.json @@ -23,7 +23,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 }, "rubicon": { "accountId": 1001, diff --git a/endpoints/openrtb2/sample-requests/invalid-stored/bad_incoming_1.json b/endpoints/openrtb2/sample-requests/invalid-stored/bad_incoming_1.json index ccb54c0547e..2a647d7d8c8 100644 --- a/endpoints/openrtb2/sample-requests/invalid-stored/bad_incoming_1.json +++ b/endpoints/openrtb2/sample-requests/invalid-stored/bad_incoming_1.json @@ -24,7 +24,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/invalid-stored/bad_incoming_2.json b/endpoints/openrtb2/sample-requests/invalid-stored/bad_incoming_2.json index 6023f86970e..d18a20d7a13 100644 --- a/endpoints/openrtb2/sample-requests/invalid-stored/bad_incoming_2.json +++ b/endpoints/openrtb2/sample-requests/invalid-stored/bad_incoming_2.json @@ -24,7 +24,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/alias-bidder-self.json b/endpoints/openrtb2/sample-requests/invalid-whole/alias-bidder-self.json index f081b365dd9..666253ec85b 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/alias-bidder-self.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/alias-bidder-self.json @@ -13,7 +13,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/alias-unknown-core.json b/endpoints/openrtb2/sample-requests/invalid-whole/alias-unknown-core.json index acf3bc0dd4f..6c1925d65b1 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/alias-unknown-core.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/alias-unknown-core.json @@ -15,7 +15,7 @@ }, "ext": { "unknown": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/app-bad-ext.json b/endpoints/openrtb2/sample-requests/invalid-whole/app-bad-ext.json index 2516a268754..672b05724c8 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/app-bad-ext.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/app-bad-ext.json @@ -32,7 +32,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/banner-h-only.json b/endpoints/openrtb2/sample-requests/invalid-whole/banner-h-only.json index 7040e8dfc3c..515824e65d9 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/banner-h-only.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/banner-h-only.json @@ -13,7 +13,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/banner-h-zero.json b/endpoints/openrtb2/sample-requests/invalid-whole/banner-h-zero.json index d98cfba100b..f18f63e5e28 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/banner-h-zero.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/banner-h-zero.json @@ -14,7 +14,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/banner-w-only.json b/endpoints/openrtb2/sample-requests/invalid-whole/banner-w-only.json index 52a7bdd2ba2..70739a65834 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/banner-w-only.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/banner-w-only.json @@ -13,7 +13,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/banner-w-zero.json b/endpoints/openrtb2/sample-requests/invalid-whole/banner-w-zero.json index 0b927f26e3c..b3453ab4cb7 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/banner-w-zero.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/banner-w-zero.json @@ -14,7 +14,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/bid-adjustment-invalid-bidder.json b/endpoints/openrtb2/sample-requests/invalid-whole/bid-adjustment-invalid-bidder.json index 985f99126c4..569e16d2d20 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/bid-adjustment-invalid-bidder.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/bid-adjustment-invalid-bidder.json @@ -13,7 +13,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/bid-adjustment-negative.json b/endpoints/openrtb2/sample-requests/invalid-whole/bid-adjustment-negative.json index 984998000c5..4db6ee09bd8 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/bid-adjustment-negative.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/bid-adjustment-negative.json @@ -13,7 +13,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/cache-nothing.json b/endpoints/openrtb2/sample-requests/invalid-whole/cache-nothing.json index 605040c6cfc..d4b875498ae 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/cache-nothing.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/cache-nothing.json @@ -15,7 +15,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/digitrust.json b/endpoints/openrtb2/sample-requests/invalid-whole/digitrust.json index 2b65ed19db0..1be93853a0b 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/digitrust.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/digitrust.json @@ -25,7 +25,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/format-empty-array.json b/endpoints/openrtb2/sample-requests/invalid-whole/format-empty-array.json index e159601b6e8..15e41cc5fb2 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/format-empty-array.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/format-empty-array.json @@ -13,7 +13,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/imp-id-duplicates.json b/endpoints/openrtb2/sample-requests/invalid-whole/imp-id-duplicates.json index 095542ef59e..53517c268b6 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/imp-id-duplicates.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/imp-id-duplicates.json @@ -18,7 +18,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } }, diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/interstital-bad-perc.json b/endpoints/openrtb2/sample-requests/invalid-whole/interstital-bad-perc.json index f04f3d8aa25..6854ea9a470 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/interstital-bad-perc.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/interstital-bad-perc.json @@ -20,7 +20,7 @@ "instl": 1, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/interstitial-empty.json b/endpoints/openrtb2/sample-requests/invalid-whole/interstitial-empty.json index 5fa28059b0d..a69f287dfab 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/interstitial-empty.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/interstitial-empty.json @@ -14,7 +14,7 @@ "instl": 1, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/no-site-or-app.json b/endpoints/openrtb2/sample-requests/invalid-whole/no-site-or-app.json index 1cbfdd501c2..c56dae324fc 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/no-site-or-app.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/no-site-or-app.json @@ -12,7 +12,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/regs-ext-gdpr-invalid.json b/endpoints/openrtb2/sample-requests/invalid-whole/regs-ext-gdpr-invalid.json index 6737295ae82..dff3023c702 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/regs-ext-gdpr-invalid.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/regs-ext-gdpr-invalid.json @@ -17,7 +17,7 @@ "id": "/19968336/header-bid-tag-0", "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } }, "banner": { diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/regs-ext-gdpr-string.json b/endpoints/openrtb2/sample-requests/invalid-whole/regs-ext-gdpr-string.json index 3abc88c70da..ce887889034 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/regs-ext-gdpr-string.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/regs-ext-gdpr-string.json @@ -17,7 +17,7 @@ "id": "/19968336/header-bid-tag-0", "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } }, "banner": { diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/regs-ext-malformed.json b/endpoints/openrtb2/sample-requests/invalid-whole/regs-ext-malformed.json index 7c2805fcdbb..a403103d6fb 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/regs-ext-malformed.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/regs-ext-malformed.json @@ -17,7 +17,7 @@ "id": "/19968336/header-bid-tag-0", "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } }, "banner": { diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/site-app-both.json b/endpoints/openrtb2/sample-requests/invalid-whole/site-app-both.json index abbcdac325f..4b643705640 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/site-app-both.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/site-app-both.json @@ -16,7 +16,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/site-empty.json b/endpoints/openrtb2/sample-requests/invalid-whole/site-empty.json index 430b25f67a0..3d53314dbb7 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/site-empty.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/site-empty.json @@ -13,7 +13,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/site-ext-amp.json b/endpoints/openrtb2/sample-requests/invalid-whole/site-ext-amp.json index 17cd68b9232..bebe4625578 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/site-ext-amp.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/site-ext-amp.json @@ -28,7 +28,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/storedrequest-id-int.json b/endpoints/openrtb2/sample-requests/invalid-whole/storedrequest-id-int.json index 3fe94a993ad..5d510d21dbd 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/storedrequest-id-int.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/storedrequest-id-int.json @@ -15,7 +15,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/unknown-bidder.json b/endpoints/openrtb2/sample-requests/invalid-whole/unknown-bidder.json index f11be6fd51c..3914ae7ae49 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/unknown-bidder.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/unknown-bidder.json @@ -24,7 +24,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 }, "unknownbidder": { "param1": "foobar", diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-consent-int.json b/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-consent-int.json index c7a6a53b087..5bc0ed33eab 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-consent-int.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-consent-int.json @@ -17,7 +17,7 @@ "id": "/19968336/header-bid-tag-0", "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } }, "banner": { diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-eids-eids-uids-empty.json b/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-eids-eids-uids-empty.json index e9914e3b7db..ebbb4e2701c 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-eids-eids-uids-empty.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-eids-eids-uids-empty.json @@ -17,7 +17,7 @@ "id": "/19968336/header-bid-tag-0", "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } }, "banner": { diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-eids-empty.json b/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-eids-empty.json index 4f66917ff3f..3d73d73117e 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-eids-empty.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-eids-empty.json @@ -17,7 +17,7 @@ "id": "/19968336/header-bid-tag-0", "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } }, "banner": { diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-eids-id-uids-empty.json b/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-eids-id-uids-empty.json index 1ca50079a9a..bbd0dadfd70 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-eids-id-uids-empty.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-eids-id-uids-empty.json @@ -17,7 +17,7 @@ "id": "/19968336/header-bid-tag-0", "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } }, "banner": { diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-eids-source-empty.json b/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-eids-source-empty.json index 8526298047f..5efff0626ef 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-eids-source-empty.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-eids-source-empty.json @@ -17,7 +17,7 @@ "id": "/19968336/header-bid-tag-0", "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } }, "banner": { diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-eids-source-unique.json b/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-eids-source-unique.json index 52565d47228..e508b113aff 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-eids-source-unique.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-eids-source-unique.json @@ -17,7 +17,7 @@ "id": "/19968336/header-bid-tag-0", "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } }, "banner": { diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-eids-uids-id-empty.json b/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-eids-uids-id-empty.json index 33a33b9f416..3a9659b7327 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-eids-uids-id-empty.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-eids-uids-id-empty.json @@ -17,7 +17,7 @@ "id": "/19968336/header-bid-tag-0", "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } }, "banner": { diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-prebid-buyeruids-empty.json b/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-prebid-buyeruids-empty.json index d967463d2d1..44bee775844 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-prebid-buyeruids-empty.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-prebid-buyeruids-empty.json @@ -18,7 +18,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-prebid-buyeruids-unknown.json b/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-prebid-buyeruids-unknown.json index bad67e2d3d8..78773066744 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-prebid-buyeruids-unknown.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-prebid-buyeruids-unknown.json @@ -18,7 +18,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-prebid-empty.json b/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-prebid-empty.json index 8113a70be68..f2e497514b7 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-prebid-empty.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/user-ext-prebid-empty.json @@ -18,7 +18,7 @@ }, "ext": { "appnexus":{ - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/user-gdpr-badtype.json b/endpoints/openrtb2/sample-requests/invalid-whole/user-gdpr-badtype.json index 3abc88c70da..ce887889034 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/user-gdpr-badtype.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/user-gdpr-badtype.json @@ -17,7 +17,7 @@ "id": "/19968336/header-bid-tag-0", "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } }, "banner": { diff --git a/endpoints/openrtb2/sample-requests/invalid-whole/user-gdpr-invalid.json b/endpoints/openrtb2/sample-requests/invalid-whole/user-gdpr-invalid.json index b2b554846ca..0729a22db80 100644 --- a/endpoints/openrtb2/sample-requests/invalid-whole/user-gdpr-invalid.json +++ b/endpoints/openrtb2/sample-requests/invalid-whole/user-gdpr-invalid.json @@ -17,7 +17,7 @@ "id": "/19968336/header-bid-tag-0", "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } }, "banner": { diff --git a/endpoints/openrtb2/sample-requests/valid-whole/exemplary/all-ext.json b/endpoints/openrtb2/sample-requests/valid-whole/exemplary/all-ext.json index 17b249a1494..3e2beedefac 100644 --- a/endpoints/openrtb2/sample-requests/valid-whole/exemplary/all-ext.json +++ b/endpoints/openrtb2/sample-requests/valid-whole/exemplary/all-ext.json @@ -39,7 +39,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 }, "districtm": { "placementId": 105 diff --git a/endpoints/openrtb2/sample-requests/valid-whole/exemplary/prebid-test-ad.json b/endpoints/openrtb2/sample-requests/valid-whole/exemplary/prebid-test-ad.json index b4fd8693953..fc4794328a4 100644 --- a/endpoints/openrtb2/sample-requests/valid-whole/exemplary/prebid-test-ad.json +++ b/endpoints/openrtb2/sample-requests/valid-whole/exemplary/prebid-test-ad.json @@ -23,7 +23,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/valid-whole/supplementary/aliased-buyeruids.json b/endpoints/openrtb2/sample-requests/valid-whole/supplementary/aliased-buyeruids.json index 1eb74614340..82125592e46 100644 --- a/endpoints/openrtb2/sample-requests/valid-whole/supplementary/aliased-buyeruids.json +++ b/endpoints/openrtb2/sample-requests/valid-whole/supplementary/aliased-buyeruids.json @@ -16,7 +16,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/valid-whole/supplementary/aliases.json b/endpoints/openrtb2/sample-requests/valid-whole/supplementary/aliases.json index 6c8608ba3c6..f6137e4a019 100644 --- a/endpoints/openrtb2/sample-requests/valid-whole/supplementary/aliases.json +++ b/endpoints/openrtb2/sample-requests/valid-whole/supplementary/aliases.json @@ -13,7 +13,7 @@ }, "ext": { "unknown": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/valid-whole/supplementary/app.json b/endpoints/openrtb2/sample-requests/valid-whole/supplementary/app.json index cad5e852e69..66e05d7636b 100644 --- a/endpoints/openrtb2/sample-requests/valid-whole/supplementary/app.json +++ b/endpoints/openrtb2/sample-requests/valid-whole/supplementary/app.json @@ -28,7 +28,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/valid-whole/supplementary/bid-adjustments.json b/endpoints/openrtb2/sample-requests/valid-whole/supplementary/bid-adjustments.json index 2ce81b97b25..0cf52a8915f 100644 --- a/endpoints/openrtb2/sample-requests/valid-whole/supplementary/bid-adjustments.json +++ b/endpoints/openrtb2/sample-requests/valid-whole/supplementary/bid-adjustments.json @@ -13,7 +13,7 @@ }, "ext": { "unknown": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/valid-whole/supplementary/cache-bids.json b/endpoints/openrtb2/sample-requests/valid-whole/supplementary/cache-bids.json index 884ec898dab..a4c93b3d3cb 100644 --- a/endpoints/openrtb2/sample-requests/valid-whole/supplementary/cache-bids.json +++ b/endpoints/openrtb2/sample-requests/valid-whole/supplementary/cache-bids.json @@ -13,7 +13,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/valid-whole/supplementary/cache-vast.json b/endpoints/openrtb2/sample-requests/valid-whole/supplementary/cache-vast.json index 7878767af78..fe9445358ba 100644 --- a/endpoints/openrtb2/sample-requests/valid-whole/supplementary/cache-vast.json +++ b/endpoints/openrtb2/sample-requests/valid-whole/supplementary/cache-vast.json @@ -13,7 +13,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/valid-whole/supplementary/ccpa-invalid.json b/endpoints/openrtb2/sample-requests/valid-whole/supplementary/ccpa-invalid.json index bf04930420b..f3b677635c0 100644 --- a/endpoints/openrtb2/sample-requests/valid-whole/supplementary/ccpa-invalid.json +++ b/endpoints/openrtb2/sample-requests/valid-whole/supplementary/ccpa-invalid.json @@ -15,7 +15,7 @@ "id": "/19968336/header-bid-tag-0", "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } }, "banner": { diff --git a/endpoints/openrtb2/sample-requests/valid-whole/supplementary/digitrust.json b/endpoints/openrtb2/sample-requests/valid-whole/supplementary/digitrust.json index 0017f5e7203..ca8e090760d 100644 --- a/endpoints/openrtb2/sample-requests/valid-whole/supplementary/digitrust.json +++ b/endpoints/openrtb2/sample-requests/valid-whole/supplementary/digitrust.json @@ -23,7 +23,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/valid-whole/supplementary/gdpr-no-consentstring.json b/endpoints/openrtb2/sample-requests/valid-whole/supplementary/gdpr-no-consentstring.json index 77f1f86bede..5a63c6d11ce 100644 --- a/endpoints/openrtb2/sample-requests/valid-whole/supplementary/gdpr-no-consentstring.json +++ b/endpoints/openrtb2/sample-requests/valid-whole/supplementary/gdpr-no-consentstring.json @@ -15,7 +15,7 @@ "id": "/19968336/header-bid-tag-0", "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } }, "banner": { diff --git a/endpoints/openrtb2/sample-requests/valid-whole/supplementary/gdpr.json b/endpoints/openrtb2/sample-requests/valid-whole/supplementary/gdpr.json index 1234f58ddce..ef9f10d0cd0 100644 --- a/endpoints/openrtb2/sample-requests/valid-whole/supplementary/gdpr.json +++ b/endpoints/openrtb2/sample-requests/valid-whole/supplementary/gdpr.json @@ -15,7 +15,7 @@ "id": "/19968336/header-bid-tag-0", "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } }, "banner": { diff --git a/endpoints/openrtb2/sample-requests/valid-whole/supplementary/interstitial-device-only.json b/endpoints/openrtb2/sample-requests/valid-whole/supplementary/interstitial-device-only.json index 2c85ef143d3..64146eaebe8 100644 --- a/endpoints/openrtb2/sample-requests/valid-whole/supplementary/interstitial-device-only.json +++ b/endpoints/openrtb2/sample-requests/valid-whole/supplementary/interstitial-device-only.json @@ -10,7 +10,7 @@ "instl": 1, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/valid-whole/supplementary/interstitial-no-extension.json b/endpoints/openrtb2/sample-requests/valid-whole/supplementary/interstitial-no-extension.json index 1e6604e7d2a..15cd832053f 100644 --- a/endpoints/openrtb2/sample-requests/valid-whole/supplementary/interstitial-no-extension.json +++ b/endpoints/openrtb2/sample-requests/valid-whole/supplementary/interstitial-no-extension.json @@ -17,7 +17,7 @@ "instl": 1, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/valid-whole/supplementary/interstitial.json b/endpoints/openrtb2/sample-requests/valid-whole/supplementary/interstitial.json index c5d373797ff..64fc2fe2653 100644 --- a/endpoints/openrtb2/sample-requests/valid-whole/supplementary/interstitial.json +++ b/endpoints/openrtb2/sample-requests/valid-whole/supplementary/interstitial.json @@ -17,7 +17,7 @@ "instl": 1, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/valid-whole/supplementary/site-amp.json b/endpoints/openrtb2/sample-requests/valid-whole/supplementary/site-amp.json index c0dbb355fea..30c0afc800a 100644 --- a/endpoints/openrtb2/sample-requests/valid-whole/supplementary/site-amp.json +++ b/endpoints/openrtb2/sample-requests/valid-whole/supplementary/site-amp.json @@ -26,7 +26,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/valid-whole/supplementary/site.json b/endpoints/openrtb2/sample-requests/valid-whole/supplementary/site.json index f0a02103c34..7a25249c763 100644 --- a/endpoints/openrtb2/sample-requests/valid-whole/supplementary/site.json +++ b/endpoints/openrtb2/sample-requests/valid-whole/supplementary/site.json @@ -23,7 +23,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/valid-whole/supplementary/timeout.json b/endpoints/openrtb2/sample-requests/valid-whole/supplementary/timeout.json index 611d96ca581..b3dbe1f5d4b 100644 --- a/endpoints/openrtb2/sample-requests/valid-whole/supplementary/timeout.json +++ b/endpoints/openrtb2/sample-requests/valid-whole/supplementary/timeout.json @@ -22,7 +22,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/endpoints/openrtb2/sample-requests/valid-whole/supplementary/user.json b/endpoints/openrtb2/sample-requests/valid-whole/supplementary/user.json index 951a7774fe4..243b0739b7b 100644 --- a/endpoints/openrtb2/sample-requests/valid-whole/supplementary/user.json +++ b/endpoints/openrtb2/sample-requests/valid-whole/supplementary/user.json @@ -23,7 +23,7 @@ }, "ext": { "appnexus": { - "placementId": 10433394 + "placementId": 12883451 } } } diff --git a/exchange/exchange_test.go b/exchange/exchange_test.go index 6718eb7df80..dc4d7d980e9 100644 --- a/exchange/exchange_test.go +++ b/exchange/exchange_test.go @@ -103,17 +103,17 @@ func TestCharacterEscape(t *testing.T) { Imp: []openrtb.Imp{{ ID: "some-impression-id", Banner: &openrtb.Banner{Format: []openrtb.Format{{W: 300, H: 250}, {W: 300, H: 600}}}, - Ext: json.RawMessage(`{"appnexus": {"placementId": 10433394}}`), + Ext: json.RawMessage(`{"appnexus": {"placementId": 1}}`), }}, Site: &openrtb.Site{Page: "prebid.org", Ext: json.RawMessage(`{"amp":0}`)}, Device: &openrtb.Device{UA: "curl/7.54.0", IP: "::1"}, AT: 1, TMax: 500, - Ext: json.RawMessage(`{"id": "some-request-id","site": {"page": "prebid.org"},"imp": [{"id": "some-impression-id","banner": {"format": [{"w": 300,"h": 250},{"w": 300,"h": 600}]},"ext": {"appnexus": {"placementId": 10433394}}}],"tmax": 500}`), + Ext: json.RawMessage(`{"id": "some-request-id","site": {"page": "prebid.org"},"imp": [{"id": "some-impression-id","banner": {"format": [{"w": 300,"h": 250},{"w": 300,"h": 600}]},"ext": {"appnexus": {"placementId": 1}}}],"tmax": 500}`), } //resolvedRequest json.RawMessage - resolvedRequest := json.RawMessage(`{"id": "some-request-id","site": {"page": "prebid.org"},"imp": [{"id": "some-impression-id","banner": {"format": [{"w": 300,"h": 250},{"w": 300,"h": 600}]},"ext": {"appnexus": {"placementId": 10433394}}}],"tmax": 500}`) + resolvedRequest := json.RawMessage(`{"id": "some-request-id","site": {"page": "prebid.org"},"imp": [{"id": "some-impression-id","banner": {"format": [{"w": 300,"h": 250},{"w": 300,"h": 600}]},"ext": {"appnexus": {"placementId": 1}}}],"tmax": 500}`) //adapterExtra map[openrtb_ext.BidderName]*seatResponseExtra, adapterExtra := make(map[openrtb_ext.BidderName]*seatResponseExtra, 1) @@ -231,7 +231,7 @@ func TestGetBidCacheInfo(t *testing.T) { } //resolvedRequest json.RawMessage - resolvedRequest := json.RawMessage(`{"id": "some-request-id","site": {"page": "prebid.org"},"imp": [{"id": "some-impression-id","banner": {"format": [{"w": 300,"h": 250},{"w": 300,"h": 600}]},"ext": {"appnexus": {"placementId": 10433394}}}],"tmax": 500}`) + resolvedRequest := json.RawMessage(`{"id": "some-request-id","site": {"page": "prebid.org"},"imp": [{"id": "some-impression-id","banner": {"format": [{"w": 300,"h": 250},{"w": 300,"h": 600}]},"ext": {"appnexus": {"placementId": 1}}}],"tmax": 500}`) //adapterExtra map[openrtb_ext.BidderName]*seatResponseExtra, adapterExtra := map[openrtb_ext.BidderName]*seatResponseExtra{ @@ -259,7 +259,7 @@ func TestGetBidCacheInfo(t *testing.T) { "siteId": 113932, "zoneId": 535510 }, - "appnexus": { "placementId": 10433394 }, + "appnexus": { "placementId": 1 }, "pubmatic": { "publisherId": "156209", "adSlot": "pubmatic_test2@300x250" }, "pulsepoint": { "cf": "300X250", "cp": 512379, "ct": 486653 }, "conversant": { "site_id": "108060" }, @@ -343,7 +343,7 @@ func buildBidResponseParams(bidderName openrtb_ext.BidderName, bidRequest *openr } //resolvedRequest json.RawMessage - resolvedRequest := json.RawMessage(`{"id": "some-request-id","site": {"page": "prebid.org"},"imp": [{"id": "some-impression-id","banner": {"format": [{"w": 300,"h": 250},{"w": 300,"h": 600}]},"ext": {"appnexus": {"placementId": 10433394}}}],"tmax": 500}`) + resolvedRequest := json.RawMessage(`{"id": "some-request-id","site": {"page": "prebid.org"},"imp": [{"id": "some-impression-id","banner": {"format": [{"w": 300,"h": 250},{"w": 300,"h": 600}]},"ext": {"appnexus": {"placementId": 1}}}],"tmax": 500}`) //adapterExtra map[openrtb_ext.BidderName]*seatResponseExtra, adapterExtra := map[openrtb_ext.BidderName]*seatResponseExtra{ diff --git a/exchange/utils_test.go b/exchange/utils_test.go index 4ccded46c68..edbe04a0d0f 100644 --- a/exchange/utils_test.go +++ b/exchange/utils_test.go @@ -153,7 +153,7 @@ func newAdapterAliasBidRequest(t *testing.T) *openrtb.BidRequest { H: 600, }}, }, - Ext: json.RawMessage(`{"appnexus": {"placementId": 10433394},"brightroll": {"placementId": 105}}`), + Ext: json.RawMessage(`{"appnexus": {"placementId": 1},"brightroll": {"placementId": 105}}`), }}, Ext: json.RawMessage(`{"prebid":{"aliases":{"brightroll":"appnexus"}}}`), } @@ -199,7 +199,7 @@ func newCCPABidRequest(t *testing.T) *openrtb.BidRequest { H: 600, }}, }, - Ext: json.RawMessage(`{"appnexus": {"placementId": 10433394}}`), + Ext: json.RawMessage(`{"appnexus": {"placementId": 1}}`), }}, } } diff --git a/pbs/pbsrequest_test.go b/pbs/pbsrequest_test.go index 3e3b37b9fad..52cd6153323 100644 --- a/pbs/pbsrequest_test.go +++ b/pbs/pbsrequest_test.go @@ -199,7 +199,7 @@ var dummyConfig = ` "bidder": "appnexus", "bid_id": "22222224", "params": { - "placementId": "10433394" + "placementId": "1" } } ] From 2cb786a07acbace488b094abad5212c659742244 Mon Sep 17 00:00:00 2001 From: guscarreon Date: Fri, 10 Jan 2020 11:29:03 -0500 Subject: [PATCH 06/13] Fix Currency Converter Doesn't Output CUR (#1154) --- adapters/adform/adform_test.go | 76 ++++++++++++++ currencies/rate_converter_test.go | 1 + exchange/exchange.go | 1 + exchange/exchange_test.go | 160 ++++++++++++++++++++++++------ 4 files changed, 205 insertions(+), 33 deletions(-) diff --git a/adapters/adform/adform_test.go b/adapters/adform/adform_test.go index e59bd951858..63646f5f7f5 100644 --- a/adapters/adform/adform_test.go +++ b/adapters/adform/adform_test.go @@ -21,6 +21,8 @@ import ( "github.com/prebid/prebid-server/adapters" "github.com/prebid/prebid-server/config" "github.com/prebid/prebid-server/openrtb_ext" + + "github.com/stretchr/testify/assert" ) func TestJsonSamples(t *testing.T) { @@ -597,3 +599,77 @@ func TestPriceTypeUrlParameterCreation(t *testing.T) { } } } + +// Asserts that toOpenRtbBidResponse() creates a *adapters.BidderResponse with +// the currency of the last valid []*adformBid element and the expected number of bids +func TestToOpenRtbBidResponse(t *testing.T) { + expectedBids := 3 + lastCurrency, anotherCurrency, emptyCurrency := "EUR", "USD", "" + + request := &openrtb.BidRequest{ + ID: "test-request-id", + Imp: []openrtb.Imp{ + { + ID: "banner-imp-no1", + Ext: json.RawMessage(`{"bidder1": { "mid": "32341" }}`), + Banner: &openrtb.Banner{}, + }, + { + ID: "banner-imp-no2", + Ext: json.RawMessage(`{"bidder1": { "mid": "32342" }}`), + Banner: &openrtb.Banner{}, + }, + { + ID: "banner-imp-no3", + Ext: json.RawMessage(`{"bidder1": { "mid": "32343" }}`), + Banner: &openrtb.Banner{}, + }, + { + ID: "banner-imp-no4", + Ext: json.RawMessage(`{"bidder1": { "mid": "32344" }}`), + Banner: &openrtb.Banner{}, + }, + }, + Device: &openrtb.Device{UA: "ua", IP: "ip"}, + User: &openrtb.User{BuyerUID: "buyerUID"}, + } + + testAdformBids := []*adformBid{ + { + ResponseType: "banner", + Banner: "banner-content1", + Price: 1.23, + Currency: anotherCurrency, + Width: 300, + Height: 200, + DealId: "dealId1", + CreativeId: "creativeId1", + }, + {}, + { + ResponseType: "banner", + Banner: "banner-content3", + Price: 1.24, + Currency: emptyCurrency, + Width: 300, + Height: 200, + DealId: "dealId3", + CreativeId: "creativeId3", + }, + { + ResponseType: "banner", + Banner: "banner-content4", + Price: 1.25, + Currency: lastCurrency, + Width: 300, + Height: 200, + DealId: "dealId4", + CreativeId: "creativeId4", + }, + } + + actualBidResponse := toOpenRtbBidResponse(testAdformBids, request) + + assert.Equalf(t, expectedBids, len(actualBidResponse.Bids), "bid count") + assert.Equalf(t, lastCurrency, actualBidResponse.Currency, "currency") +} diff --git a/currencies/rate_converter_test.go b/currencies/rate_converter_test.go index a1807a63ffb..f9a14895347 100644 --- a/currencies/rate_converter_test.go +++ b/currencies/rate_converter_test.go @@ -379,6 +379,7 @@ func TestRates(t *testing.T) { {from: "", to: "EUR", expectedRate: 0, hasError: true}, {from: "CNY", to: "", expectedRate: 0, hasError: true}, {from: "", to: "", expectedRate: 0, hasError: true}, + {from: "USD", to: "USD", expectedRate: 1, hasError: false}, } mockedHttpServer := httptest.NewServer(http.HandlerFunc( diff --git a/exchange/exchange.go b/exchange/exchange.go index 071b4f8d771..3d9055ca8a6 100644 --- a/exchange/exchange.go +++ b/exchange/exchange.go @@ -324,6 +324,7 @@ func (e *exchange) buildBidResponse(ctx context.Context, liveAdapters []openrtb_ if adapterBids[a] != nil && len(adapterBids[a].bids) > 0 { sb := e.makeSeatBid(adapterBids[a], a, adapterExtra, auc) seatBids = append(seatBids, *sb) + bidResponse.Cur = adapterBids[a].currency } } diff --git a/exchange/exchange_test.go b/exchange/exchange_test.go index dc4d7d980e9..31dddae4c74 100644 --- a/exchange/exchange_test.go +++ b/exchange/exchange_test.go @@ -314,51 +314,145 @@ func TestGetBidCacheInfo(t *testing.T) { assert.Equal(t, expCacheURL, cacheURL, "[TestGetBidCacheInfo] cacheId field in ext should equal \"%s\" \n", expCacheURL) } -func buildBidResponseParams(bidderName openrtb_ext.BidderName, bidRequest *openrtb.BidRequest) ([]openrtb_ext.BidderName, map[openrtb_ext.BidderName]*pbsOrtbSeatBid, json.RawMessage, map[openrtb_ext.BidderName]*seatResponseExtra) { - //liveAdapters []openrtb_ext.BidderName, - liveAdapters := []openrtb_ext.BidderName{bidderName} +func TestBidResponseCurrency(t *testing.T) { + // Init objects + cfg := &config.Configuration{Adapters: make(map[string]config.Adapter, 1)} + cfg.Adapters["appnexus"] = config.Adapter{Endpoint: "http://ib.adnxs.com"} - //adapterBids map[openrtb_ext.BidderName]*pbsOrtbSeatBid, - adapterBids := map[openrtb_ext.BidderName]*pbsOrtbSeatBid{ - bidderName: { - bids: []*pbsOrtbBid{ - { - bid: &openrtb.Bid{ - ID: "some-imp-id", - Price: 9.517803, - W: 300, - H: 250, - }, - bidType: openrtb_ext.BidTypeBanner, - bidTargets: map[string]string{ - "pricegranularity": "med", - "includewinners": "true", - "includebidderkeys": "false", - }, - }, - }, - currency: "USD", - //ext: bidRequest.Ext, - }, + handlerNoBidServer := func(w http.ResponseWriter, r *http.Request) { w.WriteHeader(204) } + server := httptest.NewServer(http.HandlerFunc(handlerNoBidServer)) + defer server.Close() + + e := NewExchange(server.Client(), nil, cfg, pbsmetrics.NewMetrics(metrics.NewRegistry(), openrtb_ext.BidderList(), config.DisabledMetrics{}), adapters.ParseBidderInfos(cfg.Adapters, "../static/bidder-info", openrtb_ext.BidderList()), gdpr.AlwaysAllow{}, currencies.NewRateConverterDefault()).(*exchange) + + liveAdapters := make([]openrtb_ext.BidderName, 1) + liveAdapters[0] = "appnexus" + + bidRequest := &openrtb.BidRequest{ + ID: "some-request-id", + Imp: []openrtb.Imp{{ + ID: "some-impression-id", + Banner: &openrtb.Banner{Format: []openrtb.Format{{W: 300, H: 250}, {W: 300, H: 600}}}, + Ext: json.RawMessage(`{"appnexus": {"placementId": 10433394}}`), + }}, + Site: &openrtb.Site{Page: "prebid.org", Ext: json.RawMessage(`{"amp":0}`)}, + Device: &openrtb.Device{UA: "curl/7.54.0", IP: "::1"}, + AT: 1, + TMax: 500, + Ext: json.RawMessage(`{"id": "some-request-id","site": {"page": "prebid.org"},"imp": [{"id": "some-impression-id","banner": {"format": [{"w": 300,"h": 250},{"w": 300,"h": 600}]},"ext": {"appnexus": {"placementId": 10433394}}}],"tmax": 500}`), } - //resolvedRequest json.RawMessage resolvedRequest := json.RawMessage(`{"id": "some-request-id","site": {"page": "prebid.org"},"imp": [{"id": "some-impression-id","banner": {"format": [{"w": 300,"h": 250},{"w": 300,"h": 600}]},"ext": {"appnexus": {"placementId": 1}}}],"tmax": 500}`) - //adapterExtra map[openrtb_ext.BidderName]*seatResponseExtra, adapterExtra := map[openrtb_ext.BidderName]*seatResponseExtra{ - bidderName: { - ResponseTimeMillis: 5, - Errors: []openrtb_ext.ExtBidderError{ + "appnexus": {ResponseTimeMillis: 5}, + } + + var errList []error + + sampleBid := &openrtb.Bid{ + ID: "some-imp-id", + Price: 9.517803, + W: 300, + H: 250, + Ext: nil, + } + aPbsOrtbBidArr := []*pbsOrtbBid{{bid: sampleBid, bidType: openrtb_ext.BidTypeBanner}} + sampleSeatBid := []openrtb.SeatBid{ + { + Seat: "appnexus", + Bid: []openrtb.Bid{ { - Code: 999, - Message: "Post ib.adnxs.com/openrtb2?query1&query2: unsupported protocol scheme \"\"", + ID: "some-imp-id", + Price: 9.517803, + W: 300, + H: 250, + Ext: json.RawMessage(`{"prebid":{"type":"banner"}}`), + }, + }, + }, + } + emptySeatBid := []openrtb.SeatBid{} + + // Test cases + type aTest struct { + description string + adapterBids map[openrtb_ext.BidderName]*pbsOrtbSeatBid + expectedBidResponse *openrtb.BidResponse + } + testCases := []aTest{ + { + description: "1) Adapter to bids map comes with a non-empty currency field and non-empty bid array", + adapterBids: map[openrtb_ext.BidderName]*pbsOrtbSeatBid{ + openrtb_ext.BidderName("appnexus"): { + bids: aPbsOrtbBidArr, + currency: "USD", }, }, + expectedBidResponse: &openrtb.BidResponse{ + ID: "some-request-id", + SeatBid: sampleSeatBid, + Cur: "USD", + Ext: json.RawMessage(`{"responsetimemillis":{"appnexus":5},"tmaxrequest":500} +`), + }, + }, + { + description: "2) Adapter to bids map comes with a non-empty currency field but an empty bid array", + adapterBids: map[openrtb_ext.BidderName]*pbsOrtbSeatBid{ + openrtb_ext.BidderName("appnexus"): { + bids: nil, + currency: "USD", + }, + }, + expectedBidResponse: &openrtb.BidResponse{ + ID: "some-request-id", + SeatBid: emptySeatBid, + Cur: "", + Ext: json.RawMessage(`{"responsetimemillis":{"appnexus":5},"tmaxrequest":500} +`), + }, + }, + { + description: "3) Adapter to bids map comes with an empty currency string and a non-empty bid array", + adapterBids: map[openrtb_ext.BidderName]*pbsOrtbSeatBid{ + openrtb_ext.BidderName("appnexus"): { + bids: aPbsOrtbBidArr, + currency: "", + }, + }, + expectedBidResponse: &openrtb.BidResponse{ + ID: "some-request-id", + SeatBid: sampleSeatBid, + Cur: "", + Ext: json.RawMessage(`{"responsetimemillis":{"appnexus":5},"tmaxrequest":500} +`), + }, + }, + { + description: "4) Adapter to bids map comes with an empty currency string and an empty bid array", + adapterBids: map[openrtb_ext.BidderName]*pbsOrtbSeatBid{ + openrtb_ext.BidderName("appnexus"): { + bids: nil, + currency: "", + }, + }, + expectedBidResponse: &openrtb.BidResponse{ + ID: "some-request-id", + SeatBid: emptySeatBid, + Cur: "", + Ext: json.RawMessage(`{"responsetimemillis":{"appnexus":5},"tmaxrequest":500} +`), + }, }, } - return liveAdapters, adapterBids, resolvedRequest, adapterExtra + // Run tests + for i := range testCases { + actualBidResp, err := e.buildBidResponse(context.Background(), liveAdapters, testCases[i].adapterBids, bidRequest, resolvedRequest, adapterExtra, nil, errList) + assert.NoError(t, err, fmt.Sprintf("[TEST_FAILED] e.buildBidResponse resturns error in test: %s Error message: %s \n", testCases[i].description, err)) + assert.Equalf(t, testCases[i].expectedBidResponse, actualBidResp, fmt.Sprintf("[TEST_FAILED] Objects must be equal for test: %s \n Expected: >>%s<< \n Actual: >>%s<< ", testCases[i].description, testCases[i].expectedBidResponse.Ext, actualBidResp.Ext)) + } } // TestRaceIntegration runs an integration test using all the sample params from From 072bf5b8f4e33fcd7960f07b4dde52a21e7fdc26 Mon Sep 17 00:00:00 2001 From: jmaynardxandr <46759873+jmaynardxandr@users.noreply.github.com> Date: Fri, 10 Jan 2020 09:11:34 -0800 Subject: [PATCH 07/13] =?UTF-8?q?Add=20custom=20JSON=20req/resp=20data=20t?= =?UTF-8?q?o=20the=20analytics=20logging=E2=80=A6=20(#1145)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add custom JSON req/resp data to the analytics logging for the /openrtb2/video endpoint. * Add calls in unit tests to cover logging and jsonify of video object. --- analytics/config/config.go | 6 ++++ analytics/config/config_test.go | 7 ++++ analytics/core.go | 12 +++++++ analytics/filesystem/file_module.go | 27 +++++++++++++++ analytics/filesystem/file_module_test.go | 10 ++++++ endpoints/openrtb2/video_auction.go | 42 +++++++++++++----------- endpoints/openrtb2/video_auction_test.go | 27 ++++++++------- 7 files changed, 101 insertions(+), 30 deletions(-) diff --git a/analytics/config/config.go b/analytics/config/config.go index 3073c6ca1aa..7be7c8ecca3 100644 --- a/analytics/config/config.go +++ b/analytics/config/config.go @@ -29,6 +29,12 @@ func (ea enabledAnalytics) LogAuctionObject(ao *analytics.AuctionObject) { } } +func (ea enabledAnalytics) LogVideoObject(vo *analytics.VideoObject) { + for _, module := range ea { + module.LogVideoObject(vo) + } +} + func (ea enabledAnalytics) LogCookieSyncObject(cso *analytics.CookieSyncObject) { for _, module := range ea { module.LogCookieSyncObject(cso) diff --git a/analytics/config/config_test.go b/analytics/config/config_test.go index cb2bb049e11..0fd3ec2019e 100644 --- a/analytics/config/config_test.go +++ b/analytics/config/config_test.go @@ -45,6 +45,11 @@ func TestSampleModule(t *testing.T) { if count != 4 { t.Errorf("PBSAnalyticsModule failed at LogAmpObject") } + + am.LogVideoObject(&analytics.VideoObject{}) + if count != 5 { + t.Errorf("PBSAnalyticsModule failed at LogVideoObject") + } } type sampleModule struct { @@ -53,6 +58,8 @@ type sampleModule struct { func (m *sampleModule) LogAuctionObject(ao *analytics.AuctionObject) { *m.count++ } +func (m *sampleModule) LogVideoObject(vo *analytics.VideoObject) { *m.count++ } + func (m *sampleModule) LogCookieSyncObject(cso *analytics.CookieSyncObject) { *m.count++ } func (m *sampleModule) LogSetUIDObject(so *analytics.SetUIDObject) { *m.count++ } diff --git a/analytics/core.go b/analytics/core.go index 3f16ba64c38..6fd5139fd3d 100644 --- a/analytics/core.go +++ b/analytics/core.go @@ -2,6 +2,7 @@ package analytics import ( "github.com/mxmCherry/openrtb" + "github.com/prebid/prebid-server/openrtb_ext" "github.com/prebid/prebid-server/usersync" ) @@ -15,6 +16,7 @@ import ( type PBSAnalyticsModule interface { LogAuctionObject(*AuctionObject) + LogVideoObject(*VideoObject) LogCookieSyncObject(*CookieSyncObject) LogSetUIDObject(*SetUIDObject) LogAmpObject(*AmpObject) @@ -38,6 +40,16 @@ type AmpObject struct { Origin string } +//Loggable object of a transaction at /openrtb2/video endpoint +type VideoObject struct { + Status int + Errors []error + Request *openrtb.BidRequest + Response *openrtb.BidResponse + VideoRequest *openrtb_ext.BidRequestVideo + VideoResponse *openrtb_ext.BidResponseVideo +} + //Loggable object of a transaction at /setuid type SetUIDObject struct { Status int diff --git a/analytics/filesystem/file_module.go b/analytics/filesystem/file_module.go index b9438763c4b..54d492ad97c 100644 --- a/analytics/filesystem/file_module.go +++ b/analytics/filesystem/file_module.go @@ -14,6 +14,7 @@ type RequestType string const ( COOKIE_SYNC RequestType = "/cookie_sync" AUCTION RequestType = "/openrtb2/auction" + VIDEO RequestType = "/openrtb2/video" SETUID RequestType = "/set_uid" AMP RequestType = "/openrtb2/amp" ) @@ -32,6 +33,15 @@ func (f *FileLogger) LogAuctionObject(ao *analytics.AuctionObject) { f.Logger.Flush() } +//Writes VideoObject to file +func (f *FileLogger) LogVideoObject(vo *analytics.VideoObject) { + //Code to parse the object and log in a way required + var b bytes.Buffer + b.WriteString(jsonifyVideoObject(vo)) + f.Logger.Debug(b.String()) + f.Logger.Flush() +} + //Logs SetUIDObject to file func (f *FileLogger) LogSetUIDObject(so *analytics.SetUIDObject) { //Code to parse the object and log in a way required @@ -98,6 +108,23 @@ func jsonifyAuctionObject(ao *analytics.AuctionObject) string { } } +func jsonifyVideoObject(vo *analytics.VideoObject) string { + type alias analytics.VideoObject + b, err := json.Marshal(&struct { + Type RequestType `json:"type"` + *alias + }{ + Type: VIDEO, + alias: (*alias)(vo), + }) + + if err == nil { + return string(b) + } else { + return fmt.Sprintf("Transactional Logs Error: Video object badly formed %v", err) + } +} + func jsonifyCookieSync(cso *analytics.CookieSyncObject) string { type alias analytics.CookieSyncObject diff --git a/analytics/filesystem/file_module_test.go b/analytics/filesystem/file_module_test.go index 4ec2bb6abaa..6e2d9f6263b 100644 --- a/analytics/filesystem/file_module_test.go +++ b/analytics/filesystem/file_module_test.go @@ -34,6 +34,15 @@ func TestAuctionObject_ToJson(t *testing.T) { } } +func TestVideoObject_ToJson(t *testing.T) { + vo := &analytics.VideoObject{ + Status: http.StatusOK, + } + if voJson := jsonifyVideoObject(vo); strings.Contains(voJson, "Transactional Logs Error") { + t.Fatalf("AuctionObject failed to convert to json") + } +} + func TestSetUIDObject_ToJson(t *testing.T) { so := &analytics.SetUIDObject{ Status: http.StatusOK, @@ -64,6 +73,7 @@ func TestFileLogger_LogObjects(t *testing.T) { defer os.RemoveAll(TEST_DIR) if fl, err := NewFileLogger(TEST_DIR + "//test"); err == nil { fl.LogAuctionObject(&analytics.AuctionObject{}) + fl.LogVideoObject(&analytics.VideoObject{}) fl.LogAmpObject(&analytics.AmpObject{}) fl.LogSetUIDObject(&analytics.SetUIDObject{}) fl.LogCookieSyncObject(&analytics.CookieSyncObject{}) diff --git a/endpoints/openrtb2/video_auction.go b/endpoints/openrtb2/video_auction.go index eecdc5f99d1..b8b21b762d7 100644 --- a/endpoints/openrtb2/video_auction.go +++ b/endpoints/openrtb2/video_auction.go @@ -65,7 +65,7 @@ func NewVideoEndpoint(ex exchange.Exchange, validator openrtb_ext.BidderParamVal */ func (deps *endpointDeps) VideoAuctionEndpoint(w http.ResponseWriter, r *http.Request, _ httprouter.Params) { - ao := analytics.AuctionObject{ + vo := analytics.VideoObject{ Status: http.StatusOK, Errors: make([]error, 0), } @@ -82,7 +82,7 @@ func (deps *endpointDeps) VideoAuctionEndpoint(w http.ResponseWriter, r *http.Re defer func() { deps.metricsEngine.RecordRequest(labels) deps.metricsEngine.RecordRequestTime(labels, time.Since(start)) - deps.analytics.LogAuctionObject(&ao) + deps.analytics.LogVideoObject(&vo) }() lr := &io.LimitedReader{ @@ -91,7 +91,7 @@ func (deps *endpointDeps) VideoAuctionEndpoint(w http.ResponseWriter, r *http.Re } requestJson, err := ioutil.ReadAll(lr) if err != nil { - handleError(&labels, w, []error{err}, &ao) + handleError(&labels, w, []error{err}, &vo) return } @@ -102,35 +102,37 @@ func (deps *endpointDeps) VideoAuctionEndpoint(w http.ResponseWriter, r *http.Re if err != nil { if deps.cfg.VideoStoredRequestRequired { - handleError(&labels, w, []error{err}, &ao) + handleError(&labels, w, []error{err}, &vo) return } } else { storedRequest, errs := deps.loadStoredVideoRequest(context.Background(), storedRequestId) if len(errs) > 0 { - handleError(&labels, w, errs, &ao) + handleError(&labels, w, errs, &vo) return } //merge incoming req with stored video req resolvedRequest, err = jsonpatch.MergePatch(storedRequest, requestJson) if err != nil { - handleError(&labels, w, []error{err}, &ao) + handleError(&labels, w, []error{err}, &vo) return } } //unmarshal and validate combined result videoBidReq, errL, podErrors := deps.parseVideoRequest(resolvedRequest) if len(errL) > 0 { - handleError(&labels, w, errL, &ao) + handleError(&labels, w, errL, &vo) return } + vo.VideoRequest = videoBidReq + var bidReq = &openrtb.BidRequest{} if deps.defaultRequest { if err := json.Unmarshal(deps.defReqJSON, bidReq); err != nil { err = fmt.Errorf("Invalid JSON in Default Request Settings: %s", err) - handleError(&labels, w, []error{err}, &ao) + handleError(&labels, w, []error{err}, &vo) return } } @@ -154,7 +156,7 @@ func (deps *endpointDeps) VideoAuctionEndpoint(w http.ResponseWriter, r *http.Re } err := errors.New(fmt.Sprintf("all pods are incorrect: %s", strings.Join(resPodErr, "; "))) errL = append(errL, err) - handleError(&labels, w, errL, &ao) + handleError(&labels, w, errL, &vo) return } @@ -166,7 +168,7 @@ func (deps *endpointDeps) VideoAuctionEndpoint(w http.ResponseWriter, r *http.Re errL = deps.validateRequest(bidReq) if len(errL) > 0 { - handleError(&labels, w, errL, &ao) + handleError(&labels, w, errL, &vo) return } @@ -194,16 +196,16 @@ func (deps *endpointDeps) VideoAuctionEndpoint(w http.ResponseWriter, r *http.Re if acctIdErr := validateAccount(deps.cfg, labels.PubID); acctIdErr != nil { errL = append(errL, acctIdErr) - handleError(&labels, w, errL, &ao) + handleError(&labels, w, errL, &vo) return } //execute auction logic response, err := deps.ex.HoldAuction(ctx, bidReq, usersyncs, labels, &deps.categories) - ao.Request = bidReq - ao.Response = response + vo.Request = bidReq + vo.Response = response if err != nil { errL := []error{err} - handleError(&labels, w, errL, &ao) + handleError(&labels, w, errL, &vo) return } @@ -211,18 +213,20 @@ func (deps *endpointDeps) VideoAuctionEndpoint(w http.ResponseWriter, r *http.Re bidResp, err := buildVideoResponse(response, podErrors) if err != nil { errL := []error{err} - handleError(&labels, w, errL, &ao) + handleError(&labels, w, errL, &vo) return } if bidReq.Test == 1 { bidResp.Ext = response.Ext } + vo.VideoResponse = bidResp + resp, err := json.Marshal(bidResp) //resp, err := json.Marshal(response) if err != nil { errL := []error{err} - handleError(&labels, w, errL, &ao) + handleError(&labels, w, errL, &vo) return } @@ -238,7 +242,7 @@ func cleanupVideoBidRequest(videoReq *openrtb_ext.BidRequestVideo, podErrors []P return videoReq } -func handleError(labels *pbsmetrics.Labels, w http.ResponseWriter, errL []error, ao *analytics.AuctionObject) { +func handleError(labels *pbsmetrics.Labels, w http.ResponseWriter, errL []error, vo *analytics.VideoObject) { labels.RequestStatus = pbsmetrics.RequestStatusErr var errors string var status int = http.StatusInternalServerError @@ -256,10 +260,10 @@ func handleError(labels *pbsmetrics.Labels, w http.ResponseWriter, errL []error, errors = fmt.Sprintf("%s %s", errors, er.Error()) } w.WriteHeader(status) - ao.Status = status + vo.Status = status fmt.Fprintf(w, "Critical error while running the video endpoint: %v", errors) glog.Errorf("/openrtb2/video Critical error: %v", errors) - ao.Errors = append(ao.Errors, errL...) + vo.Errors = append(vo.Errors, errL...) } func (deps *endpointDeps) createImpressions(videoReq *openrtb_ext.BidRequestVideo, podErrors []PodError) ([]openrtb.Imp, []PodError) { diff --git a/endpoints/openrtb2/video_auction_test.go b/endpoints/openrtb2/video_auction_test.go index e49a9f9cd1a..cd87041055a 100644 --- a/endpoints/openrtb2/video_auction_test.go +++ b/endpoints/openrtb2/video_auction_test.go @@ -650,7 +650,7 @@ func TestMergeOpenRTBToVideoRequest(t *testing.T) { } func TestHandleError(t *testing.T) { - ao := analytics.AuctionObject{ + vo := analytics.VideoObject{ Status: 200, Errors: make([]error, 0), } @@ -667,14 +667,14 @@ func TestHandleError(t *testing.T) { recorder := httptest.NewRecorder() err1 := errors.New("Error for testing handleError 1") err2 := errors.New("Error for testing handleError 2") - handleError(&labels, recorder, []error{err1, err2}, &ao) + handleError(&labels, recorder, []error{err1, err2}, &vo) assert.Equal(t, pbsmetrics.RequestStatusErr, labels.RequestStatus, "labels.RequestStatus should indicate an error") assert.Equal(t, 500, recorder.Code, "Error status should be written to writer") - assert.Equal(t, 500, ao.Status, "AnalyticsObject should have error status") - assert.Equal(t, 2, len(ao.Errors), "New errors should be appended to AnalyticsObject Errors") - assert.Equal(t, "Error for testing handleError 1", ao.Errors[0].Error(), "Error in AnalyticsObject should have test error message for first error") - assert.Equal(t, "Error for testing handleError 2", ao.Errors[1].Error(), "Error in AnalyticsObject should have test error message for second error") + assert.Equal(t, 500, vo.Status, "Analytics object should have error status") + assert.Equal(t, 2, len(vo.Errors), "New errors should be appended to Analytics object Errors") + assert.Equal(t, "Error for testing handleError 1", vo.Errors[0].Error(), "Error in Analytics object should have test error message for first error") + assert.Equal(t, "Error for testing handleError 2", vo.Errors[1].Error(), "Error in Analytics object should have test error message for second error") } func TestHandleErrorMetrics(t *testing.T) { @@ -692,11 +692,11 @@ func TestHandleErrorMetrics(t *testing.T) { assert.Equal(t, int64(0), met.RequestStatuses[pbsmetrics.ReqTypeVideo][pbsmetrics.RequestStatusOK].Count(), "OK requests count should be 0") assert.Equal(t, int64(1), met.RequestStatuses[pbsmetrics.ReqTypeVideo][pbsmetrics.RequestStatusErr].Count(), "Error requests count should be 1") - assert.Equal(t, 1, len(mod.auctionObjects), "Mock AnalyticsModule should have 1 AuctionObject") - assert.Equal(t, 500, mod.auctionObjects[0].Status, "AnalyticsObject should have 500 status") - assert.Equal(t, 2, len(mod.auctionObjects[0].Errors), "AnalyticsObject should have Errors length of 2") - assert.Equal(t, "request missing required field: PodConfig.DurationRangeSec", mod.auctionObjects[0].Errors[0].Error(), "First error in AnalyticsObject should have message regarding DurationRangeSec") - assert.Equal(t, "request missing required field: PodConfig.Pods", mod.auctionObjects[0].Errors[1].Error(), "Second error in AnalyticsObject should have message regarding Pods") + assert.Equal(t, 1, len(mod.videoObjects), "Mock AnalyticsModule should have 1 AuctionObject") + assert.Equal(t, 500, mod.videoObjects[0].Status, "AnalyticsObject should have 500 status") + assert.Equal(t, 2, len(mod.videoObjects[0].Errors), "AnalyticsObject should have Errors length of 2") + assert.Equal(t, "request missing required field: PodConfig.DurationRangeSec", mod.videoObjects[0].Errors[0].Error(), "First error in AnalyticsObject should have message regarding DurationRangeSec") + assert.Equal(t, "request missing required field: PodConfig.Pods", mod.videoObjects[0].Errors[1].Error(), "Second error in AnalyticsObject should have message regarding Pods") } func mockDepsWithMetrics(t *testing.T, ex *mockExchangeVideo) (*endpointDeps, *pbsmetrics.Metrics, *mockAnalyticsModule) { @@ -722,12 +722,17 @@ func mockDepsWithMetrics(t *testing.T, ex *mockExchangeVideo) (*endpointDeps, *p type mockAnalyticsModule struct { auctionObjects []*analytics.AuctionObject + videoObjects []*analytics.VideoObject } func (m *mockAnalyticsModule) LogAuctionObject(ao *analytics.AuctionObject) { m.auctionObjects = append(m.auctionObjects, ao) } +func (m *mockAnalyticsModule) LogVideoObject(vo *analytics.VideoObject) { + m.videoObjects = append(m.videoObjects, vo) +} + func (m *mockAnalyticsModule) LogCookieSyncObject(cso *analytics.CookieSyncObject) { return } func (m *mockAnalyticsModule) LogSetUIDObject(so *analytics.SetUIDObject) { return } From 3fc16854bbf2b29c45ec9ea14afb6667cf7e8a23 Mon Sep 17 00:00:00 2001 From: Scott Kay Date: Tue, 14 Jan 2020 14:20:21 -0500 Subject: [PATCH 08/13] CCPA User Sync URL Updates (#1157) --- adapters/33across/usersync_test.go | 16 +++++++-- adapters/adkernel/usersync_test.go | 8 +++-- adapters/adkernelAdn/usersync_test.go | 8 +++-- adapters/beachfront/usersync_test.go | 16 +++++++-- adapters/brightroll/usersync_test.go | 4 +-- adapters/consumable/usersync_test.go | 11 ++++-- adapters/datablocks/usersync_test.go | 8 +++-- adapters/emx_digital/usersync_test.go | 8 +++-- adapters/engagebdr/usersync_test.go | 8 +++-- adapters/gumgum/usersync_test.go | 8 +++-- adapters/improvedigital/usersync_test.go | 11 ++++-- adapters/lockerdome/usersync_test.go | 4 +-- adapters/marsmedia/usersync_test.go | 24 ++++++++++--- adapters/rhythmone/usersync_test.go | 8 +++-- adapters/triplelift/usersync_test.go | 4 +-- adapters/triplelift_native/usersync_test.go | 4 +-- adapters/unruly/usersync_test.go | 11 ++++-- adapters/visx/usersync_test.go | 11 ++++-- adapters/yieldmo/usersync_test.go | 4 +-- config/config.go | 38 ++++++++++----------- config/config_test.go | 2 +- 21 files changed, 150 insertions(+), 66 deletions(-) diff --git a/adapters/33across/usersync_test.go b/adapters/33across/usersync_test.go index f4bb28150de..a5e301b1082 100644 --- a/adapters/33across/usersync_test.go +++ b/adapters/33across/usersync_test.go @@ -5,20 +5,30 @@ import ( "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" ) func Test33AcrossSyncer(t *testing.T) { - syncURL := "https://ic.tynt.com/r/d?m=xch&rt=html&ri=123&ru=%2Fsetuid%3Fbidder%3D33across%26uid%3D33XUSERID33X&id=zzz000000000002zzz" + syncURL := "https://ic.tynt.com/r/d?m=xch&rt=html&gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&ru=%2Fsetuid%3Fbidder%3D33across%26uid%3D33XUSERID33X&id=zzz000000000002zzz" syncURLTemplate := template.Must( template.New("sync-template").Parse(syncURL), ) syncer := New33AcrossSyncer(syncURLTemplate) - syncInfo, err := syncer.GetUsersyncInfo(privacy.Policies{}) + syncInfo, err := syncer.GetUsersyncInfo(privacy.Policies{ + GDPR: gdpr.Policy{ + Signal: "A", + Consent: "B", + }, + CCPA: ccpa.Policy{ + Value: "C", + }, + }) assert.NoError(t, err) - assert.Equal(t, "https://ic.tynt.com/r/d?m=xch&rt=html&ri=123&ru=%2Fsetuid%3Fbidder%3D33across%26uid%3D33XUSERID33X&id=zzz000000000002zzz", syncInfo.URL) + assert.Equal(t, "https://ic.tynt.com/r/d?m=xch&rt=html&gdpr=A&gdpr_consent=B&us_privacy=C&ru=%2Fsetuid%3Fbidder%3D33across%26uid%3D33XUSERID33X&id=zzz000000000002zzz", syncInfo.URL) assert.Equal(t, "iframe", syncInfo.Type) assert.EqualValues(t, 58, syncer.GDPRVendorID()) assert.False(t, syncInfo.SupportCORS) diff --git a/adapters/adkernel/usersync_test.go b/adapters/adkernel/usersync_test.go index bd09c361a03..0d539d11ee0 100644 --- a/adapters/adkernel/usersync_test.go +++ b/adapters/adkernel/usersync_test.go @@ -5,12 +5,13 @@ import ( "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" ) func TestAdkernelAdnSyncer(t *testing.T) { - syncURL := "https://sync.adkernel.com/user-sync?t=image&gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&r=https%3A%2F%2Flocalhost%3A8888%2Fsetuid%3Fbidder%3Dadkernel%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%7BUID%7D" + syncURL := "https://sync.adkernel.com/user-sync?t=image&gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&r=https%3A%2F%2Flocalhost%3A8888%2Fsetuid%3Fbidder%3Dadkernel%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%7BUID%7D" syncURLTemplate := template.Must( template.New("sync-template").Parse(syncURL), ) @@ -21,10 +22,13 @@ func TestAdkernelAdnSyncer(t *testing.T) { Signal: "1", Consent: "BONciguONcjGKADACHENAOLS1rAHDAFAAEAASABQAMwAeACEAFw", }, + CCPA: ccpa.Policy{ + Value: "1NYN", + }, }) assert.NoError(t, err) - assert.Equal(t, "https://sync.adkernel.com/user-sync?t=image&gdpr=1&gdpr_consent=BONciguONcjGKADACHENAOLS1rAHDAFAAEAASABQAMwAeACEAFw&r=https%3A%2F%2Flocalhost%3A8888%2Fsetuid%3Fbidder%3Dadkernel%26gdpr%3D1%26gdpr_consent%3DBONciguONcjGKADACHENAOLS1rAHDAFAAEAASABQAMwAeACEAFw%26uid%3D%7BUID%7D", syncInfo.URL) + assert.Equal(t, "https://sync.adkernel.com/user-sync?t=image&gdpr=1&gdpr_consent=BONciguONcjGKADACHENAOLS1rAHDAFAAEAASABQAMwAeACEAFw&us_privacy=1NYN&r=https%3A%2F%2Flocalhost%3A8888%2Fsetuid%3Fbidder%3Dadkernel%26gdpr%3D1%26gdpr_consent%3DBONciguONcjGKADACHENAOLS1rAHDAFAAEAASABQAMwAeACEAFw%26uid%3D%7BUID%7D", syncInfo.URL) assert.Equal(t, "redirect", syncInfo.Type) assert.EqualValues(t, adkernelGDPRVendorID, syncer.GDPRVendorID()) assert.Equal(t, false, syncInfo.SupportCORS) diff --git a/adapters/adkernelAdn/usersync_test.go b/adapters/adkernelAdn/usersync_test.go index 007cacce29c..ecc759bdf70 100644 --- a/adapters/adkernelAdn/usersync_test.go +++ b/adapters/adkernelAdn/usersync_test.go @@ -5,12 +5,13 @@ import ( "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" ) func TestAdkernelAdnSyncer(t *testing.T) { - syncURL := "https://tag.adkernel.com/syncr?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&r=https%3A%2F%2Flocalhost%3A8888%2Fsetuid%3Fbidder%3DadkernelAdn%26uid%3D%7BUID%7D" + syncURL := "https://tag.adkernel.com/syncr?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&r=https%3A%2F%2Flocalhost%3A8888%2Fsetuid%3Fbidder%3DadkernelAdn%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%7BUID%7D" syncURLTemplate := template.Must( template.New("sync-template").Parse(syncURL), ) @@ -21,10 +22,13 @@ func TestAdkernelAdnSyncer(t *testing.T) { Signal: "1", Consent: "BONciguONcjGKADACHENAOLS1rAHDAFAAEAASABQAMwAeACEAFw", }, + CCPA: ccpa.Policy{ + Value: "1NYN", + }, }) assert.NoError(t, err) - assert.Equal(t, "https://tag.adkernel.com/syncr?gdpr=1&gdpr_consent=BONciguONcjGKADACHENAOLS1rAHDAFAAEAASABQAMwAeACEAFw&r=https%3A%2F%2Flocalhost%3A8888%2Fsetuid%3Fbidder%3DadkernelAdn%26uid%3D%7BUID%7D", syncInfo.URL) + assert.Equal(t, "https://tag.adkernel.com/syncr?gdpr=1&gdpr_consent=BONciguONcjGKADACHENAOLS1rAHDAFAAEAASABQAMwAeACEAFw&us_privacy=1NYN&r=https%3A%2F%2Flocalhost%3A8888%2Fsetuid%3Fbidder%3DadkernelAdn%26gdpr%3D1%26gdpr_consent%3DBONciguONcjGKADACHENAOLS1rAHDAFAAEAASABQAMwAeACEAFw%26uid%3D%7BUID%7D", syncInfo.URL) assert.Equal(t, "redirect", syncInfo.Type) assert.EqualValues(t, adkernelGDPRVendorID, syncer.GDPRVendorID()) assert.Equal(t, false, syncInfo.SupportCORS) diff --git a/adapters/beachfront/usersync_test.go b/adapters/beachfront/usersync_test.go index 0b71e0f92f8..f0c4b3817d1 100644 --- a/adapters/beachfront/usersync_test.go +++ b/adapters/beachfront/usersync_test.go @@ -5,20 +5,30 @@ import ( "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" ) func TestBeachfrontSyncer(t *testing.T) { - syncURL := "localhost" + syncURL := "https://sync.bfmio.com/sync_s2s?gdpr={{.GDPR}}&us_privacy={{.USPrivacy}}&url=https%3A%2F%2Flocalhost%3A8888%2Fsetuid%3Fbidder%3Dbeachfront%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%5Bio_cid%5D" syncURLTemplate := template.Must( template.New("sync-template").Parse(syncURL), ) syncer := NewBeachfrontSyncer(syncURLTemplate) - syncInfo, err := syncer.GetUsersyncInfo(privacy.Policies{}) + syncInfo, err := syncer.GetUsersyncInfo(privacy.Policies{ + GDPR: gdpr.Policy{ + Signal: "A", + Consent: "B", + }, + CCPA: ccpa.Policy{ + Value: "C", + }, + }) assert.NoError(t, err) - assert.Equal(t, "localhost", syncInfo.URL) + assert.Equal(t, "https://sync.bfmio.com/sync_s2s?gdpr=A&us_privacy=C&url=https%3A%2F%2Flocalhost%3A8888%2Fsetuid%3Fbidder%3Dbeachfront%26gdpr%3DA%26gdpr_consent%3DB%26uid%3D%5Bio_cid%5D", syncInfo.URL) assert.Equal(t, "iframe", syncInfo.Type) assert.EqualValues(t, 0, syncer.GDPRVendorID()) assert.Equal(t, false, syncInfo.SupportCORS) diff --git a/adapters/brightroll/usersync_test.go b/adapters/brightroll/usersync_test.go index 08104c048ac..a5d47e35e56 100644 --- a/adapters/brightroll/usersync_test.go +++ b/adapters/brightroll/usersync_test.go @@ -9,7 +9,7 @@ import ( ) func TestBrightrollSyncer(t *testing.T) { - syncURL := "http://test-bh.ybp.yahoo.com/sync/appnexuspbs?gdpr={{.GDPR}}&euconsent={{.GDPRConsent}}&url=localhost%2Fsetuid%3Fbidder%3Dbrightroll%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24%7BUID%7D" + syncURL := "http://test-bh.ybp.yahoo.com/sync/appnexuspbs?gdpr={{.GDPR}}&euconsent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&url=localhost%2Fsetuid%3Fbidder%3Dbrightroll%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24%7BUID%7D" syncURLTemplate := template.Must( template.New("sync-template").Parse(syncURL), ) @@ -18,7 +18,7 @@ func TestBrightrollSyncer(t *testing.T) { syncInfo, err := syncer.GetUsersyncInfo(privacy.Policies{}) assert.NoError(t, err) - assert.Equal(t, "http://test-bh.ybp.yahoo.com/sync/appnexuspbs?gdpr=&euconsent=&url=localhost%2Fsetuid%3Fbidder%3Dbrightroll%26gdpr%3D%26gdpr_consent%3D%26uid%3D%24%7BUID%7D", syncInfo.URL) + assert.Equal(t, "http://test-bh.ybp.yahoo.com/sync/appnexuspbs?gdpr=&euconsent=&us_privacy=&url=localhost%2Fsetuid%3Fbidder%3Dbrightroll%26gdpr%3D%26gdpr_consent%3D%26uid%3D%24%7BUID%7D", syncInfo.URL) assert.Equal(t, "redirect", syncInfo.Type) assert.EqualValues(t, 25, syncer.GDPRVendorID()) assert.Equal(t, false, syncInfo.SupportCORS) diff --git a/adapters/consumable/usersync_test.go b/adapters/consumable/usersync_test.go index 7def6be0a48..eb97edf2cae 100644 --- a/adapters/consumable/usersync_test.go +++ b/adapters/consumable/usersync_test.go @@ -5,12 +5,13 @@ import ( "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" ) func TestConsumableSyncer(t *testing.T) { - syncURL := "//e.serverbid.com/udb/9969/match?redir=http%3A%2F%2Flocalhost%3A8000%2Fsetuid%3Fbidder%3Dconsumable%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D" + syncURL := "//e.serverbid.com/udb/9969/match?gdpr={{.GDPR}}&euconsent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&redir=http%3A%2F%2Flocalhost%3A8000%2Fsetuid%3Fbidder%3Dconsumable%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D" syncURLTemplate := template.Must( template.New("sync-template").Parse(syncURL), ) @@ -18,12 +19,16 @@ func TestConsumableSyncer(t *testing.T) { syncer := NewConsumableSyncer(syncURLTemplate) u, err := syncer.GetUsersyncInfo(privacy.Policies{ GDPR: gdpr.Policy{ - Signal: "0", + Signal: "A", + Consent: "B", + }, + CCPA: ccpa.Policy{ + Value: "C", }, }) assert.NoError(t, err) - assert.Equal(t, "//e.serverbid.com/udb/9969/match?redir=http%3A%2F%2Flocalhost%3A8000%2Fsetuid%3Fbidder%3Dconsumable%26gdpr%3D0%26gdpr_consent%3D%26uid%3D", u.URL) + assert.Equal(t, "//e.serverbid.com/udb/9969/match?gdpr=A&euconsent=B&us_privacy=C&redir=http%3A%2F%2Flocalhost%3A8000%2Fsetuid%3Fbidder%3Dconsumable%26gdpr%3DA%26gdpr_consent%3DB%26uid%3D", u.URL) assert.Equal(t, "redirect", u.Type) assert.Equal(t, uint16(65535), syncer.GDPRVendorID()) assert.Equal(t, false, u.SupportCORS) diff --git a/adapters/datablocks/usersync_test.go b/adapters/datablocks/usersync_test.go index 9dcaf8295fa..f8500ab9b03 100644 --- a/adapters/datablocks/usersync_test.go +++ b/adapters/datablocks/usersync_test.go @@ -5,12 +5,13 @@ import ( "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" ) func TestDatablocksSyncer(t *testing.T) { - syncURL := "https://sync.v5prebid.datablocks.net/s2ssync?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&r=https%3A%2F%2Flocalhost%3A8888%2Fsetuid%3Fbidder%3Ddatablocks%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24%7Buid%7D" + syncURL := "https://sync.v5prebid.datablocks.net/s2ssync?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&r=https%3A%2F%2Flocalhost%3A8888%2Fsetuid%3Fbidder%3Ddatablocks%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24%7Buid%7D" syncURLTemplate := template.Must( template.New("sync-template").Parse(syncURL), ) @@ -21,10 +22,13 @@ func TestDatablocksSyncer(t *testing.T) { Signal: "1", Consent: "BONciguONcjGKADACHENAOLS1rAHDAFAAEAASABQAMwAeACEAFw", }, + CCPA: ccpa.Policy{ + Value: "1NYN", + }, }) assert.NoError(t, err) - assert.Equal(t, "https://sync.v5prebid.datablocks.net/s2ssync?gdpr=1&gdpr_consent=BONciguONcjGKADACHENAOLS1rAHDAFAAEAASABQAMwAeACEAFw&r=https%3A%2F%2Flocalhost%3A8888%2Fsetuid%3Fbidder%3Ddatablocks%26gdpr%3D1%26gdpr_consent%3DBONciguONcjGKADACHENAOLS1rAHDAFAAEAASABQAMwAeACEAFw%26uid%3D%24%7Buid%7D", syncInfo.URL) + assert.Equal(t, "https://sync.v5prebid.datablocks.net/s2ssync?gdpr=1&gdpr_consent=BONciguONcjGKADACHENAOLS1rAHDAFAAEAASABQAMwAeACEAFw&us_privacy=1NYN&r=https%3A%2F%2Flocalhost%3A8888%2Fsetuid%3Fbidder%3Ddatablocks%26gdpr%3D1%26gdpr_consent%3DBONciguONcjGKADACHENAOLS1rAHDAFAAEAASABQAMwAeACEAFw%26uid%3D%24%7Buid%7D", syncInfo.URL) assert.Equal(t, "redirect", syncInfo.Type) assert.EqualValues(t, datablocksGDPRVendorID, syncer.GDPRVendorID()) assert.Equal(t, false, syncInfo.SupportCORS) diff --git a/adapters/emx_digital/usersync_test.go b/adapters/emx_digital/usersync_test.go index d8f874c8545..0e76936cea4 100644 --- a/adapters/emx_digital/usersync_test.go +++ b/adapters/emx_digital/usersync_test.go @@ -5,12 +5,13 @@ import ( "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" ) func TestEMXDigitalSyncer(t *testing.T) { - syncURL := "https://cs.emxdgt.com/um?ssp=pbs&gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&redirect=localhost%2Fsetuid%3Fbidder%3Demx_digital%26uid%3D%24UID" + syncURL := "https://cs.emxdgt.com/um?ssp=pbs&gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&redirect=localhost%2Fsetuid%3Fbidder%3Demx_digital%26uid%3D%24UID" syncURLTemplate := template.Must( template.New("sync-template").Parse(syncURL), ) @@ -21,10 +22,13 @@ func TestEMXDigitalSyncer(t *testing.T) { Signal: "1", Consent: "BOPVK28OVJoTBABABAENBs-AAAAhuAKAANAAoACwAGgAPAAxAB0AHgAQAAiABOADkA", }, + CCPA: ccpa.Policy{ + Value: "1NYN", + }, }) assert.NoError(t, err) - assert.Equal(t, "https://cs.emxdgt.com/um?ssp=pbs&gdpr=1&gdpr_consent=BOPVK28OVJoTBABABAENBs-AAAAhuAKAANAAoACwAGgAPAAxAB0AHgAQAAiABOADkA&redirect=localhost%2Fsetuid%3Fbidder%3Demx_digital%26uid%3D%24UID", syncInfo.URL) + assert.Equal(t, "https://cs.emxdgt.com/um?ssp=pbs&gdpr=1&gdpr_consent=BOPVK28OVJoTBABABAENBs-AAAAhuAKAANAAoACwAGgAPAAxAB0AHgAQAAiABOADkA&us_privacy=1NYN&redirect=localhost%2Fsetuid%3Fbidder%3Demx_digital%26uid%3D%24UID", syncInfo.URL) assert.Equal(t, "iframe", syncInfo.Type) assert.EqualValues(t, 183, syncer.GDPRVendorID()) assert.Equal(t, false, syncInfo.SupportCORS) diff --git a/adapters/engagebdr/usersync_test.go b/adapters/engagebdr/usersync_test.go index fbcde923f09..45e1e41e196 100644 --- a/adapters/engagebdr/usersync_test.go +++ b/adapters/engagebdr/usersync_test.go @@ -5,12 +5,13 @@ import ( "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" ) func TestEngageBDRSyncer(t *testing.T) { - syncURL := "https://match.bnmla.com/usersync/prbds2s?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&r=localhost%2Fsetuid%3Fbidder%3Dgumgum%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D" + syncURL := "https://match.bnmla.com/usersync/s2s?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&r=localhost%2Fsetuid%3Fbidder%3Dengagebdr%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D" syncURLTemplate := template.Must( template.New("sync-template").Parse(syncURL), ) @@ -21,10 +22,13 @@ func TestEngageBDRSyncer(t *testing.T) { Signal: "1", Consent: "BOPVK28OVJoTBABABAENBs-AAAAhuAKAANAAoACwAGgAPAAxAB0AHgAQAAiABOADkA", }, + CCPA: ccpa.Policy{ + Value: "1NYN", + }, }) assert.NoError(t, err) - assert.Equal(t, "https://match.bnmla.com/usersync/prbds2s?gdpr=1&gdpr_consent=BOPVK28OVJoTBABABAENBs-AAAAhuAKAANAAoACwAGgAPAAxAB0AHgAQAAiABOADkA&r=localhost%2Fsetuid%3Fbidder%3Dgumgum%26gdpr%3D1%26gdpr_consent%3DBOPVK28OVJoTBABABAENBs-AAAAhuAKAANAAoACwAGgAPAAxAB0AHgAQAAiABOADkA%26uid%3D", syncInfo.URL) + assert.Equal(t, "https://match.bnmla.com/usersync/s2s?gdpr=1&gdpr_consent=BOPVK28OVJoTBABABAENBs-AAAAhuAKAANAAoACwAGgAPAAxAB0AHgAQAAiABOADkA&us_privacy=1NYN&r=localhost%2Fsetuid%3Fbidder%3Dengagebdr%26gdpr%3D1%26gdpr_consent%3DBOPVK28OVJoTBABABAENBs-AAAAhuAKAANAAoACwAGgAPAAxAB0AHgAQAAiABOADkA%26uid%3D", syncInfo.URL) assert.Equal(t, "iframe", syncInfo.Type) assert.EqualValues(t, 62, syncer.GDPRVendorID()) assert.Equal(t, false, syncInfo.SupportCORS) diff --git a/adapters/gumgum/usersync_test.go b/adapters/gumgum/usersync_test.go index 22c42695d38..3606f6ae04c 100644 --- a/adapters/gumgum/usersync_test.go +++ b/adapters/gumgum/usersync_test.go @@ -5,12 +5,13 @@ import ( "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" ) func TestGumGumSyncer(t *testing.T) { - syncURL := "https://rtb.gumgum.com/usync/prbds2s?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&r=localhost%2Fsetuid%3Fbidder%3Dgumgum%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D" + syncURL := "https://rtb.gumgum.com/usync/prbds2s?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&r=localhost%2Fsetuid%3Fbidder%3Dgumgum%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D" syncURLTemplate := template.Must( template.New("sync-template").Parse(syncURL), ) @@ -21,10 +22,13 @@ func TestGumGumSyncer(t *testing.T) { Signal: "1", Consent: "BOPVK28OVJoTBABABAENBs-AAAAhuAKAANAAoACwAGgAPAAxAB0AHgAQAAiABOADkA", }, + CCPA: ccpa.Policy{ + Value: "1NYN", + }, }) assert.NoError(t, err) - assert.Equal(t, "https://rtb.gumgum.com/usync/prbds2s?gdpr=1&gdpr_consent=BOPVK28OVJoTBABABAENBs-AAAAhuAKAANAAoACwAGgAPAAxAB0AHgAQAAiABOADkA&r=localhost%2Fsetuid%3Fbidder%3Dgumgum%26gdpr%3D1%26gdpr_consent%3DBOPVK28OVJoTBABABAENBs-AAAAhuAKAANAAoACwAGgAPAAxAB0AHgAQAAiABOADkA%26uid%3D", syncInfo.URL) + assert.Equal(t, "https://rtb.gumgum.com/usync/prbds2s?gdpr=1&gdpr_consent=BOPVK28OVJoTBABABAENBs-AAAAhuAKAANAAoACwAGgAPAAxAB0AHgAQAAiABOADkA&us_privacy=1NYN&r=localhost%2Fsetuid%3Fbidder%3Dgumgum%26gdpr%3D1%26gdpr_consent%3DBOPVK28OVJoTBABABAENBs-AAAAhuAKAANAAoACwAGgAPAAxAB0AHgAQAAiABOADkA%26uid%3D", syncInfo.URL) assert.Equal(t, "iframe", syncInfo.Type) assert.EqualValues(t, 61, syncer.GDPRVendorID()) assert.Equal(t, false, syncInfo.SupportCORS) diff --git a/adapters/improvedigital/usersync_test.go b/adapters/improvedigital/usersync_test.go index 861e4875a80..c928ebf123d 100644 --- a/adapters/improvedigital/usersync_test.go +++ b/adapters/improvedigital/usersync_test.go @@ -5,12 +5,13 @@ import ( "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" ) func TestImprovedigitalSyncer(t *testing.T) { - syncURL := "//not_localhost/synclocalhost%2Fsetuid%3Fbidder%3Dimprovedigital%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%7BPUB_USER_ID%7D" + syncURL := "https://ad.360yield.com/server_match?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&r=%2Fsetuid%3Fbidder%3Dimprovedigital%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%7BPUB_USER_ID%7D" syncURLTemplate := template.Must( template.New("sync-template").Parse(syncURL), ) @@ -18,12 +19,16 @@ func TestImprovedigitalSyncer(t *testing.T) { syncer := NewImprovedigitalSyncer(syncURLTemplate) syncInfo, err := syncer.GetUsersyncInfo(privacy.Policies{ GDPR: gdpr.Policy{ - Signal: "0", + Signal: "A", + Consent: "B", + }, + CCPA: ccpa.Policy{ + Value: "C", }, }) assert.NoError(t, err) - assert.Equal(t, "//not_localhost/synclocalhost%2Fsetuid%3Fbidder%3Dimprovedigital%26gdpr%3D0%26gdpr_consent%3D%26uid%3D%7BPUB_USER_ID%7D", syncInfo.URL) + assert.Equal(t, "https://ad.360yield.com/server_match?gdpr=A&gdpr_consent=B&us_privacy=C&r=%2Fsetuid%3Fbidder%3Dimprovedigital%26gdpr%3DA%26gdpr_consent%3DB%26uid%3D%7BPUB_USER_ID%7D", syncInfo.URL) assert.Equal(t, "redirect", syncInfo.Type) assert.EqualValues(t, 253, syncer.GDPRVendorID()) assert.Equal(t, false, syncInfo.SupportCORS) diff --git a/adapters/lockerdome/usersync_test.go b/adapters/lockerdome/usersync_test.go index b0307c0f215..b5dea2261b6 100644 --- a/adapters/lockerdome/usersync_test.go +++ b/adapters/lockerdome/usersync_test.go @@ -9,7 +9,7 @@ import ( ) func TestLockerDomeSyncer(t *testing.T) { - syncURL := "https://lockerdome.com/usync/prebidserver?pid=&gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&redirect=https%3A%2F%2Flocalhost%2Fsetuid%3Fbidder%3Dlockerdome%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%7B%7Buid%7D%7D" + syncURL := "https://lockerdome.com/usync/prebidserver?pid=&gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&redirect=https%3A%2F%2Flocalhost%2Fsetuid%3Fbidder%3Dlockerdome%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%7B%7Buid%7D%7D" syncURLTemplate := template.Must( template.New("sync-template").Parse(syncURL), ) @@ -18,7 +18,7 @@ func TestLockerDomeSyncer(t *testing.T) { syncInfo, err := syncer.GetUsersyncInfo(privacy.Policies{}) assert.NoError(t, err) - assert.Equal(t, "https://lockerdome.com/usync/prebidserver?pid=&gdpr=&gdpr_consent=&redirect=https%3A%2F%2Flocalhost%2Fsetuid%3Fbidder%3Dlockerdome%26gdpr%3D%26gdpr_consent%3D%26uid%3D%7B%7Buid%7D%7D", syncInfo.URL) + assert.Equal(t, "https://lockerdome.com/usync/prebidserver?pid=&gdpr=&gdpr_consent=&us_privacy=&redirect=https%3A%2F%2Flocalhost%2Fsetuid%3Fbidder%3Dlockerdome%26gdpr%3D%26gdpr_consent%3D%26uid%3D%7B%7Buid%7D%7D", syncInfo.URL) assert.Equal(t, "redirect", syncInfo.Type) assert.EqualValues(t, 0, syncer.GDPRVendorID()) assert.Equal(t, false, syncInfo.SupportCORS) diff --git a/adapters/marsmedia/usersync_test.go b/adapters/marsmedia/usersync_test.go index 0e50e2bcec9..67276a35fb6 100644 --- a/adapters/marsmedia/usersync_test.go +++ b/adapters/marsmedia/usersync_test.go @@ -5,16 +5,32 @@ import ( "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" ) func TestMarsmediaSyncer(t *testing.T) { - temp := template.Must(template.New("sync-template").Parse("http://dmp.rtbsrv.com/dmp/profiles/cm?p_id=179&gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&redirect=localhost:8000%2Fsetuid%3Fbidder%3Dmarsmedia%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24%7BUUID%7D")) - syncer := NewMarsmediaSyncer(temp) - syncInfo, err := syncer.GetUsersyncInfo(privacy.Policies{}) + syncURL := "https://dmp.rtbsrv.com/dmp/profiles/cm?p_id=179&gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&redirect=localhost:8000%2Fsetuid%3Fbidder%3Dmarsmedia%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24%7BUUID%7D" + syncURLTemplate := template.Must( + template.New("sync-template").Parse(syncURL), + ) + + syncer := NewMarsmediaSyncer(syncURLTemplate) + syncInfo, err := syncer.GetUsersyncInfo(privacy.Policies{ + GDPR: gdpr.Policy{ + Signal: "A", + Consent: "B", + }, + CCPA: ccpa.Policy{ + Value: "C", + }, + }) + assert.NoError(t, err) - assert.Equal(t, "http://dmp.rtbsrv.com/dmp/profiles/cm?p_id=179&gdpr=&gdpr_consent=&redirect=localhost:8000%2Fsetuid%3Fbidder%3Dmarsmedia%26gdpr%3D%26gdpr_consent%3D%26uid%3D%24%7BUUID%7D", syncInfo.URL) + assert.Equal(t, "https://dmp.rtbsrv.com/dmp/profiles/cm?p_id=179&gdpr=A&gdpr_consent=B&us_privacy=C&redirect=localhost:8000%2Fsetuid%3Fbidder%3Dmarsmedia%26gdpr%3DA%26gdpr_consent%3DB%26uid%3D%24%7BUUID%7D", syncInfo.URL) assert.Equal(t, "redirect", syncInfo.Type) assert.EqualValues(t, 0, syncer.GDPRVendorID()) assert.Equal(t, false, syncInfo.SupportCORS) + } diff --git a/adapters/rhythmone/usersync_test.go b/adapters/rhythmone/usersync_test.go index 0dcf4fbda7e..cee6e9b0259 100644 --- a/adapters/rhythmone/usersync_test.go +++ b/adapters/rhythmone/usersync_test.go @@ -5,12 +5,13 @@ import ( "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" ) func TestRhythmoneSyncer(t *testing.T) { - syncURL := "https://sync.1rx.io/usersync2/rmphb?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&redir=localhost%2Fsetuid%3Fbidder%3Drhythmone%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%5BRX_UUID%5D" + syncURL := "https://sync.1rx.io/usersync2/rmphb?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&redir=localhost%2Fsetuid%3Fbidder%3Drhythmone%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%5BRX_UUID%5D" syncURLTemplate := template.Must( template.New("sync-template").Parse(syncURL), ) @@ -21,10 +22,13 @@ func TestRhythmoneSyncer(t *testing.T) { Signal: "1", Consent: "BOPVK28OVJoTBABABAENBs-AAAAhuAKAANAAoACwAGgAPAAxAB0AHgAQAAiABOADkA", }, + CCPA: ccpa.Policy{ + Value: "1NYN", + }, }) assert.NoError(t, err) - assert.Equal(t, "https://sync.1rx.io/usersync2/rmphb?gdpr=1&gdpr_consent=BOPVK28OVJoTBABABAENBs-AAAAhuAKAANAAoACwAGgAPAAxAB0AHgAQAAiABOADkA&redir=localhost%2Fsetuid%3Fbidder%3Drhythmone%26gdpr%3D1%26gdpr_consent%3DBOPVK28OVJoTBABABAENBs-AAAAhuAKAANAAoACwAGgAPAAxAB0AHgAQAAiABOADkA%26uid%3D%5BRX_UUID%5D", syncInfo.URL) + assert.Equal(t, "https://sync.1rx.io/usersync2/rmphb?gdpr=1&gdpr_consent=BOPVK28OVJoTBABABAENBs-AAAAhuAKAANAAoACwAGgAPAAxAB0AHgAQAAiABOADkA&us_privacy=1NYN&redir=localhost%2Fsetuid%3Fbidder%3Drhythmone%26gdpr%3D1%26gdpr_consent%3DBOPVK28OVJoTBABABAENBs-AAAAhuAKAANAAoACwAGgAPAAxAB0AHgAQAAiABOADkA%26uid%3D%5BRX_UUID%5D", syncInfo.URL) assert.Equal(t, "redirect", syncInfo.Type) assert.EqualValues(t, 36, syncer.GDPRVendorID()) assert.Equal(t, false, syncInfo.SupportCORS) diff --git a/adapters/triplelift/usersync_test.go b/adapters/triplelift/usersync_test.go index b4bc845915b..1731b22dffb 100644 --- a/adapters/triplelift/usersync_test.go +++ b/adapters/triplelift/usersync_test.go @@ -9,7 +9,7 @@ import ( ) func TestTripleliftSyncer(t *testing.T) { - syncURL := "//eb2.3lift.com/getuid?gdpr={{.GDPR}}&cmp_cs={{.GDPRConsent}}&redir=https%3A%2F%2Feb2.3lift.com%2Fsetuid%3Fbidder%3Dtriplelift%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24UID" + syncURL := "//eb2.3lift.com/getuid?gdpr={{.GDPR}}&cmp_cs={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&redir=https%3A%2F%2Feb2.3lift.com%2Fsetuid%3Fbidder%3Dtriplelift%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24UID" syncURLTemplate := template.Must( template.New("sync-template").Parse(syncURL), ) @@ -18,7 +18,7 @@ func TestTripleliftSyncer(t *testing.T) { syncInfo, err := syncer.GetUsersyncInfo(privacy.Policies{}) assert.NoError(t, err) - assert.Equal(t, "//eb2.3lift.com/getuid?gdpr=&cmp_cs=&redir=https%3A%2F%2Feb2.3lift.com%2Fsetuid%3Fbidder%3Dtriplelift%26gdpr%3D%26gdpr_consent%3D%26uid%3D%24UID", syncInfo.URL) + assert.Equal(t, "//eb2.3lift.com/getuid?gdpr=&cmp_cs=&us_privacy=&redir=https%3A%2F%2Feb2.3lift.com%2Fsetuid%3Fbidder%3Dtriplelift%26gdpr%3D%26gdpr_consent%3D%26uid%3D%24UID", syncInfo.URL) assert.Equal(t, "redirect", syncInfo.Type) assert.EqualValues(t, 28, syncer.GDPRVendorID()) assert.Equal(t, false, syncInfo.SupportCORS) diff --git a/adapters/triplelift_native/usersync_test.go b/adapters/triplelift_native/usersync_test.go index 2fb66c2bd2a..df0757edc9f 100644 --- a/adapters/triplelift_native/usersync_test.go +++ b/adapters/triplelift_native/usersync_test.go @@ -9,7 +9,7 @@ import ( ) func TestTripleliftSyncer(t *testing.T) { - syncURL := "//eb2.3lift.com/getuid?gdpr={{.GDPR}}&cmp_cs={{.GDPRConsent}}&redir=https%3A%2F%2Feb2.3lift.com%2Fsetuid%3Fbidder%3Dtriplelift%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24UID" + syncURL := "//eb2.3lift.com/getuid?gdpr={{.GDPR}}&cmp_cs={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&redir=https%3A%2F%2Feb2.3lift.com%2Fsetuid%3Fbidder%3Dtriplelift%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24UID" syncURLTemplate := template.Must( template.New("sync-template").Parse(syncURL), ) @@ -18,7 +18,7 @@ func TestTripleliftSyncer(t *testing.T) { syncInfo, err := syncer.GetUsersyncInfo(privacy.Policies{}) assert.NoError(t, err) - assert.Equal(t, "//eb2.3lift.com/getuid?gdpr=&cmp_cs=&redir=https%3A%2F%2Feb2.3lift.com%2Fsetuid%3Fbidder%3Dtriplelift%26gdpr%3D%26gdpr_consent%3D%26uid%3D%24UID", syncInfo.URL) + assert.Equal(t, "//eb2.3lift.com/getuid?gdpr=&cmp_cs=&us_privacy=&redir=https%3A%2F%2Feb2.3lift.com%2Fsetuid%3Fbidder%3Dtriplelift%26gdpr%3D%26gdpr_consent%3D%26uid%3D%24UID", syncInfo.URL) assert.Equal(t, "redirect", syncInfo.Type) assert.EqualValues(t, 28, syncer.GDPRVendorID()) assert.Equal(t, false, syncInfo.SupportCORS) diff --git a/adapters/unruly/usersync_test.go b/adapters/unruly/usersync_test.go index 8db8f75059e..bdab254f370 100644 --- a/adapters/unruly/usersync_test.go +++ b/adapters/unruly/usersync_test.go @@ -5,12 +5,13 @@ import ( "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" ) func TestUnrulySyncer(t *testing.T) { - syncURL := "//unrulymedia.com/pixel?redir=external.com%2Fsetuid%3Fbidder%3Dunruly%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24UID" + syncURL := "https://usermatch.targeting.unrulymedia.com/pbsync?gdpr={{.GDPR}}&consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&rurl=%2Fsetuid%3Fbidder%3Dunruly%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24UID" syncURLTemplate := template.Must( template.New("sync-template").Parse(syncURL), ) @@ -18,12 +19,16 @@ func TestUnrulySyncer(t *testing.T) { syncer := NewUnrulySyncer(syncURLTemplate) syncInfo, err := syncer.GetUsersyncInfo(privacy.Policies{ GDPR: gdpr.Policy{ - Signal: "0", + Signal: "A", + Consent: "B", + }, + CCPA: ccpa.Policy{ + Value: "C", }, }) assert.NoError(t, err) - assert.Equal(t, "//unrulymedia.com/pixel?redir=external.com%2Fsetuid%3Fbidder%3Dunruly%26gdpr%3D0%26gdpr_consent%3D%26uid%3D%24UID", syncInfo.URL) + assert.Equal(t, "https://usermatch.targeting.unrulymedia.com/pbsync?gdpr=A&consent=B&us_privacy=C&rurl=%2Fsetuid%3Fbidder%3Dunruly%26gdpr%3DA%26gdpr_consent%3DB%26uid%3D%24UID", syncInfo.URL) assert.Equal(t, "iframe", syncInfo.Type) assert.EqualValues(t, 162, syncer.GDPRVendorID()) assert.Equal(t, false, syncInfo.SupportCORS) diff --git a/adapters/visx/usersync_test.go b/adapters/visx/usersync_test.go index 9133c5dfcfe..01e80e644c5 100644 --- a/adapters/visx/usersync_test.go +++ b/adapters/visx/usersync_test.go @@ -5,12 +5,13 @@ import ( "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" ) func TestVisxSyncer(t *testing.T) { - syncURL := "//not_localhost/synclocalhost%2Fsetuid%3Fbidder%3Dvisx%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24%7BUUID%7D" + syncURL := "https://t.visx.net/s2s_sync?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&redir=%2Fsetuid%3Fbidder%3Dvisx%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24%7BUUID%7D" syncURLTemplate := template.Must( template.New("sync-template").Parse(syncURL), ) @@ -18,12 +19,16 @@ func TestVisxSyncer(t *testing.T) { syncer := NewVisxSyncer(syncURLTemplate) syncInfo, err := syncer.GetUsersyncInfo(privacy.Policies{ GDPR: gdpr.Policy{ - Signal: "0", + Signal: "A", + Consent: "B", + }, + CCPA: ccpa.Policy{ + Value: "C", }, }) assert.NoError(t, err) - assert.Equal(t, "//not_localhost/synclocalhost%2Fsetuid%3Fbidder%3Dvisx%26gdpr%3D0%26gdpr_consent%3D%26uid%3D%24%7BUUID%7D", syncInfo.URL) + assert.Equal(t, "https://t.visx.net/s2s_sync?gdpr=A&gdpr_consent=B&us_privacy=C&redir=%2Fsetuid%3Fbidder%3Dvisx%26gdpr%3DA%26gdpr_consent%3DB%26uid%3D%24%7BUUID%7D", syncInfo.URL) assert.Equal(t, "redirect", syncInfo.Type) assert.EqualValues(t, 0, syncer.GDPRVendorID()) assert.Equal(t, false, syncInfo.SupportCORS) diff --git a/adapters/yieldmo/usersync_test.go b/adapters/yieldmo/usersync_test.go index 93ab907f202..5ae437c8f00 100644 --- a/adapters/yieldmo/usersync_test.go +++ b/adapters/yieldmo/usersync_test.go @@ -10,7 +10,7 @@ import ( ) func TestYieldmoSyncer(t *testing.T) { - syncURL := "//ads.yieldmo.com/pbsync?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&redirectUri=http%3A%2F%2Flocalhost%2F%2Fsetuid%3Fbidder%3Dyieldmo%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24UID" + syncURL := "//ads.yieldmo.com/pbsync?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&redirectUri=http%3A%2F%2Flocalhost%2F%2Fsetuid%3Fbidder%3Dyieldmo%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24UID" syncURLTemplate := template.Must( template.New("sync-template").Parse(syncURL), ) @@ -23,7 +23,7 @@ func TestYieldmoSyncer(t *testing.T) { }) assert.NoError(t, err) - assert.Equal(t, "//ads.yieldmo.com/pbsync?gdpr=0&gdpr_consent=&redirectUri=http%3A%2F%2Flocalhost%2F%2Fsetuid%3Fbidder%3Dyieldmo%26gdpr%3D0%26gdpr_consent%3D%26uid%3D%24UID", syncInfo.URL) + assert.Equal(t, "//ads.yieldmo.com/pbsync?gdpr=0&gdpr_consent=&us_privacy=&redirectUri=http%3A%2F%2Flocalhost%2F%2Fsetuid%3Fbidder%3Dyieldmo%26gdpr%3D0%26gdpr_consent%3D%26uid%3D%24UID", syncInfo.URL) assert.Equal(t, "redirect", syncInfo.Type) assert.EqualValues(t, 0, syncer.GDPRVendorID()) assert.False(t, syncInfo.SupportCORS) diff --git a/config/config.go b/config/config.go index d586021fd14..722aae1395c 100644 --- a/config/config.go +++ b/config/config.go @@ -484,37 +484,37 @@ func (cfg *Configuration) GetCachedAssetURL(uuid string) string { // func (cfg *Configuration) setDerivedDefaults() { externalURL := cfg.ExternalURL - setDefaultUsersync(cfg.Adapters, openrtb_ext.Bidder33Across, "https://ic.tynt.com/r/d?m=xch&rt=html&gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&ru="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3D33across%26uid%3D33XUSERID33X&id=zzz000000000002zzz") + setDefaultUsersync(cfg.Adapters, openrtb_ext.Bidder33Across, "https://ic.tynt.com/r/d?m=xch&rt=html&gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&ru="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3D33across%26uid%3D33XUSERID33X&id=zzz000000000002zzz") setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderAdform, "https://cm.adform.net/cookie?redirect_url="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dadform%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24UID") - setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderAdkernel, "https://sync.adkernel.com/user-sync?t=image&gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&r="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dadkernel%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%7BUID%7D") - setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderAdkernelAdn, "https://tag.adkernel.com/syncr?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&r="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3DadkernelAdn%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%7BUID%7D") + setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderAdkernel, "https://sync.adkernel.com/user-sync?t=image&gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&r="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dadkernel%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%7BUID%7D") + setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderAdkernelAdn, "https://tag.adkernel.com/syncr?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&r="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3DadkernelAdn%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%7BUID%7D") setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderAdpone, "https://usersync.adpone.com/csync?redir="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dadpone%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%7Buid%7D") setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderAdtelligent, "https://sync.adtelligent.com/csync?t=p&ep=0&redir="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dadtelligent%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%7Buid%7D") setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderAdvangelists, "https://nep.advangelists.com/xp/user-sync?acctid={aid}&&redirect="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dadvangelists%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24UID") setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderAppnexus, "https://ib.adnxs.com/getuid?"+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dadnxs%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24UID") - setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderBeachfront, "https://sync.bfmio.com/sync_s2s?gdpr={{.GDPR}}&url="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dbeachfront%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%5Bio_cid%5D") - setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderBrightroll, "https://pr-bh.ybp.yahoo.com/sync/appnexusprebidserver/?gdpr={{.GDPR}}&euconsent={{.GDPRConsent}}&url="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dbrightroll%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24UID") - setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderConsumable, "https://e.serverbid.com/udb/9969/match?gdpr={{.GDPR}}&euconsent={{.GDPRConsent}}&redir="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dconsumable%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D") + setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderBeachfront, "https://sync.bfmio.com/sync_s2s?gdpr={{.GDPR}}&us_privacy={{.USPrivacy}}&url="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dbeachfront%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%5Bio_cid%5D") + setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderBrightroll, "https://pr-bh.ybp.yahoo.com/sync/appnexusprebidserver/?gdpr={{.GDPR}}&euconsent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&url="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dbrightroll%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24UID") + setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderConsumable, "https://e.serverbid.com/udb/9969/match?gdpr={{.GDPR}}&euconsent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&redir="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dconsumable%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D") setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderConversant, "https://prebid-match.dotomi.com/prebid/match?rurl="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dconversant%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D") - setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderDatablocks, "https://sync.v5prebid.datablocks.net/s2ssync?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&r="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Ddatablocks%26gdpr%3D%24%7Bgdpr%7D%26gdpr_consent%3D%24%7Bgdpr_consent%7D%26uid%3D%24%7Buid%7D") - setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderEmxDigital, "https://cs.emxdgt.com/um?ssp=pbs&gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&redirect="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Demx_digital%26uid%3D%24UID") - setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderEngageBDR, "https://match.bnmla.com/usersync/s2s_sync?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&r="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dvisx%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24%7BUUID%7D") + setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderDatablocks, "https://sync.v5prebid.datablocks.net/s2ssync?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&r="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Ddatablocks%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24%7Buid%7D") + setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderEmxDigital, "https://cs.emxdgt.com/um?ssp=pbs&gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&redirect="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Demx_digital%26uid%3D%24UID") + setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderEngageBDR, "https://match.bnmla.com/usersync/s2s_sync?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&r="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dengagebdr%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24%7BUUID%7D") setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderEPlanning, "https://ads.us.e-planning.net/uspd/1/?du=https%3A%2F%2Fads.us.e-planning.net%2Fgetuid%2F1%2F5a1ad71d2d53a0f5%3F"+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Deplanning%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24UID") // openrtb_ext.BidderFacebook doesn't have a good default. // openrtb_ext.BidderGamma doesn't have a good default. setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderGamoshi, "https://rtb.gamoshi.io/user_sync_prebid?gdpr={{.GDPR}}&consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&rurl="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dgamoshi%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%5Bgusr%5D") setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderGrid, "https://x.bidswitch.net/check_uuid/"+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dgrid%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24%7BBSW_UUID%7D?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}") - setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderGumGum, "https://rtb.gumgum.com/usync/prbds2s?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&r="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dgumgum%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D") - setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderImprovedigital, "https://ad.360yield.com/server_match?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&r="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dimprovedigital%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%7BPUB_USER_ID%7D") + setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderGumGum, "https://rtb.gumgum.com/usync/prbds2s?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&r="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dgumgum%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D") + setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderImprovedigital, "https://ad.360yield.com/server_match?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&r="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dimprovedigital%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%7BPUB_USER_ID%7D") setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderIx, "https://ssum.casalemedia.com/usermatchredir?s=184932&cb="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dix%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D") setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderLifestreet, "https://ads.lfstmedia.com/idsync/137062?synced=1&ttl=1s&rurl="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dlifestreet%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24%24visitor_cookie%24%24") - setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderLockerDome, "https://lockerdome.com/usync/prebidserver?pid="+cfg.Adapters["lockerdome"].PlatformID+"&gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&redirect="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dlockerdome%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%7B%7Buid%7D%7D") - setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderMarsmedia, "https://dmp.rtbsrv.com/dmp/profiles/cm?p_id=179&gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&redirect="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dmarsmedia%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24%7BUUID%7D") + setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderLockerDome, "https://lockerdome.com/usync/prebidserver?pid="+cfg.Adapters["lockerdome"].PlatformID+"&gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&redirect="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dlockerdome%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%7B%7Buid%7D%7D") + setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderMarsmedia, "https://dmp.rtbsrv.com/dmp/profiles/cm?p_id=179&gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&redirect="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dmarsmedia%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24%7BUUID%7D") setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderMgid, "https://cm.mgid.com/m?cdsp=363893&adu="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dmgid%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%7Bmuidn%7D") setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderOpenx, "https://rtb.openx.net/sync/prebid?r="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dopenx%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24%7BUID%7D") setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderPubmatic, "https://ads.pubmatic.com/AdServer/js/user_sync.html?predirect="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dpubmatic%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D") setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderPulsepoint, "https://bh.contextweb.com/rtset?pid=561205&ev=1&rurl="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dpulsepoint%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%25%25VGUID%25%25") - setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderRhythmone, "https://sync.1rx.io/usersync2/rmphb?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&redir="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Drhythmone%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%5BRX_UUID%5D") + setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderRhythmone, "https://sync.1rx.io/usersync2/rmphb?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&redir="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Drhythmone%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%5BRX_UUID%5D") // openrtb_ext.BidderRTBHouse doesn't have a good default. // openrtb_ext.BidderRubicon doesn't have a good default. setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderSharethrough, "https://match.sharethrough.com/FGMrCMMc/v1?redirectUri="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dsharethrough%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24UID") @@ -523,12 +523,12 @@ func (cfg *Configuration) setDerivedDefaults() { setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderSovrn, "https://ap.lijit.com/pixel?redir="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dsovrn%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24UID") setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderSynacormedia, "https://sync.technoratimedia.com/services?srv=cs&pid=70&cb="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dsynacormedia%26uid%3D%5BUSER_ID%5D") // openrtb_ext.BidderTappx doesn't have a good default. - setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderTriplelift, "https://eb2.3lift.com/getuid?gpdr={{.GDPR}}&cmp_cs={{.GDPRConsent}}&redir="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dtriplelift%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24UID") - setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderTripleliftNative, "https://eb2.3lift.com/sync?gpdr={{.GDPR}}&cmp_cs={{.GDPRConsent}}") - setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderUnruly, "https://usermatch.targeting.unrulymedia.com/pbsync?gdpr={{.GDPR}}&consent={{.GDPRConsent}}&rurl="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dunruly%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24UID") - setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderVisx, "https://t.visx.net/s2s_sync?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&redir="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dvisx%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24%7BUUID%7D") + setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderTriplelift, "https://eb2.3lift.com/getuid?gpdr={{.GDPR}}&cmp_cs={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&redir="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dtriplelift%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24UID") + setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderTripleliftNative, "https://eb2.3lift.com/sync?gpdr={{.GDPR}}&cmp_cs={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&redir="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dtriplelift_native%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24UID") + setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderUnruly, "https://usermatch.targeting.unrulymedia.com/pbsync?gdpr={{.GDPR}}&consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&rurl="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dunruly%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24UID") + setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderVisx, "https://t.visx.net/s2s_sync?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&redir="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dvisx%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24%7BUUID%7D") // openrtb_ext.BidderVrtcal doesn't have a good default. - setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderYieldmo, "https://ads.yieldmo.com/pbsync?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&redirectUri="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dyieldmo%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24UID") + setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderYieldmo, "https://ads.yieldmo.com/pbsync?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&redirectUri="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dyieldmo%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24UID") } func setDefaultUsersync(m map[string]Adapter, bidder openrtb_ext.BidderName, defaultValue string) { diff --git a/config/config_test.go b/config/config_test.go index 24008980a86..182a46eef50 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -272,7 +272,7 @@ func TestFullConfig(t *testing.T) { cmpStrings(t, "adapters.brightroll.usersync_url", cfg.Adapters[string(openrtb_ext.BidderBrightroll)].UserSyncURL, "http://test-bh.ybp.yahoo.com/sync/appnexuspbs?gdpr={{.GDPR}}&euconsent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&url=%s") cmpStrings(t, "adapters.adkerneladn.usersync_url", cfg.Adapters[strings.ToLower(string(openrtb_ext.BidderAdkernelAdn))].UserSyncURL, "https://tag.adkernel.com/syncr?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&r=") cmpStrings(t, "adapters.rhythmone.endpoint", cfg.Adapters[string(openrtb_ext.BidderRhythmone)].Endpoint, "http://tag.1rx.io/rmp") - cmpStrings(t, "adapters.rhythmone.usersync_url", cfg.Adapters[string(openrtb_ext.BidderRhythmone)].UserSyncURL, "https://sync.1rx.io/usersync2/rmphb?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&redir=http%3A%2F%2Fprebid-server.prebid.org%2F%2Fsetuid%3Fbidder%3Drhythmone%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%5BRX_UUID%5D") + cmpStrings(t, "adapters.rhythmone.usersync_url", cfg.Adapters[string(openrtb_ext.BidderRhythmone)].UserSyncURL, "https://sync.1rx.io/usersync2/rmphb?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&redir=http%3A%2F%2Fprebid-server.prebid.org%2F%2Fsetuid%3Fbidder%3Drhythmone%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%5BRX_UUID%5D") cmpBools(t, "account_required", cfg.AccountRequired, true) cmpBools(t, "account_adapter_details", cfg.Metrics.Disabled.AccountAdapterDetails, true) cmpStrings(t, "certificates_file", cfg.PemCertsFile, "/etc/ssl/cert.pem") From b4ed836adea5ca8e86d3fc99a5e16a677eca9a19 Mon Sep 17 00:00:00 2001 From: hhhjort <31041505+hhhjort@users.noreply.github.com> Date: Tue, 14 Jan 2020 14:42:47 -0500 Subject: [PATCH 09/13] Fixes audienceNetwork adapter ignoring banner.format sizes. (#1164) --- .../supplemental/banner-format-only.json | 140 ++++++++++++++++++ adapters/audienceNetwork/facebook.go | 13 +- 2 files changed, 151 insertions(+), 2 deletions(-) create mode 100644 adapters/audienceNetwork/audienceNetworktest/supplemental/banner-format-only.json diff --git a/adapters/audienceNetwork/audienceNetworktest/supplemental/banner-format-only.json b/adapters/audienceNetwork/audienceNetworktest/supplemental/banner-format-only.json new file mode 100644 index 00000000000..52b7655593a --- /dev/null +++ b/adapters/audienceNetwork/audienceNetworktest/supplemental/banner-format-only.json @@ -0,0 +1,140 @@ +{ + "mockBidRequest": { + "id": "test-req-id", + "imp": [ + { + "id": "test-imp-id", + "banner": { + "format": [ + { + "w": 640, + "h": 480 + }, + { + "w": 300, + "h": 250 + } + ] + }, + "ext": { + "bidder": { + "publisherid": "123", + "placementid": "456" + } + } + } + ], + "site": { + "domain": "prebid.org", + "page": "prebid.org" + }, + "device": { + "ip": "152.193.6.74" + }, + "user": { + "id": "db089de9-a62e-4861-a881-0ff15e052516", + "buyeruid": "v4_bidder_token" + }, + "tmax": 500 + }, + "httpcalls": [ + { + "expectedRequest": { + "uri": "https://an.facebook.com/placementbid.ortb", + "headers": { + "Accept": [ + "application/json" + ], + "Content-Type": [ + "application/json;charset=utf-8" + ], + "X-Fb-Pool-Routing-Token": [ + "v4_bidder_token" + ] + }, + "body": { + "id": "test-req-id", + "imp": [ + { + "id": "test-imp-id", + "banner": { + "w": -1, + "h": 250 + }, + "tagid": "123_456" + } + ], + "ext": { + "appnexus": { + "hb_source": 5 + }, + "prebid": {} + }, + "site": { + "domain": "prebid.org", + "page": "prebid.org", + "publisher": { + "id": "123" + } + }, + "device": { + "ip": "152.193.6.74" + }, + "user": { + "id": "db089de9-a62e-4861-a881-0ff15e052516", + "buyeruid": "v4_bidder_token" + }, + "tmax": 500, + "ext": { + "authentication_id": "b2f9edfd707106adb6b692520081ad7e2a345444af1a895310228297a1b6247e", + "platformid": "test-platform-id" + } + } + }, + "mockResponse": { + "status": 200, + "body": { + "id": "test-req-id", + "seatbid": [ + { + "bid": [ + { + "id": "987", + "impid": "test-imp-id", + "price": 1.000000, + "adm": "{\"type\":\"ID\",\"bid_id\":\"987\",\"placement_id\":\"123_456\",\"resolved_placement_id\":\"123_456\",\"sdk_version\":\"5.5.0\",\"device_id\":\"abc\",\"template\":1,\"payload\":null,\"bid_time_token\":\"v4_bidder_token=\"}", + "nurl": "https://www.facebook.com/audiencenetwork/nurl/?partner=test-platform-id&app=def&placement=456&auction=123&impression=123&request=123478&bid=987&ortb_loss_code=0&clearing_price=${AUCTION_PRICE}&app_version=iOS-1.0", + "lurl": "https://www.facebook.com/audiencenetwork/nurl/?partner=test-platform-id&app=def&placement=456&auction=123&impression=123&request=123478&bid=987&ortb_loss_code=${AUCTION_LOSS}&clearing_price=${AUCTION_PRICE}&app_version=iOS-1.0", + "burl": "https://www.facebook.com/audiencenetwork/burl/?partner=test-platform-id&app=def&placement=456&auction=123&impression=123&request=123478&bid=987&clearing_price=${AUCTION_PRICE}" + } + ] + } + ], + "bidid": "654", + "cur": "USD" + } + } + } + ], + "expectedBidResponses": [ + { + "currency": "USD", + "bids": [ + { + "bid": { + "id": "987", + "impid": "test-imp-id", + "price": 1, + "adm": "{\"type\":\"ID\",\"bid_id\":\"987\",\"placement_id\":\"123_456\",\"resolved_placement_id\":\"123_456\",\"sdk_version\":\"5.5.0\",\"device_id\":\"abc\",\"template\":1,\"payload\":null,\"bid_time_token\":\"v4_bidder_token=\"}", + "adid": "987", + "crid": "987", + "nurl": "https://www.facebook.com/audiencenetwork/nurl/?partner=test-platform-id&app=def&placement=456&auction=123&impression=123&request=123478&bid=987&ortb_loss_code=0&clearing_price=${AUCTION_PRICE}&app_version=iOS-1.0", + "lurl": "https://www.facebook.com/audiencenetwork/nurl/?partner=test-platform-id&app=def&placement=456&auction=123&impression=123&request=123478&bid=987&ortb_loss_code=${AUCTION_LOSS}&clearing_price=${AUCTION_PRICE}&app_version=iOS-1.0", + "burl": "https://www.facebook.com/audiencenetwork/burl/?partner=test-platform-id&app=def&placement=456&auction=123&impression=123&request=123478&bid=987&clearing_price=${AUCTION_PRICE}" + }, + "type": "banner" + } + ] + } + ] +} diff --git a/adapters/audienceNetwork/facebook.go b/adapters/audienceNetwork/facebook.go index 1500f314f88..706673cbafc 100644 --- a/adapters/audienceNetwork/facebook.go +++ b/adapters/audienceNetwork/facebook.go @@ -184,8 +184,17 @@ func (this *FacebookAdapter) modifyImp(out *openrtb.Imp) error { } if out.Banner.H == nil { - return &errortypes.BadInput{ - Message: fmt.Sprintf("imp #%s: banner height required", out.ID), + for _, f := range out.Banner.Format { + if _, ok := supportedBannerHeights[f.H]; ok { + h := f.H + out.Banner.H = &h + break + } + } + if out.Banner.H == nil { + return &errortypes.BadInput{ + Message: fmt.Sprintf("imp #%s: banner height required", out.ID), + } } } From 3a026fb1cee62cce85e4dfc986c0a12db6f0bcce Mon Sep 17 00:00:00 2001 From: Isha Bharti Date: Thu, 16 Jan 2020 11:44:38 +0530 Subject: [PATCH 10/13] Adding changes for import statement --- .travis.yml | 2 +- Makefile | 2 +- README.md | 10 +- adapters/33across/33across.go | 6 +- adapters/33across/33across_test.go | 2 +- adapters/33across/params_test.go | 2 +- adapters/33across/usersync.go | 4 +- adapters/33across/usersync_test.go | 6 +- adapters/adapterstest/test_json.go | 2 +- adapters/adform/adform.go | 8 +- adapters/adform/adform_test.go | 14 +-- adapters/adform/params_test.go | 2 +- adapters/adform/usersync.go | 4 +- adapters/adform/usersync_test.go | 4 +- adapters/adkernel/adkernel.go | 8 +- adapters/adkernel/adkernel_test.go | 2 +- adapters/adkernel/usersync.go | 4 +- adapters/adkernel/usersync_test.go | 6 +- adapters/adkernelAdn/adkernelAdn.go | 8 +- adapters/adkernelAdn/adkernelAdn_test.go | 2 +- adapters/adkernelAdn/usersync.go | 4 +- adapters/adkernelAdn/usersync_test.go | 6 +- adapters/adpone/adpone.go | 6 +- adapters/adpone/adpone_test.go | 2 +- adapters/adpone/usersync.go | 4 +- adapters/adpone/usersync_test.go | 2 +- adapters/adtelligent/adtelligent.go | 6 +- adapters/adtelligent/adtelligent_test.go | 2 +- adapters/adtelligent/params_test.go | 2 +- adapters/adtelligent/usersync.go | 4 +- adapters/adtelligent/usersync_test.go | 4 +- adapters/advangelists/advangelists.go | 8 +- adapters/advangelists/advangelists_test.go | 2 +- adapters/advangelists/params_test.go | 2 +- adapters/advangelists/usersync.go | 4 +- adapters/advangelists/usersync_test.go | 4 +- adapters/applogy/applogy.go | 6 +- adapters/applogy/applogy_test.go | 2 +- adapters/appnexus/appnexus.go | 10 +- adapters/appnexus/appnexus_test.go | 12 +- adapters/appnexus/params_test.go | 2 +- adapters/appnexus/usersync.go | 4 +- adapters/appnexus/usersync_test.go | 2 +- adapters/audienceNetwork/facebook.go | 6 +- adapters/audienceNetwork/facebook_test.go | 2 +- adapters/audienceNetwork/usersync.go | 4 +- adapters/audienceNetwork/usersync_test.go | 2 +- adapters/beachfront/beachfront.go | 6 +- adapters/beachfront/beachfront_test.go | 2 +- adapters/beachfront/params_test.go | 2 +- adapters/beachfront/usersync.go | 4 +- adapters/beachfront/usersync_test.go | 6 +- adapters/bidder.go | 4 +- adapters/brightroll/brightroll.go | 6 +- adapters/brightroll/brightroll_test.go | 2 +- adapters/brightroll/params_test.go | 2 +- adapters/brightroll/usersync.go | 4 +- adapters/brightroll/usersync_test.go | 2 +- adapters/consumable/consumable.go | 6 +- adapters/consumable/consumable_test.go | 2 +- adapters/consumable/params_test.go | 2 +- adapters/consumable/usersync.go | 4 +- adapters/consumable/usersync_test.go | 6 +- adapters/conversant/conversant.go | 6 +- adapters/conversant/conversant_test.go | 10 +- adapters/conversant/usersync.go | 4 +- adapters/conversant/usersync_test.go | 4 +- adapters/datablocks/datablocks.go | 8 +- adapters/datablocks/datablocks_test.go | 2 +- adapters/datablocks/usersync.go | 4 +- adapters/datablocks/usersync_test.go | 6 +- adapters/emx_digital/emx_digital.go | 6 +- adapters/emx_digital/emx_digital_test.go | 2 +- adapters/emx_digital/params_test.go | 2 +- adapters/emx_digital/usersync.go | 4 +- adapters/emx_digital/usersync_test.go | 6 +- adapters/engagebdr/engagebdr.go | 6 +- adapters/engagebdr/engagebdr_test.go | 2 +- adapters/engagebdr/params_test.go | 2 +- adapters/engagebdr/usersync.go | 4 +- adapters/engagebdr/usersync_test.go | 6 +- adapters/eplanning/eplanning.go | 6 +- adapters/eplanning/eplanning_test.go | 2 +- adapters/eplanning/usersync.go | 4 +- adapters/eplanning/usersync_test.go | 2 +- adapters/gamma/gamma.go | 6 +- adapters/gamma/gamma_test.go | 2 +- adapters/gamma/params_test.go | 2 +- adapters/gamma/usersync.go | 4 +- adapters/gamma/usersync_test.go | 4 +- adapters/gamoshi/gamoshi.go | 6 +- adapters/gamoshi/gamoshi_test.go | 2 +- adapters/gamoshi/params_test.go | 2 +- adapters/gamoshi/usersync.go | 4 +- adapters/gamoshi/usersync_test.go | 4 +- adapters/grid/grid.go | 6 +- adapters/grid/grid_test.go | 2 +- adapters/grid/usersync.go | 4 +- adapters/grid/usersync_test.go | 4 +- adapters/gumgum/gumgum.go | 6 +- adapters/gumgum/gumgum_test.go | 2 +- adapters/gumgum/params_test.go | 2 +- adapters/gumgum/usersync.go | 4 +- adapters/gumgum/usersync_test.go | 6 +- adapters/improvedigital/improvedigital.go | 6 +- .../improvedigital/improvedigital_test.go | 2 +- adapters/improvedigital/params_test.go | 2 +- adapters/improvedigital/usersync.go | 4 +- adapters/improvedigital/usersync_test.go | 6 +- adapters/info.go | 6 +- adapters/info_test.go | 8 +- adapters/ix/ix.go | 8 +- adapters/ix/ix_test.go | 4 +- adapters/ix/usersync.go | 4 +- adapters/ix/usersync_test.go | 2 +- adapters/kubient/kubient.go | 6 +- adapters/kubient/kubient_test.go | 2 +- adapters/legacy.go | 4 +- adapters/lifestreet/lifestreet.go | 8 +- adapters/lifestreet/lifestreet_test.go | 10 +- adapters/lifestreet/usersync.go | 4 +- adapters/lifestreet/usersync_test.go | 4 +- adapters/lockerdome/lockerdome.go | 6 +- adapters/lockerdome/lockerdome_test.go | 2 +- adapters/lockerdome/params_test.go | 2 +- adapters/lockerdome/usersync.go | 4 +- adapters/lockerdome/usersync_test.go | 2 +- adapters/marsmedia/marsmedia.go | 6 +- adapters/marsmedia/marsmedia_test.go | 2 +- adapters/marsmedia/params_test.go | 2 +- adapters/marsmedia/usersync.go | 4 +- adapters/marsmedia/usersync_test.go | 6 +- adapters/mgid/mgid.go | 6 +- adapters/mgid/mgid_test.go | 2 +- adapters/mgid/usersync.go | 4 +- adapters/mgid/usersync_test.go | 4 +- adapters/openrtb_util.go | 4 +- adapters/openrtb_util_test.go | 4 +- adapters/openx/openx.go | 6 +- adapters/openx/openx_test.go | 2 +- adapters/openx/params_test.go | 2 +- adapters/openx/usersync.go | 4 +- adapters/openx/usersync_test.go | 2 +- adapters/pubmatic/params_test.go | 2 +- adapters/pubmatic/pubmatic.go | 8 +- adapters/pubmatic/pubmatic_test.go | 14 +-- adapters/pubmatic/usersync.go | 4 +- adapters/pubmatic/usersync_test.go | 4 +- adapters/pubnative/pubnative.go | 6 +- adapters/pubnative/pubnative_test.go | 2 +- adapters/pulsepoint/pulsepoint.go | 8 +- adapters/pulsepoint/pulsepoint_test.go | 14 +-- adapters/pulsepoint/usersync.go | 4 +- adapters/pulsepoint/usersync_test.go | 2 +- adapters/rhythmone/params_test.go | 2 +- adapters/rhythmone/rhythmone.go | 6 +- adapters/rhythmone/rhythmone_test.go | 2 +- adapters/rhythmone/usersync.go | 4 +- adapters/rhythmone/usersync_test.go | 6 +- adapters/rtbhouse/rtbhouse.go | 4 +- adapters/rtbhouse/rtbhouse_test.go | 2 +- adapters/rtbhouse/usersync.go | 4 +- adapters/rtbhouse/usersync_test.go | 4 +- adapters/rubicon/rubicon.go | 8 +- adapters/rubicon/rubicon_test.go | 14 +-- adapters/rubicon/usersync.go | 4 +- adapters/rubicon/usersync_test.go | 4 +- adapters/sharethrough/butler.go | 6 +- adapters/sharethrough/butler_test.go | 6 +- adapters/sharethrough/params_test.go | 2 +- adapters/sharethrough/sharethrough.go | 4 +- adapters/sharethrough/sharethrough_test.go | 4 +- adapters/sharethrough/usersync.go | 4 +- adapters/sharethrough/usersync_test.go | 4 +- adapters/sharethrough/utils.go | 2 +- adapters/sharethrough/utils_test.go | 2 +- adapters/somoaudience/params_test.go | 2 +- adapters/somoaudience/somoaudience.go | 6 +- adapters/somoaudience/somoaudience_test.go | 2 +- adapters/somoaudience/usersync.go | 4 +- adapters/somoaudience/usersync_test.go | 2 +- adapters/sonobi/params_test.go | 2 +- adapters/sonobi/sonobi.go | 6 +- adapters/sonobi/sonobi_test.go | 2 +- adapters/sonobi/usersync.go | 4 +- adapters/sonobi/usersync_test.go | 4 +- adapters/sovrn/sovrn.go | 8 +- adapters/sovrn/sovrn_test.go | 12 +- adapters/sovrn/usersync.go | 4 +- adapters/sovrn/usersync_test.go | 4 +- adapters/synacormedia/params_test.go | 2 +- adapters/synacormedia/synacormedia.go | 8 +- adapters/synacormedia/synacormedia_test.go | 2 +- adapters/synacormedia/usersync.go | 4 +- adapters/synacormedia/usersync_test.go | 2 +- adapters/syncer.go | 8 +- adapters/syncer_test.go | 6 +- adapters/tappx/params_test.go | 2 +- adapters/tappx/tappx.go | 8 +- adapters/tappx/tappx_test.go | 4 +- adapters/triplelift/triplelift.go | 6 +- adapters/triplelift/triplelift_test.go | 2 +- adapters/triplelift/usersync.go | 4 +- adapters/triplelift/usersync_test.go | 2 +- .../triplelift_native/triplelift_native.go | 6 +- .../triplelift_native_test.go | 4 +- adapters/triplelift_native/usersync.go | 4 +- adapters/triplelift_native/usersync_test.go | 2 +- adapters/unruly/unruly.go | 6 +- adapters/unruly/unruly_test.go | 8 +- adapters/unruly/usersync.go | 4 +- adapters/unruly/usersync_test.go | 6 +- adapters/verizonmedia/params_test.go | 2 +- adapters/verizonmedia/usersync.go | 4 +- adapters/verizonmedia/usersync_test.go | 2 +- adapters/verizonmedia/verizonmedia.go | 6 +- adapters/verizonmedia/verizonmedia_test.go | 4 +- adapters/visx/params_test.go | 2 +- adapters/visx/usersync.go | 4 +- adapters/visx/usersync_test.go | 6 +- adapters/visx/visx.go | 4 +- adapters/visx/visx_test.go | 2 +- adapters/vrtcal/params_test.go | 2 +- adapters/vrtcal/usersync.go | 4 +- adapters/vrtcal/usersync_test.go | 4 +- adapters/vrtcal/vrtcal.go | 4 +- adapters/vrtcal/vrtcal_test.go | 2 +- adapters/yieldmo/params_test.go | 2 +- adapters/yieldmo/usersync.go | 4 +- adapters/yieldmo/usersync_test.go | 4 +- adapters/yieldmo/yieldmo.go | 6 +- adapters/yieldmo/yieldmo_test.go | 2 +- analytics/config/config.go | 6 +- analytics/config/config_test.go | 4 +- analytics/core.go | 4 +- analytics/filesystem/file_module.go | 2 +- analytics/filesystem/file_module_test.go | 4 +- cache/dummycache/dummycache.go | 2 +- cache/filecache/filecache.go | 2 +- cache/postgrescache/postgrescache.go | 4 +- config/config.go | 6 +- config/config_test.go | 2 +- currencies/constant_rates_test.go | 2 +- currencies/rate_converter_test.go | 2 +- currencies/rates_test.go | 2 +- docs/developers/automated-tests.md | 2 +- docs/developers/code-reviews.md | 4 +- docs/developers/contributing.md | 6 +- docs/endpoints/info/bidders/bidderName.md | 2 +- docs/endpoints/openrtb2/auction.md | 4 +- endpoints/auction.go | 26 ++--- endpoints/auction_test.go | 20 ++-- endpoints/cookie_sync.go | 18 +-- endpoints/cookie_sync_test.go | 20 ++-- endpoints/currency_rates.go | 2 +- endpoints/currency_rates_test.go | 2 +- endpoints/getuids.go | 4 +- endpoints/getuids_test.go | 2 +- endpoints/info/bidders.go | 4 +- endpoints/info/bidders_test.go | 8 +- endpoints/openrtb2/amp_auction.go | 24 ++-- endpoints/openrtb2/amp_auction_test.go | 14 +-- endpoints/openrtb2/auction.go | 24 ++-- endpoints/openrtb2/auction_benchmark_test.go | 18 +-- endpoints/openrtb2/auction_test.go | 18 +-- endpoints/openrtb2/interstitial.go | 6 +- endpoints/openrtb2/video_auction.go | 16 +-- endpoints/openrtb2/video_auction_test.go | 16 +-- endpoints/setuid.go | 12 +- endpoints/setuid_test.go | 14 +-- exchange/adapter_map.go | 104 +++++++++--------- exchange/adapter_map_test.go | 6 +- exchange/auction.go | 6 +- exchange/auction_test.go | 6 +- exchange/bidder.go | 8 +- exchange/bidder_test.go | 6 +- exchange/bidder_validate_bids.go | 6 +- exchange/bidder_validate_bids_test.go | 6 +- exchange/exchange.go | 18 +-- exchange/exchange_test.go | 30 ++--- exchange/legacy.go | 10 +- exchange/legacy_test.go | 10 +- exchange/price_granularity.go | 2 +- exchange/price_granularity_test.go | 2 +- exchange/targeting.go | 2 +- exchange/targeting_test.go | 12 +- exchange/utils.go | 10 +- exchange/utils_test.go | 4 +- gdpr/gdpr.go | 4 +- gdpr/impl.go | 6 +- gdpr/impl_test.go | 4 +- gdpr/vendorlist-fetching.go | 4 +- gdpr/vendorlist-fetching_test.go | 2 +- go.mod | 2 +- main.go | 10 +- main_test.go | 2 +- openrtb_ext/device.go | 2 +- openrtb_ext/device_test.go | 2 +- openrtb_ext/imp.go | 2 +- openrtb_ext/site_test.go | 2 +- pbs/pbsrequest.go | 10 +- pbs/pbsrequest_test.go | 4 +- pbs/usersync.go | 10 +- pbsmetrics/config/metrics.go | 8 +- pbsmetrics/config/metrics_test.go | 6 +- pbsmetrics/go_metrics.go | 4 +- pbsmetrics/go_metrics_test.go | 4 +- pbsmetrics/metrics.go | 2 +- pbsmetrics/metrics_mock.go | 2 +- pbsmetrics/prometheus/prometheus.go | 6 +- pbsmetrics/prometheus/prometheus_test.go | 6 +- pbsmetrics/prometheus/type_conversion.go | 4 +- prebid_cache_client/client.go | 4 +- prebid_cache_client/client_test.go | 6 +- privacy/ccpa/policy.go | 2 +- privacy/policies.go | 4 +- router/admin.go | 4 +- router/router.go | 58 +++++----- router/router_test.go | 4 +- server/listener.go | 2 +- server/listener_test.go | 4 +- server/prometheus.go | 6 +- server/server.go | 6 +- server/server_test.go | 2 +- .../backends/db_fetcher/fetcher.go | 2 +- .../backends/empty_fetcher/fetcher.go | 2 +- .../backends/file_fetcher/fetcher.go | 2 +- .../backends/file_fetcher/fetcher_test.go | 2 +- .../backends/http_fetcher/fetcher.go | 2 +- stored_requests/caches/cachestest/reliable.go | 2 +- stored_requests/caches/memory/cache.go | 4 +- stored_requests/caches/memory/cache_test.go | 6 +- stored_requests/config/config.go | 26 ++--- stored_requests/config/config_test.go | 10 +- stored_requests/events/api/api.go | 2 +- stored_requests/events/api/api_test.go | 6 +- stored_requests/events/events.go | 2 +- stored_requests/events/events_test.go | 4 +- stored_requests/events/http/http.go | 2 +- stored_requests/events/postgres/polling.go | 2 +- stored_requests/events/postgres/startup.go | 2 +- stored_requests/fetcher.go | 2 +- stored_requests/fetcher_test.go | 2 +- usersync/cookie.go | 4 +- usersync/cookie_test.go | 4 +- usersync/usersync.go | 2 +- usersync/usersyncers/syncer.go | 96 ++++++++-------- usersync/usersyncers/syncer_test.go | 4 +- 348 files changed, 992 insertions(+), 992 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3cc55e5f184..b46dd356e73 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ go: - '1.12' - '1.13' -go_import_path: github.com/prebid/prebid-server +go_import_path: github.com/PubMatic-OpenWrap/prebid-server env: - GO111MODULE=on diff --git a/Makefile b/Makefile index 8ffea91fe36..8475ce8369b 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ test: deps ifeq "$(adapter)" "" ./validate.sh else - go test github.com/prebid/prebid-server/adapters/$(adapter) -bench=. + go test github.com/PubMatic-OpenWrap/prebid-server/adapters/$(adapter) -bench=. endif # build will ensure all of our tests pass and then build the go binary diff --git a/README.md b/README.md index a59bf5f6aa3..e3e1686ea9d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![Build Status](https://travis-ci.org/prebid/prebid-server.svg?branch=master)](https://travis-ci.org/prebid/prebid-server) -[![Go Report Card](https://goreportcard.com/badge/github.com/prebid/prebid-server?style=flat-square)](https://goreportcard.com/report/github.com/prebid/prebid-server) +[![Go Report Card](https://goreportcard.com/badge/github.com/PubMatic-OpenWrap/prebid-server?style=flat-square)](https://goreportcard.com/report/github.com/PubMatic-OpenWrap/prebid-server) # Prebid Server @@ -26,8 +26,8 @@ Download and prepare Prebid Server: ```bash cd YOUR_DIRECTORY -git clone https://github.com/prebid/prebid-server src/github.com/prebid/prebid-server -cd src/github.com/prebid/prebid-server +git clone https://github.com/PubMatic-OpenWrap/prebid-server src/github.com/PubMatic-OpenWrap/prebid-server +cd src/github.com/PubMatic-OpenWrap/prebid-server ``` Run the automated tests: @@ -53,6 +53,6 @@ Want to [add an adapter](docs/developers/add-new-bidder.md)? Found a bug? Great! This project is in its infancy, and many things can be improved. -Report bugs, request features, and suggest improvements [on Github](https://github.com/prebid/prebid-server/issues). +Report bugs, request features, and suggest improvements [on Github](https://github.com/PubMatic-OpenWrap/prebid-server/issues). -Or better yet, [open a pull request](https://github.com/prebid/prebid-server/compare) with the changes you'd like to see. +Or better yet, [open a pull request](https://github.com/PubMatic-OpenWrap/prebid-server/compare) with the changes you'd like to see. diff --git a/adapters/33across/33across.go b/adapters/33across/33across.go index 5c1b31eeb8c..ea3f8012fe1 100644 --- a/adapters/33across/33across.go +++ b/adapters/33across/33across.go @@ -6,9 +6,9 @@ import ( "net/http" "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/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) type TtxAdapter struct { diff --git a/adapters/33across/33across_test.go b/adapters/33across/33across_test.go index ccdcbf9cc2c..1ec04dacb9e 100644 --- a/adapters/33across/33across_test.go +++ b/adapters/33across/33across_test.go @@ -3,7 +3,7 @@ package ttx import ( "testing" - "github.com/prebid/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" ) func TestJsonSamples(t *testing.T) { diff --git a/adapters/33across/params_test.go b/adapters/33across/params_test.go index 0c7cde18216..19dfb22198c 100644 --- a/adapters/33across/params_test.go +++ b/adapters/33across/params_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) // This file actually intends to test static/bidder-params/33across.json diff --git a/adapters/33across/usersync.go b/adapters/33across/usersync.go index 7bc9ae458ae..0bed70ee60d 100644 --- a/adapters/33across/usersync.go +++ b/adapters/33across/usersync.go @@ -3,8 +3,8 @@ package ttx import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func New33AcrossSyncer(temp *template.Template) usersync.Usersyncer { diff --git a/adapters/33across/usersync_test.go b/adapters/33across/usersync_test.go index a5e301b1082..fd2ebcd195b 100644 --- a/adapters/33across/usersync_test.go +++ b/adapters/33across/usersync_test.go @@ -4,9 +4,9 @@ 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/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/ccpa" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr" "github.com/stretchr/testify/assert" ) diff --git a/adapters/adapterstest/test_json.go b/adapters/adapterstest/test_json.go index a0d1954894a..d7c77496a38 100644 --- a/adapters/adapterstest/test_json.go +++ b/adapters/adapterstest/test_json.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" "github.com/yudai/gojsondiff" "github.com/yudai/gojsondiff/formatter" diff --git a/adapters/adform/adform.go b/adapters/adform/adform.go index 3aeea62ebde..41150c6b5c2 100644 --- a/adapters/adform/adform.go +++ b/adapters/adform/adform.go @@ -12,10 +12,10 @@ import ( "strconv" "strings" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/errortypes" - "github.com/prebid/prebid-server/openrtb_ext" - "github.com/prebid/prebid-server/pbs" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/pbs" "github.com/buger/jsonparser" "github.com/mxmCherry/openrtb" diff --git a/adapters/adform/adform_test.go b/adapters/adform/adform_test.go index 63646f5f7f5..a09985a68f6 100644 --- a/adapters/adform/adform_test.go +++ b/adapters/adform/adform_test.go @@ -10,17 +10,17 @@ import ( "testing" "time" - "github.com/prebid/prebid-server/adapters/adapterstest" - "github.com/prebid/prebid-server/cache/dummycache" - "github.com/prebid/prebid-server/pbs" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/cache/dummycache" + "github.com/PubMatic-OpenWrap/prebid-server/pbs" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" "fmt" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "github.com/stretchr/testify/assert" ) diff --git a/adapters/adform/params_test.go b/adapters/adform/params_test.go index ae0a02b6a97..98596075c74 100644 --- a/adapters/adform/params_test.go +++ b/adapters/adform/params_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) // This file actually intends to test static/bidder-params/adform.json diff --git a/adapters/adform/usersync.go b/adapters/adform/usersync.go index 32b4e3a91c1..b98c1b6c0fc 100644 --- a/adapters/adform/usersync.go +++ b/adapters/adform/usersync.go @@ -3,8 +3,8 @@ package adform import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func NewAdformSyncer(temp *template.Template) usersync.Usersyncer { diff --git a/adapters/adform/usersync_test.go b/adapters/adform/usersync_test.go index 855506da2ed..3a507331e85 100644 --- a/adapters/adform/usersync_test.go +++ b/adapters/adform/usersync_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/prebid/prebid-server/privacy" - "github.com/prebid/prebid-server/privacy/gdpr" + "github.com/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr" ) func TestAdformSyncer(t *testing.T) { diff --git a/adapters/adkernel/adkernel.go b/adapters/adkernel/adkernel.go index e7aec4b9cc4..c457ffc444e 100644 --- a/adapters/adkernel/adkernel.go +++ b/adapters/adkernel/adkernel.go @@ -9,10 +9,10 @@ import ( "github.com/golang/glog" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/errortypes" - "github.com/prebid/prebid-server/macros" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/macros" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) type adkernelAdapter struct { diff --git a/adapters/adkernel/adkernel_test.go b/adapters/adkernel/adkernel_test.go index 7eac77efca9..f7cb9a22a9e 100644 --- a/adapters/adkernel/adkernel_test.go +++ b/adapters/adkernel/adkernel_test.go @@ -3,7 +3,7 @@ package adkernel import ( "testing" - "github.com/prebid/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" ) func TestJsonSamples(t *testing.T) { diff --git a/adapters/adkernel/usersync.go b/adapters/adkernel/usersync.go index 2e2ebdb9fe3..7622e1da3b7 100644 --- a/adapters/adkernel/usersync.go +++ b/adapters/adkernel/usersync.go @@ -3,8 +3,8 @@ package adkernel import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) const adkernelGDPRVendorID = uint16(14) diff --git a/adapters/adkernel/usersync_test.go b/adapters/adkernel/usersync_test.go index 0d539d11ee0..53435d5e3a0 100644 --- a/adapters/adkernel/usersync_test.go +++ b/adapters/adkernel/usersync_test.go @@ -4,9 +4,9 @@ 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/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/ccpa" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr" "github.com/stretchr/testify/assert" ) diff --git a/adapters/adkernelAdn/adkernelAdn.go b/adapters/adkernelAdn/adkernelAdn.go index 56bdfe2503b..f904d7c9ad0 100644 --- a/adapters/adkernelAdn/adkernelAdn.go +++ b/adapters/adkernelAdn/adkernelAdn.go @@ -9,10 +9,10 @@ import ( "github.com/golang/glog" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/errortypes" - "github.com/prebid/prebid-server/macros" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/macros" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) const defaultDomain string = "tag.adkernel.com" diff --git a/adapters/adkernelAdn/adkernelAdn_test.go b/adapters/adkernelAdn/adkernelAdn_test.go index 444e776aceb..e8145723822 100644 --- a/adapters/adkernelAdn/adkernelAdn_test.go +++ b/adapters/adkernelAdn/adkernelAdn_test.go @@ -3,7 +3,7 @@ package adkernelAdn import ( "testing" - "github.com/prebid/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" ) func TestJsonSamples(t *testing.T) { diff --git a/adapters/adkernelAdn/usersync.go b/adapters/adkernelAdn/usersync.go index 0bedac38e46..ab60edf2dc7 100644 --- a/adapters/adkernelAdn/usersync.go +++ b/adapters/adkernelAdn/usersync.go @@ -3,8 +3,8 @@ package adkernelAdn import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) const adkernelGDPRVendorID = uint16(14) diff --git a/adapters/adkernelAdn/usersync_test.go b/adapters/adkernelAdn/usersync_test.go index ecc759bdf70..2f90e73d348 100644 --- a/adapters/adkernelAdn/usersync_test.go +++ b/adapters/adkernelAdn/usersync_test.go @@ -4,9 +4,9 @@ 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/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/ccpa" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr" "github.com/stretchr/testify/assert" ) diff --git a/adapters/adpone/adpone.go b/adapters/adpone/adpone.go index 345a4988580..3022bda0bc1 100644 --- a/adapters/adpone/adpone.go +++ b/adapters/adpone/adpone.go @@ -3,12 +3,12 @@ package adpone import ( "encoding/json" "fmt" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "net/http" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" ) func NewAdponeBidder(endpoint string) *adponeAdapter { diff --git a/adapters/adpone/adpone_test.go b/adapters/adpone/adpone_test.go index e4d67a41b75..2cce1d7c62c 100644 --- a/adapters/adpone/adpone_test.go +++ b/adapters/adpone/adpone_test.go @@ -3,7 +3,7 @@ package adpone import ( "testing" - "github.com/prebid/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" ) const testsDir = "adponetest" diff --git a/adapters/adpone/usersync.go b/adapters/adpone/usersync.go index 480ecb82f3f..b80ee4442a3 100644 --- a/adapters/adpone/usersync.go +++ b/adapters/adpone/usersync.go @@ -3,8 +3,8 @@ package adpone import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) const adponeGDPRVendorID = uint16(16) diff --git a/adapters/adpone/usersync_test.go b/adapters/adpone/usersync_test.go index 87b4e9ae440..7bc528b8f36 100644 --- a/adapters/adpone/usersync_test.go +++ b/adapters/adpone/usersync_test.go @@ -4,7 +4,7 @@ import ( "testing" "text/template" - "github.com/prebid/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy" "github.com/stretchr/testify/assert" ) diff --git a/adapters/adtelligent/adtelligent.go b/adapters/adtelligent/adtelligent.go index 7f0262fdc92..f52edab9c79 100644 --- a/adapters/adtelligent/adtelligent.go +++ b/adapters/adtelligent/adtelligent.go @@ -6,9 +6,9 @@ import ( "net/http" "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/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) type AdtelligentAdapter struct { diff --git a/adapters/adtelligent/adtelligent_test.go b/adapters/adtelligent/adtelligent_test.go index 63655da677e..9b42bbb10d1 100644 --- a/adapters/adtelligent/adtelligent_test.go +++ b/adapters/adtelligent/adtelligent_test.go @@ -3,7 +3,7 @@ package adtelligent import ( "testing" - "github.com/prebid/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" ) func TestJsonSamples(t *testing.T) { diff --git a/adapters/adtelligent/params_test.go b/adapters/adtelligent/params_test.go index eb2aab0d437..8d8eb6d13b3 100644 --- a/adapters/adtelligent/params_test.go +++ b/adapters/adtelligent/params_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) // This file actually intends to test static/bidder-params/adtelligent.json diff --git a/adapters/adtelligent/usersync.go b/adapters/adtelligent/usersync.go index cda3b62a071..4315a6f348c 100644 --- a/adapters/adtelligent/usersync.go +++ b/adapters/adtelligent/usersync.go @@ -3,8 +3,8 @@ package adtelligent import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func NewAdtelligentSyncer(temp *template.Template) usersync.Usersyncer { diff --git a/adapters/adtelligent/usersync_test.go b/adapters/adtelligent/usersync_test.go index 1cc5dfe4627..e0006847ccd 100644 --- a/adapters/adtelligent/usersync_test.go +++ b/adapters/adtelligent/usersync_test.go @@ -4,8 +4,8 @@ import ( "testing" "text/template" - "github.com/prebid/prebid-server/privacy" - "github.com/prebid/prebid-server/privacy/gdpr" + "github.com/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr" "github.com/stretchr/testify/assert" ) diff --git a/adapters/advangelists/advangelists.go b/adapters/advangelists/advangelists.go index 0ce33104ca7..4e529d72d75 100644 --- a/adapters/advangelists/advangelists.go +++ b/adapters/advangelists/advangelists.go @@ -8,10 +8,10 @@ import ( "github.com/golang/glog" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/errortypes" - "github.com/prebid/prebid-server/macros" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/macros" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) type AdvangelistsAdapter struct { diff --git a/adapters/advangelists/advangelists_test.go b/adapters/advangelists/advangelists_test.go index 116a2c54ec6..d21c325d84d 100644 --- a/adapters/advangelists/advangelists_test.go +++ b/adapters/advangelists/advangelists_test.go @@ -1,7 +1,7 @@ package advangelists import ( - "github.com/prebid/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" "testing" ) diff --git a/adapters/advangelists/params_test.go b/adapters/advangelists/params_test.go index a58217a0ffd..2a94c782092 100644 --- a/adapters/advangelists/params_test.go +++ b/adapters/advangelists/params_test.go @@ -2,7 +2,7 @@ package advangelists import ( "encoding/json" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "testing" ) diff --git a/adapters/advangelists/usersync.go b/adapters/advangelists/usersync.go index 6167a2e39d9..5ba287757b8 100644 --- a/adapters/advangelists/usersync.go +++ b/adapters/advangelists/usersync.go @@ -3,8 +3,8 @@ package advangelists import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func NewAdvangelistsSyncer(temp *template.Template) usersync.Usersyncer { diff --git a/adapters/advangelists/usersync_test.go b/adapters/advangelists/usersync_test.go index b97652c1c46..a68472fb4bf 100644 --- a/adapters/advangelists/usersync_test.go +++ b/adapters/advangelists/usersync_test.go @@ -4,8 +4,8 @@ import ( "testing" "text/template" - "github.com/prebid/prebid-server/privacy" - "github.com/prebid/prebid-server/privacy/gdpr" + "github.com/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr" "github.com/stretchr/testify/assert" ) diff --git a/adapters/applogy/applogy.go b/adapters/applogy/applogy.go index a1215e24940..6fc957cc4f0 100644 --- a/adapters/applogy/applogy.go +++ b/adapters/applogy/applogy.go @@ -7,9 +7,9 @@ import ( "strconv" "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/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) type ApplogyAdapter struct { diff --git a/adapters/applogy/applogy_test.go b/adapters/applogy/applogy_test.go index 8883db5786a..4e656259f35 100644 --- a/adapters/applogy/applogy_test.go +++ b/adapters/applogy/applogy_test.go @@ -3,7 +3,7 @@ package applogy import ( "testing" - "github.com/prebid/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" ) func TestJsonSamples(t *testing.T) { diff --git a/adapters/appnexus/appnexus.go b/adapters/appnexus/appnexus.go index 3986bfd45b0..2a30560983a 100644 --- a/adapters/appnexus/appnexus.go +++ b/adapters/appnexus/appnexus.go @@ -11,15 +11,15 @@ import ( "strings" "github.com/buger/jsonparser" - "github.com/prebid/prebid-server/pbs" + "github.com/PubMatic-OpenWrap/prebid-server/pbs" "golang.org/x/net/context/ctxhttp" "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/pbsmetrics" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics" ) type AppNexusAdapter struct { diff --git a/adapters/appnexus/appnexus_test.go b/adapters/appnexus/appnexus_test.go index bf49374940a..76b8f37c3a9 100644 --- a/adapters/appnexus/appnexus_test.go +++ b/adapters/appnexus/appnexus_test.go @@ -10,16 +10,16 @@ import ( "testing" "time" - "github.com/prebid/prebid-server/cache/dummycache" - "github.com/prebid/prebid-server/pbs" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/cache/dummycache" + "github.com/PubMatic-OpenWrap/prebid-server/pbs" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" "fmt" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/adapters/adapterstest" - "github.com/prebid/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/config" ) func TestJsonSamples(t *testing.T) { diff --git a/adapters/appnexus/params_test.go b/adapters/appnexus/params_test.go index f84cccc9a4c..c30f5cf3e2a 100644 --- a/adapters/appnexus/params_test.go +++ b/adapters/appnexus/params_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) // This file actually intends to test static/bidder-params/appnexus.json diff --git a/adapters/appnexus/usersync.go b/adapters/appnexus/usersync.go index 22f46f1e723..16ffdfa3338 100644 --- a/adapters/appnexus/usersync.go +++ b/adapters/appnexus/usersync.go @@ -3,8 +3,8 @@ package appnexus import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func NewAppnexusSyncer(temp *template.Template) usersync.Usersyncer { diff --git a/adapters/appnexus/usersync_test.go b/adapters/appnexus/usersync_test.go index 24b9eede9d6..6796ce13b96 100644 --- a/adapters/appnexus/usersync_test.go +++ b/adapters/appnexus/usersync_test.go @@ -4,7 +4,7 @@ import ( "testing" "text/template" - "github.com/prebid/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy" "github.com/stretchr/testify/assert" ) diff --git a/adapters/audienceNetwork/facebook.go b/adapters/audienceNetwork/facebook.go index 706673cbafc..87075db9d45 100644 --- a/adapters/audienceNetwork/facebook.go +++ b/adapters/audienceNetwork/facebook.go @@ -13,9 +13,9 @@ import ( "github.com/buger/jsonparser" "github.com/golang/glog" "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/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) type FacebookAdapter struct { diff --git a/adapters/audienceNetwork/facebook_test.go b/adapters/audienceNetwork/facebook_test.go index 2ce0ef3ba64..9c89ee74079 100644 --- a/adapters/audienceNetwork/facebook_test.go +++ b/adapters/audienceNetwork/facebook_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/prebid/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" ) type tagInfo struct { diff --git a/adapters/audienceNetwork/usersync.go b/adapters/audienceNetwork/usersync.go index 45c1281d0ae..6b8ba3ba7a3 100644 --- a/adapters/audienceNetwork/usersync.go +++ b/adapters/audienceNetwork/usersync.go @@ -3,8 +3,8 @@ package audienceNetwork import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func NewFacebookSyncer(temp *template.Template) usersync.Usersyncer { diff --git a/adapters/audienceNetwork/usersync_test.go b/adapters/audienceNetwork/usersync_test.go index c3836e4f154..e11fb194dec 100644 --- a/adapters/audienceNetwork/usersync_test.go +++ b/adapters/audienceNetwork/usersync_test.go @@ -4,7 +4,7 @@ import ( "testing" "text/template" - "github.com/prebid/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy" "github.com/stretchr/testify/assert" ) diff --git a/adapters/beachfront/beachfront.go b/adapters/beachfront/beachfront.go index e2eb31b3577..26f759e4a45 100644 --- a/adapters/beachfront/beachfront.go +++ b/adapters/beachfront/beachfront.go @@ -5,9 +5,9 @@ import ( "errors" "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/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "net/http" "reflect" "strconv" diff --git a/adapters/beachfront/beachfront_test.go b/adapters/beachfront/beachfront_test.go index 4e82deaf3d8..683b0ac90c9 100644 --- a/adapters/beachfront/beachfront_test.go +++ b/adapters/beachfront/beachfront_test.go @@ -3,7 +3,7 @@ package beachfront import ( "testing" - "github.com/prebid/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" ) func TestJsonSamples(t *testing.T) { diff --git a/adapters/beachfront/params_test.go b/adapters/beachfront/params_test.go index ebc0a768900..982bd96c609 100644 --- a/adapters/beachfront/params_test.go +++ b/adapters/beachfront/params_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) func TestValidParams(t *testing.T) { diff --git a/adapters/beachfront/usersync.go b/adapters/beachfront/usersync.go index a255d4d994b..cfb099a80c6 100644 --- a/adapters/beachfront/usersync.go +++ b/adapters/beachfront/usersync.go @@ -3,8 +3,8 @@ package beachfront import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func NewBeachfrontSyncer(temp *template.Template) usersync.Usersyncer { diff --git a/adapters/beachfront/usersync_test.go b/adapters/beachfront/usersync_test.go index f0c4b3817d1..38efd0a54d7 100644 --- a/adapters/beachfront/usersync_test.go +++ b/adapters/beachfront/usersync_test.go @@ -4,9 +4,9 @@ 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/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/ccpa" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr" "github.com/stretchr/testify/assert" ) diff --git a/adapters/bidder.go b/adapters/bidder.go index 9d3ffb75414..65e95fca7bf 100644 --- a/adapters/bidder.go +++ b/adapters/bidder.go @@ -6,8 +6,8 @@ import ( "net/http" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/errortypes" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) // Bidder describes how to connect to external demand. diff --git a/adapters/brightroll/brightroll.go b/adapters/brightroll/brightroll.go index 0ae95dd303a..382b203ff68 100644 --- a/adapters/brightroll/brightroll.go +++ b/adapters/brightroll/brightroll.go @@ -7,9 +7,9 @@ import ( "strconv" "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/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) type BrightrollAdapter struct { diff --git a/adapters/brightroll/brightroll_test.go b/adapters/brightroll/brightroll_test.go index 0a6c2c44567..347a157968c 100644 --- a/adapters/brightroll/brightroll_test.go +++ b/adapters/brightroll/brightroll_test.go @@ -3,7 +3,7 @@ package brightroll import ( "testing" - "github.com/prebid/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" ) func TestJsonSamples(t *testing.T) { diff --git a/adapters/brightroll/params_test.go b/adapters/brightroll/params_test.go index beac822f8f0..6c65b8ce3ef 100644 --- a/adapters/brightroll/params_test.go +++ b/adapters/brightroll/params_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) // This file actually intends to test static/bidder-params/brightroll.json diff --git a/adapters/brightroll/usersync.go b/adapters/brightroll/usersync.go index b33cc5a2943..74729f70025 100644 --- a/adapters/brightroll/usersync.go +++ b/adapters/brightroll/usersync.go @@ -3,8 +3,8 @@ package brightroll import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func NewBrightrollSyncer(temp *template.Template) usersync.Usersyncer { diff --git a/adapters/brightroll/usersync_test.go b/adapters/brightroll/usersync_test.go index a5d47e35e56..1ca0325495e 100644 --- a/adapters/brightroll/usersync_test.go +++ b/adapters/brightroll/usersync_test.go @@ -4,7 +4,7 @@ import ( "testing" "text/template" - "github.com/prebid/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy" "github.com/stretchr/testify/assert" ) diff --git a/adapters/consumable/consumable.go b/adapters/consumable/consumable.go index d3954104f7b..409d8450e39 100644 --- a/adapters/consumable/consumable.go +++ b/adapters/consumable/consumable.go @@ -4,9 +4,9 @@ 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/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "net/http" "net/url" "strconv" diff --git a/adapters/consumable/consumable_test.go b/adapters/consumable/consumable_test.go index 734ee400523..1cdb0fadd5f 100644 --- a/adapters/consumable/consumable_test.go +++ b/adapters/consumable/consumable_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/prebid/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" ) func TestJsonSamples(t *testing.T) { diff --git a/adapters/consumable/params_test.go b/adapters/consumable/params_test.go index 42de5cb9ca8..9f922796bc2 100644 --- a/adapters/consumable/params_test.go +++ b/adapters/consumable/params_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) // This file actually intends to test static/bidder-params/consumable.json diff --git a/adapters/consumable/usersync.go b/adapters/consumable/usersync.go index 68a93c80e02..64efc60101b 100644 --- a/adapters/consumable/usersync.go +++ b/adapters/consumable/usersync.go @@ -3,8 +3,8 @@ package consumable import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) var VENDOR_ID uint16 = 65535 // TODO: Insert consumable value when one is assigned diff --git a/adapters/consumable/usersync_test.go b/adapters/consumable/usersync_test.go index eb97edf2cae..af332282208 100644 --- a/adapters/consumable/usersync_test.go +++ b/adapters/consumable/usersync_test.go @@ -4,9 +4,9 @@ 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/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/ccpa" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr" "github.com/stretchr/testify/assert" ) diff --git a/adapters/conversant/conversant.go b/adapters/conversant/conversant.go index b248e2e9dc1..f299a02f39c 100644 --- a/adapters/conversant/conversant.go +++ b/adapters/conversant/conversant.go @@ -9,9 +9,9 @@ import ( "net/http" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/errortypes" - "github.com/prebid/prebid-server/pbs" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/pbs" "golang.org/x/net/context/ctxhttp" ) diff --git a/adapters/conversant/conversant_test.go b/adapters/conversant/conversant_test.go index b958e320dc7..1555133afe1 100644 --- a/adapters/conversant/conversant_test.go +++ b/adapters/conversant/conversant_test.go @@ -12,11 +12,11 @@ import ( "time" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/cache/dummycache" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/pbs" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/cache/dummycache" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/pbs" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) // Constants diff --git a/adapters/conversant/usersync.go b/adapters/conversant/usersync.go index c2676df6620..3fe0a45cef7 100644 --- a/adapters/conversant/usersync.go +++ b/adapters/conversant/usersync.go @@ -3,8 +3,8 @@ package conversant import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func NewConversantSyncer(temp *template.Template) usersync.Usersyncer { diff --git a/adapters/conversant/usersync_test.go b/adapters/conversant/usersync_test.go index 16affbd1d32..ef05454b036 100644 --- a/adapters/conversant/usersync_test.go +++ b/adapters/conversant/usersync_test.go @@ -4,8 +4,8 @@ import ( "testing" "text/template" - "github.com/prebid/prebid-server/privacy" - "github.com/prebid/prebid-server/privacy/gdpr" + "github.com/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr" "github.com/stretchr/testify/assert" ) diff --git a/adapters/datablocks/datablocks.go b/adapters/datablocks/datablocks.go index ec4ab6ceb2d..e4d1d128f00 100644 --- a/adapters/datablocks/datablocks.go +++ b/adapters/datablocks/datablocks.go @@ -5,10 +5,10 @@ import ( "fmt" "github.com/golang/glog" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/errortypes" - "github.com/prebid/prebid-server/macros" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/macros" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "net/http" "strconv" "text/template" diff --git a/adapters/datablocks/datablocks_test.go b/adapters/datablocks/datablocks_test.go index 28c42016087..85a1fcd050d 100644 --- a/adapters/datablocks/datablocks_test.go +++ b/adapters/datablocks/datablocks_test.go @@ -3,7 +3,7 @@ package datablocks import ( "testing" - "github.com/prebid/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" ) func TestJsonSamples(t *testing.T) { diff --git a/adapters/datablocks/usersync.go b/adapters/datablocks/usersync.go index c8ec92aa857..24a988258cf 100644 --- a/adapters/datablocks/usersync.go +++ b/adapters/datablocks/usersync.go @@ -3,8 +3,8 @@ package datablocks import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) const datablocksGDPRVendorID = uint16(14) diff --git a/adapters/datablocks/usersync_test.go b/adapters/datablocks/usersync_test.go index f8500ab9b03..409503a2329 100644 --- a/adapters/datablocks/usersync_test.go +++ b/adapters/datablocks/usersync_test.go @@ -4,9 +4,9 @@ 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/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/ccpa" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr" "github.com/stretchr/testify/assert" ) diff --git a/adapters/emx_digital/emx_digital.go b/adapters/emx_digital/emx_digital.go index ccaa96e67ad..f797339b2db 100644 --- a/adapters/emx_digital/emx_digital.go +++ b/adapters/emx_digital/emx_digital.go @@ -9,9 +9,9 @@ import ( "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/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) type EmxDigitalAdapter struct { diff --git a/adapters/emx_digital/emx_digital_test.go b/adapters/emx_digital/emx_digital_test.go index c0f03d5d66d..73d9e6abd5b 100644 --- a/adapters/emx_digital/emx_digital_test.go +++ b/adapters/emx_digital/emx_digital_test.go @@ -3,7 +3,7 @@ package emx_digital import ( "testing" - "github.com/prebid/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" ) func TestJsonSamples(t *testing.T) { diff --git a/adapters/emx_digital/params_test.go b/adapters/emx_digital/params_test.go index 49ad9eb1a9c..9a6ff5cf73f 100644 --- a/adapters/emx_digital/params_test.go +++ b/adapters/emx_digital/params_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) func TestValidParams(t *testing.T) { diff --git a/adapters/emx_digital/usersync.go b/adapters/emx_digital/usersync.go index a453955b22e..38b6377f317 100644 --- a/adapters/emx_digital/usersync.go +++ b/adapters/emx_digital/usersync.go @@ -3,8 +3,8 @@ package emx_digital import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func NewEMXDigitalSyncer(temp *template.Template) usersync.Usersyncer { diff --git a/adapters/emx_digital/usersync_test.go b/adapters/emx_digital/usersync_test.go index 0e76936cea4..971a202e87f 100644 --- a/adapters/emx_digital/usersync_test.go +++ b/adapters/emx_digital/usersync_test.go @@ -4,9 +4,9 @@ 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/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/ccpa" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr" "github.com/stretchr/testify/assert" ) diff --git a/adapters/engagebdr/engagebdr.go b/adapters/engagebdr/engagebdr.go index 48b103ae7b4..15b14992a38 100644 --- a/adapters/engagebdr/engagebdr.go +++ b/adapters/engagebdr/engagebdr.go @@ -2,14 +2,14 @@ package engagebdr import ( "encoding/json" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "net/http" "fmt" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" ) type EngageBDRAdapter struct { diff --git a/adapters/engagebdr/engagebdr_test.go b/adapters/engagebdr/engagebdr_test.go index 069cf8b8210..c33a6d3f985 100644 --- a/adapters/engagebdr/engagebdr_test.go +++ b/adapters/engagebdr/engagebdr_test.go @@ -1,7 +1,7 @@ package engagebdr import ( - "github.com/prebid/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" "net/http" "testing" ) diff --git a/adapters/engagebdr/params_test.go b/adapters/engagebdr/params_test.go index c797d04ecc8..b6c887eac66 100644 --- a/adapters/engagebdr/params_test.go +++ b/adapters/engagebdr/params_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) func TestValidParams(t *testing.T) { diff --git a/adapters/engagebdr/usersync.go b/adapters/engagebdr/usersync.go index ae4047aa89c..99b6a1224c0 100644 --- a/adapters/engagebdr/usersync.go +++ b/adapters/engagebdr/usersync.go @@ -1,8 +1,8 @@ package engagebdr import ( - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" "text/template" ) diff --git a/adapters/engagebdr/usersync_test.go b/adapters/engagebdr/usersync_test.go index 45e1e41e196..cb914eaa57e 100644 --- a/adapters/engagebdr/usersync_test.go +++ b/adapters/engagebdr/usersync_test.go @@ -4,9 +4,9 @@ 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/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/ccpa" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr" "github.com/stretchr/testify/assert" ) diff --git a/adapters/eplanning/eplanning.go b/adapters/eplanning/eplanning.go index 49acd30efd6..1b564195390 100644 --- a/adapters/eplanning/eplanning.go +++ b/adapters/eplanning/eplanning.go @@ -12,9 +12,9 @@ import ( "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/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "strconv" ) diff --git a/adapters/eplanning/eplanning_test.go b/adapters/eplanning/eplanning_test.go index d1219ce4eef..5848df5947b 100644 --- a/adapters/eplanning/eplanning_test.go +++ b/adapters/eplanning/eplanning_test.go @@ -4,7 +4,7 @@ import ( "net/http" "testing" - "github.com/prebid/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" ) func TestJsonSamples(t *testing.T) { diff --git a/adapters/eplanning/usersync.go b/adapters/eplanning/usersync.go index 252c106a77c..281ee6f1a9a 100644 --- a/adapters/eplanning/usersync.go +++ b/adapters/eplanning/usersync.go @@ -3,8 +3,8 @@ package eplanning import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func NewEPlanningSyncer(temp *template.Template) usersync.Usersyncer { diff --git a/adapters/eplanning/usersync_test.go b/adapters/eplanning/usersync_test.go index 890832bafc3..72aadfc33fd 100644 --- a/adapters/eplanning/usersync_test.go +++ b/adapters/eplanning/usersync_test.go @@ -4,7 +4,7 @@ import ( "testing" "text/template" - "github.com/prebid/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy" "github.com/stretchr/testify/assert" ) diff --git a/adapters/gamma/gamma.go b/adapters/gamma/gamma.go index c011954fff9..60a29ebc42d 100644 --- a/adapters/gamma/gamma.go +++ b/adapters/gamma/gamma.go @@ -8,9 +8,9 @@ import ( "strconv" "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/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) type GammaAdapter struct { diff --git a/adapters/gamma/gamma_test.go b/adapters/gamma/gamma_test.go index 8322646c3d6..d9e75d34abc 100644 --- a/adapters/gamma/gamma_test.go +++ b/adapters/gamma/gamma_test.go @@ -3,7 +3,7 @@ package gamma import ( "testing" - "github.com/prebid/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" ) func TestJsonSamples(t *testing.T) { diff --git a/adapters/gamma/params_test.go b/adapters/gamma/params_test.go index 3329545a264..5e096cbf849 100644 --- a/adapters/gamma/params_test.go +++ b/adapters/gamma/params_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) // This file actually intends to test static/bidder-params/gamma.json diff --git a/adapters/gamma/usersync.go b/adapters/gamma/usersync.go index f19c522cebc..884468fe8ae 100644 --- a/adapters/gamma/usersync.go +++ b/adapters/gamma/usersync.go @@ -3,8 +3,8 @@ package gamma import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func NewGammaSyncer(temp *template.Template) usersync.Usersyncer { diff --git a/adapters/gamma/usersync_test.go b/adapters/gamma/usersync_test.go index 4278f9abd36..04a88e5ede8 100644 --- a/adapters/gamma/usersync_test.go +++ b/adapters/gamma/usersync_test.go @@ -4,8 +4,8 @@ import ( "testing" "text/template" - "github.com/prebid/prebid-server/privacy" - "github.com/prebid/prebid-server/privacy/gdpr" + "github.com/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr" "github.com/stretchr/testify/assert" ) diff --git a/adapters/gamoshi/gamoshi.go b/adapters/gamoshi/gamoshi.go index af915f682a1..d9ad60a1a88 100644 --- a/adapters/gamoshi/gamoshi.go +++ b/adapters/gamoshi/gamoshi.go @@ -8,9 +8,9 @@ import ( "github.com/golang/glog" "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/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) type GamoshiAdapter struct { diff --git a/adapters/gamoshi/gamoshi_test.go b/adapters/gamoshi/gamoshi_test.go index 77b9c5997bc..2bce428097b 100644 --- a/adapters/gamoshi/gamoshi_test.go +++ b/adapters/gamoshi/gamoshi_test.go @@ -3,7 +3,7 @@ package gamoshi import ( "testing" - "github.com/prebid/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" ) func TestJsonSamples(t *testing.T) { diff --git a/adapters/gamoshi/params_test.go b/adapters/gamoshi/params_test.go index 29a1864b9ae..d33740ee515 100644 --- a/adapters/gamoshi/params_test.go +++ b/adapters/gamoshi/params_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) // This file actually intends to test static/bidder-params/gamoshi.json diff --git a/adapters/gamoshi/usersync.go b/adapters/gamoshi/usersync.go index 6b7c43dd6a2..73101ada257 100644 --- a/adapters/gamoshi/usersync.go +++ b/adapters/gamoshi/usersync.go @@ -3,8 +3,8 @@ package gamoshi import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func NewGamoshiSyncer(temp *template.Template) usersync.Usersyncer { diff --git a/adapters/gamoshi/usersync_test.go b/adapters/gamoshi/usersync_test.go index b8e3e327e44..1824befd047 100644 --- a/adapters/gamoshi/usersync_test.go +++ b/adapters/gamoshi/usersync_test.go @@ -4,8 +4,8 @@ import ( "testing" "text/template" - "github.com/prebid/prebid-server/privacy" - "github.com/prebid/prebid-server/privacy/ccpa" + "github.com/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/ccpa" "github.com/stretchr/testify/assert" ) diff --git a/adapters/grid/grid.go b/adapters/grid/grid.go index 3e38edd4578..89541b8d6e6 100644 --- a/adapters/grid/grid.go +++ b/adapters/grid/grid.go @@ -6,9 +6,9 @@ import ( "net/http" "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/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) type GridAdapter struct { diff --git a/adapters/grid/grid_test.go b/adapters/grid/grid_test.go index 316ed4fd95e..8008b9598a3 100644 --- a/adapters/grid/grid_test.go +++ b/adapters/grid/grid_test.go @@ -3,7 +3,7 @@ package grid import ( "testing" - "github.com/prebid/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" ) func TestJsonSamples(t *testing.T) { diff --git a/adapters/grid/usersync.go b/adapters/grid/usersync.go index ddf7d5db66b..7651fe80e28 100644 --- a/adapters/grid/usersync.go +++ b/adapters/grid/usersync.go @@ -3,8 +3,8 @@ package grid import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func NewGridSyncer(temp *template.Template) usersync.Usersyncer { diff --git a/adapters/grid/usersync_test.go b/adapters/grid/usersync_test.go index 9b97f605a41..a4fee2e5f78 100644 --- a/adapters/grid/usersync_test.go +++ b/adapters/grid/usersync_test.go @@ -4,8 +4,8 @@ import ( "testing" "text/template" - "github.com/prebid/prebid-server/privacy" - "github.com/prebid/prebid-server/privacy/gdpr" + "github.com/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr" "github.com/stretchr/testify/assert" ) diff --git a/adapters/gumgum/gumgum.go b/adapters/gumgum/gumgum.go index 84a008d1891..34c53752d71 100644 --- a/adapters/gumgum/gumgum.go +++ b/adapters/gumgum/gumgum.go @@ -4,9 +4,9 @@ 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/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "net/http" ) diff --git a/adapters/gumgum/gumgum_test.go b/adapters/gumgum/gumgum_test.go index f87c8cf6216..bbb80df630b 100644 --- a/adapters/gumgum/gumgum_test.go +++ b/adapters/gumgum/gumgum_test.go @@ -1,7 +1,7 @@ package gumgum import ( - "github.com/prebid/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" "testing" ) diff --git a/adapters/gumgum/params_test.go b/adapters/gumgum/params_test.go index 4cb6f019197..087c9136031 100644 --- a/adapters/gumgum/params_test.go +++ b/adapters/gumgum/params_test.go @@ -2,7 +2,7 @@ package gumgum import ( "encoding/json" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "testing" ) diff --git a/adapters/gumgum/usersync.go b/adapters/gumgum/usersync.go index 5d29c7dceb2..b56b9d73c3c 100644 --- a/adapters/gumgum/usersync.go +++ b/adapters/gumgum/usersync.go @@ -3,8 +3,8 @@ package gumgum import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func NewGumGumSyncer(temp *template.Template) usersync.Usersyncer { diff --git a/adapters/gumgum/usersync_test.go b/adapters/gumgum/usersync_test.go index 3606f6ae04c..884e7c6b462 100644 --- a/adapters/gumgum/usersync_test.go +++ b/adapters/gumgum/usersync_test.go @@ -4,9 +4,9 @@ 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/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/ccpa" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr" "github.com/stretchr/testify/assert" ) diff --git a/adapters/improvedigital/improvedigital.go b/adapters/improvedigital/improvedigital.go index e51d7dc5273..e3c04991f22 100644 --- a/adapters/improvedigital/improvedigital.go +++ b/adapters/improvedigital/improvedigital.go @@ -6,9 +6,9 @@ import ( "net/http" "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/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) type ImprovedigitalAdapter struct { diff --git a/adapters/improvedigital/improvedigital_test.go b/adapters/improvedigital/improvedigital_test.go index a5f69459c88..ad3bf6d6150 100644 --- a/adapters/improvedigital/improvedigital_test.go +++ b/adapters/improvedigital/improvedigital_test.go @@ -3,7 +3,7 @@ package improvedigital import ( "testing" - "github.com/prebid/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" ) func TestJsonSamples(t *testing.T) { diff --git a/adapters/improvedigital/params_test.go b/adapters/improvedigital/params_test.go index 13bdd807560..f603479793f 100644 --- a/adapters/improvedigital/params_test.go +++ b/adapters/improvedigital/params_test.go @@ -2,7 +2,7 @@ package improvedigital import ( "encoding/json" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "testing" ) diff --git a/adapters/improvedigital/usersync.go b/adapters/improvedigital/usersync.go index 72c3ddafd49..9b5f7e89872 100644 --- a/adapters/improvedigital/usersync.go +++ b/adapters/improvedigital/usersync.go @@ -3,8 +3,8 @@ package improvedigital import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func NewImprovedigitalSyncer(temp *template.Template) usersync.Usersyncer { diff --git a/adapters/improvedigital/usersync_test.go b/adapters/improvedigital/usersync_test.go index c928ebf123d..70bea22363f 100644 --- a/adapters/improvedigital/usersync_test.go +++ b/adapters/improvedigital/usersync_test.go @@ -4,9 +4,9 @@ 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/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/ccpa" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr" "github.com/stretchr/testify/assert" ) diff --git a/adapters/info.go b/adapters/info.go index 732ae85589b..811f5b7b717 100644 --- a/adapters/info.go +++ b/adapters/info.go @@ -7,9 +7,9 @@ import ( "github.com/golang/glog" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/openrtb_ext" - "github.com/prebid/prebid-server/pbsmetrics" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics" yaml "gopkg.in/yaml.v2" ) diff --git a/adapters/info_test.go b/adapters/info_test.go index 9c0dd16babb..bee691b830d 100644 --- a/adapters/info_test.go +++ b/adapters/info_test.go @@ -6,10 +6,10 @@ import ( "testing" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/errortypes" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "github.com/stretchr/testify/assert" ) diff --git a/adapters/ix/ix.go b/adapters/ix/ix.go index f43abb506e8..b05cddbe871 100644 --- a/adapters/ix/ix.go +++ b/adapters/ix/ix.go @@ -8,15 +8,15 @@ import ( "io/ioutil" "net/http" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" - "github.com/prebid/prebid-server/pbs" + "github.com/PubMatic-OpenWrap/prebid-server/pbs" "golang.org/x/net/context/ctxhttp" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" ) // maximum number of bid requests diff --git a/adapters/ix/ix_test.go b/adapters/ix/ix_test.go index 72d0fc5e543..eb872b36aea 100644 --- a/adapters/ix/ix_test.go +++ b/adapters/ix/ix_test.go @@ -12,8 +12,8 @@ import ( "time" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/pbs" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/pbs" ) const url string = "http://appnexus-us-east.lb.indexww.com/bidder?p=184932" diff --git a/adapters/ix/usersync.go b/adapters/ix/usersync.go index 6f3558949e0..dcb4d646489 100644 --- a/adapters/ix/usersync.go +++ b/adapters/ix/usersync.go @@ -3,8 +3,8 @@ package ix import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func NewIxSyncer(temp *template.Template) usersync.Usersyncer { diff --git a/adapters/ix/usersync_test.go b/adapters/ix/usersync_test.go index 10f91da1abe..142ee6ac027 100644 --- a/adapters/ix/usersync_test.go +++ b/adapters/ix/usersync_test.go @@ -4,7 +4,7 @@ import ( "testing" "text/template" - "github.com/prebid/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy" "github.com/stretchr/testify/assert" ) diff --git a/adapters/kubient/kubient.go b/adapters/kubient/kubient.go index cb1fe93ff82..762996c3939 100644 --- a/adapters/kubient/kubient.go +++ b/adapters/kubient/kubient.go @@ -3,12 +3,12 @@ package kubient import ( "encoding/json" "fmt" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "net/http" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" ) func NewKubientBidder(endpoint string) *KubientAdapter { diff --git a/adapters/kubient/kubient_test.go b/adapters/kubient/kubient_test.go index 196d7628604..0bfd8229a47 100644 --- a/adapters/kubient/kubient_test.go +++ b/adapters/kubient/kubient_test.go @@ -1,7 +1,7 @@ package kubient import ( - "github.com/prebid/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" "testing" ) diff --git a/adapters/legacy.go b/adapters/legacy.go index ea76e870015..d3874c533a5 100644 --- a/adapters/legacy.go +++ b/adapters/legacy.go @@ -6,8 +6,8 @@ import ( "net/http" "time" - "github.com/prebid/prebid-server/pbs" - "github.com/prebid/prebid-server/ssl" + "github.com/PubMatic-OpenWrap/prebid-server/pbs" + "github.com/PubMatic-OpenWrap/prebid-server/ssl" ) // This file contains some deprecated, legacy types. diff --git a/adapters/lifestreet/lifestreet.go b/adapters/lifestreet/lifestreet.go index c9fff664922..8b502f73efa 100644 --- a/adapters/lifestreet/lifestreet.go +++ b/adapters/lifestreet/lifestreet.go @@ -5,15 +5,15 @@ import ( "context" "encoding/json" "fmt" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "io/ioutil" "net/http" "strings" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/errortypes" - "github.com/prebid/prebid-server/pbs" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/pbs" "golang.org/x/net/context/ctxhttp" ) diff --git a/adapters/lifestreet/lifestreet_test.go b/adapters/lifestreet/lifestreet_test.go index 79247ceeebf..3e93b09c0b2 100644 --- a/adapters/lifestreet/lifestreet_test.go +++ b/adapters/lifestreet/lifestreet_test.go @@ -10,15 +10,15 @@ import ( "testing" "time" - "github.com/prebid/prebid-server/cache/dummycache" - "github.com/prebid/prebid-server/pbs" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/cache/dummycache" + "github.com/PubMatic-OpenWrap/prebid-server/pbs" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" "fmt" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/config" ) type lsTagInfo struct { diff --git a/adapters/lifestreet/usersync.go b/adapters/lifestreet/usersync.go index 15ffde4db74..4f18854e54a 100644 --- a/adapters/lifestreet/usersync.go +++ b/adapters/lifestreet/usersync.go @@ -3,8 +3,8 @@ package lifestreet import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func NewLifestreetSyncer(temp *template.Template) usersync.Usersyncer { diff --git a/adapters/lifestreet/usersync_test.go b/adapters/lifestreet/usersync_test.go index 8fee09358e8..134af2f5b88 100644 --- a/adapters/lifestreet/usersync_test.go +++ b/adapters/lifestreet/usersync_test.go @@ -4,8 +4,8 @@ import ( "testing" "text/template" - "github.com/prebid/prebid-server/privacy" - "github.com/prebid/prebid-server/privacy/gdpr" + "github.com/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr" "github.com/stretchr/testify/assert" ) diff --git a/adapters/lockerdome/lockerdome.go b/adapters/lockerdome/lockerdome.go index cc3545fa364..ecffad78e24 100644 --- a/adapters/lockerdome/lockerdome.go +++ b/adapters/lockerdome/lockerdome.go @@ -6,9 +6,9 @@ import ( "net/http" "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/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) const unexpectedStatusCodeMessage = "Unexpected status code: %d. Run with request.debug = 1 for more info" diff --git a/adapters/lockerdome/lockerdome_test.go b/adapters/lockerdome/lockerdome_test.go index 5f8c19f0652..2805c9d3812 100644 --- a/adapters/lockerdome/lockerdome_test.go +++ b/adapters/lockerdome/lockerdome_test.go @@ -1,7 +1,7 @@ package lockerdome import ( - "github.com/prebid/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" "testing" ) diff --git a/adapters/lockerdome/params_test.go b/adapters/lockerdome/params_test.go index 815246571e3..61ee259a437 100644 --- a/adapters/lockerdome/params_test.go +++ b/adapters/lockerdome/params_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) // This file tests static/bidder-params/lockerdome.json diff --git a/adapters/lockerdome/usersync.go b/adapters/lockerdome/usersync.go index fb01f8e2d99..67c4e15dd2d 100644 --- a/adapters/lockerdome/usersync.go +++ b/adapters/lockerdome/usersync.go @@ -3,8 +3,8 @@ package lockerdome import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func NewLockerDomeSyncer(temp *template.Template) usersync.Usersyncer { diff --git a/adapters/lockerdome/usersync_test.go b/adapters/lockerdome/usersync_test.go index b5dea2261b6..acfa788e5f7 100644 --- a/adapters/lockerdome/usersync_test.go +++ b/adapters/lockerdome/usersync_test.go @@ -4,7 +4,7 @@ import ( "testing" "text/template" - "github.com/prebid/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy" "github.com/stretchr/testify/assert" ) diff --git a/adapters/marsmedia/marsmedia.go b/adapters/marsmedia/marsmedia.go index 359ebb7b8ae..f38fb485e63 100644 --- a/adapters/marsmedia/marsmedia.go +++ b/adapters/marsmedia/marsmedia.go @@ -7,9 +7,9 @@ import ( "strconv" "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/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) type MarsmediaAdapter struct { diff --git a/adapters/marsmedia/marsmedia_test.go b/adapters/marsmedia/marsmedia_test.go index ce96d882608..6b93e755834 100644 --- a/adapters/marsmedia/marsmedia_test.go +++ b/adapters/marsmedia/marsmedia_test.go @@ -3,7 +3,7 @@ package marsmedia import ( "testing" - "github.com/prebid/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" ) func TestJsonSamples(t *testing.T) { diff --git a/adapters/marsmedia/params_test.go b/adapters/marsmedia/params_test.go index 43cd49c2ed3..2e3b483824d 100644 --- a/adapters/marsmedia/params_test.go +++ b/adapters/marsmedia/params_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) // This file actually intends to test static/bidder-params/marsmedia.json diff --git a/adapters/marsmedia/usersync.go b/adapters/marsmedia/usersync.go index 50996f325ac..63d06d9dcc5 100644 --- a/adapters/marsmedia/usersync.go +++ b/adapters/marsmedia/usersync.go @@ -3,8 +3,8 @@ package marsmedia import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func NewMarsmediaSyncer(temp *template.Template) usersync.Usersyncer { diff --git a/adapters/marsmedia/usersync_test.go b/adapters/marsmedia/usersync_test.go index 67276a35fb6..c5d04cf6a8f 100644 --- a/adapters/marsmedia/usersync_test.go +++ b/adapters/marsmedia/usersync_test.go @@ -4,9 +4,9 @@ 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/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/ccpa" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr" "github.com/stretchr/testify/assert" ) diff --git a/adapters/mgid/mgid.go b/adapters/mgid/mgid.go index 014288804d9..24e28489b40 100644 --- a/adapters/mgid/mgid.go +++ b/adapters/mgid/mgid.go @@ -5,9 +5,9 @@ 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/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "net/http" ) diff --git a/adapters/mgid/mgid_test.go b/adapters/mgid/mgid_test.go index e7c5b9d904f..d768db2d64c 100644 --- a/adapters/mgid/mgid_test.go +++ b/adapters/mgid/mgid_test.go @@ -1,7 +1,7 @@ package mgid import ( - "github.com/prebid/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" "testing" ) diff --git a/adapters/mgid/usersync.go b/adapters/mgid/usersync.go index fbdb95f01fc..3eb77025d4d 100644 --- a/adapters/mgid/usersync.go +++ b/adapters/mgid/usersync.go @@ -3,8 +3,8 @@ package mgid import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func NewMgidSyncer(temp *template.Template) usersync.Usersyncer { diff --git a/adapters/mgid/usersync_test.go b/adapters/mgid/usersync_test.go index 2ce634eeac2..b918dabfe0b 100644 --- a/adapters/mgid/usersync_test.go +++ b/adapters/mgid/usersync_test.go @@ -4,8 +4,8 @@ import ( "testing" "text/template" - "github.com/prebid/prebid-server/privacy" - "github.com/prebid/prebid-server/privacy/gdpr" + "github.com/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr" "github.com/stretchr/testify/assert" ) diff --git a/adapters/openrtb_util.go b/adapters/openrtb_util.go index 55064ea7d07..0be655994b9 100644 --- a/adapters/openrtb_util.go +++ b/adapters/openrtb_util.go @@ -3,8 +3,8 @@ package adapters import ( "encoding/json" - "github.com/prebid/prebid-server/errortypes" - "github.com/prebid/prebid-server/pbs" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/pbs" "github.com/mxmCherry/openrtb" ) diff --git a/adapters/openrtb_util_test.go b/adapters/openrtb_util_test.go index 2cf67c22537..e66ee9f65b8 100644 --- a/adapters/openrtb_util_test.go +++ b/adapters/openrtb_util_test.go @@ -6,8 +6,8 @@ import ( "encoding/json" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/pbs" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/pbs" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" "github.com/stretchr/testify/assert" ) diff --git a/adapters/openx/openx.go b/adapters/openx/openx.go index dd176813820..8048d8d0669 100644 --- a/adapters/openx/openx.go +++ b/adapters/openx/openx.go @@ -6,9 +6,9 @@ import ( "net/http" "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/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) const hbconfig = "hb_pbs_1.0.0" diff --git a/adapters/openx/openx_test.go b/adapters/openx/openx_test.go index f7765d846ad..41b464c294a 100644 --- a/adapters/openx/openx_test.go +++ b/adapters/openx/openx_test.go @@ -3,7 +3,7 @@ package openx import ( "testing" - "github.com/prebid/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" ) func TestJsonSamples(t *testing.T) { diff --git a/adapters/openx/params_test.go b/adapters/openx/params_test.go index b7ea970ab1f..87ce08fc733 100644 --- a/adapters/openx/params_test.go +++ b/adapters/openx/params_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) // This file actually intends to test static/bidder-params/openx.json diff --git a/adapters/openx/usersync.go b/adapters/openx/usersync.go index bb4b328ce62..f557e5e4095 100644 --- a/adapters/openx/usersync.go +++ b/adapters/openx/usersync.go @@ -3,8 +3,8 @@ package openx import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func NewOpenxSyncer(temp *template.Template) usersync.Usersyncer { diff --git a/adapters/openx/usersync_test.go b/adapters/openx/usersync_test.go index 86f9bb0115e..53db1327a45 100644 --- a/adapters/openx/usersync_test.go +++ b/adapters/openx/usersync_test.go @@ -4,7 +4,7 @@ import ( "testing" "text/template" - "github.com/prebid/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy" "github.com/stretchr/testify/assert" ) diff --git a/adapters/pubmatic/params_test.go b/adapters/pubmatic/params_test.go index c8a300b9910..9615fb978e6 100644 --- a/adapters/pubmatic/params_test.go +++ b/adapters/pubmatic/params_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) // This file actually intends to test static/bidder-params/pubmatic.json diff --git a/adapters/pubmatic/pubmatic.go b/adapters/pubmatic/pubmatic.go index aae115386d0..be2392fe78f 100644 --- a/adapters/pubmatic/pubmatic.go +++ b/adapters/pubmatic/pubmatic.go @@ -13,10 +13,10 @@ import ( "github.com/golang/glog" "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/pbs" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/pbs" "golang.org/x/net/context/ctxhttp" ) diff --git a/adapters/pubmatic/pubmatic_test.go b/adapters/pubmatic/pubmatic_test.go index be086f5adf1..4188b9e0cff 100644 --- a/adapters/pubmatic/pubmatic_test.go +++ b/adapters/pubmatic/pubmatic_test.go @@ -13,13 +13,13 @@ import ( "time" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/adapters/adapterstest" - "github.com/prebid/prebid-server/cache/dummycache" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/openrtb_ext" - "github.com/prebid/prebid-server/pbs" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/cache/dummycache" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/pbs" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func TestJsonSamples(t *testing.T) { diff --git a/adapters/pubmatic/usersync.go b/adapters/pubmatic/usersync.go index 7b4d8e86b50..f35470c0ad9 100644 --- a/adapters/pubmatic/usersync.go +++ b/adapters/pubmatic/usersync.go @@ -3,8 +3,8 @@ package pubmatic import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func NewPubmaticSyncer(temp *template.Template) usersync.Usersyncer { diff --git a/adapters/pubmatic/usersync_test.go b/adapters/pubmatic/usersync_test.go index ef81d223377..15032c2dda6 100644 --- a/adapters/pubmatic/usersync_test.go +++ b/adapters/pubmatic/usersync_test.go @@ -4,8 +4,8 @@ import ( "testing" "text/template" - "github.com/prebid/prebid-server/privacy" - "github.com/prebid/prebid-server/privacy/gdpr" + "github.com/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr" "github.com/stretchr/testify/assert" ) diff --git a/adapters/pubnative/pubnative.go b/adapters/pubnative/pubnative.go index 4dc92920d8e..de0db7df811 100644 --- a/adapters/pubnative/pubnative.go +++ b/adapters/pubnative/pubnative.go @@ -8,9 +8,9 @@ import ( "strconv" "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/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) type PubnativeAdapter struct { diff --git a/adapters/pubnative/pubnative_test.go b/adapters/pubnative/pubnative_test.go index 56c919ca2dc..f3f8e5af4e2 100644 --- a/adapters/pubnative/pubnative_test.go +++ b/adapters/pubnative/pubnative_test.go @@ -3,7 +3,7 @@ package pubnative import ( "testing" - "github.com/prebid/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" ) func TestJsonSamples(t *testing.T) { diff --git a/adapters/pulsepoint/pulsepoint.go b/adapters/pulsepoint/pulsepoint.go index 3a5123084ba..2e2737c3def 100644 --- a/adapters/pulsepoint/pulsepoint.go +++ b/adapters/pulsepoint/pulsepoint.go @@ -11,10 +11,10 @@ import ( "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/pbs" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/pbs" "golang.org/x/net/context/ctxhttp" ) diff --git a/adapters/pulsepoint/pulsepoint_test.go b/adapters/pulsepoint/pulsepoint_test.go index efc2638322f..adaeeb647af 100644 --- a/adapters/pulsepoint/pulsepoint_test.go +++ b/adapters/pulsepoint/pulsepoint_test.go @@ -12,13 +12,13 @@ import ( "time" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/adapters/adapterstest" - "github.com/prebid/prebid-server/cache/dummycache" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/openrtb_ext" - "github.com/prebid/prebid-server/pbs" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/cache/dummycache" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/pbs" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) /** diff --git a/adapters/pulsepoint/usersync.go b/adapters/pulsepoint/usersync.go index 58de835be28..4c7d5ca63c8 100644 --- a/adapters/pulsepoint/usersync.go +++ b/adapters/pulsepoint/usersync.go @@ -3,8 +3,8 @@ package pulsepoint import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func NewPulsepointSyncer(temp *template.Template) usersync.Usersyncer { diff --git a/adapters/pulsepoint/usersync_test.go b/adapters/pulsepoint/usersync_test.go index e1680fd22ba..8dd32564930 100644 --- a/adapters/pulsepoint/usersync_test.go +++ b/adapters/pulsepoint/usersync_test.go @@ -4,7 +4,7 @@ import ( "testing" "text/template" - "github.com/prebid/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy" "github.com/stretchr/testify/assert" ) diff --git a/adapters/rhythmone/params_test.go b/adapters/rhythmone/params_test.go index 7d8cad47d53..00eacf15082 100644 --- a/adapters/rhythmone/params_test.go +++ b/adapters/rhythmone/params_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) func TestValidParams(t *testing.T) { diff --git a/adapters/rhythmone/rhythmone.go b/adapters/rhythmone/rhythmone.go index 3cd2acb299d..e43f8304d98 100644 --- a/adapters/rhythmone/rhythmone.go +++ b/adapters/rhythmone/rhythmone.go @@ -5,9 +5,9 @@ import ( "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/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "net/http" ) diff --git a/adapters/rhythmone/rhythmone_test.go b/adapters/rhythmone/rhythmone_test.go index 9a54623dbe9..823abc71c49 100644 --- a/adapters/rhythmone/rhythmone_test.go +++ b/adapters/rhythmone/rhythmone_test.go @@ -1,7 +1,7 @@ package rhythmone import ( - "github.com/prebid/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" "testing" ) diff --git a/adapters/rhythmone/usersync.go b/adapters/rhythmone/usersync.go index 0f7db388e5c..534c60dd4bc 100644 --- a/adapters/rhythmone/usersync.go +++ b/adapters/rhythmone/usersync.go @@ -3,8 +3,8 @@ package rhythmone import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func NewRhythmoneSyncer(temp *template.Template) usersync.Usersyncer { diff --git a/adapters/rhythmone/usersync_test.go b/adapters/rhythmone/usersync_test.go index cee6e9b0259..020b5eac29e 100644 --- a/adapters/rhythmone/usersync_test.go +++ b/adapters/rhythmone/usersync_test.go @@ -4,9 +4,9 @@ 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/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/ccpa" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr" "github.com/stretchr/testify/assert" ) diff --git a/adapters/rtbhouse/rtbhouse.go b/adapters/rtbhouse/rtbhouse.go index 6478c6863d6..02b474b72f3 100644 --- a/adapters/rtbhouse/rtbhouse.go +++ b/adapters/rtbhouse/rtbhouse.go @@ -6,8 +6,8 @@ import ( "net/http" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" ) func NewRTBHouseBidder(endpoint string) *RTBHouseAdapter { diff --git a/adapters/rtbhouse/rtbhouse_test.go b/adapters/rtbhouse/rtbhouse_test.go index 3ae9d511406..54554afde72 100644 --- a/adapters/rtbhouse/rtbhouse_test.go +++ b/adapters/rtbhouse/rtbhouse_test.go @@ -3,7 +3,7 @@ package rtbhouse import ( "testing" - "github.com/prebid/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" ) const testsDir = "rtbhousetest" diff --git a/adapters/rtbhouse/usersync.go b/adapters/rtbhouse/usersync.go index 3e38d67e593..97e673124aa 100644 --- a/adapters/rtbhouse/usersync.go +++ b/adapters/rtbhouse/usersync.go @@ -3,8 +3,8 @@ package rtbhouse import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) const rtbHouseGDPRVendorID = uint16(16) diff --git a/adapters/rtbhouse/usersync_test.go b/adapters/rtbhouse/usersync_test.go index bb139f7a2e5..7b1d198b74d 100644 --- a/adapters/rtbhouse/usersync_test.go +++ b/adapters/rtbhouse/usersync_test.go @@ -4,8 +4,8 @@ import ( "testing" "text/template" - "github.com/prebid/prebid-server/privacy" - "github.com/prebid/prebid-server/privacy/gdpr" + "github.com/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr" "github.com/stretchr/testify/assert" ) diff --git a/adapters/rubicon/rubicon.go b/adapters/rubicon/rubicon.go index e7461c48f7e..1c0c5a37835 100644 --- a/adapters/rubicon/rubicon.go +++ b/adapters/rubicon/rubicon.go @@ -11,14 +11,14 @@ import ( "strings" "github.com/golang/glog" - "github.com/prebid/prebid-server/pbs" + "github.com/PubMatic-OpenWrap/prebid-server/pbs" "golang.org/x/net/context/ctxhttp" "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/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) type RubiconAdapter struct { diff --git a/adapters/rubicon/rubicon_test.go b/adapters/rubicon/rubicon_test.go index dd9cea62bc7..087fe0a1eeb 100644 --- a/adapters/rubicon/rubicon_test.go +++ b/adapters/rubicon/rubicon_test.go @@ -10,19 +10,19 @@ import ( "testing" "time" - "github.com/prebid/prebid-server/adapters/adapterstest" - "github.com/prebid/prebid-server/cache/dummycache" - "github.com/prebid/prebid-server/pbs" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/cache/dummycache" + "github.com/PubMatic-OpenWrap/prebid-server/pbs" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" "fmt" "strings" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "github.com/stretchr/testify/assert" ) diff --git a/adapters/rubicon/usersync.go b/adapters/rubicon/usersync.go index 08d98825a1e..9c86024771e 100644 --- a/adapters/rubicon/usersync.go +++ b/adapters/rubicon/usersync.go @@ -3,8 +3,8 @@ package rubicon import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func NewRubiconSyncer(temp *template.Template) usersync.Usersyncer { diff --git a/adapters/rubicon/usersync_test.go b/adapters/rubicon/usersync_test.go index 646ebff2dc4..2fd53d6b62b 100644 --- a/adapters/rubicon/usersync_test.go +++ b/adapters/rubicon/usersync_test.go @@ -4,8 +4,8 @@ import ( "testing" "text/template" - "github.com/prebid/prebid-server/privacy" - "github.com/prebid/prebid-server/privacy/gdpr" + "github.com/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr" "github.com/stretchr/testify/assert" ) diff --git a/adapters/sharethrough/butler.go b/adapters/sharethrough/butler.go index 61081aaa3ff..8ce92a1ccf4 100644 --- a/adapters/sharethrough/butler.go +++ b/adapters/sharethrough/butler.go @@ -4,9 +4,9 @@ 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/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "net/http" "net/url" "regexp" diff --git a/adapters/sharethrough/butler_test.go b/adapters/sharethrough/butler_test.go index 673e172105e..ddfe145e8c1 100644 --- a/adapters/sharethrough/butler_test.go +++ b/adapters/sharethrough/butler_test.go @@ -3,9 +3,9 @@ package sharethrough import ( "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/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "github.com/stretchr/testify/assert" "net/http" "regexp" diff --git a/adapters/sharethrough/params_test.go b/adapters/sharethrough/params_test.go index 416f459341d..e4e659f4420 100644 --- a/adapters/sharethrough/params_test.go +++ b/adapters/sharethrough/params_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) func TestValidParams(t *testing.T) { diff --git a/adapters/sharethrough/sharethrough.go b/adapters/sharethrough/sharethrough.go index d1b2408ce66..9402a3510f5 100644 --- a/adapters/sharethrough/sharethrough.go +++ b/adapters/sharethrough/sharethrough.go @@ -3,8 +3,8 @@ package sharethrough import ( "fmt" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" "net/http" "regexp" ) diff --git a/adapters/sharethrough/sharethrough_test.go b/adapters/sharethrough/sharethrough_test.go index 699496c3355..eaf89a208a4 100644 --- a/adapters/sharethrough/sharethrough_test.go +++ b/adapters/sharethrough/sharethrough_test.go @@ -3,8 +3,8 @@ package sharethrough import ( "fmt" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" "github.com/stretchr/testify/assert" "net/http" "regexp" diff --git a/adapters/sharethrough/usersync.go b/adapters/sharethrough/usersync.go index a951fcd6a0a..7d5d6f135a8 100644 --- a/adapters/sharethrough/usersync.go +++ b/adapters/sharethrough/usersync.go @@ -1,8 +1,8 @@ package sharethrough import ( - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" "text/template" ) diff --git a/adapters/sharethrough/usersync_test.go b/adapters/sharethrough/usersync_test.go index 4802329554e..c48a6d51f8e 100644 --- a/adapters/sharethrough/usersync_test.go +++ b/adapters/sharethrough/usersync_test.go @@ -4,8 +4,8 @@ import ( "testing" "text/template" - "github.com/prebid/prebid-server/privacy" - "github.com/prebid/prebid-server/privacy/gdpr" + "github.com/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr" "github.com/stretchr/testify/assert" ) diff --git a/adapters/sharethrough/utils.go b/adapters/sharethrough/utils.go index 76d8b7a1f76..7ff3772bf34 100644 --- a/adapters/sharethrough/utils.go +++ b/adapters/sharethrough/utils.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/buger/jsonparser" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "html/template" "net" "net/url" diff --git a/adapters/sharethrough/utils_test.go b/adapters/sharethrough/utils_test.go index fffc52f6140..4c9aed1fe55 100644 --- a/adapters/sharethrough/utils_test.go +++ b/adapters/sharethrough/utils_test.go @@ -5,7 +5,7 @@ import ( "encoding/json" "fmt" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "github.com/stretchr/testify/assert" "regexp" "testing" diff --git a/adapters/somoaudience/params_test.go b/adapters/somoaudience/params_test.go index 2cbb2b1f51a..b74725aac21 100644 --- a/adapters/somoaudience/params_test.go +++ b/adapters/somoaudience/params_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) // This file actually intends to test static/bidder-params/somoaudience.json diff --git a/adapters/somoaudience/somoaudience.go b/adapters/somoaudience/somoaudience.go index 71593b43d1c..287cd3a9171 100644 --- a/adapters/somoaudience/somoaudience.go +++ b/adapters/somoaudience/somoaudience.go @@ -6,9 +6,9 @@ import ( "net/http" "strconv" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/errortypes" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "github.com/mxmCherry/openrtb" ) diff --git a/adapters/somoaudience/somoaudience_test.go b/adapters/somoaudience/somoaudience_test.go index 002c889c7e7..86561ce40a4 100644 --- a/adapters/somoaudience/somoaudience_test.go +++ b/adapters/somoaudience/somoaudience_test.go @@ -3,7 +3,7 @@ package somoaudience import ( "testing" - "github.com/prebid/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" ) func TestJsonSamples(t *testing.T) { diff --git a/adapters/somoaudience/usersync.go b/adapters/somoaudience/usersync.go index e1e7e2ef21d..2d0b715d669 100644 --- a/adapters/somoaudience/usersync.go +++ b/adapters/somoaudience/usersync.go @@ -3,8 +3,8 @@ package somoaudience import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func NewSomoaudienceSyncer(temp *template.Template) usersync.Usersyncer { diff --git a/adapters/somoaudience/usersync_test.go b/adapters/somoaudience/usersync_test.go index 86460506d68..9abcc65e748 100644 --- a/adapters/somoaudience/usersync_test.go +++ b/adapters/somoaudience/usersync_test.go @@ -4,7 +4,7 @@ import ( "testing" "text/template" - "github.com/prebid/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy" "github.com/stretchr/testify/assert" ) diff --git a/adapters/sonobi/params_test.go b/adapters/sonobi/params_test.go index 3e9d63e8101..00fe63c6b6e 100644 --- a/adapters/sonobi/params_test.go +++ b/adapters/sonobi/params_test.go @@ -2,7 +2,7 @@ package sonobi import ( "encoding/json" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "testing" ) diff --git a/adapters/sonobi/sonobi.go b/adapters/sonobi/sonobi.go index 7685c0efaf0..bf383941ebd 100644 --- a/adapters/sonobi/sonobi.go +++ b/adapters/sonobi/sonobi.go @@ -4,9 +4,9 @@ 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/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "net/http" ) diff --git a/adapters/sonobi/sonobi_test.go b/adapters/sonobi/sonobi_test.go index 1c22bff3a2f..bea0aa8cc72 100644 --- a/adapters/sonobi/sonobi_test.go +++ b/adapters/sonobi/sonobi_test.go @@ -1,7 +1,7 @@ package sonobi import ( - "github.com/prebid/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" "net/http" "testing" ) diff --git a/adapters/sonobi/usersync.go b/adapters/sonobi/usersync.go index 6986d0fd8a1..6ac950563bc 100644 --- a/adapters/sonobi/usersync.go +++ b/adapters/sonobi/usersync.go @@ -1,8 +1,8 @@ package sonobi import ( - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" "text/template" ) diff --git a/adapters/sonobi/usersync_test.go b/adapters/sonobi/usersync_test.go index bfe5859e5d1..8eadaef8f9c 100644 --- a/adapters/sonobi/usersync_test.go +++ b/adapters/sonobi/usersync_test.go @@ -4,8 +4,8 @@ import ( "testing" "text/template" - "github.com/prebid/prebid-server/privacy" - "github.com/prebid/prebid-server/privacy/gdpr" + "github.com/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr" "github.com/stretchr/testify/assert" ) diff --git a/adapters/sovrn/sovrn.go b/adapters/sovrn/sovrn.go index 3e5a126be45..1cfbd1e64fe 100644 --- a/adapters/sovrn/sovrn.go +++ b/adapters/sovrn/sovrn.go @@ -13,10 +13,10 @@ import ( "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/pbs" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/pbs" "golang.org/x/net/context/ctxhttp" ) diff --git a/adapters/sovrn/sovrn_test.go b/adapters/sovrn/sovrn_test.go index 59b5b5e0c50..d328925fe4d 100644 --- a/adapters/sovrn/sovrn_test.go +++ b/adapters/sovrn/sovrn_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/pbs" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/pbs" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" "context" "net/http" @@ -18,10 +18,10 @@ import ( "strconv" "time" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/adapters/adapterstest" - "github.com/prebid/prebid-server/cache/dummycache" - "github.com/prebid/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/cache/dummycache" + "github.com/PubMatic-OpenWrap/prebid-server/config" ) func TestJsonSamples(t *testing.T) { diff --git a/adapters/sovrn/usersync.go b/adapters/sovrn/usersync.go index b4de623718a..3f4e81439c6 100644 --- a/adapters/sovrn/usersync.go +++ b/adapters/sovrn/usersync.go @@ -3,8 +3,8 @@ package sovrn import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func NewSovrnSyncer(temp *template.Template) usersync.Usersyncer { diff --git a/adapters/sovrn/usersync_test.go b/adapters/sovrn/usersync_test.go index 4a4dfd9d1b9..e91c73245bb 100644 --- a/adapters/sovrn/usersync_test.go +++ b/adapters/sovrn/usersync_test.go @@ -4,8 +4,8 @@ import ( "testing" "text/template" - "github.com/prebid/prebid-server/privacy" - "github.com/prebid/prebid-server/privacy/gdpr" + "github.com/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr" "github.com/stretchr/testify/assert" ) diff --git a/adapters/synacormedia/params_test.go b/adapters/synacormedia/params_test.go index ffd891f4e84..2f3f981e0e5 100644 --- a/adapters/synacormedia/params_test.go +++ b/adapters/synacormedia/params_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) // This file actually intends to test static/bidder-params/synacormedia.json diff --git a/adapters/synacormedia/synacormedia.go b/adapters/synacormedia/synacormedia.go index ccb2798f8cf..84ee0e920a4 100644 --- a/adapters/synacormedia/synacormedia.go +++ b/adapters/synacormedia/synacormedia.go @@ -8,10 +8,10 @@ import ( "github.com/golang/glog" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/errortypes" - "github.com/prebid/prebid-server/macros" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/macros" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) type SynacorMediaAdapter struct { diff --git a/adapters/synacormedia/synacormedia_test.go b/adapters/synacormedia/synacormedia_test.go index ced825f8b57..b653af329d9 100644 --- a/adapters/synacormedia/synacormedia_test.go +++ b/adapters/synacormedia/synacormedia_test.go @@ -3,7 +3,7 @@ package synacormedia import ( "testing" - "github.com/prebid/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" ) func TestJsonSamples(t *testing.T) { diff --git a/adapters/synacormedia/usersync.go b/adapters/synacormedia/usersync.go index 988c1b9ef6a..d7de9150744 100644 --- a/adapters/synacormedia/usersync.go +++ b/adapters/synacormedia/usersync.go @@ -3,8 +3,8 @@ package synacormedia import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func NewSynacorMediaSyncer(temp *template.Template) usersync.Usersyncer { diff --git a/adapters/synacormedia/usersync_test.go b/adapters/synacormedia/usersync_test.go index 538efb30c73..7ee7b1aa19b 100644 --- a/adapters/synacormedia/usersync_test.go +++ b/adapters/synacormedia/usersync_test.go @@ -4,7 +4,7 @@ import ( "testing" "text/template" - "github.com/prebid/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy" "github.com/stretchr/testify/assert" ) diff --git a/adapters/syncer.go b/adapters/syncer.go index c212a4366c9..705f6e19bd4 100644 --- a/adapters/syncer.go +++ b/adapters/syncer.go @@ -3,10 +3,10 @@ package adapters import ( "text/template" - "github.com/prebid/prebid-server/macros" - "github.com/prebid/prebid-server/openrtb_ext" - "github.com/prebid/prebid-server/privacy" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/macros" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func GDPRAwareSyncerIDs(syncers map[openrtb_ext.BidderName]usersync.Usersyncer) map[openrtb_ext.BidderName]uint16 { diff --git a/adapters/syncer_test.go b/adapters/syncer_test.go index 9be523091dd..05fa83cdb34 100644 --- a/adapters/syncer_test.go +++ b/adapters/syncer_test.go @@ -4,9 +4,9 @@ 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/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/ccpa" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr" "github.com/stretchr/testify/assert" ) diff --git a/adapters/tappx/params_test.go b/adapters/tappx/params_test.go index 3a73d4dab53..d6fcbb9cff6 100644 --- a/adapters/tappx/params_test.go +++ b/adapters/tappx/params_test.go @@ -2,7 +2,7 @@ package tappx import ( "encoding/json" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "testing" ) diff --git a/adapters/tappx/tappx.go b/adapters/tappx/tappx.go index 69000c335e0..fc28cf44fc5 100644 --- a/adapters/tappx/tappx.go +++ b/adapters/tappx/tappx.go @@ -5,10 +5,10 @@ import ( "fmt" "github.com/golang/glog" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/errortypes" - "github.com/prebid/prebid-server/macros" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/macros" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "net/http" "net/url" "strconv" diff --git a/adapters/tappx/tappx_test.go b/adapters/tappx/tappx_test.go index bc195b5978f..75490037ea3 100644 --- a/adapters/tappx/tappx_test.go +++ b/adapters/tappx/tappx_test.go @@ -1,8 +1,8 @@ package tappx import ( - "github.com/prebid/prebid-server/adapters/adapterstest" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "github.com/stretchr/testify/assert" "net/http" "regexp" diff --git a/adapters/triplelift/triplelift.go b/adapters/triplelift/triplelift.go index b33ef8d0112..787105baae2 100644 --- a/adapters/triplelift/triplelift.go +++ b/adapters/triplelift/triplelift.go @@ -6,9 +6,9 @@ import ( "net/http" "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/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) type TripleliftAdapter struct { diff --git a/adapters/triplelift/triplelift_test.go b/adapters/triplelift/triplelift_test.go index 2d7ed04f51b..999abaeff73 100644 --- a/adapters/triplelift/triplelift_test.go +++ b/adapters/triplelift/triplelift_test.go @@ -1,7 +1,7 @@ package triplelift import ( - "github.com/prebid/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" "testing" ) diff --git a/adapters/triplelift/usersync.go b/adapters/triplelift/usersync.go index 5cb524bea11..0bd678b0e14 100644 --- a/adapters/triplelift/usersync.go +++ b/adapters/triplelift/usersync.go @@ -3,8 +3,8 @@ package triplelift import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func NewTripleliftSyncer(temp *template.Template) usersync.Usersyncer { diff --git a/adapters/triplelift/usersync_test.go b/adapters/triplelift/usersync_test.go index 1731b22dffb..30b1a33b3e9 100644 --- a/adapters/triplelift/usersync_test.go +++ b/adapters/triplelift/usersync_test.go @@ -4,7 +4,7 @@ import ( "testing" "text/template" - "github.com/prebid/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy" "github.com/stretchr/testify/assert" ) diff --git a/adapters/triplelift_native/triplelift_native.go b/adapters/triplelift_native/triplelift_native.go index c3cb6b24bba..a3ba481c20b 100644 --- a/adapters/triplelift_native/triplelift_native.go +++ b/adapters/triplelift_native/triplelift_native.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/golang/glog" "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/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "net/http" ) diff --git a/adapters/triplelift_native/triplelift_native_test.go b/adapters/triplelift_native/triplelift_native_test.go index 69d0562538f..0e61415608b 100644 --- a/adapters/triplelift_native/triplelift_native_test.go +++ b/adapters/triplelift_native/triplelift_native_test.go @@ -2,8 +2,8 @@ package triplelift_native import ( "fmt" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" "github.com/stretchr/testify/assert" "testing" ) diff --git a/adapters/triplelift_native/usersync.go b/adapters/triplelift_native/usersync.go index b7587b77950..a8d246f07cd 100644 --- a/adapters/triplelift_native/usersync.go +++ b/adapters/triplelift_native/usersync.go @@ -3,8 +3,8 @@ package triplelift_native import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func NewTripleliftSyncer(temp *template.Template) usersync.Usersyncer { diff --git a/adapters/triplelift_native/usersync_test.go b/adapters/triplelift_native/usersync_test.go index df0757edc9f..ec229e2e68c 100644 --- a/adapters/triplelift_native/usersync_test.go +++ b/adapters/triplelift_native/usersync_test.go @@ -4,7 +4,7 @@ import ( "testing" "text/template" - "github.com/prebid/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy" "github.com/stretchr/testify/assert" ) diff --git a/adapters/unruly/unruly.go b/adapters/unruly/unruly.go index b0d4539d38b..20e9474c399 100644 --- a/adapters/unruly/unruly.go +++ b/adapters/unruly/unruly.go @@ -4,9 +4,9 @@ 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/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "net/http" ) diff --git a/adapters/unruly/unruly_test.go b/adapters/unruly/unruly_test.go index addcae08ceb..cae97699fc9 100644 --- a/adapters/unruly/unruly_test.go +++ b/adapters/unruly/unruly_test.go @@ -4,10 +4,10 @@ import ( "encoding/json" "fmt" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/adapters/adapterstest" - "github.com/prebid/prebid-server/errortypes" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "net/http" "reflect" "testing" diff --git a/adapters/unruly/usersync.go b/adapters/unruly/usersync.go index c90052a475f..248b4923875 100644 --- a/adapters/unruly/usersync.go +++ b/adapters/unruly/usersync.go @@ -3,8 +3,8 @@ package unruly import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func NewUnrulySyncer(temp *template.Template) usersync.Usersyncer { diff --git a/adapters/unruly/usersync_test.go b/adapters/unruly/usersync_test.go index bdab254f370..29ed7a0b1b7 100644 --- a/adapters/unruly/usersync_test.go +++ b/adapters/unruly/usersync_test.go @@ -4,9 +4,9 @@ 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/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/ccpa" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr" "github.com/stretchr/testify/assert" ) diff --git a/adapters/verizonmedia/params_test.go b/adapters/verizonmedia/params_test.go index febda6058e6..9250c265526 100644 --- a/adapters/verizonmedia/params_test.go +++ b/adapters/verizonmedia/params_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) // This file actually intends to test static/bidder-params/verizonmedia.json diff --git a/adapters/verizonmedia/usersync.go b/adapters/verizonmedia/usersync.go index 31fb12a2064..612aab3b1f0 100644 --- a/adapters/verizonmedia/usersync.go +++ b/adapters/verizonmedia/usersync.go @@ -1,8 +1,8 @@ package verizonmedia import ( - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" "text/template" ) diff --git a/adapters/verizonmedia/usersync_test.go b/adapters/verizonmedia/usersync_test.go index ad77ef0e6cb..6455078a6f5 100644 --- a/adapters/verizonmedia/usersync_test.go +++ b/adapters/verizonmedia/usersync_test.go @@ -4,7 +4,7 @@ import ( "testing" "text/template" - "github.com/prebid/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy" "github.com/stretchr/testify/assert" ) diff --git a/adapters/verizonmedia/verizonmedia.go b/adapters/verizonmedia/verizonmedia.go index ac881df95a6..5d6b8b6692c 100644 --- a/adapters/verizonmedia/verizonmedia.go +++ b/adapters/verizonmedia/verizonmedia.go @@ -7,9 +7,9 @@ import ( "net/http" "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/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) type VerizonMediaAdapter struct { diff --git a/adapters/verizonmedia/verizonmedia_test.go b/adapters/verizonmedia/verizonmedia_test.go index d4a8885c6e3..b7d4f56d7c5 100644 --- a/adapters/verizonmedia/verizonmedia_test.go +++ b/adapters/verizonmedia/verizonmedia_test.go @@ -1,8 +1,8 @@ package verizonmedia import ( - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" "testing" ) diff --git a/adapters/visx/params_test.go b/adapters/visx/params_test.go index e857e8d2639..f59ce49a46d 100644 --- a/adapters/visx/params_test.go +++ b/adapters/visx/params_test.go @@ -2,7 +2,7 @@ package visx import ( "encoding/json" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "testing" ) diff --git a/adapters/visx/usersync.go b/adapters/visx/usersync.go index 0ceb58c505f..484b22fab92 100644 --- a/adapters/visx/usersync.go +++ b/adapters/visx/usersync.go @@ -3,8 +3,8 @@ package visx import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func NewVisxSyncer(temp *template.Template) usersync.Usersyncer { diff --git a/adapters/visx/usersync_test.go b/adapters/visx/usersync_test.go index 01e80e644c5..8854a5afef5 100644 --- a/adapters/visx/usersync_test.go +++ b/adapters/visx/usersync_test.go @@ -4,9 +4,9 @@ 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/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/ccpa" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr" "github.com/stretchr/testify/assert" ) diff --git a/adapters/visx/visx.go b/adapters/visx/visx.go index 14fd2b683a6..5dc7bb3bc9d 100644 --- a/adapters/visx/visx.go +++ b/adapters/visx/visx.go @@ -6,8 +6,8 @@ import ( "net/http" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" ) type VisxAdapter struct { diff --git a/adapters/visx/visx_test.go b/adapters/visx/visx_test.go index 0d1fe3193e0..4151169c3c7 100644 --- a/adapters/visx/visx_test.go +++ b/adapters/visx/visx_test.go @@ -3,7 +3,7 @@ package visx import ( "testing" - "github.com/prebid/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" ) func TestJsonSamples(t *testing.T) { diff --git a/adapters/vrtcal/params_test.go b/adapters/vrtcal/params_test.go index ba57b6d82f8..5f80812f26f 100644 --- a/adapters/vrtcal/params_test.go +++ b/adapters/vrtcal/params_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) //Vrtcal doesn't currently require any custom fields. This file is included for conformity only diff --git a/adapters/vrtcal/usersync.go b/adapters/vrtcal/usersync.go index 04e52955033..0fd97875a0e 100644 --- a/adapters/vrtcal/usersync.go +++ b/adapters/vrtcal/usersync.go @@ -3,8 +3,8 @@ package vrtcal import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func NewVrtcalSyncer(temp *template.Template) usersync.Usersyncer { diff --git a/adapters/vrtcal/usersync_test.go b/adapters/vrtcal/usersync_test.go index 26e5838dbe3..faea653f795 100644 --- a/adapters/vrtcal/usersync_test.go +++ b/adapters/vrtcal/usersync_test.go @@ -4,8 +4,8 @@ import ( "testing" "text/template" - "github.com/prebid/prebid-server/privacy" - "github.com/prebid/prebid-server/privacy/gdpr" + "github.com/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr" "github.com/stretchr/testify/assert" ) diff --git a/adapters/vrtcal/vrtcal.go b/adapters/vrtcal/vrtcal.go index 0ebbc5f19fd..c59ea89419b 100644 --- a/adapters/vrtcal/vrtcal.go +++ b/adapters/vrtcal/vrtcal.go @@ -6,8 +6,8 @@ import ( "net/http" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" ) type VrtcalAdapter struct { diff --git a/adapters/vrtcal/vrtcal_test.go b/adapters/vrtcal/vrtcal_test.go index 72f4618e392..fe536244310 100644 --- a/adapters/vrtcal/vrtcal_test.go +++ b/adapters/vrtcal/vrtcal_test.go @@ -3,7 +3,7 @@ package vrtcal import ( "testing" - "github.com/prebid/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" ) func TestJsonSamples(t *testing.T) { diff --git a/adapters/yieldmo/params_test.go b/adapters/yieldmo/params_test.go index 0a8fe2d10f1..87044a2dd57 100644 --- a/adapters/yieldmo/params_test.go +++ b/adapters/yieldmo/params_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) // This file actually intends to test static/bidder-params/yieldmo.json diff --git a/adapters/yieldmo/usersync.go b/adapters/yieldmo/usersync.go index f853bbb86a5..16fa10e5b78 100644 --- a/adapters/yieldmo/usersync.go +++ b/adapters/yieldmo/usersync.go @@ -3,8 +3,8 @@ package yieldmo import ( "text/template" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func NewYieldmoSyncer(temp *template.Template) usersync.Usersyncer { diff --git a/adapters/yieldmo/usersync_test.go b/adapters/yieldmo/usersync_test.go index 5ae437c8f00..10cba77a060 100644 --- a/adapters/yieldmo/usersync_test.go +++ b/adapters/yieldmo/usersync_test.go @@ -4,8 +4,8 @@ import ( "testing" "text/template" - "github.com/prebid/prebid-server/privacy" - "github.com/prebid/prebid-server/privacy/gdpr" + "github.com/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr" "github.com/stretchr/testify/assert" ) diff --git a/adapters/yieldmo/yieldmo.go b/adapters/yieldmo/yieldmo.go index ffb2e40b649..3b423ec63a0 100644 --- a/adapters/yieldmo/yieldmo.go +++ b/adapters/yieldmo/yieldmo.go @@ -6,9 +6,9 @@ import ( "net/http" "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/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) type YieldmoAdapter struct { diff --git a/adapters/yieldmo/yieldmo_test.go b/adapters/yieldmo/yieldmo_test.go index 5f7ffcb5ea4..9219fdb4cb9 100644 --- a/adapters/yieldmo/yieldmo_test.go +++ b/adapters/yieldmo/yieldmo_test.go @@ -3,7 +3,7 @@ package yieldmo import ( "testing" - "github.com/prebid/prebid-server/adapters/adapterstest" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adapterstest" ) func TestJsonSamples(t *testing.T) { diff --git a/analytics/config/config.go b/analytics/config/config.go index 7be7c8ecca3..181f6dec04e 100644 --- a/analytics/config/config.go +++ b/analytics/config/config.go @@ -2,9 +2,9 @@ package config import ( "github.com/golang/glog" - "github.com/prebid/prebid-server/analytics" - "github.com/prebid/prebid-server/analytics/filesystem" - "github.com/prebid/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/analytics" + "github.com/PubMatic-OpenWrap/prebid-server/analytics/filesystem" + "github.com/PubMatic-OpenWrap/prebid-server/config" ) //Modules that need to be logged to need to be initialized here diff --git a/analytics/config/config_test.go b/analytics/config/config_test.go index 0fd3ec2019e..6326a5e656a 100644 --- a/analytics/config/config_test.go +++ b/analytics/config/config_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/analytics" - "github.com/prebid/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/analytics" + "github.com/PubMatic-OpenWrap/prebid-server/config" ) const TEST_DIR string = "testFiles" diff --git a/analytics/core.go b/analytics/core.go index 6fd5139fd3d..c33e8ad6c76 100644 --- a/analytics/core.go +++ b/analytics/core.go @@ -2,8 +2,8 @@ package analytics import ( "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/openrtb_ext" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) /* diff --git a/analytics/filesystem/file_module.go b/analytics/filesystem/file_module.go index 54d492ad97c..dc513df03a9 100644 --- a/analytics/filesystem/file_module.go +++ b/analytics/filesystem/file_module.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/chasex/glog" - "github.com/prebid/prebid-server/analytics" + "github.com/PubMatic-OpenWrap/prebid-server/analytics" ) type RequestType string diff --git a/analytics/filesystem/file_module_test.go b/analytics/filesystem/file_module_test.go index 6e2d9f6263b..9835a273e1a 100644 --- a/analytics/filesystem/file_module_test.go +++ b/analytics/filesystem/file_module_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/analytics" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/analytics" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) const TEST_DIR string = "testFiles" diff --git a/cache/dummycache/dummycache.go b/cache/dummycache/dummycache.go index 8cf9f2c4dff..245b36325aa 100644 --- a/cache/dummycache/dummycache.go +++ b/cache/dummycache/dummycache.go @@ -3,7 +3,7 @@ package dummycache import ( "fmt" - "github.com/prebid/prebid-server/cache" + "github.com/PubMatic-OpenWrap/prebid-server/cache" ) // Cache dummy config that will echo back results diff --git a/cache/filecache/filecache.go b/cache/filecache/filecache.go index 0c1ba435388..b6cebbcf50c 100644 --- a/cache/filecache/filecache.go +++ b/cache/filecache/filecache.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "github.com/golang/glog" - "github.com/prebid/prebid-server/cache" + "github.com/PubMatic-OpenWrap/prebid-server/cache" "gopkg.in/yaml.v2" ) diff --git a/cache/postgrescache/postgrescache.go b/cache/postgrescache/postgrescache.go index df8b8fe49b2..c6a53552616 100644 --- a/cache/postgrescache/postgrescache.go +++ b/cache/postgrescache/postgrescache.go @@ -7,11 +7,11 @@ import ( "encoding/gob" "time" - "github.com/prebid/prebid-server/stored_requests" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests" "github.com/coocood/freecache" "github.com/lib/pq" - "github.com/prebid/prebid-server/cache" + "github.com/PubMatic-OpenWrap/prebid-server/cache" ) type CacheConfig struct { diff --git a/config/config.go b/config/config.go index 722aae1395c..1cd6f928594 100644 --- a/config/config.go +++ b/config/config.go @@ -10,8 +10,8 @@ import ( "time" "github.com/golang/glog" - "github.com/prebid/prebid-server/macros" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/macros" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "github.com/spf13/viper" validator "github.com/asaskevich/govalidator" @@ -657,7 +657,7 @@ func SetupViper(v *viper.Viper, filename string) { } // Disabling adapters by default that require some specific config params. - // If you're using one of these, make sure you check out the documentation (https://github.com/prebid/prebid-server/tree/master/docs/bidders) + // If you're using one of these, make sure you check out the documentation (https://github.com/PubMatic-OpenWrap/prebid-server/tree/master/docs/bidders) // for them and specify all the parameters they need for them to work correctly. v.SetDefault("adapters.audiencenetwork.disabled", true) v.SetDefault("adapters.rubicon.disabled", true) diff --git a/config/config_test.go b/config/config_test.go index 182a46eef50..a6bc8f82daa 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -9,7 +9,7 @@ import ( "encoding/json" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "github.com/spf13/viper" "github.com/stretchr/testify/assert" ) diff --git a/currencies/constant_rates_test.go b/currencies/constant_rates_test.go index e1fbb7d4971..d8fe5ada055 100644 --- a/currencies/constant_rates_test.go +++ b/currencies/constant_rates_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/prebid/prebid-server/currencies" + "github.com/PubMatic-OpenWrap/prebid-server/currencies" ) func TestGetRate_ConstantRates(t *testing.T) { diff --git a/currencies/rate_converter_test.go b/currencies/rate_converter_test.go index f9a14895347..63ccd035c0c 100644 --- a/currencies/rate_converter_test.go +++ b/currencies/rate_converter_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/prebid/prebid-server/currencies" + "github.com/PubMatic-OpenWrap/prebid-server/currencies" "github.com/stretchr/testify/assert" ) diff --git a/currencies/rates_test.go b/currencies/rates_test.go index 915b817d7a5..acdcccd9fc6 100644 --- a/currencies/rates_test.go +++ b/currencies/rates_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/prebid/prebid-server/currencies" + "github.com/PubMatic-OpenWrap/prebid-server/currencies" ) func TestUnMarshallRates(t *testing.T) { diff --git a/docs/developers/automated-tests.md b/docs/developers/automated-tests.md index 12532237e08..7e09fb85f34 100644 --- a/docs/developers/automated-tests.md +++ b/docs/developers/automated-tests.md @@ -15,7 +15,7 @@ For more info on how to write tests in Go, see [the Go docs](https://golang.org/ ## Adapter Tests If your adapter makes HTTP calls using standard JSON, you should use the -[RunJSONBidderTest](https://github.com/prebid/prebid-server/blob/master/adapters/adapterstest/test_json.go#L50) function. +[RunJSONBidderTest](https://github.com/PubMatic-OpenWrap/prebid-server/blob/master/adapters/adapterstest/test_json.go#L50) function. This will be much more thorough, convenient, maintainable, and reusable than writing standard Go tests for your adapter. diff --git a/docs/developers/code-reviews.md b/docs/developers/code-reviews.md index d8ee820cd80..20c824b39ba 100644 --- a/docs/developers/code-reviews.md +++ b/docs/developers/code-reviews.md @@ -1,7 +1,7 @@ # Code Reviews ## Standards -Anyone is free to review and comment on any [open pull requests](https://github.com/prebid/prebid-server/pulls). +Anyone is free to review and comment on any [open pull requests](https://github.com/PubMatic-OpenWrap/prebid-server/pulls). All pull requests must be reviewed and approved by at least one [core member](https://github.com/orgs/prebid/teams/core/members) before merge. @@ -38,7 +38,7 @@ Some examples include: - Can we improve the user's experience in any way? - Have the relevant [docs](..) been added or updated? If not, add the `needs docs` label. - Do you believe that the code works by looking at the unit tests? If not, suggest more tests until you do! -- Is the motivation behind these changes clear? If not, there must be [an issue](https://github.com/prebid/prebid-server/issues) explaining it. Are there better ways to achieve those goals? +- Is the motivation behind these changes clear? If not, there must be [an issue](https://github.com/PubMatic-OpenWrap/prebid-server/issues) explaining it. Are there better ways to achieve those goals? - Does the code use any global, mutable state? [Inject dependencies](https://en.wikipedia.org/wiki/Dependency_injection) instead! - Can the code be organized into smaller, more modular pieces? - Is there dead code which can be deleted? Or TODO comments which should be resolved? diff --git a/docs/developers/contributing.md b/docs/developers/contributing.md index 2dafa67fb2e..b418efa2877 100644 --- a/docs/developers/contributing.md +++ b/docs/developers/contributing.md @@ -2,7 +2,7 @@ ## Create an issue -[Create an issue](https://github.com/prebid/prebid-server/issues/new) describing the motivation for your changes. +[Create an issue](https://github.com/PubMatic-OpenWrap/prebid-server/issues/new) describing the motivation for your changes. Are you fixing a bug? Improving documentation? Optimizing some slow code? Pull Requests without associated Issues may still be accepted, if the motivation is obvious. @@ -38,7 +38,7 @@ those updates must be submitted in the same Pull Request as the code changes. ## Open a Pull Request When you're ready, [submit a Pull Request](https://help.github.com/articles/creating-a-pull-request/) -against the `master` branch of [our GitHub repository](https://github.com/prebid/prebid-server/compare). +against the `master` branch of [our GitHub repository](https://github.com/PubMatic-OpenWrap/prebid-server/compare). Pull Requests will be vetted through [Travis CI](https://travis-ci.com/). To reproduce these same tests locally, do: @@ -49,5 +49,5 @@ To reproduce these same tests locally, do: If the tests pass locally, but fail on your PR, [update your fork](https://help.github.com/articles/syncing-a-fork/) with the latest code from `master`. -**Note**: We also have some [known intermittent failures](https://github.com/prebid/prebid-server/issues/103). +**Note**: We also have some [known intermittent failures](https://github.com/PubMatic-OpenWrap/prebid-server/issues/103). If the tests still fail after pulling `master`, don't worry about it. We'll re-run them when we review your PR. diff --git a/docs/endpoints/info/bidders/bidderName.md b/docs/endpoints/info/bidders/bidderName.md index cd525e640f6..6faf976c158 100644 --- a/docs/endpoints/info/bidders/bidderName.md +++ b/docs/endpoints/info/bidders/bidderName.md @@ -34,7 +34,7 @@ This endpoint returns JSON like: The fields hold the following information: -- `maintainer.email`: A contact email for the Bidder's maintainer. In general, Bidder bugs should be logged as [issues](https://github.com/prebid/prebid-server/issues)... but this contact email may be useful in case of emergency. +- `maintainer.email`: A contact email for the Bidder's maintainer. In general, Bidder bugs should be logged as [issues](https://github.com/PubMatic-OpenWrap/prebid-server/issues)... but this contact email may be useful in case of emergency. - `capabilities.app.mediaTypes`: A list of media types this Bidder supports from Mobile Apps. - `capabilities.site.mediaTypes`: A list of media types this Bidder supports from Web pages. diff --git a/docs/endpoints/openrtb2/auction.md b/docs/endpoints/openrtb2/auction.md index 9ae6ec78bee..12c1b94ec1c 100644 --- a/docs/endpoints/openrtb2/auction.md +++ b/docs/endpoints/openrtb2/auction.md @@ -637,8 +637,8 @@ This supports publishers who want to sell different impressions to different bid This endpoint returns a 400 if the request contains deprecated properties (e.g. `imp.wmin`, `imp.hmax`). The error message in the response should describe how to "fix" the request to make it legal. -If the message is unclear, please [log an issue](https://github.com/prebid/prebid-server/issues) -or [submit a pull request](https://github.com/prebid/prebid-server/pulls) to improve it. +If the message is unclear, please [log an issue](https://github.com/PubMatic-OpenWrap/prebid-server/issues) +or [submit a pull request](https://github.com/PubMatic-OpenWrap/prebid-server/pulls) to improve it. #### Determining Bid Security (http/https) diff --git a/endpoints/auction.go b/endpoints/auction.go index bf592e43b02..fe3837b5cd8 100644 --- a/endpoints/auction.go +++ b/endpoints/auction.go @@ -13,19 +13,19 @@ import ( "github.com/golang/glog" "github.com/julienschmidt/httprouter" "github.com/mssola/user_agent" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/cache" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/errortypes" - "github.com/prebid/prebid-server/exchange" - "github.com/prebid/prebid-server/gdpr" - "github.com/prebid/prebid-server/openrtb_ext" - "github.com/prebid/prebid-server/pbs" - "github.com/prebid/prebid-server/pbsmetrics" - pbc "github.com/prebid/prebid-server/prebid_cache_client" - "github.com/prebid/prebid-server/privacy" - gdprPolicy "github.com/prebid/prebid-server/privacy/gdpr" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/cache" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/exchange" + "github.com/PubMatic-OpenWrap/prebid-server/gdpr" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/pbs" + "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics" + pbc "github.com/PubMatic-OpenWrap/prebid-server/prebid_cache_client" + "github.com/PubMatic-OpenWrap/prebid-server/privacy" + gdprPolicy "github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) type bidResult struct { diff --git a/endpoints/auction_test.go b/endpoints/auction_test.go index df91f8ca004..985a9c44d3f 100644 --- a/endpoints/auction_test.go +++ b/endpoints/auction_test.go @@ -11,16 +11,16 @@ import ( "testing" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/cache/dummycache" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/gdpr" - "github.com/prebid/prebid-server/openrtb_ext" - "github.com/prebid/prebid-server/pbs" - "github.com/prebid/prebid-server/pbsmetrics" - metricsConf "github.com/prebid/prebid-server/pbsmetrics/config" - "github.com/prebid/prebid-server/prebid_cache_client" - gdprPolicy "github.com/prebid/prebid-server/privacy/gdpr" - "github.com/prebid/prebid-server/usersync/usersyncers" + "github.com/PubMatic-OpenWrap/prebid-server/cache/dummycache" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/gdpr" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/pbs" + "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics" + metricsConf "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics/config" + "github.com/PubMatic-OpenWrap/prebid-server/prebid_cache_client" + gdprPolicy "github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr" + "github.com/PubMatic-OpenWrap/prebid-server/usersync/usersyncers" "github.com/spf13/viper" ) diff --git a/endpoints/cookie_sync.go b/endpoints/cookie_sync.go index 9787a8f78f2..50ee2adf9e9 100644 --- a/endpoints/cookie_sync.go +++ b/endpoints/cookie_sync.go @@ -13,15 +13,15 @@ import ( "github.com/buger/jsonparser" "github.com/golang/glog" "github.com/julienschmidt/httprouter" - "github.com/prebid/prebid-server/analytics" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/gdpr" - "github.com/prebid/prebid-server/openrtb_ext" - "github.com/prebid/prebid-server/pbsmetrics" - "github.com/prebid/prebid-server/privacy" - "github.com/prebid/prebid-server/privacy/ccpa" - gdprPolicy "github.com/prebid/prebid-server/privacy/gdpr" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/analytics" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/gdpr" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics" + "github.com/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/ccpa" + gdprPolicy "github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func NewCookieSyncEndpoint(syncers map[openrtb_ext.BidderName]usersync.Usersyncer, cfg *config.Configuration, syncPermissions gdpr.Permissions, metrics pbsmetrics.MetricsEngine, pbsAnalytics analytics.PBSAnalyticsModule) httprouter.Handle { diff --git a/endpoints/cookie_sync_test.go b/endpoints/cookie_sync_test.go index 011cecf3341..8530389d10f 100644 --- a/endpoints/cookie_sync_test.go +++ b/endpoints/cookie_sync_test.go @@ -11,16 +11,16 @@ import ( "github.com/buger/jsonparser" "github.com/julienschmidt/httprouter" - "github.com/prebid/prebid-server/adapters/appnexus" - "github.com/prebid/prebid-server/adapters/audienceNetwork" - "github.com/prebid/prebid-server/adapters/lifestreet" - "github.com/prebid/prebid-server/adapters/pubmatic" - analyticsConf "github.com/prebid/prebid-server/analytics/config" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/gdpr" - "github.com/prebid/prebid-server/openrtb_ext" - metricsConf "github.com/prebid/prebid-server/pbsmetrics/config" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/appnexus" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/audienceNetwork" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/lifestreet" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/pubmatic" + analyticsConf "github.com/PubMatic-OpenWrap/prebid-server/analytics/config" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/gdpr" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" + metricsConf "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics/config" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" "github.com/stretchr/testify/assert" ) diff --git a/endpoints/currency_rates.go b/endpoints/currency_rates.go index 745dbe3e7d4..7290c0fe4f9 100644 --- a/endpoints/currency_rates.go +++ b/endpoints/currency_rates.go @@ -6,7 +6,7 @@ import ( "time" "github.com/golang/glog" - "github.com/prebid/prebid-server/currencies" + "github.com/PubMatic-OpenWrap/prebid-server/currencies" ) // currencyRatesInfo holds currency rates information. diff --git a/endpoints/currency_rates_test.go b/endpoints/currency_rates_test.go index e0b127fcd95..5e43cec05bf 100644 --- a/endpoints/currency_rates_test.go +++ b/endpoints/currency_rates_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/prebid/prebid-server/currencies" + "github.com/PubMatic-OpenWrap/prebid-server/currencies" "github.com/stretchr/testify/assert" ) diff --git a/endpoints/getuids.go b/endpoints/getuids.go index 859c0e7288c..af431912aee 100644 --- a/endpoints/getuids.go +++ b/endpoints/getuids.go @@ -4,8 +4,8 @@ import ( "net/http" "github.com/julienschmidt/httprouter" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" "encoding/json" ) diff --git a/endpoints/getuids_test.go b/endpoints/getuids_test.go index 7988acbaffe..fb984e15c35 100644 --- a/endpoints/getuids_test.go +++ b/endpoints/getuids_test.go @@ -5,7 +5,7 @@ import ( "net/http/httptest" "testing" - "github.com/prebid/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/config" "github.com/stretchr/testify/assert" ) diff --git a/endpoints/info/bidders.go b/endpoints/info/bidders.go index f5bd2982600..09205b749d9 100644 --- a/endpoints/info/bidders.go +++ b/endpoints/info/bidders.go @@ -7,8 +7,8 @@ import ( "github.com/buger/jsonparser" "github.com/golang/glog" "github.com/julienschmidt/httprouter" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) // NewBiddersEndpoint implements /info/bidders diff --git a/endpoints/info/bidders_test.go b/endpoints/info/bidders_test.go index 8a1dae390e6..f3eb0ac3ebc 100644 --- a/endpoints/info/bidders_test.go +++ b/endpoints/info/bidders_test.go @@ -14,10 +14,10 @@ import ( "github.com/julienschmidt/httprouter" "github.com/stretchr/testify/assert" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/endpoints/info" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/endpoints/info" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" yaml "gopkg.in/yaml.v2" ) diff --git a/endpoints/openrtb2/amp_auction.go b/endpoints/openrtb2/amp_auction.go index d92f9d0ae61..6cdf1e8268d 100644 --- a/endpoints/openrtb2/amp_auction.go +++ b/endpoints/openrtb2/amp_auction.go @@ -16,18 +16,18 @@ import ( "github.com/golang/glog" "github.com/julienschmidt/httprouter" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/analytics" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/errortypes" - "github.com/prebid/prebid-server/exchange" - "github.com/prebid/prebid-server/openrtb_ext" - "github.com/prebid/prebid-server/pbsmetrics" - "github.com/prebid/prebid-server/privacy" - "github.com/prebid/prebid-server/privacy/ccpa" - "github.com/prebid/prebid-server/privacy/gdpr" - "github.com/prebid/prebid-server/stored_requests" - "github.com/prebid/prebid-server/stored_requests/backends/empty_fetcher" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/analytics" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/exchange" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics" + "github.com/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/ccpa" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests/backends/empty_fetcher" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) const defaultAmpRequestTimeoutMillis = 900 diff --git a/endpoints/openrtb2/amp_auction_test.go b/endpoints/openrtb2/amp_auction_test.go index c62a6a710d5..c7d076896bb 100644 --- a/endpoints/openrtb2/amp_auction_test.go +++ b/endpoints/openrtb2/amp_auction_test.go @@ -11,15 +11,15 @@ import ( "strconv" "testing" - "github.com/prebid/prebid-server/stored_requests" - "github.com/prebid/prebid-server/stored_requests/backends/empty_fetcher" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests/backends/empty_fetcher" "github.com/mxmCherry/openrtb" - analyticsConf "github.com/prebid/prebid-server/analytics/config" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/exchange" - "github.com/prebid/prebid-server/openrtb_ext" - "github.com/prebid/prebid-server/pbsmetrics" + analyticsConf "github.com/PubMatic-OpenWrap/prebid-server/analytics/config" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/exchange" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics" metrics "github.com/rcrowley/go-metrics" "github.com/stretchr/testify/assert" ) diff --git a/endpoints/openrtb2/auction.go b/endpoints/openrtb2/auction.go index a0ed19e5fa4..49ebc6f379a 100644 --- a/endpoints/openrtb2/auction.go +++ b/endpoints/openrtb2/auction.go @@ -20,17 +20,17 @@ import ( "github.com/mxmCherry/openrtb" "github.com/mxmCherry/openrtb/native" nativeRequests "github.com/mxmCherry/openrtb/native/request" - "github.com/prebid/prebid-server/analytics" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/errortypes" - "github.com/prebid/prebid-server/exchange" - "github.com/prebid/prebid-server/openrtb_ext" - "github.com/prebid/prebid-server/pbsmetrics" - "github.com/prebid/prebid-server/prebid" - "github.com/prebid/prebid-server/privacy/ccpa" - "github.com/prebid/prebid-server/stored_requests" - "github.com/prebid/prebid-server/stored_requests/backends/empty_fetcher" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/analytics" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/exchange" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics" + "github.com/PubMatic-OpenWrap/prebid-server/prebid" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/ccpa" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests/backends/empty_fetcher" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" "golang.org/x/net/publicsuffix" ) @@ -708,7 +708,7 @@ func (deps *endpointDeps) validateImpExt(imp *openrtb.Imp, aliases map[string]st // NOTE: This is not part of the official API, we are not expecting clients // migrate from imp[...].ext.${BIDDER} to imp[...].ext.prebid.bidder.${BIDDER} // at this time - // https://github.com/prebid/prebid-server/pull/846#issuecomment-476352224 + // https://github.com/PubMatic-OpenWrap/prebid-server/pull/846#issuecomment-476352224 if rawPrebidExt, ok := bidderExts[openrtb_ext.PrebidExtKey]; ok { var prebidExt openrtb_ext.ExtImpPrebid if err := json.Unmarshal(rawPrebidExt, &prebidExt); err == nil && prebidExt.Bidder != nil { diff --git a/endpoints/openrtb2/auction_benchmark_test.go b/endpoints/openrtb2/auction_benchmark_test.go index 93d7575e865..2ac82b5c52f 100644 --- a/endpoints/openrtb2/auction_benchmark_test.go +++ b/endpoints/openrtb2/auction_benchmark_test.go @@ -6,17 +6,17 @@ import ( "strings" "testing" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/currencies" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/currencies" metrics "github.com/rcrowley/go-metrics" - analyticsConf "github.com/prebid/prebid-server/analytics/config" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/exchange" - "github.com/prebid/prebid-server/gdpr" - "github.com/prebid/prebid-server/openrtb_ext" - "github.com/prebid/prebid-server/pbsmetrics" - "github.com/prebid/prebid-server/stored_requests/backends/empty_fetcher" + analyticsConf "github.com/PubMatic-OpenWrap/prebid-server/analytics/config" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/exchange" + "github.com/PubMatic-OpenWrap/prebid-server/gdpr" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests/backends/empty_fetcher" ) // dummyServer returns the header bidding test ad. This response was scraped from a real appnexus server response. diff --git a/endpoints/openrtb2/auction_test.go b/endpoints/openrtb2/auction_test.go index 89f0fa255df..820d195f5f2 100644 --- a/endpoints/openrtb2/auction_test.go +++ b/endpoints/openrtb2/auction_test.go @@ -15,20 +15,20 @@ import ( "testing" "time" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/stored_requests" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests" metrics "github.com/rcrowley/go-metrics" "github.com/buger/jsonparser" jsonpatch "github.com/evanphx/json-patch" "github.com/mxmCherry/openrtb" - analyticsConf "github.com/prebid/prebid-server/analytics/config" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/errortypes" - "github.com/prebid/prebid-server/exchange" - "github.com/prebid/prebid-server/openrtb_ext" - "github.com/prebid/prebid-server/pbsmetrics" - "github.com/prebid/prebid-server/stored_requests/backends/empty_fetcher" + analyticsConf "github.com/PubMatic-OpenWrap/prebid-server/analytics/config" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/exchange" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests/backends/empty_fetcher" "github.com/stretchr/testify/assert" ) diff --git a/endpoints/openrtb2/interstitial.go b/endpoints/openrtb2/interstitial.go index 4329d873756..7ba5332e890 100644 --- a/endpoints/openrtb2/interstitial.go +++ b/endpoints/openrtb2/interstitial.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/errortypes" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) func processInterstitials(req *openrtb.BidRequest) error { diff --git a/endpoints/openrtb2/video_auction.go b/endpoints/openrtb2/video_auction.go index b8b21b762d7..ed461c957d7 100644 --- a/endpoints/openrtb2/video_auction.go +++ b/endpoints/openrtb2/video_auction.go @@ -14,18 +14,18 @@ import ( "github.com/buger/jsonparser" jsonpatch "github.com/evanphx/json-patch" - "github.com/prebid/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" "github.com/golang/glog" "github.com/julienschmidt/httprouter" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/analytics" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/exchange" - "github.com/prebid/prebid-server/openrtb_ext" - "github.com/prebid/prebid-server/pbsmetrics" - "github.com/prebid/prebid-server/stored_requests" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/analytics" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/exchange" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) var defaultRequestTimeout int64 = 5000 diff --git a/endpoints/openrtb2/video_auction_test.go b/endpoints/openrtb2/video_auction_test.go index cd87041055a..cda35ba9d28 100644 --- a/endpoints/openrtb2/video_auction_test.go +++ b/endpoints/openrtb2/video_auction_test.go @@ -10,14 +10,14 @@ import ( "testing" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/analytics" - analyticsConf "github.com/prebid/prebid-server/analytics/config" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/exchange" - "github.com/prebid/prebid-server/openrtb_ext" - "github.com/prebid/prebid-server/pbsmetrics" - "github.com/prebid/prebid-server/stored_requests" - "github.com/prebid/prebid-server/stored_requests/backends/empty_fetcher" + "github.com/PubMatic-OpenWrap/prebid-server/analytics" + analyticsConf "github.com/PubMatic-OpenWrap/prebid-server/analytics/config" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/exchange" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests/backends/empty_fetcher" metrics "github.com/rcrowley/go-metrics" "github.com/stretchr/testify/assert" ) diff --git a/endpoints/setuid.go b/endpoints/setuid.go index 53d8f43bdc2..3ff0c66e100 100644 --- a/endpoints/setuid.go +++ b/endpoints/setuid.go @@ -10,12 +10,12 @@ import ( "time" "github.com/julienschmidt/httprouter" - "github.com/prebid/prebid-server/analytics" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/gdpr" - "github.com/prebid/prebid-server/openrtb_ext" - "github.com/prebid/prebid-server/pbsmetrics" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/analytics" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/gdpr" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) const ( diff --git a/endpoints/setuid_test.go b/endpoints/setuid_test.go index 555f6173b0f..17aabaabb6b 100644 --- a/endpoints/setuid_test.go +++ b/endpoints/setuid_test.go @@ -10,16 +10,16 @@ import ( "testing" "time" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/pbsmetrics" - "github.com/prebid/prebid-server/privacy" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics" + "github.com/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" "github.com/stretchr/testify/assert" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" - analyticsConf "github.com/prebid/prebid-server/analytics/config" - metricsConf "github.com/prebid/prebid-server/pbsmetrics/config" + analyticsConf "github.com/PubMatic-OpenWrap/prebid-server/analytics/config" + metricsConf "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics/config" ) func TestSetUIDEndpoint(t *testing.T) { diff --git a/exchange/adapter_map.go b/exchange/adapter_map.go index 30a31727d6b..6a4c6e869d4 100644 --- a/exchange/adapter_map.go +++ b/exchange/adapter_map.go @@ -5,59 +5,59 @@ import ( "net/http" "strings" - "github.com/prebid/prebid-server/adapters/kubient" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/kubient" - "github.com/prebid/prebid-server/adapters" - ttx "github.com/prebid/prebid-server/adapters/33across" - "github.com/prebid/prebid-server/adapters/adform" - "github.com/prebid/prebid-server/adapters/adkernel" - "github.com/prebid/prebid-server/adapters/adkernelAdn" - "github.com/prebid/prebid-server/adapters/adpone" - "github.com/prebid/prebid-server/adapters/adtelligent" - "github.com/prebid/prebid-server/adapters/advangelists" - "github.com/prebid/prebid-server/adapters/applogy" - "github.com/prebid/prebid-server/adapters/appnexus" - "github.com/prebid/prebid-server/adapters/audienceNetwork" - "github.com/prebid/prebid-server/adapters/beachfront" - "github.com/prebid/prebid-server/adapters/brightroll" - "github.com/prebid/prebid-server/adapters/consumable" - "github.com/prebid/prebid-server/adapters/conversant" - "github.com/prebid/prebid-server/adapters/datablocks" - "github.com/prebid/prebid-server/adapters/emx_digital" - "github.com/prebid/prebid-server/adapters/engagebdr" - "github.com/prebid/prebid-server/adapters/eplanning" - "github.com/prebid/prebid-server/adapters/gamma" - "github.com/prebid/prebid-server/adapters/gamoshi" - "github.com/prebid/prebid-server/adapters/grid" - "github.com/prebid/prebid-server/adapters/gumgum" - "github.com/prebid/prebid-server/adapters/improvedigital" - "github.com/prebid/prebid-server/adapters/ix" - "github.com/prebid/prebid-server/adapters/lifestreet" - "github.com/prebid/prebid-server/adapters/lockerdome" - "github.com/prebid/prebid-server/adapters/marsmedia" - "github.com/prebid/prebid-server/adapters/mgid" - "github.com/prebid/prebid-server/adapters/openx" - "github.com/prebid/prebid-server/adapters/pubmatic" - "github.com/prebid/prebid-server/adapters/pubnative" - "github.com/prebid/prebid-server/adapters/pulsepoint" - "github.com/prebid/prebid-server/adapters/rhythmone" - "github.com/prebid/prebid-server/adapters/rtbhouse" - "github.com/prebid/prebid-server/adapters/rubicon" - "github.com/prebid/prebid-server/adapters/sharethrough" - "github.com/prebid/prebid-server/adapters/somoaudience" - "github.com/prebid/prebid-server/adapters/sonobi" - "github.com/prebid/prebid-server/adapters/sovrn" - "github.com/prebid/prebid-server/adapters/synacormedia" - "github.com/prebid/prebid-server/adapters/tappx" - "github.com/prebid/prebid-server/adapters/triplelift" - "github.com/prebid/prebid-server/adapters/triplelift_native" - "github.com/prebid/prebid-server/adapters/unruly" - "github.com/prebid/prebid-server/adapters/verizonmedia" - "github.com/prebid/prebid-server/adapters/visx" - "github.com/prebid/prebid-server/adapters/vrtcal" - "github.com/prebid/prebid-server/adapters/yieldmo" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + ttx "github.com/PubMatic-OpenWrap/prebid-server/adapters/33across" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adform" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adkernel" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adkernelAdn" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adpone" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adtelligent" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/advangelists" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/applogy" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/appnexus" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/audienceNetwork" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/beachfront" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/brightroll" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/consumable" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/conversant" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/datablocks" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/emx_digital" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/engagebdr" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/eplanning" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/gamma" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/gamoshi" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/grid" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/gumgum" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/improvedigital" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/ix" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/lifestreet" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/lockerdome" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/marsmedia" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/mgid" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/openx" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/pubmatic" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/pubnative" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/pulsepoint" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/rhythmone" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/rtbhouse" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/rubicon" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/sharethrough" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/somoaudience" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/sonobi" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/sovrn" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/synacormedia" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/tappx" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/triplelift" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/triplelift_native" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/unruly" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/verizonmedia" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/visx" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/vrtcal" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/yieldmo" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) // The newAdapterMap function is segregated to its own file to make it a simple and clean location for each Adapter diff --git a/exchange/adapter_map_test.go b/exchange/adapter_map_test.go index a732f357897..433fd13aeab 100644 --- a/exchange/adapter_map_test.go +++ b/exchange/adapter_map_test.go @@ -4,9 +4,9 @@ import ( "strings" "testing" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) func TestNewAdapterMap(t *testing.T) { diff --git a/exchange/auction.go b/exchange/auction.go index 2b9a8cb58fc..d597f13a14d 100644 --- a/exchange/auction.go +++ b/exchange/auction.go @@ -10,9 +10,9 @@ import ( uuid "github.com/gofrs/uuid" "github.com/golang/glog" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/openrtb_ext" - "github.com/prebid/prebid-server/prebid_cache_client" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/prebid_cache_client" ) func newAuction(seatBids map[openrtb_ext.BidderName]*pbsOrtbSeatBid, numImps int) *auction { diff --git a/exchange/auction_test.go b/exchange/auction_test.go index ea19732d82b..aa9f9bdc7ed 100644 --- a/exchange/auction_test.go +++ b/exchange/auction_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/openrtb_ext" - "github.com/prebid/prebid-server/prebid_cache_client" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/prebid_cache_client" "github.com/mxmCherry/openrtb" "github.com/stretchr/testify/assert" diff --git a/exchange/bidder.go b/exchange/bidder.go index 5708660057f..c57f33b08f7 100644 --- a/exchange/bidder.go +++ b/exchange/bidder.go @@ -12,10 +12,10 @@ import ( "github.com/mxmCherry/openrtb" nativeRequests "github.com/mxmCherry/openrtb/native/request" nativeResponse "github.com/mxmCherry/openrtb/native/response" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/currencies" - "github.com/prebid/prebid-server/errortypes" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/currencies" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "golang.org/x/net/context/ctxhttp" ) diff --git a/exchange/bidder_test.go b/exchange/bidder_test.go index 173bc37ee51..ff2257b678a 100644 --- a/exchange/bidder_test.go +++ b/exchange/bidder_test.go @@ -11,9 +11,9 @@ import ( "time" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/currencies" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/currencies" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "github.com/stretchr/testify/assert" ) diff --git a/exchange/bidder_validate_bids.go b/exchange/bidder_validate_bids.go index d0c5a11fbf8..aeecbea5f62 100644 --- a/exchange/bidder_validate_bids.go +++ b/exchange/bidder_validate_bids.go @@ -7,9 +7,9 @@ import ( "strings" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/currencies" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/currencies" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "golang.org/x/text/currency" ) diff --git a/exchange/bidder_validate_bids_test.go b/exchange/bidder_validate_bids_test.go index 2e189532357..165ddd1f152 100644 --- a/exchange/bidder_validate_bids_test.go +++ b/exchange/bidder_validate_bids_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/currencies" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/currencies" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "github.com/stretchr/testify/assert" ) diff --git a/exchange/exchange.go b/exchange/exchange.go index 3d9055ca8a6..6e70b46cc1f 100644 --- a/exchange/exchange.go +++ b/exchange/exchange.go @@ -11,18 +11,18 @@ import ( "sort" "time" - "github.com/prebid/prebid-server/stored_requests" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests" "github.com/golang/glog" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/currencies" - "github.com/prebid/prebid-server/errortypes" - "github.com/prebid/prebid-server/gdpr" - "github.com/prebid/prebid-server/openrtb_ext" - "github.com/prebid/prebid-server/pbsmetrics" - "github.com/prebid/prebid-server/prebid_cache_client" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/currencies" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/gdpr" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics" + "github.com/PubMatic-OpenWrap/prebid-server/prebid_cache_client" ) // Exchange runs Auctions. Implementations must be threadsafe, and will be shared across many goroutines. diff --git a/exchange/exchange_test.go b/exchange/exchange_test.go index 31dddae4c74..374e6f2f367 100644 --- a/exchange/exchange_test.go +++ b/exchange/exchange_test.go @@ -14,20 +14,20 @@ import ( "testing" "time" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/currencies" - "github.com/prebid/prebid-server/prebid_cache_client" - "github.com/prebid/prebid-server/stored_requests" - "github.com/prebid/prebid-server/stored_requests/backends/file_fetcher" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/currencies" + "github.com/PubMatic-OpenWrap/prebid-server/prebid_cache_client" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests/backends/file_fetcher" "github.com/buger/jsonparser" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/gdpr" - "github.com/prebid/prebid-server/openrtb_ext" - "github.com/prebid/prebid-server/pbsmetrics" - metricsConf "github.com/prebid/prebid-server/pbsmetrics/config" - pbc "github.com/prebid/prebid-server/prebid_cache_client" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/gdpr" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics" + metricsConf "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics/config" + pbc "github.com/PubMatic-OpenWrap/prebid-server/prebid_cache_client" "github.com/rcrowley/go-metrics" "github.com/stretchr/testify/assert" "github.com/yudai/gojsondiff" @@ -64,15 +64,15 @@ func TestNewExchange(t *testing.T) { // and check whether the returned request successfully prints any '&' characters as it should // To do so, we: // 1) Write the endpoint adapter URL with an '&' character into a new config,Configuration struct -// as specified in https://github.com/prebid/prebid-server/issues/465 +// as specified in https://github.com/PubMatic-OpenWrap/prebid-server/issues/465 // 2) Initialize a new exchange with said configuration // 3) Build all the parameters e.buildBidResponse(ctx.Background(), liveA... ) needs including the -// sample request as specified in https://github.com/prebid/prebid-server/issues/465 +// sample request as specified in https://github.com/PubMatic-OpenWrap/prebid-server/issues/465 // 4) Build a BidResponse struct using exchange.buildBidResponse(ctx.Background(), liveA... ) // 5) Assert we have no '&' characters in the response that exchange.buildBidResponse returns func TestCharacterEscape(t *testing.T) { /* 1) Adapter with a '& char in its endpoint property */ - /* https://github.com/prebid/prebid-server/issues/465 */ + /* https://github.com/PubMatic-OpenWrap/prebid-server/issues/465 */ cfg := &config.Configuration{ Adapters: make(map[string]config.Adapter, 1), } @@ -97,7 +97,7 @@ func TestCharacterEscape(t *testing.T) { adapterBids := make(map[openrtb_ext.BidderName]*pbsOrtbSeatBid, 1) adapterBids["appnexus"] = &pbsOrtbSeatBid{currency: "USD"} - //An openrtb.BidRequest struct as specified in https://github.com/prebid/prebid-server/issues/465 + //An openrtb.BidRequest struct as specified in https://github.com/PubMatic-OpenWrap/prebid-server/issues/465 bidRequest := &openrtb.BidRequest{ ID: "some-request-id", Imp: []openrtb.Imp{{ diff --git a/exchange/legacy.go b/exchange/legacy.go index 22882543ac9..29f4b209247 100644 --- a/exchange/legacy.go +++ b/exchange/legacy.go @@ -7,11 +7,11 @@ import ( "github.com/buger/jsonparser" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/currencies" - "github.com/prebid/prebid-server/openrtb_ext" - "github.com/prebid/prebid-server/pbs" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/currencies" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/pbs" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) // AdaptLegacyAdapter turns a bidder.Adapter into an adaptedBidder. diff --git a/exchange/legacy_test.go b/exchange/legacy_test.go index 3ca804a115c..97d25bafd4e 100644 --- a/exchange/legacy_test.go +++ b/exchange/legacy_test.go @@ -10,11 +10,11 @@ import ( "github.com/buger/jsonparser" "github.com/evanphx/json-patch" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/currencies" - "github.com/prebid/prebid-server/openrtb_ext" - "github.com/prebid/prebid-server/pbs" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/currencies" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/pbs" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) func TestSiteVideo(t *testing.T) { diff --git a/exchange/price_granularity.go b/exchange/price_granularity.go index 27b0302db4a..ad31f0ae344 100644 --- a/exchange/price_granularity.go +++ b/exchange/price_granularity.go @@ -4,7 +4,7 @@ import ( "math" "strconv" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) // DEFAULT_PRECISION should be taken care of in openrtb_ext/request.go, but throwing an additional safety check here. diff --git a/exchange/price_granularity_test.go b/exchange/price_granularity_test.go index 09af1fcdf98..9c3aa1411d9 100644 --- a/exchange/price_granularity_test.go +++ b/exchange/price_granularity_test.go @@ -3,7 +3,7 @@ package exchange import ( "testing" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) func TestGetPriceBucketString(t *testing.T) { diff --git a/exchange/targeting.go b/exchange/targeting.go index 994ad9e7c81..29b75e205fa 100644 --- a/exchange/targeting.go +++ b/exchange/targeting.go @@ -4,7 +4,7 @@ import ( "strconv" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) const maxKeyLength = 20 diff --git a/exchange/targeting_test.go b/exchange/targeting_test.go index 92b338f97fb..efb5ae4a4f8 100644 --- a/exchange/targeting_test.go +++ b/exchange/targeting_test.go @@ -8,16 +8,16 @@ import ( "testing" "time" - "github.com/prebid/prebid-server/currencies" + "github.com/PubMatic-OpenWrap/prebid-server/currencies" - "github.com/prebid/prebid-server/gdpr" + "github.com/PubMatic-OpenWrap/prebid-server/gdpr" - "github.com/prebid/prebid-server/pbsmetrics" - metricsConf "github.com/prebid/prebid-server/pbsmetrics/config" + "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics" + metricsConf "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics/config" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "github.com/stretchr/testify/assert" ) diff --git a/exchange/utils.go b/exchange/utils.go index d1c95b88b86..e4283898c26 100644 --- a/exchange/utils.go +++ b/exchange/utils.go @@ -8,11 +8,11 @@ import ( "github.com/buger/jsonparser" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/gdpr" - "github.com/prebid/prebid-server/openrtb_ext" - "github.com/prebid/prebid-server/pbsmetrics" - "github.com/prebid/prebid-server/privacy" - "github.com/prebid/prebid-server/privacy/ccpa" + "github.com/PubMatic-OpenWrap/prebid-server/gdpr" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics" + "github.com/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/ccpa" ) // cleanOpenRTBRequests splits the input request into requests which are sanitized for each bidder. Intended behavior is: diff --git a/exchange/utils_test.go b/exchange/utils_test.go index edbe04a0d0f..78b8813326e 100644 --- a/exchange/utils_test.go +++ b/exchange/utils_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/openrtb_ext" - "github.com/prebid/prebid-server/pbsmetrics" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics" "github.com/stretchr/testify/assert" ) diff --git a/gdpr/gdpr.go b/gdpr/gdpr.go index bdba008a77a..4bd2302b651 100644 --- a/gdpr/gdpr.go +++ b/gdpr/gdpr.go @@ -4,8 +4,8 @@ import ( "context" "net/http" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) type Permissions interface { diff --git a/gdpr/impl.go b/gdpr/impl.go index 2fe6a67e99f..54e1fbf57e9 100644 --- a/gdpr/impl.go +++ b/gdpr/impl.go @@ -6,12 +6,12 @@ import ( "github.com/prebid/go-gdpr/consentconstants" "github.com/prebid/go-gdpr/vendorconsent" "github.com/prebid/go-gdpr/vendorlist" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) // This file implements GDPR permissions for the app. -// For more info, see https://github.com/prebid/prebid-server/issues/501 +// For more info, see https://github.com/PubMatic-OpenWrap/prebid-server/issues/501 // // Nothing in this file is exported. Public APIs can be found in gdpr.go diff --git a/gdpr/impl_test.go b/gdpr/impl_test.go index a1d4af3346d..685aba8cb0e 100644 --- a/gdpr/impl_test.go +++ b/gdpr/impl_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "github.com/prebid/go-gdpr/vendorlist" ) diff --git a/gdpr/vendorlist-fetching.go b/gdpr/vendorlist-fetching.go index d492e9e5e11..f0e5b4e16d4 100644 --- a/gdpr/vendorlist-fetching.go +++ b/gdpr/vendorlist-fetching.go @@ -12,7 +12,7 @@ import ( "github.com/golang/glog" "github.com/prebid/go-gdpr/vendorlist" - "github.com/prebid/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/config" "golang.org/x/net/context/ctxhttp" ) @@ -20,7 +20,7 @@ type saveVendors func(uint16, vendorlist.VendorList) // This file provides the vendorlist-fetching function for Prebid Server. // -// For more info, see https://github.com/prebid/prebid-server/issues/504 +// For more info, see https://github.com/PubMatic-OpenWrap/prebid-server/issues/504 // // Nothing in this file is exported. Public APIs can be found in gdpr.go diff --git a/gdpr/vendorlist-fetching_test.go b/gdpr/vendorlist-fetching_test.go index cdde3c46a68..af75aaeb541 100644 --- a/gdpr/vendorlist-fetching_test.go +++ b/gdpr/vendorlist-fetching_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/prebid/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/config" ) func TestVendorFetch(t *testing.T) { diff --git a/go.mod b/go.mod index 5c837c2ee7b..522f2d7d259 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/prebid/prebid-server +module github.com/PubMatic-OpenWrap/prebid-server go 1.12 diff --git a/main.go b/main.go index ae3b7fd5705..b370a2b18e7 100644 --- a/main.go +++ b/main.go @@ -6,11 +6,11 @@ import ( "net/http" "time" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/currencies" - pbc "github.com/prebid/prebid-server/prebid_cache_client" - "github.com/prebid/prebid-server/router" - "github.com/prebid/prebid-server/server" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/currencies" + pbc "github.com/PubMatic-OpenWrap/prebid-server/prebid_cache_client" + "github.com/PubMatic-OpenWrap/prebid-server/router" + "github.com/PubMatic-OpenWrap/prebid-server/server" "github.com/golang/glog" "github.com/spf13/viper" diff --git a/main_test.go b/main_test.go index d7dc9dd24a0..4da56acce09 100644 --- a/main_test.go +++ b/main_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/prebid/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/config" "github.com/spf13/viper" ) diff --git a/openrtb_ext/device.go b/openrtb_ext/device.go index b3fd6cbb48f..9179c9c929d 100644 --- a/openrtb_ext/device.go +++ b/openrtb_ext/device.go @@ -4,7 +4,7 @@ import ( "strconv" "github.com/buger/jsonparser" - "github.com/prebid/prebid-server/errortypes" + "github.com/PubMatic-OpenWrap/prebid-server/errortypes" ) // PrebidExtKey represents the prebid extension key used in requests diff --git a/openrtb_ext/device_test.go b/openrtb_ext/device_test.go index e307374ef38..b4c85bcc0b0 100644 --- a/openrtb_ext/device_test.go +++ b/openrtb_ext/device_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "github.com/stretchr/testify/assert" ) diff --git a/openrtb_ext/imp.go b/openrtb_ext/imp.go index 499d1f631bf..d3bcc9c73d1 100644 --- a/openrtb_ext/imp.go +++ b/openrtb_ext/imp.go @@ -23,7 +23,7 @@ type ExtImpPrebid struct { // NOTE: This is not part of the official API, we are not expecting clients // migrate from imp[...].ext.${BIDDER} to imp[...].ext.prebid.bidder.${BIDDER} // at this time - // https://github.com/prebid/prebid-server/pull/846#issuecomment-476352224 + // https://github.com/PubMatic-OpenWrap/prebid-server/pull/846#issuecomment-476352224 Bidder map[string]json.RawMessage `json:"bidder"` } diff --git a/openrtb_ext/site_test.go b/openrtb_ext/site_test.go index 67ec6cc4f99..0d41e0c02ce 100644 --- a/openrtb_ext/site_test.go +++ b/openrtb_ext/site_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "github.com/stretchr/testify/assert" ) diff --git a/pbs/pbsrequest.go b/pbs/pbsrequest.go index 9e79b62b38b..0900aca5fe8 100644 --- a/pbs/pbsrequest.go +++ b/pbs/pbsrequest.go @@ -10,11 +10,11 @@ import ( "strings" "time" - "github.com/prebid/prebid-server/cache" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/prebid" - "github.com/prebid/prebid-server/stored_requests" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/cache" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/prebid" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" "github.com/blang/semver" "github.com/buger/jsonparser" diff --git a/pbs/pbsrequest_test.go b/pbs/pbsrequest_test.go index 52cd6153323..29c40cec427 100644 --- a/pbs/pbsrequest_test.go +++ b/pbs/pbsrequest_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/magiconair/properties/assert" - "github.com/prebid/prebid-server/cache/dummycache" - "github.com/prebid/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/cache/dummycache" + "github.com/PubMatic-OpenWrap/prebid-server/config" ) const mimeVideoMp4 = "video/mp4" diff --git a/pbs/usersync.go b/pbs/usersync.go index b5339f036b8..f03b49a6175 100644 --- a/pbs/usersync.go +++ b/pbs/usersync.go @@ -11,11 +11,11 @@ import ( "github.com/golang/glog" "github.com/julienschmidt/httprouter" - "github.com/prebid/prebid-server/analytics" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/pbsmetrics" - "github.com/prebid/prebid-server/ssl" - "github.com/prebid/prebid-server/usersync" + "github.com/PubMatic-OpenWrap/prebid-server/analytics" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics" + "github.com/PubMatic-OpenWrap/prebid-server/ssl" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) // Recaptcha code from https://github.com/haisum/recaptcha/blob/master/recaptcha.go diff --git a/pbsmetrics/config/metrics.go b/pbsmetrics/config/metrics.go index 81cfbfd0798..299661638d2 100644 --- a/pbsmetrics/config/metrics.go +++ b/pbsmetrics/config/metrics.go @@ -3,10 +3,10 @@ package config import ( "time" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/openrtb_ext" - "github.com/prebid/prebid-server/pbsmetrics" - prometheusmetrics "github.com/prebid/prebid-server/pbsmetrics/prometheus" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics" + prometheusmetrics "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics/prometheus" metrics "github.com/rcrowley/go-metrics" influxdb "github.com/vrischmann/go-metrics-influxdb" ) diff --git a/pbsmetrics/config/metrics_test.go b/pbsmetrics/config/metrics_test.go index ad817ba75a9..7de78b99983 100644 --- a/pbsmetrics/config/metrics_test.go +++ b/pbsmetrics/config/metrics_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - mainConfig "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/openrtb_ext" - "github.com/prebid/prebid-server/pbsmetrics" + mainConfig "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics" "github.com/rcrowley/go-metrics" ) diff --git a/pbsmetrics/go_metrics.go b/pbsmetrics/go_metrics.go index 9b3dd65ff4e..bb64088b143 100644 --- a/pbsmetrics/go_metrics.go +++ b/pbsmetrics/go_metrics.go @@ -6,8 +6,8 @@ import ( "time" "github.com/golang/glog" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" metrics "github.com/rcrowley/go-metrics" ) diff --git a/pbsmetrics/go_metrics_test.go b/pbsmetrics/go_metrics_test.go index b403733dcc7..69565108499 100644 --- a/pbsmetrics/go_metrics_test.go +++ b/pbsmetrics/go_metrics_test.go @@ -3,8 +3,8 @@ package pbsmetrics import ( "testing" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" metrics "github.com/rcrowley/go-metrics" "github.com/stretchr/testify/assert" ) diff --git a/pbsmetrics/metrics.go b/pbsmetrics/metrics.go index aea9735c276..8ef9cfb8950 100644 --- a/pbsmetrics/metrics.go +++ b/pbsmetrics/metrics.go @@ -3,7 +3,7 @@ package pbsmetrics import ( "time" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) // Labels defines the labels that can be attached to the metrics. diff --git a/pbsmetrics/metrics_mock.go b/pbsmetrics/metrics_mock.go index 6d57f9fcfaa..7287fcc294b 100644 --- a/pbsmetrics/metrics_mock.go +++ b/pbsmetrics/metrics_mock.go @@ -3,7 +3,7 @@ package pbsmetrics import ( "time" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "github.com/stretchr/testify/mock" ) diff --git a/pbsmetrics/prometheus/prometheus.go b/pbsmetrics/prometheus/prometheus.go index 7cb80643542..ecd76b74bf3 100644 --- a/pbsmetrics/prometheus/prometheus.go +++ b/pbsmetrics/prometheus/prometheus.go @@ -4,9 +4,9 @@ import ( "strconv" "time" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/openrtb_ext" - "github.com/prebid/prebid-server/pbsmetrics" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pbsmetrics/prometheus/prometheus_test.go b/pbsmetrics/prometheus/prometheus_test.go index 4cf9676e1d4..42395cf6c51 100644 --- a/pbsmetrics/prometheus/prometheus_test.go +++ b/pbsmetrics/prometheus/prometheus_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/openrtb_ext" - "github.com/prebid/prebid-server/pbsmetrics" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics" "github.com/prometheus/client_golang/prometheus" dto "github.com/prometheus/client_model/go" "github.com/stretchr/testify/assert" diff --git a/pbsmetrics/prometheus/type_conversion.go b/pbsmetrics/prometheus/type_conversion.go index 8294ede0617..ad81e84e041 100644 --- a/pbsmetrics/prometheus/type_conversion.go +++ b/pbsmetrics/prometheus/type_conversion.go @@ -3,8 +3,8 @@ package prometheusmetrics import ( "strconv" - "github.com/prebid/prebid-server/openrtb_ext" - "github.com/prebid/prebid-server/pbsmetrics" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics" ) func actionsAsString() []string { diff --git a/prebid_cache_client/client.go b/prebid_cache_client/client.go index 6da69f68243..15700b6ed13 100644 --- a/prebid_cache_client/client.go +++ b/prebid_cache_client/client.go @@ -11,8 +11,8 @@ import ( "strings" "time" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/pbsmetrics" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics" "github.com/buger/jsonparser" "github.com/golang/glog" diff --git a/prebid_cache_client/client_test.go b/prebid_cache_client/client_test.go index d3b5ee4bfaf..47a0a78d7c0 100644 --- a/prebid_cache_client/client_test.go +++ b/prebid_cache_client/client_test.go @@ -9,9 +9,9 @@ import ( "strconv" "testing" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/pbsmetrics" - metricsConf "github.com/prebid/prebid-server/pbsmetrics/config" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics" + metricsConf "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/privacy/ccpa/policy.go b/privacy/ccpa/policy.go index e34a35717a4..539504c11dd 100644 --- a/privacy/ccpa/policy.go +++ b/privacy/ccpa/policy.go @@ -6,7 +6,7 @@ import ( "github.com/buger/jsonparser" "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) // Policy represents the CCPA regulation for an OpenRTB bid request. diff --git a/privacy/policies.go b/privacy/policies.go index ebe34ef5c3d..bc8a1b6d198 100644 --- a/privacy/policies.go +++ b/privacy/policies.go @@ -3,8 +3,8 @@ package privacy import ( "github.com/mxmCherry/openrtb" - "github.com/prebid/prebid-server/privacy/ccpa" - "github.com/prebid/prebid-server/privacy/gdpr" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/ccpa" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr" ) // Policies represents the privacy regulations for an OpenRTB bid request. diff --git a/router/admin.go b/router/admin.go index 83c4701bb19..608c7869e99 100644 --- a/router/admin.go +++ b/router/admin.go @@ -4,8 +4,8 @@ import ( "net/http" "net/http/pprof" - "github.com/prebid/prebid-server/currencies" - "github.com/prebid/prebid-server/endpoints" + "github.com/PubMatic-OpenWrap/prebid-server/currencies" + "github.com/PubMatic-OpenWrap/prebid-server/endpoints" ) func Admin(revision string, rateConverter *currencies.RateConverter) *http.ServeMux { diff --git a/router/router.go b/router/router.go index 1994639110c..20e68e7e392 100644 --- a/router/router.go +++ b/router/router.go @@ -12,35 +12,35 @@ import ( "strings" "time" - "github.com/prebid/prebid-server/adapters" - "github.com/prebid/prebid-server/adapters/adform" - "github.com/prebid/prebid-server/adapters/appnexus" - "github.com/prebid/prebid-server/adapters/conversant" - "github.com/prebid/prebid-server/adapters/ix" - "github.com/prebid/prebid-server/adapters/lifestreet" - "github.com/prebid/prebid-server/adapters/pubmatic" - "github.com/prebid/prebid-server/adapters/pulsepoint" - "github.com/prebid/prebid-server/adapters/rubicon" - "github.com/prebid/prebid-server/adapters/sovrn" - analyticsConf "github.com/prebid/prebid-server/analytics/config" - "github.com/prebid/prebid-server/cache" - "github.com/prebid/prebid-server/cache/dummycache" - "github.com/prebid/prebid-server/cache/filecache" - "github.com/prebid/prebid-server/cache/postgrescache" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/currencies" - "github.com/prebid/prebid-server/endpoints" - infoEndpoints "github.com/prebid/prebid-server/endpoints/info" - "github.com/prebid/prebid-server/endpoints/openrtb2" - "github.com/prebid/prebid-server/exchange" - "github.com/prebid/prebid-server/gdpr" - "github.com/prebid/prebid-server/openrtb_ext" - "github.com/prebid/prebid-server/pbs" - metricsConf "github.com/prebid/prebid-server/pbsmetrics/config" - pbc "github.com/prebid/prebid-server/prebid_cache_client" - "github.com/prebid/prebid-server/ssl" - storedRequestsConf "github.com/prebid/prebid-server/stored_requests/config" - "github.com/prebid/prebid-server/usersync/usersyncers" + "github.com/PubMatic-OpenWrap/prebid-server/adapters" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adform" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/appnexus" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/conversant" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/ix" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/lifestreet" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/pubmatic" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/pulsepoint" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/rubicon" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/sovrn" + analyticsConf "github.com/PubMatic-OpenWrap/prebid-server/analytics/config" + "github.com/PubMatic-OpenWrap/prebid-server/cache" + "github.com/PubMatic-OpenWrap/prebid-server/cache/dummycache" + "github.com/PubMatic-OpenWrap/prebid-server/cache/filecache" + "github.com/PubMatic-OpenWrap/prebid-server/cache/postgrescache" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/currencies" + "github.com/PubMatic-OpenWrap/prebid-server/endpoints" + infoEndpoints "github.com/PubMatic-OpenWrap/prebid-server/endpoints/info" + "github.com/PubMatic-OpenWrap/prebid-server/endpoints/openrtb2" + "github.com/PubMatic-OpenWrap/prebid-server/exchange" + "github.com/PubMatic-OpenWrap/prebid-server/gdpr" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/pbs" + metricsConf "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics/config" + pbc "github.com/PubMatic-OpenWrap/prebid-server/prebid_cache_client" + "github.com/PubMatic-OpenWrap/prebid-server/ssl" + storedRequestsConf "github.com/PubMatic-OpenWrap/prebid-server/stored_requests/config" + "github.com/PubMatic-OpenWrap/prebid-server/usersync/usersyncers" "github.com/golang/glog" "github.com/julienschmidt/httprouter" diff --git a/router/router_test.go b/router/router_test.go index 66434769b47..32aec6cc9d3 100644 --- a/router/router_test.go +++ b/router/router_test.go @@ -8,8 +8,8 @@ import ( "os" "testing" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "github.com/stretchr/testify/assert" ) diff --git a/server/listener.go b/server/listener.go index bd58e67332f..fe9aea19e3f 100644 --- a/server/listener.go +++ b/server/listener.go @@ -6,7 +6,7 @@ import ( "time" "github.com/golang/glog" - "github.com/prebid/prebid-server/pbsmetrics" + "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics" ) // monitorableListener tracks any opened connections in the metrics. diff --git a/server/listener_test.go b/server/listener_test.go index 100a6bba003..61d6970688d 100644 --- a/server/listener_test.go +++ b/server/listener_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/pbsmetrics" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics" metrics "github.com/rcrowley/go-metrics" ) diff --git a/server/prometheus.go b/server/prometheus.go index 67ea4403ebd..f5d990a34dd 100644 --- a/server/prometheus.go +++ b/server/prometheus.go @@ -7,9 +7,9 @@ import ( "github.com/golang/glog" "github.com/prometheus/client_golang/prometheus/promhttp" - "github.com/prebid/prebid-server/config" - metricsconfig "github.com/prebid/prebid-server/pbsmetrics/config" - prometheusMetrics "github.com/prebid/prebid-server/pbsmetrics/prometheus" + "github.com/PubMatic-OpenWrap/prebid-server/config" + metricsconfig "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics/config" + prometheusMetrics "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics/prometheus" ) func newPrometheusServer(cfg *config.Configuration, metrics *metricsconfig.DetailedMetricsEngine) *http.Server { diff --git a/server/server.go b/server/server.go index 4929eafd232..c0a3111b57c 100644 --- a/server/server.go +++ b/server/server.go @@ -13,9 +13,9 @@ import ( "github.com/NYTimes/gziphandler" "github.com/golang/glog" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/pbsmetrics" - metricsconfig "github.com/prebid/prebid-server/pbsmetrics/config" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics" + metricsconfig "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics/config" ) // Listen blocks forever, serving PBS requests on the given port. This will block forever, until the process is shut down. diff --git a/server/server_test.go b/server/server_test.go index e7ef593a4b5..3d6d5684e96 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/prebid/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/config" ) func TestNewAdminServer(t *testing.T) { diff --git a/stored_requests/backends/db_fetcher/fetcher.go b/stored_requests/backends/db_fetcher/fetcher.go index a8232fd5173..07bd1d6d0bf 100644 --- a/stored_requests/backends/db_fetcher/fetcher.go +++ b/stored_requests/backends/db_fetcher/fetcher.go @@ -8,7 +8,7 @@ import ( "github.com/lib/pq" "github.com/golang/glog" - "github.com/prebid/prebid-server/stored_requests" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests" ) func NewFetcher(db *sql.DB, queryMaker func(int, int) string) stored_requests.AllFetcher { diff --git a/stored_requests/backends/empty_fetcher/fetcher.go b/stored_requests/backends/empty_fetcher/fetcher.go index 25e8ead434b..48ef468abca 100644 --- a/stored_requests/backends/empty_fetcher/fetcher.go +++ b/stored_requests/backends/empty_fetcher/fetcher.go @@ -3,7 +3,7 @@ package empty_fetcher import ( "context" "encoding/json" - "github.com/prebid/prebid-server/stored_requests" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests" ) // EmptyFetcher is a nil-object which has no Stored Requests. diff --git a/stored_requests/backends/file_fetcher/fetcher.go b/stored_requests/backends/file_fetcher/fetcher.go index 60853f65da7..6d7cb9caf77 100644 --- a/stored_requests/backends/file_fetcher/fetcher.go +++ b/stored_requests/backends/file_fetcher/fetcher.go @@ -7,7 +7,7 @@ import ( "io/ioutil" "strings" - "github.com/prebid/prebid-server/stored_requests" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests" ) // NewFileFetcher _immediately_ loads stored request data from local files. diff --git a/stored_requests/backends/file_fetcher/fetcher_test.go b/stored_requests/backends/file_fetcher/fetcher_test.go index 2429a77cd25..76f5e494a64 100644 --- a/stored_requests/backends/file_fetcher/fetcher_test.go +++ b/stored_requests/backends/file_fetcher/fetcher_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/prebid/prebid-server/stored_requests" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests" "github.com/stretchr/testify/assert" ) diff --git a/stored_requests/backends/http_fetcher/fetcher.go b/stored_requests/backends/http_fetcher/fetcher.go index b7e42c9e6cf..efd85a001e0 100644 --- a/stored_requests/backends/http_fetcher/fetcher.go +++ b/stored_requests/backends/http_fetcher/fetcher.go @@ -9,7 +9,7 @@ import ( "net/http" "strings" - "github.com/prebid/prebid-server/stored_requests" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests" "github.com/golang/glog" "golang.org/x/net/context/ctxhttp" diff --git a/stored_requests/caches/cachestest/reliable.go b/stored_requests/caches/cachestest/reliable.go index e08a20e9cdb..59e6683f8b0 100644 --- a/stored_requests/caches/cachestest/reliable.go +++ b/stored_requests/caches/cachestest/reliable.go @@ -5,7 +5,7 @@ import ( "encoding/json" "testing" - "github.com/prebid/prebid-server/stored_requests" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests" ) const ( diff --git a/stored_requests/caches/memory/cache.go b/stored_requests/caches/memory/cache.go index c5702080ef9..1edc6e58413 100644 --- a/stored_requests/caches/memory/cache.go +++ b/stored_requests/caches/memory/cache.go @@ -7,8 +7,8 @@ import ( "github.com/coocood/freecache" "github.com/golang/glog" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/stored_requests" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests" ) // NewCache returns an in-memory Cache which evicts items if: diff --git a/stored_requests/caches/memory/cache_test.go b/stored_requests/caches/memory/cache_test.go index ba4703ef89a..673b9a0c8fe 100644 --- a/stored_requests/caches/memory/cache_test.go +++ b/stored_requests/caches/memory/cache_test.go @@ -7,9 +7,9 @@ import ( "strconv" "testing" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/stored_requests" - "github.com/prebid/prebid-server/stored_requests/caches/cachestest" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests/caches/cachestest" ) func TestLRURobustness(t *testing.T) { diff --git a/stored_requests/config/config.go b/stored_requests/config/config.go index e8f6b0bdf46..f0935256f85 100644 --- a/stored_requests/config/config.go +++ b/stored_requests/config/config.go @@ -6,22 +6,22 @@ import ( "net/http" "time" - "github.com/prebid/prebid-server/pbsmetrics" + "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics" "github.com/golang/glog" "github.com/julienschmidt/httprouter" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/stored_requests" - "github.com/prebid/prebid-server/stored_requests/backends/db_fetcher" - "github.com/prebid/prebid-server/stored_requests/backends/empty_fetcher" - "github.com/prebid/prebid-server/stored_requests/backends/file_fetcher" - "github.com/prebid/prebid-server/stored_requests/backends/http_fetcher" - "github.com/prebid/prebid-server/stored_requests/caches/memory" - "github.com/prebid/prebid-server/stored_requests/caches/nil_cache" - "github.com/prebid/prebid-server/stored_requests/events" - apiEvents "github.com/prebid/prebid-server/stored_requests/events/api" - httpEvents "github.com/prebid/prebid-server/stored_requests/events/http" - postgresEvents "github.com/prebid/prebid-server/stored_requests/events/postgres" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests/backends/db_fetcher" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests/backends/empty_fetcher" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests/backends/file_fetcher" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests/backends/http_fetcher" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests/caches/memory" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests/caches/nil_cache" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests/events" + apiEvents "github.com/PubMatic-OpenWrap/prebid-server/stored_requests/events/api" + httpEvents "github.com/PubMatic-OpenWrap/prebid-server/stored_requests/events/http" + postgresEvents "github.com/PubMatic-OpenWrap/prebid-server/stored_requests/events/postgres" ) // This gets set to the connection string used when a database connection is made. We only support a single diff --git a/stored_requests/config/config_test.go b/stored_requests/config/config_test.go index 11748a59966..bce6056bed2 100644 --- a/stored_requests/config/config_test.go +++ b/stored_requests/config/config_test.go @@ -11,11 +11,11 @@ import ( sqlmock "github.com/DATA-DOG/go-sqlmock" "github.com/julienschmidt/httprouter" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/stored_requests/backends/empty_fetcher" - "github.com/prebid/prebid-server/stored_requests/backends/http_fetcher" - "github.com/prebid/prebid-server/stored_requests/events" - httpEvents "github.com/prebid/prebid-server/stored_requests/events/http" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests/backends/empty_fetcher" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests/backends/http_fetcher" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests/events" + httpEvents "github.com/PubMatic-OpenWrap/prebid-server/stored_requests/events/http" ) func TestNewEmptyFetcher(t *testing.T) { diff --git a/stored_requests/events/api/api.go b/stored_requests/events/api/api.go index 6dce4ebaad6..a37fadd36b2 100644 --- a/stored_requests/events/api/api.go +++ b/stored_requests/events/api/api.go @@ -6,7 +6,7 @@ import ( "net/http" "github.com/julienschmidt/httprouter" - "github.com/prebid/prebid-server/stored_requests/events" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests/events" ) type eventsAPI struct { diff --git a/stored_requests/events/api/api_test.go b/stored_requests/events/api/api_test.go index 64cf68b0a91..eee6143de10 100644 --- a/stored_requests/events/api/api_test.go +++ b/stored_requests/events/api/api_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/stored_requests/caches/memory" - "github.com/prebid/prebid-server/stored_requests/events" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests/caches/memory" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests/events" ) func TestGoodRequests(t *testing.T) { diff --git a/stored_requests/events/events.go b/stored_requests/events/events.go index ea67e8eeeb9..2e8dd07c880 100644 --- a/stored_requests/events/events.go +++ b/stored_requests/events/events.go @@ -4,7 +4,7 @@ import ( "context" "encoding/json" - "github.com/prebid/prebid-server/stored_requests" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests" ) // Save represents a bulk save diff --git a/stored_requests/events/events_test.go b/stored_requests/events/events_test.go index aaece692bd2..eba0683de51 100644 --- a/stored_requests/events/events_test.go +++ b/stored_requests/events/events_test.go @@ -7,8 +7,8 @@ import ( "reflect" "testing" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/stored_requests/caches/memory" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests/caches/memory" ) func TestListen(t *testing.T) { diff --git a/stored_requests/events/http/http.go b/stored_requests/events/http/http.go index 4f141dac5cd..1139b00bbfb 100644 --- a/stored_requests/events/http/http.go +++ b/stored_requests/events/http/http.go @@ -12,7 +12,7 @@ import ( "golang.org/x/net/context/ctxhttp" "github.com/buger/jsonparser" - "github.com/prebid/prebid-server/stored_requests/events" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests/events" "github.com/golang/glog" ) diff --git a/stored_requests/events/postgres/polling.go b/stored_requests/events/postgres/polling.go index 8f912709d61..3bfecfb41a6 100644 --- a/stored_requests/events/postgres/polling.go +++ b/stored_requests/events/postgres/polling.go @@ -8,7 +8,7 @@ import ( "time" "github.com/golang/glog" - "github.com/prebid/prebid-server/stored_requests/events" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests/events" ) // PollForUpdates returns an EventProducer which checks the database for updates every refreshRate. diff --git a/stored_requests/events/postgres/startup.go b/stored_requests/events/postgres/startup.go index 395294a6e60..620bca645bf 100644 --- a/stored_requests/events/postgres/startup.go +++ b/stored_requests/events/postgres/startup.go @@ -5,7 +5,7 @@ import ( "database/sql" "github.com/golang/glog" - "github.com/prebid/prebid-server/stored_requests/events" + "github.com/PubMatic-OpenWrap/prebid-server/stored_requests/events" ) // This function queries the database to get all the data, and is guaranteed to return diff --git a/stored_requests/fetcher.go b/stored_requests/fetcher.go index 808495e4584..d0f7f5969ec 100644 --- a/stored_requests/fetcher.go +++ b/stored_requests/fetcher.go @@ -5,7 +5,7 @@ import ( "encoding/json" "fmt" - "github.com/prebid/prebid-server/pbsmetrics" + "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics" ) // Fetcher knows how to fetch Stored Request data by id. diff --git a/stored_requests/fetcher_test.go b/stored_requests/fetcher_test.go index c1040acdb90..2e505d35a88 100644 --- a/stored_requests/fetcher_test.go +++ b/stored_requests/fetcher_test.go @@ -6,7 +6,7 @@ import ( "errors" "testing" - "github.com/prebid/prebid-server/pbsmetrics" + "github.com/PubMatic-OpenWrap/prebid-server/pbsmetrics" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/usersync/cookie.go b/usersync/cookie.go index 461fbba8d03..8fa90524136 100644 --- a/usersync/cookie.go +++ b/usersync/cookie.go @@ -8,8 +8,8 @@ import ( "net/http" "time" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) const ( diff --git a/usersync/cookie_test.go b/usersync/cookie_test.go index ef2e9911e46..c05eadd4a98 100644 --- a/usersync/cookie_test.go +++ b/usersync/cookie_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" "github.com/stretchr/testify/assert" ) diff --git a/usersync/usersync.go b/usersync/usersync.go index 2b313a021f8..af034155a31 100644 --- a/usersync/usersync.go +++ b/usersync/usersync.go @@ -1,6 +1,6 @@ package usersync -import "github.com/prebid/prebid-server/privacy" +import "github.com/PubMatic-OpenWrap/prebid-server/privacy" type Usersyncer interface { // GetUsersyncInfo returns basic info the browser needs in order to run a user sync. diff --git a/usersync/usersyncers/syncer.go b/usersync/usersyncers/syncer.go index 6277993238a..3dafe0c2f9b 100644 --- a/usersync/usersyncers/syncer.go +++ b/usersync/usersyncers/syncer.go @@ -4,56 +4,56 @@ import ( "strings" "text/template" - "github.com/prebid/prebid-server/adapters/adpone" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adpone" "github.com/golang/glog" - ttx "github.com/prebid/prebid-server/adapters/33across" - "github.com/prebid/prebid-server/adapters/adform" - "github.com/prebid/prebid-server/adapters/adkernel" - "github.com/prebid/prebid-server/adapters/adkernelAdn" - "github.com/prebid/prebid-server/adapters/adtelligent" - "github.com/prebid/prebid-server/adapters/advangelists" - "github.com/prebid/prebid-server/adapters/appnexus" - "github.com/prebid/prebid-server/adapters/audienceNetwork" - "github.com/prebid/prebid-server/adapters/beachfront" - "github.com/prebid/prebid-server/adapters/brightroll" - "github.com/prebid/prebid-server/adapters/consumable" - "github.com/prebid/prebid-server/adapters/conversant" - "github.com/prebid/prebid-server/adapters/datablocks" - "github.com/prebid/prebid-server/adapters/emx_digital" - "github.com/prebid/prebid-server/adapters/engagebdr" - "github.com/prebid/prebid-server/adapters/eplanning" - "github.com/prebid/prebid-server/adapters/gamma" - "github.com/prebid/prebid-server/adapters/gamoshi" - "github.com/prebid/prebid-server/adapters/grid" - "github.com/prebid/prebid-server/adapters/gumgum" - "github.com/prebid/prebid-server/adapters/improvedigital" - "github.com/prebid/prebid-server/adapters/ix" - "github.com/prebid/prebid-server/adapters/lifestreet" - "github.com/prebid/prebid-server/adapters/lockerdome" - "github.com/prebid/prebid-server/adapters/marsmedia" - "github.com/prebid/prebid-server/adapters/mgid" - "github.com/prebid/prebid-server/adapters/openx" - "github.com/prebid/prebid-server/adapters/pubmatic" - "github.com/prebid/prebid-server/adapters/pulsepoint" - "github.com/prebid/prebid-server/adapters/rhythmone" - "github.com/prebid/prebid-server/adapters/rtbhouse" - "github.com/prebid/prebid-server/adapters/rubicon" - "github.com/prebid/prebid-server/adapters/sharethrough" - "github.com/prebid/prebid-server/adapters/somoaudience" - "github.com/prebid/prebid-server/adapters/sonobi" - "github.com/prebid/prebid-server/adapters/sovrn" - "github.com/prebid/prebid-server/adapters/synacormedia" - "github.com/prebid/prebid-server/adapters/triplelift" - "github.com/prebid/prebid-server/adapters/triplelift_native" - "github.com/prebid/prebid-server/adapters/unruly" - "github.com/prebid/prebid-server/adapters/verizonmedia" - "github.com/prebid/prebid-server/adapters/visx" - "github.com/prebid/prebid-server/adapters/vrtcal" - "github.com/prebid/prebid-server/adapters/yieldmo" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/openrtb_ext" - "github.com/prebid/prebid-server/usersync" + ttx "github.com/PubMatic-OpenWrap/prebid-server/adapters/33across" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adform" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adkernel" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adkernelAdn" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/adtelligent" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/advangelists" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/appnexus" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/audienceNetwork" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/beachfront" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/brightroll" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/consumable" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/conversant" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/datablocks" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/emx_digital" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/engagebdr" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/eplanning" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/gamma" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/gamoshi" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/grid" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/gumgum" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/improvedigital" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/ix" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/lifestreet" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/lockerdome" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/marsmedia" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/mgid" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/openx" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/pubmatic" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/pulsepoint" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/rhythmone" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/rtbhouse" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/rubicon" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/sharethrough" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/somoaudience" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/sonobi" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/sovrn" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/synacormedia" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/triplelift" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/triplelift_native" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/unruly" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/verizonmedia" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/visx" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/vrtcal" + "github.com/PubMatic-OpenWrap/prebid-server/adapters/yieldmo" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/usersync" ) // NewSyncerMap returns a map of all the usersyncer objects. diff --git a/usersync/usersyncers/syncer_test.go b/usersync/usersyncers/syncer_test.go index dd2b5b5d1e9..1e93d75111d 100644 --- a/usersync/usersyncers/syncer_test.go +++ b/usersync/usersyncers/syncer_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" - "github.com/prebid/prebid-server/config" - "github.com/prebid/prebid-server/openrtb_ext" + "github.com/PubMatic-OpenWrap/prebid-server/config" + "github.com/PubMatic-OpenWrap/prebid-server/openrtb_ext" ) func TestNewSyncerMap(t *testing.T) { From 1736ed64c257a97bd3fed86d3b5eaf596fe91844 Mon Sep 17 00:00:00 2001 From: Isha Bharti Date: Mon, 27 Jan 2020 11:20:26 +0530 Subject: [PATCH 11/13] Updating pubmatic default Usersync URL in config --- config/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/config.go b/config/config.go index 9f753575f9d..0740eccc7b4 100644 --- a/config/config.go +++ b/config/config.go @@ -512,7 +512,7 @@ func (cfg *Configuration) setDerivedDefaults() { setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderMarsmedia, "https://dmp.rtbsrv.com/dmp/profiles/cm?p_id=179&gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&redirect="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dmarsmedia%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24%7BUUID%7D") setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderMgid, "https://cm.mgid.com/m?cdsp=363893&adu="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dmgid%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%7Bmuidn%7D") setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderOpenx, "https://rtb.openx.net/sync/prebid?r="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dopenx%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24%7BUID%7D") - setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderPubmatic, "https://ads.pubmatic.com/AdServer/js/user_sync.html?predirect="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dpubmatic%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D") + setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderPubmatic, "https://ads.pubmatic.com/AdServer/js/user_sync.html?us_privacy={{.USPrivacy}}&predirect="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dpubmatic%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D") setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderPulsepoint, "https://bh.contextweb.com/rtset?pid=561205&ev=1&rurl="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dpulsepoint%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%25%25VGUID%25%25") setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderRhythmone, "https://sync.1rx.io/usersync2/rmphb?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&redir="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Drhythmone%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%5BRX_UUID%5D") // openrtb_ext.BidderRTBHouse doesn't have a good default. From 0cc50e7a5b57a2322a6bb98522e90f006bd2bd93 Mon Sep 17 00:00:00 2001 From: Isha Bharti Date: Tue, 28 Jan 2020 13:54:25 +0530 Subject: [PATCH 12/13] Updating usersync url for pubmatic --- adapters/pubmatic/usersync_test.go | 12 +++++++----- config/config.go | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/adapters/pubmatic/usersync_test.go b/adapters/pubmatic/usersync_test.go index 15032c2dda6..562710d017b 100644 --- a/adapters/pubmatic/usersync_test.go +++ b/adapters/pubmatic/usersync_test.go @@ -10,7 +10,7 @@ import ( ) func TestPubmaticSyncer(t *testing.T) { - syncURL := "//ads.pubmatic.com/AdServer/js/user_sync.html?predirect=localhost%2Fsetuid%3Fbidder%3Dpubmatic%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D" + syncURL := "//ads.pubmatic.com/AdServer/js/user_sync.html?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&predirect=localhost%2Fsetuid%3Fbidder%3Dpubmatic%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D" syncURLTemplate := template.Must( template.New("sync-template").Parse(syncURL), ) @@ -18,13 +18,15 @@ func TestPubmaticSyncer(t *testing.T) { syncer := NewPubmaticSyncer(syncURLTemplate) syncInfo, err := syncer.GetUsersyncInfo(privacy.Policies{ GDPR: gdpr.Policy{ - Signal: "1", - Consent: "BONciguONcjGKADACHENAOLS1rAHDAFAAEAASABQAMwAeACEAFw", + Signal: "A", + Consent: "B", + }, + CCPA: ccpa.Policy{ + Value: "C", }, }) - assert.NoError(t, err) - assert.Equal(t, "//ads.pubmatic.com/AdServer/js/user_sync.html?predirect=localhost%2Fsetuid%3Fbidder%3Dpubmatic%26gdpr%3D1%26gdpr_consent%3DBONciguONcjGKADACHENAOLS1rAHDAFAAEAASABQAMwAeACEAFw%26uid%3D", syncInfo.URL) + assert.Equal(t, "//ads.pubmatic.com/AdServer/js/user_sync.html?gdpr=A&gdpr_consent=B&us_privacy=C&predirect=localhost%2Fsetuid%3Fbidder%3Dpubmatic%26gdpr%3DA%26gdpr_consent%3DB%26uid%3D", syncInfo.URL) assert.Equal(t, "iframe", syncInfo.Type) assert.EqualValues(t, 76, syncer.GDPRVendorID()) assert.Equal(t, false, syncInfo.SupportCORS) diff --git a/config/config.go b/config/config.go index 0740eccc7b4..5935123b3e4 100644 --- a/config/config.go +++ b/config/config.go @@ -512,7 +512,7 @@ func (cfg *Configuration) setDerivedDefaults() { setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderMarsmedia, "https://dmp.rtbsrv.com/dmp/profiles/cm?p_id=179&gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&redirect="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dmarsmedia%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24%7BUUID%7D") setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderMgid, "https://cm.mgid.com/m?cdsp=363893&adu="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dmgid%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%7Bmuidn%7D") setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderOpenx, "https://rtb.openx.net/sync/prebid?r="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dopenx%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24%7BUID%7D") - setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderPubmatic, "https://ads.pubmatic.com/AdServer/js/user_sync.html?us_privacy={{.USPrivacy}}&predirect="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dpubmatic%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D") + setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderPubmatic, "https://ads.pubmatic.com/AdServer/js/user_sync.html?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&predirect="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dpubmatic%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D") setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderPulsepoint, "https://bh.contextweb.com/rtset?pid=561205&ev=1&rurl="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dpulsepoint%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%25%25VGUID%25%25") setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderRhythmone, "https://sync.1rx.io/usersync2/rmphb?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&redir="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Drhythmone%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%5BRX_UUID%5D") // openrtb_ext.BidderRTBHouse doesn't have a good default. From 1399e3f341ee224d5aedd344b6abecc0bef4bee3 Mon Sep 17 00:00:00 2001 From: Isha Bharti Date: Tue, 28 Jan 2020 14:16:11 +0530 Subject: [PATCH 13/13] Updating test case pubmatic usersync --- adapters/pubmatic/usersync_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/adapters/pubmatic/usersync_test.go b/adapters/pubmatic/usersync_test.go index 562710d017b..fb702cbc349 100644 --- a/adapters/pubmatic/usersync_test.go +++ b/adapters/pubmatic/usersync_test.go @@ -5,6 +5,7 @@ import ( "text/template" "github.com/PubMatic-OpenWrap/prebid-server/privacy" + "github.com/PubMatic-OpenWrap/prebid-server/privacy/ccpa" "github.com/PubMatic-OpenWrap/prebid-server/privacy/gdpr" "github.com/stretchr/testify/assert" )