Skip to content

Commit

Permalink
Merge pull request prebid#141 from monetization/v2.28.0-yahoo
Browse files Browse the repository at this point in the history 
* New Adapter: MeloZen (prebid#3784)

* taboola-support-app-in-prebid-server (prebid#3795)

* OwnAdx: Bidder param and URL updates (prebid#3813)

Co-authored-by: Hina Yadav <hina.yadav@vertoz.com>

* Use format=prebid on adserver requests. (prebid#3846)

* New Module: 51Degrees (prebid#3650)

Co-authored-by: James Rosewell <james@51degrees.com>
Co-authored-by: Marin Miletic <mrnmiletic@gmail.com>
Co-authored-by: Sarana-Anna <anna.sarana@gmail.com>
Co-authored-by: Eugene Dorfman <eugene.dorfman@gmail.com>
Co-authored-by: Krasilchuk Yaroslav <legend.ko@hotmail.com>

* ADTS-455 remove video validations (prebid#3842)

authored by @gg-natalia

* Update Vidazoo bidder info for GPP support (prebid#3869)

* declare support for ORTB 2.6 (prebid#3872)

authored by @bretg

* new adapter (prebid#3833)

authored by @Pubrise

* Fix currency conversion bug. (prebid#3867)

Co-authored-by: ddubyk <ddubyk@magnite.com>

* freewheel-adapter: support 2.6 (prebid#3873)

* Update mobilefuse.yaml to indicate support for OpenRTB 2.6 and GPP (prebid#3871)

* specifies ortb 2.6 support (prebid#3) (prebid#3876)

* PulsePoint: ortb 2.6 version and gpp support (prebid#3874)

authored by @anand-venkatraman

* Revert "New Module: 51Degrees (prebid#3650)" (prebid#3888)

This reverts commit 2606e75.

---------

Co-authored-by: benben2001 <145416009+benben2001@users.noreply.github.com>
Co-authored-by: ahmadlob <109217988+ahmadlob@users.noreply.github.com>
Co-authored-by: ownAdx <135326256+ownAdx-prebid@users.noreply.github.com>
Co-authored-by: Hina Yadav <hina.yadav@vertoz.com>
Co-authored-by: Antonios Sarhanis <tsarhanis@gmail.com>
Co-authored-by: James Rosewell <james@51degrees.com>
Co-authored-by: Marin Miletic <mrnmiletic@gmail.com>
Co-authored-by: Sarana-Anna <anna.sarana@gmail.com>
Co-authored-by: Eugene Dorfman <eugene.dorfman@gmail.com>
Co-authored-by: Krasilchuk Yaroslav <legend.ko@hotmail.com>
Co-authored-by: gg-natalia <148577437+gg-natalia@users.noreply.github.com>
Co-authored-by: Saar Amrani <saar120@gmail.com>
Co-authored-by: bretg <bgorsline@gmail.com>
Co-authored-by: Pubrise <prebid@pubrise.ai>
Co-authored-by: Dubyk Danylo <45672370+CTMBNara@users.noreply.github.com>
Co-authored-by: ddubyk <ddubyk@magnite.com>
Co-authored-by: mwang-sticky <mwang@freewheel.tv>
Co-authored-by: dtbarne <7635750+dtbarne@users.noreply.github.com>
Co-authored-by: Nick Llerandi <nick.llerandi@kargo.com>
Co-authored-by: Anand Venkatraman <avenkatraman@pulsepoint.com>
Co-authored-by: Brian Sardo <1168933+bsardo@users.noreply.github.com>
  • Loading branch information
@scr-oath @benben2001
@ahmadlob @ownAdx-prebid @antosarho @jwrosewell @iNetJoJo @Sarana-Anna @justadreamer @legendko @gg-natalia @saar120 @bretg @Pubrise @CTMBNara @mwang-sticky @dtbarne @nickllerandi @anand-venkatraman @bsardo
22 people authored and GitHub Enterprise committed Oct 4, 2024
2 parents baf9e51 + 296c68e commit 903f685
Show file tree
Hide file tree
Showing 78 changed files with 3,453 additions and 157 deletions.
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntius.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ func makeEndpointUrl(ortbRequest openrtb2.BidRequest, a *adapter, noCookies bool
}

q.Set("tzo", fmt.Sprint(tzo))
q.Set("format", "json")
q.Set("format", "prebid")

url := endpointUrl + "?" + q.Encode()
return url, nil
Expand Down
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/exemplary/simple-banner.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=json&tzo=0",
"uri": "http://whatever.url?format=prebid&tzo=0",
"body": {
"adUnits": [
{
Expand Down
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/supplemental/check-dealId.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=json&tzo=0",
"uri": "http://whatever.url?format=prebid&tzo=0",
"body": {
"adUnits": [
{
Expand Down
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/supplemental/check-gdpr.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://gdpr.url?consentString=CONSENT_STRING&format=json&gdpr=1&tzo=0",
"uri": "http://gdpr.url?consentString=CONSENT_STRING&format=prebid&gdpr=1&tzo=0",
"body": {
"adUnits": [
{
Expand Down
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/supplemental/check-gross-bids.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=json&tzo=0",
"uri": "http://whatever.url?format=prebid&tzo=0",
"body": {
"adUnits": [
{
Expand Down
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/supplemental/check-net-bids.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=json&tzo=0",
"uri": "http://whatever.url?format=prebid&tzo=0",
"body": {
"adUnits": [
{
Expand Down
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/supplemental/check-noCookies-parameter.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=json&noCookies=true&tzo=0",
"uri": "http://whatever.url?format=prebid&noCookies=true&tzo=0",
"body": {
"adUnits": [
{
Expand Down
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/supplemental/check-noCookies.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=json&noCookies=true&tzo=0",
"uri": "http://whatever.url?format=prebid&noCookies=true&tzo=0",
"body": {
"adUnits": [
{
Expand Down
6 changes: 3 additions & 3 deletions adapters/adnuntius/adnuntiustest/supplemental/check-order-multi-imp.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@
}
]
},

"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=json&tzo=0",
"uri": "http://whatever.url?format=prebid&tzo=0",
"body": {
"adUnits": [
{
Expand Down Expand Up @@ -159,6 +159,6 @@
],
"currency": "NOK"
}

]
}
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/supplemental/check-userId.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=json&tzo=0",
"uri": "http://whatever.url?format=prebid&tzo=0",
"body": {
"adUnits": [
{
Expand Down
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/supplemental/empty-regs-ext.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=json&tzo=0",
"uri": "http://whatever.url?format=prebid&tzo=0",
"body": {
"adUnits": [
{
Expand Down
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/supplemental/empty-regs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=json&tzo=0",
"uri": "http://whatever.url?format=prebid&tzo=0",
"body": {
"adUnits": [
{
Expand Down
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/supplemental/height-error.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=json&tzo=0",
"uri": "http://whatever.url?format=prebid&tzo=0",
"body": {
"adUnits": [
{
Expand Down
4 changes: 2 additions & 2 deletions adapters/adnuntius/adnuntiustest/supplemental/max-deals-test.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
}
]
},

"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=json&tzo=0",
"uri": "http://whatever.url?format=prebid&tzo=0",
"body": {
"adUnits": [
{
Expand Down
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/supplemental/send-header-information.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"Mozilla/5.0 (Linux; Android 8.0; Pixel 2 Build/OPD3.170816.012) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.93 Mobile Safari/537.36"
]
},
"uri": "http://whatever.url?format=json&tzo=0",
"uri": "http://whatever.url?format=prebid&tzo=0",
"body": {
"adUnits": [
{
Expand Down
4 changes: 2 additions & 2 deletions adapters/adnuntius/adnuntiustest/supplemental/site-ext.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=json&tzo=0",
"uri": "http://whatever.url?format=prebid&tzo=0",
"body": {
"adUnits": [
{
Expand Down Expand Up @@ -111,4 +111,4 @@
"currency": "NOK"
}
]
}
}
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/supplemental/size-check.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=json&noCookies=true&tzo=0",
"uri": "http://whatever.url?format=prebid&noCookies=true&tzo=0",
"body": {
"adUnits": [
{
Expand Down
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/supplemental/status-400.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=json&tzo=0",
"uri": "http://whatever.url?format=prebid&tzo=0",
"body": {
"adUnits": [
{
Expand Down
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/supplemental/test-networks.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=json&tzo=0",
"uri": "http://whatever.url?format=prebid&tzo=0",
"body": {
"adUnits": [
{
Expand Down
10 changes: 5 additions & 5 deletions adapters/adnuntius/adnuntiustest/supplemental/user-ext.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
"user": {
"ext":{
"eids" : [
{
"source": "idProvider",
{
"source": "idProvider",
"uids": [
{ "id": "userId", "atype": 1, "ext": { "stype": "ppuid" } }
]
]
}
]
}
Expand Down Expand Up @@ -39,7 +39,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=json&tzo=0",
"uri": "http://whatever.url?format=prebid&tzo=0",
"body": {
"adUnits": [
{
Expand Down Expand Up @@ -110,4 +110,4 @@
"currency": "NOK"
}
]
}
}
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/supplemental/width-error.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=json&tzo=0",
"uri": "http://whatever.url?format=prebid&tzo=0",
"body": {
"adUnits": [
{
Expand Down
15 changes: 1 addition & 14 deletions adapters/gumgum/gumgum.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,12 +161,8 @@ func preprocess(imp *openrtb2.Imp) (*openrtb_ext.ExtImpGumGum, error) {
}

if imp.Video != nil {
err := validateVideoParams(imp.Video)
if err != nil {
return nil, err
}

if gumgumExt.IrisID != "" {
var err error
videoCopy := *imp.Video
videoExt := openrtb_ext.ExtImpGumGumVideo{IrisID: gumgumExt.IrisID}
videoCopy.Ext, err = json.Marshal(&videoExt)
Expand Down Expand Up @@ -221,15 +217,6 @@ func getMediaTypeForImpID(impID string, imps []openrtb2.Imp) openrtb_ext.BidType
return openrtb_ext.BidTypeVideo
}

func validateVideoParams(video *openrtb2.Video) (err error) {
if video.W == nil || *video.W == 0 || video.H == nil || *video.H == 0 || video.MinDuration == 0 || video.MaxDuration == 0 || video.Placement == 0 || video.Linearity == 0 {
return &errortypes.BadInput{
Message: "Invalid or missing video field(s)",
}
}
return nil
}

// Builder builds a new instance of the GumGum adapter for the given bidder with the given config.
func Builder(bidderName openrtb_ext.BidderName, config config.Adapter, server config.Server) (adapters.Bidder, error) {
bidder := &adapter{
Expand Down
36 changes: 0 additions & 36 deletions adapters/gumgum/gumgumtest/supplemental/missing-video-params.json
View file

This file was deleted.

35 changes: 0 additions & 35 deletions adapters/gumgum/gumgumtest/supplemental/video-missing-size.json
View file

This file was deleted.

Loading

0 comments on commit 903f685

Please sign in to comment.