From f49b5955f8d3465d3390845ec6f38c6371ad1b14 Mon Sep 17 00:00:00 2001 From: Rishi Parmar Date: Fri, 13 Dec 2024 22:16:11 +0530 Subject: [PATCH 1/9] Medianet: Add iframe sync (#4081) --- static/bidder-info/medianet.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/static/bidder-info/medianet.yaml b/static/bidder-info/medianet.yaml index 1b23d5aec96..90c81b205d4 100644 --- a/static/bidder-info/medianet.yaml +++ b/static/bidder-info/medianet.yaml @@ -19,6 +19,9 @@ capabilities: - video - native userSync: + iframe: + url: https://hbx.media.net/checksync.php?cid=8CUEHS6F9&cs=87&type=mpbc&cv=37&vsSync=1&uspstring={{.USPrivacy}}&gdpr={{.GDPR}}&gdprsting={{.GDPRConsent}}&gpp={{.GPP}}&gpp_sid={{.GPPSID}}&redirect={{.RedirectURL}} + userMacro: "" redirect: url: https://hbx.media.net/cksync.php?cs=1&type=pbs&ovsid=setstatuscode&bidder=medianet&gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&redirect={{.RedirectURL}}&gpp={{.GPP}}&gpp_sid={{.GPPSID}} userMacro: "" \ No newline at end of file From 467f728bb5265052b463b614671fb6f0d1d8d847 Mon Sep 17 00:00:00 2001 From: Sheridan C Rawlins <41922797+scr-oath@users.noreply.github.com> Date: Fri, 13 Dec 2024 11:25:40 -0800 Subject: [PATCH 2/9] Older devices are sending "gpc": 1 and this can't marshal. (#4070) --- openrtb_ext/request_wrapper.go | 4 +- openrtb_ext/request_wrapper_test.go | 15 +++++++ util/jsonutil/forcestring.go | 20 ++++++++++ util/jsonutil/forcestring_test.go | 61 +++++++++++++++++++++++++++++ 4 files changed, 97 insertions(+), 3 deletions(-) create mode 100644 util/jsonutil/forcestring.go create mode 100644 util/jsonutil/forcestring_test.go diff --git a/openrtb_ext/request_wrapper.go b/openrtb_ext/request_wrapper.go index cb60948768f..7b73d318673 100644 --- a/openrtb_ext/request_wrapper.go +++ b/openrtb_ext/request_wrapper.go @@ -1278,9 +1278,7 @@ func (re *RegExt) unmarshal(extJson json.RawMessage) error { gpcJson, hasGPC := re.ext[gpcKey] if hasGPC && gpcJson != nil { - if err := jsonutil.Unmarshal(gpcJson, &re.gpc); err != nil { - return err - } + return jsonutil.ParseIntoString(gpcJson, &re.gpc) } return nil diff --git a/openrtb_ext/request_wrapper_test.go b/openrtb_ext/request_wrapper_test.go index 73851238d00..e4c14b60316 100644 --- a/openrtb_ext/request_wrapper_test.go +++ b/openrtb_ext/request_wrapper_test.go @@ -2344,6 +2344,20 @@ func TestRegExtUnmarshal(t *testing.T) { expectGPC: ptrutil.ToPtr("some_value"), expectError: false, }, + { + name: `valid_gpc_json_"1"`, + regExt: &RegExt{}, + extJson: json.RawMessage(`{"gpc": "1"}`), + expectGPC: ptrutil.ToPtr("1"), + expectError: false, + }, + { + name: `valid_gpc_json_1`, + regExt: &RegExt{}, + extJson: json.RawMessage(`{"gpc": 1}`), + expectGPC: ptrutil.ToPtr("1"), + expectError: false, + }, { name: "malformed_gpc_json", regExt: &RegExt{}, @@ -2377,6 +2391,7 @@ func TestRegExtUnmarshal(t *testing.T) { assert.Equal(t, tt.expectDSA, tt.regExt.dsa) assert.Equal(t, tt.expectGDPR, tt.regExt.gdpr) assert.Equal(t, tt.expectUSPrivacy, tt.regExt.usPrivacy) + assert.Equal(t, tt.expectGPC, tt.regExt.gpc) }) } } diff --git a/util/jsonutil/forcestring.go b/util/jsonutil/forcestring.go new file mode 100644 index 00000000000..64ce2a67958 --- /dev/null +++ b/util/jsonutil/forcestring.go @@ -0,0 +1,20 @@ +package jsonutil + +import ( + "errors" + + "github.com/prebid/prebid-server/v3/util/ptrutil" + "github.com/tidwall/gjson" +) + +// ParseIntoString Parse json bytes into a string pointer +func ParseIntoString(b []byte, ppString **string) error { + if ppString == nil { + return errors.New("ppString is nil") + } + result := gjson.ParseBytes(b) + if result.Exists() && result.Raw != `null` { + *ppString = ptrutil.ToPtr(result.String()) + } + return nil +} diff --git a/util/jsonutil/forcestring_test.go b/util/jsonutil/forcestring_test.go new file mode 100644 index 00000000000..60f87fafa42 --- /dev/null +++ b/util/jsonutil/forcestring_test.go @@ -0,0 +1,61 @@ +package jsonutil + +import ( + "testing" + + "github.com/prebid/prebid-server/v3/util/ptrutil" + "github.com/stretchr/testify/assert" +) + +func Test_ParseIntoString(t *testing.T) { + tests := []struct { + name string + b []byte + want *string + wantErr bool + }{ + { + name: "empty", + }, + { + name: "quoted_1", + b: []byte(`"1"`), + want: ptrutil.ToPtr("1"), + }, + { + name: "unquoted_1", + b: []byte(`1`), + want: ptrutil.ToPtr("1"), + }, + { + name: "null", + b: []byte(`null`), + }, + { + name: "quoted_null", + b: []byte(`"null"`), + want: ptrutil.ToPtr("null"), + }, + { + name: "quoted_hello", + b: []byte(`"hello"`), + want: ptrutil.ToPtr("hello"), + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + var got *string + err := ParseIntoString(tt.b, &got) + if tt.wantErr { + assert.Error(t, err) + return + } + assert.NoError(t, err) + assert.Equal(t, tt.want, got) + }) + } +} + +func Test_ParseIntoNilStringError(t *testing.T) { + assert.Error(t, ParseIntoString([]byte(`"123"`), nil)) +} From 06677e3cf3fd72d1124d9f6ff4ed41df06712e55 Mon Sep 17 00:00:00 2001 From: bretg Date: Fri, 13 Dec 2024 14:27:12 -0500 Subject: [PATCH 3/9] Update code-reviews.md (#3905) --- docs/developers/code-reviews.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/developers/code-reviews.md b/docs/developers/code-reviews.md index d8ee820cd80..360efd6aee4 100644 --- a/docs/developers/code-reviews.md +++ b/docs/developers/code-reviews.md @@ -42,3 +42,4 @@ Some examples include: - 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? +- Look for code used by other adapters. Encourage adapter submitter to utilize common code. From f14e113e82ee185efcb4f915127528f104775d80 Mon Sep 17 00:00:00 2001 From: Scott Kay Date: Fri, 13 Dec 2024 18:08:55 -0500 Subject: [PATCH 4/9] OpenRTB 2.6-202402 + OpenRTB 2.6-202409 Field Support (#4100) --- go.mod | 2 +- go.sum | 2 + openrtb_ext/convert_down.go | 40 +++++++++++--- openrtb_ext/convert_down_test.go | 92 ++++++++++++++++++++++++++++++-- 4 files changed, 123 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index db378338fe8..55ac94b617d 100644 --- a/go.mod +++ b/go.mod @@ -28,7 +28,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/prebid/go-gdpr v1.12.0 github.com/prebid/go-gpp v0.2.0 - github.com/prebid/openrtb/v20 v20.1.0 + github.com/prebid/openrtb/v20 v20.3.0 github.com/prometheus/client_golang v1.12.1 github.com/prometheus/client_model v0.2.0 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 diff --git a/go.sum b/go.sum index bf94ffbc7f4..d176e89dda9 100644 --- a/go.sum +++ b/go.sum @@ -410,6 +410,8 @@ github.com/prebid/go-gpp v0.2.0 h1:41Ssxd4Zxr50WgwG1q/1+6awGU3pFnwV7FR4XCLQSuM= github.com/prebid/go-gpp v0.2.0/go.mod h1:b0TLoVln+HXFD9L9xeimxIH3FN8WDKPJ42auslxEkow= github.com/prebid/openrtb/v20 v20.1.0 h1:Rb+Z3H3UxiqqnjgJK3R9Wt73ibrh7HPzG7ikBckQNqc= github.com/prebid/openrtb/v20 v20.1.0/go.mod h1:hLBrA/APkSrxs5MaW639l+y/EAHivDfRagO2TX/wbSc= +github.com/prebid/openrtb/v20 v20.3.0 h1:56z5mIrZ4FdjKxiu3Del0O4890f4AZpvz5PgPLMY1j0= +github.com/prebid/openrtb/v20 v20.3.0/go.mod h1:hLBrA/APkSrxs5MaW639l+y/EAHivDfRagO2TX/wbSc= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= diff --git a/openrtb_ext/convert_down.go b/openrtb_ext/convert_down.go index bfb6028d8c7..2bd8a1ba5b0 100644 --- a/openrtb_ext/convert_down.go +++ b/openrtb_ext/convert_down.go @@ -1,5 +1,7 @@ package openrtb_ext +import "github.com/prebid/openrtb/v20/adcom1" + func ConvertDownTo25(r *RequestWrapper) error { // schain if err := moveSupplyChainFrom26To25(r); err != nil { @@ -174,9 +176,9 @@ func moveRewardedFrom26ToPrebidExt(i *ImpWrapper) error { return nil } -// clear26Fields sets all fields introduced in OpenRTB 2.6 to default values, which +// Clear26Fields sets all fields introduced in OpenRTB 2.6 to default values, which // will cause them to be omitted during json marshal. -func clear26Fields(r *RequestWrapper) { +func Clear26Fields(r *RequestWrapper) { r.WLangB = nil r.CatTax = 0 @@ -267,9 +269,9 @@ func clear26Fields(r *RequestWrapper) { } } -// clear202211Fields sets all fields introduced in OpenRTB 2.6-202211 to default values +// Clear202211Fields sets all fields introduced in OpenRTB 2.6-202211 to default values // which will cause them to be omitted during json marshal. -func clear202211Fields(r *RequestWrapper) { +func Clear202211Fields(r *RequestWrapper) { r.DOOH = nil if app := r.App; app != nil { @@ -291,9 +293,9 @@ func clear202211Fields(r *RequestWrapper) { } } -// clear202303Fields sets all fields introduced in OpenRTB 2.6-202303 to default values +// Clear202303Fields sets all fields introduced in OpenRTB 2.6-202303 to default values // which will cause them to be omitted during json marshal. -func clear202303Fields(r *RequestWrapper) { +func Clear202303Fields(r *RequestWrapper) { for _, imp := range r.GetImp() { imp.Refresh = nil @@ -303,9 +305,9 @@ func clear202303Fields(r *RequestWrapper) { } } -// clear202309Fields sets all fields introduced in OpenRTB 2.6-202309 to default values +// Clear202309Fields sets all fields introduced in OpenRTB 2.6-202309 to default values // which will cause them to be omitted during json marshal. -func clear202309Fields(r *RequestWrapper) { +func Clear202309Fields(r *RequestWrapper) { r.ACat = nil for _, imp := range r.GetImp() { @@ -326,3 +328,25 @@ func clear202309Fields(r *RequestWrapper) { } } } + +// Clear202402Fields sets all fields introduced in OpenRTB 2.6-202402 to default values +// which will cause them to be omitted during json marshal. +func Clear202402Fields(r *RequestWrapper) { + for _, imp := range r.GetImp() { + if video := imp.Video; video != nil { + video.PodDedupe = nil + } + } +} + +// Clear202409Fields sets all fields introduced in OpenRTB 2.6-202409 to default values +// which will cause them to be omitted during json marshal. +func Clear202409Fields(r *RequestWrapper) { + if user := r.User; user != nil { + for i := range user.EIDs { + user.EIDs[i].Inserter = "" + user.EIDs[i].Matcher = "" + user.EIDs[i].MM = adcom1.MatchMethodUnknown + } + } +} diff --git a/openrtb_ext/convert_down_test.go b/openrtb_ext/convert_down_test.go index f32f3da04bb..684ae5cda4c 100644 --- a/openrtb_ext/convert_down_test.go +++ b/openrtb_ext/convert_down_test.go @@ -578,7 +578,7 @@ func TestClear26Fields(t *testing.T) { } r := &RequestWrapper{BidRequest: given} - clear26Fields(r) + Clear26Fields(r) assert.Equal(t, expected, r.BidRequest) } @@ -637,7 +637,7 @@ func TestClear202211Fields(t *testing.T) { for _, test := range testCases { t.Run(test.name, func(t *testing.T) { r := &RequestWrapper{BidRequest: &test.given} - clear202211Fields(r) + Clear202211Fields(r) assert.Equal(t, &test.expected, r.BidRequest) }) } @@ -666,7 +666,7 @@ func TestClear202303Fields(t *testing.T) { } r := &RequestWrapper{BidRequest: &given} - clear202303Fields(r) + Clear202303Fields(r) assert.Equal(t, expected, given) } @@ -713,6 +713,90 @@ func TestClear202309Fields(t *testing.T) { } r := &RequestWrapper{BidRequest: &given} - clear202309Fields(r) + Clear202309Fields(r) assert.Equal(t, expected, given) } + +func TestClear202402Fields(t *testing.T) { + given := openrtb2.BidRequest{ + ID: "anyID", + Imp: []openrtb2.Imp{ + { + ID: "imp2", + Video: &openrtb2.Video{ + PodID: "1", + PodDedupe: []adcom1.PodDedupe{adcom1.PodDedupeADomain}, + }, + }, + }, + } + + expected := openrtb2.BidRequest{ + ID: "anyID", + Imp: []openrtb2.Imp{ + { + ID: "imp2", + Video: &openrtb2.Video{ + PodID: "1", + }, + }, + }, + } + + r := &RequestWrapper{BidRequest: &given} + Clear202402Fields(r) + assert.Equal(t, expected, given) +} + +func TestClear202409Fields(t *testing.T) { + testCases := []struct { + name string + given openrtb2.BidRequest + expected openrtb2.BidRequest + }{ + { + name: "user-nil", + given: openrtb2.BidRequest{User: nil}, + expected: openrtb2.BidRequest{User: nil}, + }, + { + name: "eids-nil", + given: openrtb2.BidRequest{User: &openrtb2.User{EIDs: nil}}, + expected: openrtb2.BidRequest{User: &openrtb2.User{EIDs: nil}}, + }, + { + name: "cleared", + given: openrtb2.BidRequest{ + User: &openrtb2.User{ + EIDs: []openrtb2.EID{ + { + Source: "anySource", + Inserter: "anyInserter", + Matcher: "anyMatcher", + MM: adcom1.MatchMethodBrowserCookieSync, + UIDs: []openrtb2.UID{{ID: "anyID"}}, + }, + }, + }, + }, + expected: openrtb2.BidRequest{ + User: &openrtb2.User{ + EIDs: []openrtb2.EID{ + { + Source: "anySource", + UIDs: []openrtb2.UID{{ID: "anyID"}}, + }, + }, + }, + }, + }, + } + + for _, test := range testCases { + t.Run(test.name, func(t *testing.T) { + r := &RequestWrapper{BidRequest: &test.given} + Clear202409Fields(r) + assert.Equal(t, test.expected, test.given) + }) + } +} From fead7ecbda51f8856883e67ad08e487b3057027f Mon Sep 17 00:00:00 2001 From: metax-kehan <115962296+metax-kehan@users.noreply.github.com> Date: Mon, 16 Dec 2024 22:01:34 +0800 Subject: [PATCH 5/9] MetaX: Add BidVideo for video ads (#4095) Signed-off-by: Kehan Pan --- adapters/metax/metax.go | 16 ++++++- adapters/metax/metax_test.go | 42 +++++++++++++++++++ .../metaxtest/exemplary/simple-app-video.json | 20 +++++++-- 3 files changed, 73 insertions(+), 5 deletions(-) diff --git a/adapters/metax/metax.go b/adapters/metax/metax.go index bd1f6272bea..8b197043623 100644 --- a/adapters/metax/metax.go +++ b/adapters/metax/metax.go @@ -99,8 +99,9 @@ func (a *adapter) MakeBids(bidReq *openrtb2.BidRequest, reqData *adapters.Reques return nil, []error{err} } resp.Bids = append(resp.Bids, &adapters.TypedBid{ - Bid: bid, - BidType: bidType, + Bid: bid, + BidType: bidType, + BidVideo: getBidVideo(bid), }) } } @@ -177,6 +178,17 @@ func getBidType(bid *openrtb2.Bid) (openrtb_ext.BidType, error) { } } +func getBidVideo(bid *openrtb2.Bid) *openrtb_ext.ExtBidPrebidVideo { + bidVideo := openrtb_ext.ExtBidPrebidVideo{} + if len(bid.Cat) > 0 { + bidVideo.PrimaryCategory = bid.Cat[0] + } + if bid.Dur > 0 { + bidVideo.Duration = int(bid.Dur) + } + return &bidVideo +} + // Builder builds a new instance of the MetaX adapter for the given bidder with the given config. func Builder(bidderName openrtb_ext.BidderName, config config.Adapter, server config.Server) (adapters.Bidder, error) { if config.Endpoint == "" { diff --git a/adapters/metax/metax_test.go b/adapters/metax/metax_test.go index cd1e39ad6c4..f4f9d7e4966 100644 --- a/adapters/metax/metax_test.go +++ b/adapters/metax/metax_test.go @@ -148,6 +148,48 @@ func TestGetBidType(t *testing.T) { } } +func TestGetBidVideo(t *testing.T) { + tests := []struct { + description string + bid *openrtb2.Bid + bidvideo openrtb_ext.ExtBidPrebidVideo + }{ + { + description: "One category, no duration", + bid: &openrtb2.Bid{Cat: []string{"IAB1-1"}}, + bidvideo: openrtb_ext.ExtBidPrebidVideo{PrimaryCategory: "IAB1-1", Duration: 0}, + }, + { + description: "Two categories and use the first, no duration", + bid: &openrtb2.Bid{Cat: []string{"IAB1-1", "IAB1-2"}}, + bidvideo: openrtb_ext.ExtBidPrebidVideo{PrimaryCategory: "IAB1-1", Duration: 0}, + }, + { + description: "No category, no duration", + bid: &openrtb2.Bid{Cat: []string{}}, + bidvideo: openrtb_ext.ExtBidPrebidVideo{PrimaryCategory: "", Duration: 0}, + }, + { + description: "No category(nil), no duration", + bid: &openrtb2.Bid{Cat: nil}, + bidvideo: openrtb_ext.ExtBidPrebidVideo{PrimaryCategory: "", Duration: 0}, + }, + { + description: "Two categories and use the first, duration is 15", + bid: &openrtb2.Bid{Cat: []string{"IAB1-1", "IAB1-2"}, Dur: 15}, + bidvideo: openrtb_ext.ExtBidPrebidVideo{PrimaryCategory: "IAB1-1", Duration: 15}, + }, + } + + for _, test := range tests { + t.Run(test.description, func(t *testing.T) { + bidVideo := getBidVideo(test.bid) + assert.Equal(t, test.bidvideo.PrimaryCategory, bidVideo.PrimaryCategory) + assert.Equal(t, test.bidvideo.Duration, bidVideo.Duration) + }) + } +} + func TestBuilder(t *testing.T) { serverCfg := config.Server{} diff --git a/adapters/metax/metaxtest/exemplary/simple-app-video.json b/adapters/metax/metaxtest/exemplary/simple-app-video.json index 4f4272ee3db..1761f626137 100644 --- a/adapters/metax/metaxtest/exemplary/simple-app-video.json +++ b/adapters/metax/metaxtest/exemplary/simple-app-video.json @@ -98,7 +98,12 @@ "crid": "test-crid", "w": 1024, "h": 576, - "mtype": 2 + "mtype": 2, + "dur": 15, + "cat": [ + "IAB1-5", + "IAB1-6" + ] } ] } @@ -120,9 +125,18 @@ "crid": "test-crid", "w": 1024, "h": 576, - "mtype": 2 + "mtype": 2, + "dur": 15, + "cat": [ + "IAB1-5", + "IAB1-6" + ] }, - "type": "video" + "type": "video", + "video": { + "duration": 15, + "primary_category": "IAB1-5" + } } ] } From 620bf955ce7593b2f4cfe21df266d1a55a4d36a9 Mon Sep 17 00:00:00 2001 From: Viral Vala <63396712+pm-viral-vala@users.noreply.github.com> Date: Mon, 16 Dec 2024 19:39:06 +0530 Subject: [PATCH 6/9] PubMatic: Remove req.ext.prebid from bid requests (#4092) --- adapters/pubmatic/pubmatic.go | 2 -- adapters/pubmatic/pubmatic_test.go | 31 ++----------------- .../pubmatictest/exemplary/banner.json | 10 ++---- .../pubmatictest/exemplary/fledge.json | 2 +- .../pubmatictest/exemplary/native.json | 3 +- .../pubmatictest/exemplary/video.json | 8 +---- .../pubmatictest/supplemental/app.json | 4 +-- .../supplemental/dctrAndPmZoneID.json | 3 +- .../pubmatictest/supplemental/extra-bid.json | 17 ---------- .../supplemental/gptSlotNameInImpExt.json | 3 +- .../gptSlotNameInImpExtPbAdslot.json | 3 +- .../pubmatictest/supplemental/impExt.json | 1 - .../supplemental/invalidparam.json | 1 - .../supplemental/multiplemedia.json | 5 +-- .../supplemental/native_invalid_adm.json | 1 - .../pubmatictest/supplemental/nilReqExt.json | 3 +- .../pubmatictest/supplemental/noAdSlot.json | 4 +-- .../supplemental/pmZoneIDInKeywords.json | 3 +- .../supplemental/reqBidderParams.json | 8 ----- .../supplemental/trimPublisherID.json | 3 +- 20 files changed, 16 insertions(+), 99 deletions(-) diff --git a/adapters/pubmatic/pubmatic.go b/adapters/pubmatic/pubmatic.go index 0d8d612a862..ef6354b7bb9 100644 --- a/adapters/pubmatic/pubmatic.go +++ b/adapters/pubmatic/pubmatic.go @@ -65,7 +65,6 @@ type extRequestAdServer struct { Wrapper *pubmaticWrapperExt `json:"wrapper,omitempty"` Acat []string `json:"acat,omitempty"` Marketplace *marketplaceReqExt `json:"marketplace,omitempty"` - openrtb_ext.ExtRequest } type respExt struct { @@ -362,7 +361,6 @@ func extractPubmaticExtFromRequest(request *openrtb2.BidRequest) (extRequestAdSe if err != nil { return pmReqExt, fmt.Errorf("error decoding Request.ext : %s", err.Error()) } - pmReqExt.ExtRequest = *reqExt reqExtBidderParams := make(map[string]json.RawMessage) if reqExt.Prebid.BidderParams != nil { diff --git a/adapters/pubmatic/pubmatic_test.go b/adapters/pubmatic/pubmatic_test.go index 7543ab9a30d..122840771b1 100644 --- a/adapters/pubmatic/pubmatic_test.go +++ b/adapters/pubmatic/pubmatic_test.go @@ -268,14 +268,8 @@ func TestExtractPubmaticExtFromRequest(t *testing.T) { Ext: json.RawMessage(`{"prebid":{"bidderparams":{}}}`), }, }, - expectedReqExt: extRequestAdServer{ - ExtRequest: openrtb_ext.ExtRequest{ - Prebid: openrtb_ext.ExtRequestPrebid{ - BidderParams: json.RawMessage("{}"), - }, - }, - }, - wantErr: false, + expectedReqExt: extRequestAdServer{}, + wantErr: false, }, { name: "Only_Pubmatic_wrapper_ext_present", @@ -286,11 +280,6 @@ func TestExtractPubmaticExtFromRequest(t *testing.T) { }, expectedReqExt: extRequestAdServer{ Wrapper: &pubmaticWrapperExt{ProfileID: 123, VersionID: 456}, - ExtRequest: openrtb_ext.ExtRequest{ - Prebid: openrtb_ext.ExtRequestPrebid{ - BidderParams: json.RawMessage(`{"wrapper":{"profile":123,"version":456}}`), - }, - }, }, wantErr: false, }, @@ -313,11 +302,6 @@ func TestExtractPubmaticExtFromRequest(t *testing.T) { expectedReqExt: extRequestAdServer{ Wrapper: &pubmaticWrapperExt{ProfileID: 123, VersionID: 456}, Acat: []string{"drg", "dlu", "ssr"}, - ExtRequest: openrtb_ext.ExtRequest{ - Prebid: openrtb_ext.ExtRequestPrebid{ - BidderParams: json.RawMessage(`{"acat":[" drg \t","dlu","ssr"],"wrapper":{"profile":123,"version":456}}`), - }, - }, }, wantErr: false, }, @@ -330,11 +314,6 @@ func TestExtractPubmaticExtFromRequest(t *testing.T) { }, expectedReqExt: extRequestAdServer{ Wrapper: &pubmaticWrapperExt{ProfileID: 123, VersionID: 456}, - ExtRequest: openrtb_ext.ExtRequest{ - Prebid: openrtb_ext.ExtRequestPrebid{ - BidderParams: json.RawMessage(`{"acat":[1,3,4],"wrapper":{"profile":123,"version":456}}`), - }, - }, }, wantErr: true, }, @@ -348,12 +327,6 @@ func TestExtractPubmaticExtFromRequest(t *testing.T) { expectedReqExt: extRequestAdServer{ Marketplace: &marketplaceReqExt{AllowedBidders: []string{"pubmatic", "groupm"}}, Wrapper: &pubmaticWrapperExt{ProfileID: 123, VersionID: 456}, - ExtRequest: openrtb_ext.ExtRequest{ - Prebid: openrtb_ext.ExtRequestPrebid{ - BidderParams: json.RawMessage(`{"wrapper":{"profile":123,"version":456}}`), - AlternateBidderCodes: &openrtb_ext.ExtAlternateBidderCodes{Enabled: true, Bidders: map[string]openrtb_ext.ExtAdapterAlternateBidderCodes{"pubmatic": {Enabled: true, AllowedBidderCodes: []string{"groupm"}}}}, - }, - }, }, wantErr: false, }, diff --git a/adapters/pubmatic/pubmatictest/exemplary/banner.json b/adapters/pubmatic/pubmatictest/exemplary/banner.json index 2e129128bae..8e505bd3348 100644 --- a/adapters/pubmatic/pubmatictest/exemplary/banner.json +++ b/adapters/pubmatic/pubmatictest/exemplary/banner.json @@ -46,8 +46,7 @@ "id": "1234" } } - }, - + }, "httpCalls": [ { "expectedRequest": { @@ -89,12 +88,7 @@ "profile": 5123, "version":1 }, - "acat": ["drg","dlu","ssr"], - "prebid": { - "bidderparams": { - "acat": ["drg","dlu","ssr"] - } - } + "acat": ["drg","dlu","ssr"] } }, "impIDs":["test-imp-id"] diff --git a/adapters/pubmatic/pubmatictest/exemplary/fledge.json b/adapters/pubmatic/pubmatictest/exemplary/fledge.json index 94d0f000c31..96c8f93ca5c 100644 --- a/adapters/pubmatic/pubmatictest/exemplary/fledge.json +++ b/adapters/pubmatic/pubmatictest/exemplary/fledge.json @@ -47,7 +47,7 @@ } } ], - "ext": {"prebid":{}} + "ext": {} }, "impIDs":["test-imp-id"] }, diff --git a/adapters/pubmatic/pubmatictest/exemplary/native.json b/adapters/pubmatic/pubmatictest/exemplary/native.json index 075a581d5cb..dedabf8af41 100644 --- a/adapters/pubmatic/pubmatictest/exemplary/native.json +++ b/adapters/pubmatic/pubmatictest/exemplary/native.json @@ -56,8 +56,7 @@ "wrapper": { "profile": 5123, "version": 1 - }, - "prebid": {} + } } }, "impIDs":["test-native-imp"] diff --git a/adapters/pubmatic/pubmatictest/exemplary/video.json b/adapters/pubmatic/pubmatictest/exemplary/video.json index f8bdaee6e8c..509f05518dd 100644 --- a/adapters/pubmatic/pubmatictest/exemplary/video.json +++ b/adapters/pubmatic/pubmatictest/exemplary/video.json @@ -53,7 +53,6 @@ } } }, - "httpCalls": [ { "expectedRequest": { @@ -100,12 +99,7 @@ "profile": 5123, "version":1 }, - "acat": ["drg","dlu","ssr"], - "prebid": { - "bidderparams": { - "acat": ["drg","dlu","ssr"] - } - } + "acat": ["drg","dlu","ssr"] } }, "impIDs":["test-video-imp"] diff --git a/adapters/pubmatic/pubmatictest/supplemental/app.json b/adapters/pubmatic/pubmatictest/supplemental/app.json index 34e000615a2..e6c769f6d38 100644 --- a/adapters/pubmatic/pubmatictest/supplemental/app.json +++ b/adapters/pubmatic/pubmatictest/supplemental/app.json @@ -41,7 +41,6 @@ "ext":{} } }, - "httpCalls": [ { "expectedRequest": { @@ -83,8 +82,7 @@ "wrapper": { "profile": 5123, "version":1 - }, - "prebid": {} + } } }, "impIDs":["app-imp"] diff --git a/adapters/pubmatic/pubmatictest/supplemental/dctrAndPmZoneID.json b/adapters/pubmatic/pubmatictest/supplemental/dctrAndPmZoneID.json index f16c864e07f..f2a96428b9a 100644 --- a/adapters/pubmatic/pubmatictest/supplemental/dctrAndPmZoneID.json +++ b/adapters/pubmatic/pubmatictest/supplemental/dctrAndPmZoneID.json @@ -92,8 +92,7 @@ "wrapper": { "profile": 5123, "version": 1 - }, - "prebid": {} + } } }, "impIDs":["test-imp-id"] diff --git a/adapters/pubmatic/pubmatictest/supplemental/extra-bid.json b/adapters/pubmatic/pubmatictest/supplemental/extra-bid.json index 0f1e02bf3b1..c14e6ca8e81 100644 --- a/adapters/pubmatic/pubmatictest/supplemental/extra-bid.json +++ b/adapters/pubmatic/pubmatictest/supplemental/extra-bid.json @@ -58,7 +58,6 @@ } } }, - "httpCalls": [ { "expectedRequest": { @@ -103,22 +102,6 @@ "acat": ["drg","dlu","ssr"], "marketplace": { "allowedbidders": ["pubmatic", "groupm"] - }, - "prebid": { - "bidderparams": { - "acat": ["drg","dlu","ssr"] - }, - "alternatebiddercodes": { - "enabled": true, - "bidders": { - "pubmatic": { - "enabled": true, - "allowedbiddercodes": [ - "groupm" - ] - } - } - } } } }, diff --git a/adapters/pubmatic/pubmatictest/supplemental/gptSlotNameInImpExt.json b/adapters/pubmatic/pubmatictest/supplemental/gptSlotNameInImpExt.json index f25e9bd998a..47b4320f2ef 100644 --- a/adapters/pubmatic/pubmatictest/supplemental/gptSlotNameInImpExt.json +++ b/adapters/pubmatic/pubmatictest/supplemental/gptSlotNameInImpExt.json @@ -97,8 +97,7 @@ "wrapper": { "profile": 5123, "version": 1 - }, - "prebid": {} + } } }, "impIDs":["test-imp-id"] diff --git a/adapters/pubmatic/pubmatictest/supplemental/gptSlotNameInImpExtPbAdslot.json b/adapters/pubmatic/pubmatictest/supplemental/gptSlotNameInImpExtPbAdslot.json index 0acc7554ae5..7770d9d8cc5 100644 --- a/adapters/pubmatic/pubmatictest/supplemental/gptSlotNameInImpExtPbAdslot.json +++ b/adapters/pubmatic/pubmatictest/supplemental/gptSlotNameInImpExtPbAdslot.json @@ -93,8 +93,7 @@ "wrapper": { "profile": 5123, "version": 1 - }, - "prebid": {} + } } }, "impIDs":["test-imp-id"] diff --git a/adapters/pubmatic/pubmatictest/supplemental/impExt.json b/adapters/pubmatic/pubmatictest/supplemental/impExt.json index 368dd2fa3dd..5f0c4a89ba6 100644 --- a/adapters/pubmatic/pubmatictest/supplemental/impExt.json +++ b/adapters/pubmatic/pubmatictest/supplemental/impExt.json @@ -84,7 +84,6 @@ } }, "ext": { - "prebid": {}, "wrapper": { "profile": 5123, "version": 1 diff --git a/adapters/pubmatic/pubmatictest/supplemental/invalidparam.json b/adapters/pubmatic/pubmatictest/supplemental/invalidparam.json index 82e9ecef25c..cb226534851 100644 --- a/adapters/pubmatic/pubmatictest/supplemental/invalidparam.json +++ b/adapters/pubmatic/pubmatictest/supplemental/invalidparam.json @@ -94,7 +94,6 @@ } } }, - "expectedMakeRequestsErrors": [ { "value": "Invalid adSlot AdTag_Div1@", diff --git a/adapters/pubmatic/pubmatictest/supplemental/multiplemedia.json b/adapters/pubmatic/pubmatictest/supplemental/multiplemedia.json index 1fcbc2d73dd..293f4dfbabc 100644 --- a/adapters/pubmatic/pubmatictest/supplemental/multiplemedia.json +++ b/adapters/pubmatic/pubmatictest/supplemental/multiplemedia.json @@ -25,7 +25,6 @@ "id": "siteID" } }, - "httpCalls": [ { "expectedRequest": { @@ -54,9 +53,7 @@ "id": "999" } }, - "ext" : { - "prebid": {} - } + "ext" : {} }, "impIDs":["multiple-media-imp"] }, diff --git a/adapters/pubmatic/pubmatictest/supplemental/native_invalid_adm.json b/adapters/pubmatic/pubmatictest/supplemental/native_invalid_adm.json index d5fb862167a..a412bbd207e 100644 --- a/adapters/pubmatic/pubmatictest/supplemental/native_invalid_adm.json +++ b/adapters/pubmatic/pubmatictest/supplemental/native_invalid_adm.json @@ -53,7 +53,6 @@ } }, "ext": { - "prebid": {}, "wrapper": { "profile": 5123, "version": 1 diff --git a/adapters/pubmatic/pubmatictest/supplemental/nilReqExt.json b/adapters/pubmatic/pubmatictest/supplemental/nilReqExt.json index 91cca7490af..d9534a3cb08 100644 --- a/adapters/pubmatic/pubmatictest/supplemental/nilReqExt.json +++ b/adapters/pubmatic/pubmatictest/supplemental/nilReqExt.json @@ -90,8 +90,7 @@ "wrapper": { "profile": 5123, "version": 1 - }, - "prebid": {} + } } }, "impIDs":["test-imp-id"] diff --git a/adapters/pubmatic/pubmatictest/supplemental/noAdSlot.json b/adapters/pubmatic/pubmatictest/supplemental/noAdSlot.json index cd0eb9c2963..79e374cc4ea 100644 --- a/adapters/pubmatic/pubmatictest/supplemental/noAdSlot.json +++ b/adapters/pubmatic/pubmatictest/supplemental/noAdSlot.json @@ -38,7 +38,6 @@ } } }, - "httpCalls": [{ "expectedRequest": { "uri": "https://hbopenbid.pubmatic.com/translator?source=prebid-server", @@ -72,8 +71,7 @@ "wrapper": { "profile": 5123, "version": 1 - }, - "prebid": {} + } } }, "impIDs":["test-imp-id"] diff --git a/adapters/pubmatic/pubmatictest/supplemental/pmZoneIDInKeywords.json b/adapters/pubmatic/pubmatictest/supplemental/pmZoneIDInKeywords.json index 55d8088246e..8d9c7667961 100644 --- a/adapters/pubmatic/pubmatictest/supplemental/pmZoneIDInKeywords.json +++ b/adapters/pubmatic/pubmatictest/supplemental/pmZoneIDInKeywords.json @@ -91,8 +91,7 @@ "wrapper": { "profile": 5123, "version": 1 - }, - "prebid": {} + } } }, "impIDs":["test-imp-id"] diff --git a/adapters/pubmatic/pubmatictest/supplemental/reqBidderParams.json b/adapters/pubmatic/pubmatictest/supplemental/reqBidderParams.json index 3ec9442eba2..4f33b61f6f3 100644 --- a/adapters/pubmatic/pubmatictest/supplemental/reqBidderParams.json +++ b/adapters/pubmatic/pubmatictest/supplemental/reqBidderParams.json @@ -99,14 +99,6 @@ "wrapper": { "profile": 1234, "version": 2 - }, - "prebid": { - "bidderparams": { - "wrapper": { - "profile": 1234, - "version": 2 - } - } } } }, diff --git a/adapters/pubmatic/pubmatictest/supplemental/trimPublisherID.json b/adapters/pubmatic/pubmatictest/supplemental/trimPublisherID.json index 06757c8cc55..1f8f0396eec 100644 --- a/adapters/pubmatic/pubmatictest/supplemental/trimPublisherID.json +++ b/adapters/pubmatic/pubmatictest/supplemental/trimPublisherID.json @@ -89,8 +89,7 @@ "wrapper": { "profile": 5123, "version": 1 - }, - "prebid": {} + } } }, "impIDs":["test-imp-id"] From f4a1fae128cf2d1a58de59c278b3108c52d17766 Mon Sep 17 00:00:00 2001 From: Brian Sardo <1168933+bsardo@users.noreply.github.com> Date: Mon, 16 Dec 2024 13:03:40 -0500 Subject: [PATCH 7/9] PubMatic: Remove empty prebid objects from tests (#4109) --- .../pubmatictest/supplemental/displayManagerInAppExt.json | 3 +-- .../supplemental/displayManagerInAppExtPrebid.json | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/adapters/pubmatic/pubmatictest/supplemental/displayManagerInAppExt.json b/adapters/pubmatic/pubmatictest/supplemental/displayManagerInAppExt.json index 92b19b290f3..4ac1c6bed64 100644 --- a/adapters/pubmatic/pubmatictest/supplemental/displayManagerInAppExt.json +++ b/adapters/pubmatic/pubmatictest/supplemental/displayManagerInAppExt.json @@ -102,8 +102,7 @@ "wrapper": { "profile": 5123, "version": 1 - }, - "prebid": {} + } } }, "impIDs": [ diff --git a/adapters/pubmatic/pubmatictest/supplemental/displayManagerInAppExtPrebid.json b/adapters/pubmatic/pubmatictest/supplemental/displayManagerInAppExtPrebid.json index 558fb324f17..4657aae2acc 100644 --- a/adapters/pubmatic/pubmatictest/supplemental/displayManagerInAppExtPrebid.json +++ b/adapters/pubmatic/pubmatictest/supplemental/displayManagerInAppExtPrebid.json @@ -110,8 +110,7 @@ "wrapper": { "profile": 5123, "version": 1 - }, - "prebid": {} + } } }, "impIDs": [ From 64d41cdef90c7a2cac23e7b74d0935fe9ea6539d Mon Sep 17 00:00:00 2001 From: bretg Date: Mon, 16 Dec 2024 13:41:38 -0500 Subject: [PATCH 8/9] Add stale PR workflow (#4098) --- .github/workflows/slack-stale-pr.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/workflows/slack-stale-pr.yml diff --git a/.github/workflows/slack-stale-pr.yml b/.github/workflows/slack-stale-pr.yml new file mode 100644 index 00000000000..a610c3e7de9 --- /dev/null +++ b/.github/workflows/slack-stale-pr.yml @@ -0,0 +1,27 @@ +name: Post Stale PRs To Slack + +on: + # run Monday 9am and on-demand + workflow_dispatch: + schedule: + - cron: '0 9 * * 1' + +jobs: + fetch-PRs: + runs-on: ubuntu-latest + steps: + - name: Fetch pull requests + id: local + uses: paritytech/stale-pr-finder@v0.3.0 + with: + GITHUB_TOKEN: ${{ github.token }} + days-stale: 14 + ignoredLabels: "blocked" + - name: Post to a Slack channel + id: slack + uses: slackapi/slack-github-action@v1.27.1 + with: + channel-id: ${{ secrets.SLACK_CHANNEL_ID }} + slack-message: "${{ steps.local.outputs.message }}" + env: + SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }} From f3b5bcea80b2f16038ce4c53a72fb13e01e28d4d Mon Sep 17 00:00:00 2001 From: SmartHubSolutions <87376145+SmartHubSolutions@users.noreply.github.com> Date: Mon, 16 Dec 2024 20:56:24 +0200 Subject: [PATCH 9/9] Smarthub: Update to Attekmi Endpoint (#4047) --- adapters/smarthub/smarthub_test.go | 2 +- adapters/smarthub/smarthubtest/exemplary/banner.json | 2 +- adapters/smarthub/smarthubtest/exemplary/native.json | 2 +- adapters/smarthub/smarthubtest/exemplary/video.json | 2 +- .../smarthub/smarthubtest/supplemental/bad-response.json | 2 +- .../smarthubtest/supplemental/empty-seatbid-0-bid.json | 2 +- .../smarthub/smarthubtest/supplemental/empty-seatbid.json | 2 +- adapters/smarthub/smarthubtest/supplemental/status-204.json | 2 +- adapters/smarthub/smarthubtest/supplemental/status-400.json | 2 +- adapters/smarthub/smarthubtest/supplemental/status-503.json | 2 +- .../smarthubtest/supplemental/unexpected-status.json | 2 +- .../smarthub/smarthubtest/supplemental/wrong-bidtype.json | 2 +- static/bidder-info/felixads.yaml | 2 +- static/bidder-info/jdpmedia.yaml | 2 +- static/bidder-info/markapp.yaml | 2 +- static/bidder-info/smarthub.yaml | 6 +++--- static/bidder-info/tredio.yaml | 2 +- static/bidder-info/vimayx.yaml | 2 +- static/bidder-params/smarthub.json | 6 +++--- 19 files changed, 23 insertions(+), 23 deletions(-) diff --git a/adapters/smarthub/smarthub_test.go b/adapters/smarthub/smarthub_test.go index a932364bd00..bee9c04aa8c 100644 --- a/adapters/smarthub/smarthub_test.go +++ b/adapters/smarthub/smarthub_test.go @@ -11,7 +11,7 @@ import ( func TestJsonSamples(t *testing.T) { bidder, buildErr := Builder(openrtb_ext.BidderSmartHub, config.Adapter{ - Endpoint: "http://prebid.smart-hub.io/pbserver?partnerName={{.Host}}&seat={{.AccountID}}&token={{.SourceId}}"}, config.Server{ExternalUrl: "http://hosturl.com", GvlID: 1, DataCenter: "2"}) + Endpoint: "https://prebid.example.com/pbserver?partnerName={{.Host}}&seat={{.AccountID}}&token={{.SourceId}}"}, config.Server{ExternalUrl: "http://hosturl.com", GvlID: 1, DataCenter: "2"}) assert.NoError(t, buildErr) adapterstest.RunJSONBidderTest(t, "smarthubtest", bidder) diff --git a/adapters/smarthub/smarthubtest/exemplary/banner.json b/adapters/smarthub/smarthubtest/exemplary/banner.json index 66eef5e6dac..9f17b164614 100644 --- a/adapters/smarthub/smarthubtest/exemplary/banner.json +++ b/adapters/smarthub/smarthubtest/exemplary/banner.json @@ -46,7 +46,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "http://prebid.smart-hub.io/pbserver?partnerName=partnertest&seat=9Q20EdGxzgWdfPYShScl&token=zpl5iB5Ugpe9ofVTzi44WzfjZZYq1yer", + "uri": "https://prebid.example.com/pbserver?partnerName=partnertest&seat=9Q20EdGxzgWdfPYShScl&token=zpl5iB5Ugpe9ofVTzi44WzfjZZYq1yer", "body": { "id": "id", "imp": [ diff --git a/adapters/smarthub/smarthubtest/exemplary/native.json b/adapters/smarthub/smarthubtest/exemplary/native.json index 3360ac05915..5ea6bde0dcd 100644 --- a/adapters/smarthub/smarthubtest/exemplary/native.json +++ b/adapters/smarthub/smarthubtest/exemplary/native.json @@ -46,7 +46,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "http://prebid.smart-hub.io/pbserver?partnerName=partnertest&seat=9Q20EdGxzgWdfPYShScl&token=zpl5iB5Ugpe9ofVTzi44WzfjZZYq1yer", + "uri": "https://prebid.example.com/pbserver?partnerName=partnertest&seat=9Q20EdGxzgWdfPYShScl&token=zpl5iB5Ugpe9ofVTzi44WzfjZZYq1yer", "body": { "id": "id", "imp": [ diff --git a/adapters/smarthub/smarthubtest/exemplary/video.json b/adapters/smarthub/smarthubtest/exemplary/video.json index 30134dce0ca..85d5bd4ad97 100644 --- a/adapters/smarthub/smarthubtest/exemplary/video.json +++ b/adapters/smarthub/smarthubtest/exemplary/video.json @@ -66,7 +66,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "http://prebid.smart-hub.io/pbserver?partnerName=partnertest&seat=9Q20EdGxzgWdfPYShScl&token=zpl5iB5Ugpe9ofVTzi44WzfjZZYq1yer", + "uri": "https://prebid.example.com/pbserver?partnerName=partnertest&seat=9Q20EdGxzgWdfPYShScl&token=zpl5iB5Ugpe9ofVTzi44WzfjZZYq1yer", "body": { "id": "id", "imp": [ diff --git a/adapters/smarthub/smarthubtest/supplemental/bad-response.json b/adapters/smarthub/smarthubtest/supplemental/bad-response.json index 5911c140a05..00c9ff6a875 100644 --- a/adapters/smarthub/smarthubtest/supplemental/bad-response.json +++ b/adapters/smarthub/smarthubtest/supplemental/bad-response.json @@ -46,7 +46,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "http://prebid.smart-hub.io/pbserver?partnerName=partnertest&seat=9Q20EdGxzgWdfPYShScl&token=zpl5iB5Ugpe9ofVTzi44WzfjZZYq1yer", + "uri": "https://prebid.example.com/pbserver?partnerName=partnertest&seat=9Q20EdGxzgWdfPYShScl&token=zpl5iB5Ugpe9ofVTzi44WzfjZZYq1yer", "body": { "id": "id", "imp": [ diff --git a/adapters/smarthub/smarthubtest/supplemental/empty-seatbid-0-bid.json b/adapters/smarthub/smarthubtest/supplemental/empty-seatbid-0-bid.json index c8cbc9efe62..f30134ef0fd 100644 --- a/adapters/smarthub/smarthubtest/supplemental/empty-seatbid-0-bid.json +++ b/adapters/smarthub/smarthubtest/supplemental/empty-seatbid-0-bid.json @@ -46,7 +46,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "http://prebid.smart-hub.io/pbserver?partnerName=partnertest&seat=9Q20EdGxzgWdfPYShScl&token=zpl5iB5Ugpe9ofVTzi44WzfjZZYq1yer", + "uri": "https://prebid.example.com/pbserver?partnerName=partnertest&seat=9Q20EdGxzgWdfPYShScl&token=zpl5iB5Ugpe9ofVTzi44WzfjZZYq1yer", "body": { "id": "id", "imp": [ diff --git a/adapters/smarthub/smarthubtest/supplemental/empty-seatbid.json b/adapters/smarthub/smarthubtest/supplemental/empty-seatbid.json index 1af890de1f6..d4d935d19f9 100644 --- a/adapters/smarthub/smarthubtest/supplemental/empty-seatbid.json +++ b/adapters/smarthub/smarthubtest/supplemental/empty-seatbid.json @@ -46,7 +46,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "http://prebid.smart-hub.io/pbserver?partnerName=partnertest&seat=9Q20EdGxzgWdfPYShScl&token=zpl5iB5Ugpe9ofVTzi44WzfjZZYq1yer", + "uri": "https://prebid.example.com/pbserver?partnerName=partnertest&seat=9Q20EdGxzgWdfPYShScl&token=zpl5iB5Ugpe9ofVTzi44WzfjZZYq1yer", "body": { "id": "id", "imp": [ diff --git a/adapters/smarthub/smarthubtest/supplemental/status-204.json b/adapters/smarthub/smarthubtest/supplemental/status-204.json index 56922fc6fe8..91610d40bdd 100644 --- a/adapters/smarthub/smarthubtest/supplemental/status-204.json +++ b/adapters/smarthub/smarthubtest/supplemental/status-204.json @@ -46,7 +46,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "http://prebid.smart-hub.io/pbserver?partnerName=partnertest&seat=9Q20EdGxzgWdfPYShScl&token=zpl5iB5Ugpe9ofVTzi44WzfjZZYq1yer", + "uri": "https://prebid.example.com/pbserver?partnerName=partnertest&seat=9Q20EdGxzgWdfPYShScl&token=zpl5iB5Ugpe9ofVTzi44WzfjZZYq1yer", "body": { "id": "id", "imp": [ diff --git a/adapters/smarthub/smarthubtest/supplemental/status-400.json b/adapters/smarthub/smarthubtest/supplemental/status-400.json index 5ef22853a3f..df16bed4e58 100644 --- a/adapters/smarthub/smarthubtest/supplemental/status-400.json +++ b/adapters/smarthub/smarthubtest/supplemental/status-400.json @@ -46,7 +46,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "http://prebid.smart-hub.io/pbserver?partnerName=partnertest&seat=9Q20EdGxzgWdfPYShScl&token=zpl5iB5Ugpe9ofVTzi44WzfjZZYq1yer", + "uri": "https://prebid.example.com/pbserver?partnerName=partnertest&seat=9Q20EdGxzgWdfPYShScl&token=zpl5iB5Ugpe9ofVTzi44WzfjZZYq1yer", "body": { "id": "id", "imp": [ diff --git a/adapters/smarthub/smarthubtest/supplemental/status-503.json b/adapters/smarthub/smarthubtest/supplemental/status-503.json index 140b8e99051..c10b0f6c0f7 100644 --- a/adapters/smarthub/smarthubtest/supplemental/status-503.json +++ b/adapters/smarthub/smarthubtest/supplemental/status-503.json @@ -46,7 +46,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "http://prebid.smart-hub.io/pbserver?partnerName=partnertest&seat=9Q20EdGxzgWdfPYShScl&token=zpl5iB5Ugpe9ofVTzi44WzfjZZYq1yer", + "uri": "https://prebid.example.com/pbserver?partnerName=partnertest&seat=9Q20EdGxzgWdfPYShScl&token=zpl5iB5Ugpe9ofVTzi44WzfjZZYq1yer", "body": { "id": "id", "imp": [ diff --git a/adapters/smarthub/smarthubtest/supplemental/unexpected-status.json b/adapters/smarthub/smarthubtest/supplemental/unexpected-status.json index e05c7dedb6c..4fdd11f0807 100644 --- a/adapters/smarthub/smarthubtest/supplemental/unexpected-status.json +++ b/adapters/smarthub/smarthubtest/supplemental/unexpected-status.json @@ -46,7 +46,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "http://prebid.smart-hub.io/pbserver?partnerName=partnertest&seat=9Q20EdGxzgWdfPYShScl&token=zpl5iB5Ugpe9ofVTzi44WzfjZZYq1yer", + "uri": "https://prebid.example.com/pbserver?partnerName=partnertest&seat=9Q20EdGxzgWdfPYShScl&token=zpl5iB5Ugpe9ofVTzi44WzfjZZYq1yer", "body": { "id": "id", "imp": [ diff --git a/adapters/smarthub/smarthubtest/supplemental/wrong-bidtype.json b/adapters/smarthub/smarthubtest/supplemental/wrong-bidtype.json index 680dd051fa0..7c6bc0f00da 100644 --- a/adapters/smarthub/smarthubtest/supplemental/wrong-bidtype.json +++ b/adapters/smarthub/smarthubtest/supplemental/wrong-bidtype.json @@ -46,7 +46,7 @@ "httpCalls": [ { "expectedRequest": { - "uri": "http://prebid.smart-hub.io/pbserver?partnerName=partnertest&seat=9Q20EdGxzgWdfPYShScl&token=zpl5iB5Ugpe9ofVTzi44WzfjZZYq1yer", + "uri": "https://prebid.example.com/pbserver?partnerName=partnertest&seat=9Q20EdGxzgWdfPYShScl&token=zpl5iB5Ugpe9ofVTzi44WzfjZZYq1yer", "body": { "id": "id", "imp": [ diff --git a/static/bidder-info/felixads.yaml b/static/bidder-info/felixads.yaml index 98a8745a881..baa2268f4da 100644 --- a/static/bidder-info/felixads.yaml +++ b/static/bidder-info/felixads.yaml @@ -1,2 +1,2 @@ -endpoint: "http://felixads-prebid.smart-hub.io/pbserver/?seat={{.AccountID}}&token={{.SourceId}}" +endpoint: "https://felixads-prebid.attekmi.com/pbserver/?seat={{.AccountID}}&token={{.SourceId}}" aliasOf: "smarthub" diff --git a/static/bidder-info/jdpmedia.yaml b/static/bidder-info/jdpmedia.yaml index 8139dd4ffb4..f558955a2f2 100644 --- a/static/bidder-info/jdpmedia.yaml +++ b/static/bidder-info/jdpmedia.yaml @@ -1,4 +1,4 @@ -endpoint: "http://jdpmedia-prebid.smart-hub.io/pbserver/?seat={{.AccountID}}&token={{.SourceId}}" +endpoint: "https://jdpmedia-prebid.attekmi.com/pbserver/?seat={{.AccountID}}&token={{.SourceId}}" aliasOf: "smarthub" userSync: supports: diff --git a/static/bidder-info/markapp.yaml b/static/bidder-info/markapp.yaml index 79d8887c20c..b0e71062424 100644 --- a/static/bidder-info/markapp.yaml +++ b/static/bidder-info/markapp.yaml @@ -1,4 +1,4 @@ -endpoint: "http://markapp-prebid.smart-hub.io/pbserver/?seat={{.AccountID}}&token={{.SourceId}}" +endpoint: "https://markapp-prebid.attekmi.com/pbserver/?seat={{.AccountID}}&token={{.SourceId}}" aliasOf: "smarthub" userSync: supports: diff --git a/static/bidder-info/smarthub.yaml b/static/bidder-info/smarthub.yaml index 687c6c3fe81..43e12ae2570 100644 --- a/static/bidder-info/smarthub.yaml +++ b/static/bidder-info/smarthub.yaml @@ -1,6 +1,6 @@ -endpoint: "http://prebid.smart-hub.io/pbserver?partnerName={{.Host}}&seat={{.AccountID}}&token={{.SourceId}}" +endpoint: "https://prebid.attekmi.com/pbserver?partnerName={{.Host}}&seat={{.AccountID}}&token={{.SourceId}}" maintainer: - email: "support@smart-hub.io" + email: "prebid@attekmi.com" capabilities: app: mediaTypes: @@ -13,7 +13,7 @@ capabilities: - video - native userSync: - # smarthub supports user syncing, but requires configuration by the host. contact this + # Attekmi supports user syncing, but requires configuration by the host. contact this # bidder directly at the email address in this file to ask about enabling user sync. supports: - redirect diff --git a/static/bidder-info/tredio.yaml b/static/bidder-info/tredio.yaml index 5ed85a937df..fd8ac68689b 100644 --- a/static/bidder-info/tredio.yaml +++ b/static/bidder-info/tredio.yaml @@ -1,4 +1,4 @@ -endpoint: "http://tredio-prebid.smart-hub.io/pbserver/?seat={{.AccountID}}&token={{.SourceId}}" +endpoint: "https://tredio-prebid.attekmi.com/pbserver/?seat={{.AccountID}}&token={{.SourceId}}" aliasOf: "smarthub" userSync: supports: diff --git a/static/bidder-info/vimayx.yaml b/static/bidder-info/vimayx.yaml index 2104b17df10..567d95c8c2b 100644 --- a/static/bidder-info/vimayx.yaml +++ b/static/bidder-info/vimayx.yaml @@ -1,2 +1,2 @@ -endpoint: "http://vimayx-prebid.smart-hub.io/pbserver/?seat={{.AccountID}}&token={{.SourceId}}" +endpoint: "https://vimayx-prebid.attekmi.com/pbserver/?seat={{.AccountID}}&token={{.SourceId}}" aliasOf: "smarthub" diff --git a/static/bidder-params/smarthub.json b/static/bidder-params/smarthub.json index dd9888fa937..53d93bddfe8 100644 --- a/static/bidder-params/smarthub.json +++ b/static/bidder-params/smarthub.json @@ -1,12 +1,12 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "title": "SmartHub Adapter Params", - "description": "A schema which validates params accepted by the SmartHub adapter", + "title": "Attekmi (formerly SmartHub) Adapter Params", + "description": "A schema which validates params accepted by the Attekmi (formerly SmartHub) adapter", "type": "object", "properties": { "partnerName": { "type": "string", - "description": "SmartHub unique partner name", + "description": "Attekmi (formerly SmartHub) unique partner name", "minLength": 1 }, "seat": {