Merge pull request prebid#141 from monetization/v2.28.0-yahoo

* 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 <[email protected]> * Use format=prebid on adserver requests. (prebid#3846) * New Module: 51Degrees (prebid#3650) Co-authored-by: James Rosewell <[email protected]> Co-authored-by: Marin Miletic <[email protected]> Co-authored-by: Sarana-Anna <[email protected]> Co-authored-by: Eugene Dorfman <[email protected]> Co-authored-by: Krasilchuk Yaroslav <[email protected]> * 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 <[email protected]> * 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 <[email protected]> Co-authored-by: ahmadlob <[email protected]> Co-authored-by: ownAdx <[email protected]> Co-authored-by: Hina Yadav <[email protected]> Co-authored-by: Antonios Sarhanis <[email protected]> Co-authored-by: James Rosewell <[email protected]> Co-authored-by: Marin Miletic <[email protected]> Co-authored-by: Sarana-Anna <[email protected]> Co-authored-by: Eugene Dorfman <[email protected]> Co-authored-by: Krasilchuk Yaroslav <[email protected]> Co-authored-by: gg-natalia <[email protected]> Co-authored-by: Saar Amrani <[email protected]> Co-authored-by: bretg <[email protected]> Co-authored-by: Pubrise <[email protected]> Co-authored-by: Dubyk Danylo <[email protected]> Co-authored-by: ddubyk <[email protected]> Co-authored-by: mwang-sticky <[email protected]> Co-authored-by: dtbarne <[email protected]> Co-authored-by: Nick Llerandi <[email protected]> Co-authored-by: Anand Venkatraman <[email protected]> Co-authored-by: Brian Sardo <[email protected]>
scr-oath · Oct 4, 2024 · 903f685 · 903f685
2 parents baf9e51 + 296c68e
commit 903f685
Show file tree

Hide file tree

Showing 78 changed files with 3,453 additions and 157 deletions.
diff --git a/adapters/adnuntius/adnuntius.go b/adapters/adnuntius/adnuntius.go
@@ -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

diff --git a/adapters/adnuntius/adnuntiustest/exemplary/simple-banner.json b/adapters/adnuntius/adnuntiustest/exemplary/simple-banner.json
@@ -31,7 +31,7 @@
     "httpCalls": [
         {
             "expectedRequest": {
-                "uri": "http://whatever.url?format=json&tzo=0",
+                "uri": "http://whatever.url?format=prebid&tzo=0",
                 "body": {
                     "adUnits": [
                         {

diff --git a/adapters/adnuntius/adnuntiustest/supplemental/check-dealId.json b/adapters/adnuntius/adnuntiustest/supplemental/check-dealId.json
@@ -31,7 +31,7 @@
   "httpCalls": [
       {
           "expectedRequest": {
-              "uri": "http://whatever.url?format=json&tzo=0",
+              "uri": "http://whatever.url?format=prebid&tzo=0",
               "body": {
                   "adUnits": [
                       {

diff --git a/adapters/adnuntius/adnuntiustest/supplemental/check-gdpr.json b/adapters/adnuntius/adnuntiustest/supplemental/check-gdpr.json
@@ -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": [
 						{

diff --git a/adapters/adnuntius/adnuntiustest/supplemental/check-gross-bids.json b/adapters/adnuntius/adnuntiustest/supplemental/check-gross-bids.json
@@ -31,7 +31,7 @@
 	"httpCalls": [
 		{
 			"expectedRequest": {
-				"uri": "http://whatever.url?format=json&tzo=0",
+				"uri": "http://whatever.url?format=prebid&tzo=0",
 				"body": {
 					"adUnits": [
 						{

diff --git a/adapters/adnuntius/adnuntiustest/supplemental/check-net-bids.json b/adapters/adnuntius/adnuntiustest/supplemental/check-net-bids.json
@@ -31,7 +31,7 @@
 	"httpCalls": [
 		{
 			"expectedRequest": {
-				"uri": "http://whatever.url?format=json&tzo=0",
+				"uri": "http://whatever.url?format=prebid&tzo=0",
 				"body": {
 					"adUnits": [
 						{

diff --git a/adapters/adnuntius/adnuntiustest/supplemental/check-noCookies-parameter.json b/adapters/adnuntius/adnuntiustest/supplemental/check-noCookies-parameter.json
@@ -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": [
 						{

diff --git a/adapters/adnuntius/adnuntiustest/supplemental/check-noCookies.json b/adapters/adnuntius/adnuntiustest/supplemental/check-noCookies.json
@@ -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": [
 						{

diff --git a/adapters/adnuntius/adnuntiustest/supplemental/check-order-multi-imp.json b/adapters/adnuntius/adnuntiustest/supplemental/check-order-multi-imp.json
@@ -47,11 +47,11 @@
 			}
 		]
 	},
-	
+
 	"httpCalls": [
 		{
 			"expectedRequest": {
-				"uri": "http://whatever.url?format=json&tzo=0",
+				"uri": "http://whatever.url?format=prebid&tzo=0",
 				"body": {
 					"adUnits": [
 						{
@@ -159,6 +159,6 @@
 			],
 			"currency": "NOK"
 		}
-	
+
     ]
 }
diff --git a/adapters/adnuntius/adnuntiustest/supplemental/check-userId.json b/adapters/adnuntius/adnuntiustest/supplemental/check-userId.json
@@ -30,7 +30,7 @@
 	"httpCalls": [
 		{
 			"expectedRequest": {
-				"uri": "http://whatever.url?format=json&tzo=0",
+				"uri": "http://whatever.url?format=prebid&tzo=0",
 				"body": {
 					"adUnits": [
 						{

diff --git a/adapters/adnuntius/adnuntiustest/supplemental/empty-regs-ext.json b/adapters/adnuntius/adnuntiustest/supplemental/empty-regs-ext.json
@@ -33,7 +33,7 @@
 	"httpCalls": [
 		{
 			"expectedRequest": {
-				"uri": "http://whatever.url?format=json&tzo=0",
+				"uri": "http://whatever.url?format=prebid&tzo=0",
 				"body": {
 					"adUnits": [
 						{

diff --git a/adapters/adnuntius/adnuntiustest/supplemental/empty-regs.json b/adapters/adnuntius/adnuntiustest/supplemental/empty-regs.json
@@ -32,7 +32,7 @@
 	"httpCalls": [
 		{
 			"expectedRequest": {
-				"uri": "http://whatever.url?format=json&tzo=0",
+				"uri": "http://whatever.url?format=prebid&tzo=0",
 				"body": {
 					"adUnits": [
 						{

diff --git a/adapters/adnuntius/adnuntiustest/supplemental/height-error.json b/adapters/adnuntius/adnuntiustest/supplemental/height-error.json
@@ -30,7 +30,7 @@
 	"httpCalls": [
 		{
 			"expectedRequest": {
-				"uri": "http://whatever.url?format=json&tzo=0",
+				"uri": "http://whatever.url?format=prebid&tzo=0",
 				"body": {
 					"adUnits": [
 						{

diff --git a/adapters/adnuntius/adnuntiustest/supplemental/max-deals-test.json b/adapters/adnuntius/adnuntiustest/supplemental/max-deals-test.json
@@ -28,11 +28,11 @@
 			}
 		]
 	},
-	
+
 	"httpCalls": [
 		{
 			"expectedRequest": {
-				"uri": "http://whatever.url?format=json&tzo=0",
+				"uri": "http://whatever.url?format=prebid&tzo=0",
 				"body": {
 					"adUnits": [
 						{

diff --git a/adapters/adnuntius/adnuntiustest/supplemental/send-header-information.json b/adapters/adnuntius/adnuntiustest/supplemental/send-header-information.json
@@ -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": [
 						{

diff --git a/adapters/adnuntius/adnuntiustest/supplemental/site-ext.json b/adapters/adnuntius/adnuntiustest/supplemental/site-ext.json
@@ -37,7 +37,7 @@
 	"httpCalls": [
 		{
 			"expectedRequest": {
-				"uri": "http://whatever.url?format=json&tzo=0",
+				"uri": "http://whatever.url?format=prebid&tzo=0",
 				"body": {
 					"adUnits": [
 						{
@@ -111,4 +111,4 @@
 			"currency": "NOK"
 		}
 	]
-}
+}
diff --git a/adapters/adnuntius/adnuntiustest/supplemental/size-check.json b/adapters/adnuntius/adnuntiustest/supplemental/size-check.json
@@ -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": [
 						{

diff --git a/adapters/adnuntius/adnuntiustest/supplemental/status-400.json b/adapters/adnuntius/adnuntiustest/supplemental/status-400.json
@@ -27,7 +27,7 @@
 	"httpCalls": [
 		{
 			"expectedRequest": {
-				"uri": "http://whatever.url?format=json&tzo=0",
+				"uri": "http://whatever.url?format=prebid&tzo=0",
 				"body": {
 					"adUnits": [
 						{

diff --git a/adapters/adnuntius/adnuntiustest/supplemental/test-networks.json b/adapters/adnuntius/adnuntiustest/supplemental/test-networks.json
@@ -32,7 +32,7 @@
 	"httpCalls": [
 			{
 					"expectedRequest": {
-							"uri": "http://whatever.url?format=json&tzo=0",
+							"uri": "http://whatever.url?format=prebid&tzo=0",
 							"body": {
 									"adUnits": [
 											{

diff --git a/adapters/adnuntius/adnuntiustest/supplemental/user-ext.json b/adapters/adnuntius/adnuntiustest/supplemental/user-ext.json
@@ -4,11 +4,11 @@
 		"user": {
 			"ext":{
 				"eids" : [
-					{ 
-						"source": "idProvider", 
+					{
+						"source": "idProvider",
 						"uids": [
 							{ "id": "userId", "atype": 1, "ext": { "stype": "ppuid" } }
-						] 
+						]
 					}
 				]
 			}
@@ -39,7 +39,7 @@
 	"httpCalls": [
 		{
 			"expectedRequest": {
-				"uri": "http://whatever.url?format=json&tzo=0",
+				"uri": "http://whatever.url?format=prebid&tzo=0",
 				"body": {
 					"adUnits": [
 						{
@@ -110,4 +110,4 @@
 			"currency": "NOK"
 		}
 	]
-}
+}
diff --git a/adapters/adnuntius/adnuntiustest/supplemental/width-error.json b/adapters/adnuntius/adnuntiustest/supplemental/width-error.json
@@ -30,7 +30,7 @@
 	"httpCalls": [
 		{
 			"expectedRequest": {
-				"uri": "http://whatever.url?format=json&tzo=0",
+				"uri": "http://whatever.url?format=prebid&tzo=0",
 				"body": {
 					"adUnits": [
 						{

diff --git a/adapters/gumgum/gumgum.go b/adapters/gumgum/gumgum.go
@@ -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)
@@ -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{

diff --git a/adapters/gumgum/gumgumtest/supplemental/missing-video-params.json b/adapters/gumgum/gumgumtest/supplemental/missing-video-params.json
diff --git a/adapters/gumgum/gumgumtest/supplemental/video-missing-size.json b/adapters/gumgum/gumgumtest/supplemental/video-missing-size.json