diff --git a/adapters/gamoshi/gamoshi.go b/adapters/gamoshi/gamoshi.go index 016feb1789c..af915f682a1 100644 --- a/adapters/gamoshi/gamoshi.go +++ b/adapters/gamoshi/gamoshi.go @@ -101,7 +101,7 @@ func (a *GamoshiAdapter) MakeRequests(request *openrtb.BidRequest, reqInfo *adap if len(thisURI) == 0 { thisURI = "https://rtb.gamoshi.io" } - thisURI = thisURI + "/r/" + gamoshiExt.SupplyPartnerId + "/bidr?reqformat=RTB_JSON" + thisURI = thisURI + "/r/" + gamoshiExt.SupplyPartnerId + "/bidr?bidder=prebid-server" headers := http.Header{} headers.Add("Content-Type", "application/json;charset=utf-8") headers.Add("Accept", "application/json") diff --git a/adapters/gamoshi/gamoshitest/exemplary/banner-and-audio.json b/adapters/gamoshi/gamoshitest/exemplary/banner-and-audio.json index 51c30394763..b8024edd635 100644 --- a/adapters/gamoshi/gamoshitest/exemplary/banner-and-audio.json +++ b/adapters/gamoshi/gamoshitest/exemplary/banner-and-audio.json @@ -40,7 +40,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "https://rtb.gamoshi.io/r/1707/bidr?reqformat=RTB_JSON", + "uri": "https://rtb.gamoshi.io/r/1707/bidr?bidder=prebid-server", "body": { "id": "test-request-id", "imp": [ diff --git a/adapters/gamoshi/gamoshitest/exemplary/banner-and-video.json b/adapters/gamoshi/gamoshitest/exemplary/banner-and-video.json index 05608f1c050..2342b49e5cf 100644 --- a/adapters/gamoshi/gamoshitest/exemplary/banner-and-video.json +++ b/adapters/gamoshi/gamoshitest/exemplary/banner-and-video.json @@ -41,7 +41,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "https://rtb.gamoshi.io/r/1707/bidr?reqformat=RTB_JSON", + "uri": "https://rtb.gamoshi.io/r/1707/bidr?bidder=prebid-server", "body": { "id": "test-request-id", "imp": [ diff --git a/adapters/gamoshi/gamoshitest/exemplary/banner-native-audio.json b/adapters/gamoshi/gamoshitest/exemplary/banner-native-audio.json index 71a7530bb34..22ce1e833b9 100644 --- a/adapters/gamoshi/gamoshitest/exemplary/banner-native-audio.json +++ b/adapters/gamoshi/gamoshitest/exemplary/banner-native-audio.json @@ -52,7 +52,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "https://rtb.gamoshi.io/r/1707/bidr?reqformat=RTB_JSON", + "uri": "https://rtb.gamoshi.io/r/1707/bidr?bidder=prebid-server", "body": { "id": "test-request-id", "imp": [ diff --git a/adapters/gamoshi/gamoshitest/exemplary/banner-video-native.json b/adapters/gamoshi/gamoshitest/exemplary/banner-video-native.json index 80f4f24dc8a..5999e3797a8 100644 --- a/adapters/gamoshi/gamoshitest/exemplary/banner-video-native.json +++ b/adapters/gamoshi/gamoshitest/exemplary/banner-video-native.json @@ -53,7 +53,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "https://rtb.gamoshi.io/r/1707/bidr?reqformat=RTB_JSON", + "uri": "https://rtb.gamoshi.io/r/1707/bidr?bidder=prebid-server", "body": { "id": "test-request-id", "imp": [ diff --git a/adapters/gamoshi/gamoshitest/exemplary/simple-banner.json b/adapters/gamoshi/gamoshitest/exemplary/simple-banner.json index 397da9de907..2262efe9e61 100644 --- a/adapters/gamoshi/gamoshitest/exemplary/simple-banner.json +++ b/adapters/gamoshi/gamoshitest/exemplary/simple-banner.json @@ -28,7 +28,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "https://rtb.gamoshi.io/r/1707/bidr?reqformat=RTB_JSON", + "uri": "https://rtb.gamoshi.io/r/1707/bidr?bidder=prebid-server", "body": { "id": "test-request-id", "imp": [ diff --git a/adapters/gamoshi/gamoshitest/exemplary/simple-video.json b/adapters/gamoshi/gamoshitest/exemplary/simple-video.json index 37b66ca8ae3..2c10ad62383 100644 --- a/adapters/gamoshi/gamoshitest/exemplary/simple-video.json +++ b/adapters/gamoshi/gamoshitest/exemplary/simple-video.json @@ -22,7 +22,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "https://rtb.gamoshi.io/r/1707/bidr?reqformat=RTB_JSON", + "uri": "https://rtb.gamoshi.io/r/1707/bidr?bidder=prebid-server", "body": { "id": "test-request-id", "imp": [ diff --git a/adapters/gamoshi/gamoshitest/exemplary/valid-extension.json b/adapters/gamoshi/gamoshitest/exemplary/valid-extension.json index c12995c3042..6806dba26ad 100644 --- a/adapters/gamoshi/gamoshitest/exemplary/valid-extension.json +++ b/adapters/gamoshi/gamoshitest/exemplary/valid-extension.json @@ -22,7 +22,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "https://rtb.gamoshi.io/r/1707/bidr?reqformat=RTB_JSON", + "uri": "https://rtb.gamoshi.io/r/1707/bidr?bidder=prebid-server", "body": { "id": "test-request-id", "imp": [ diff --git a/adapters/gamoshi/gamoshitest/exemplary/valid-with-device.json b/adapters/gamoshi/gamoshitest/exemplary/valid-with-device.json index c4756470e2d..32fd21e285d 100644 --- a/adapters/gamoshi/gamoshitest/exemplary/valid-with-device.json +++ b/adapters/gamoshi/gamoshitest/exemplary/valid-with-device.json @@ -38,7 +38,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "https://rtb.gamoshi.io/r/1707/bidr?reqformat=RTB_JSON", + "uri": "https://rtb.gamoshi.io/r/1707/bidr?bidder=prebid-server", "body": { "id": "test-request-id", "device": { diff --git a/adapters/gamoshi/gamoshitest/exemplary/video-and-audio.json b/adapters/gamoshi/gamoshitest/exemplary/video-and-audio.json index 02b7bfb5e20..ec01c7b97e2 100644 --- a/adapters/gamoshi/gamoshitest/exemplary/video-and-audio.json +++ b/adapters/gamoshi/gamoshitest/exemplary/video-and-audio.json @@ -34,7 +34,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "https://rtb.gamoshi.io/r/1707/bidr?reqformat=RTB_JSON", + "uri": "https://rtb.gamoshi.io/r/1707/bidr?bidder=prebid-server", "body": { "id": "test-request-id", "imp": [ diff --git a/adapters/gamoshi/gamoshitest/supplemental/bad-response-no-body.json b/adapters/gamoshi/gamoshitest/supplemental/bad-response-no-body.json index 88d66fc4252..29390963bef 100644 --- a/adapters/gamoshi/gamoshitest/supplemental/bad-response-no-body.json +++ b/adapters/gamoshi/gamoshitest/supplemental/bad-response-no-body.json @@ -22,7 +22,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "https://rtb.gamoshi.io/r/1707/bidr?reqformat=RTB_JSON", + "uri": "https://rtb.gamoshi.io/r/1707/bidr?bidder=prebid-server", "body": { "id": "test-request-id", "imp": [ diff --git a/adapters/gamoshi/gamoshitest/supplemental/status-bad-request.json b/adapters/gamoshi/gamoshitest/supplemental/status-bad-request.json index a0293bf6f47..64c75fc85bb 100644 --- a/adapters/gamoshi/gamoshitest/supplemental/status-bad-request.json +++ b/adapters/gamoshi/gamoshitest/supplemental/status-bad-request.json @@ -22,7 +22,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "https://rtb.gamoshi.io/r/1707/bidr?reqformat=RTB_JSON", + "uri": "https://rtb.gamoshi.io/r/1707/bidr?bidder=prebid-server", "body": { "id": "test-request-id", "imp": [ diff --git a/adapters/gamoshi/gamoshitest/supplemental/status-no-content.json b/adapters/gamoshi/gamoshitest/supplemental/status-no-content.json index 57227e72ccc..3bcb4a9b62d 100644 --- a/adapters/gamoshi/gamoshitest/supplemental/status-no-content.json +++ b/adapters/gamoshi/gamoshitest/supplemental/status-no-content.json @@ -22,7 +22,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "https://rtb.gamoshi.io/r/1707/bidr?reqformat=RTB_JSON", + "uri": "https://rtb.gamoshi.io/r/1707/bidr?bidder=prebid-server", "body": { "id": "test-request-id", "imp": [ diff --git a/adapters/gamoshi/gamoshitest/supplemental/unexpected-status-code.json b/adapters/gamoshi/gamoshitest/supplemental/unexpected-status-code.json index acb9652f153..1789707adf7 100644 --- a/adapters/gamoshi/gamoshitest/supplemental/unexpected-status-code.json +++ b/adapters/gamoshi/gamoshitest/supplemental/unexpected-status-code.json @@ -22,7 +22,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "https://rtb.gamoshi.io/r/1707/bidr?reqformat=RTB_JSON", + "uri": "https://rtb.gamoshi.io/r/1707/bidr?bidder=prebid-server", "body": { "id": "test-request-id", "imp": [ diff --git a/adapters/gamoshi/usersync_test.go b/adapters/gamoshi/usersync_test.go index 10e23c02973..9ba7a52fe5e 100644 --- a/adapters/gamoshi/usersync_test.go +++ b/adapters/gamoshi/usersync_test.go @@ -9,7 +9,7 @@ import ( ) func TestGamoshiSyncer(t *testing.T) { - syncURL := "https://rtb.gamoshi.io/pix/1707/scm?gdpr={{.GDPR}}&consent={{.GDPRConsent}}&rurl=localhost/setuid%3Fbidder%3Dgamoshi%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%5Bgusr%5D" + syncURL := "https://rtb.gamoshi.io/user_sync_prebid?gdpr={{.GDPR}}&consent={{.GDPRConsent}}&rurl=https%3A%2F%2Flocalhost%2Fsetuid%3Fbidder%3Dgamoshi%26gdpr%3D%7B%7B.GDPR%7D%7D%26gdpr_consent%3D%7B%7B.GDPRConsent%7D%7D%26uid%3D%5Bgusr%5D" syncURLTemplate := template.Must( template.New("sync-template").Parse(syncURL), ) @@ -18,7 +18,7 @@ func TestGamoshiSyncer(t *testing.T) { syncInfo, err := syncer.GetUsersyncInfo(privacy.Policies{}) assert.NoError(t, err) - assert.Equal(t, "https://rtb.gamoshi.io/pix/1707/scm?gdpr=&consent=&rurl=localhost/setuid%3Fbidder%3Dgamoshi%26gdpr%3D%26gdpr_consent%3D%26uid%3D%5Bgusr%5D", syncInfo.URL) + assert.Equal(t, "https://rtb.gamoshi.io/user_sync_prebid?gdpr=&consent=&rurl=https%3A%2F%2Flocalhost%2Fsetuid%3Fbidder%3Dgamoshi%26gdpr%3D%7B%7B.GDPR%7D%7D%26gdpr_consent%3D%7B%7B.GDPRConsent%7D%7D%26uid%3D%5Bgusr%5D", syncInfo.URL) assert.Equal(t, "redirect", syncInfo.Type) assert.EqualValues(t, 644, syncer.GDPRVendorID()) assert.Equal(t, false, syncInfo.SupportCORS) diff --git a/config/config.go b/config/config.go index 585047fcb99..1b24f715617 100644 --- a/config/config.go +++ b/config/config.go @@ -502,7 +502,7 @@ func (cfg *Configuration) setDerivedDefaults() { 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/pix/0000/scm?gdpr={{.GDPR}}&consent={{.GDPRConsent}}&rurl="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dgamoshi%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%5Bgusr%5D") + setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderGamoshi, "https://rtb.gamoshi.io/user_sync_prebid?gdpr={{.GDPR}}&consent={{.GDPRConsent}}&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}}") 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")