diff --git a/adapters/sspBC/sspbc.go b/adapters/sspBC/sspbc.go index ae7d5f40e14..4a12ddaa51e 100644 --- a/adapters/sspBC/sspbc.go +++ b/adapters/sspBC/sspbc.go @@ -1,135 +1,70 @@ package sspBC import ( - "bytes" "encoding/json" - "errors" "fmt" - "html/template" "net/http" "net/url" - "strings" "github.com/prebid/openrtb/v20/openrtb2" "github.com/prebid/prebid-server/v3/adapters" "github.com/prebid/prebid-server/v3/config" "github.com/prebid/prebid-server/v3/errortypes" + "github.com/prebid/prebid-server/v3/metrics" "github.com/prebid/prebid-server/v3/openrtb_ext" "github.com/prebid/prebid-server/v3/util/jsonutil" ) const ( - adapterVersion = "5.8" - impFallbackSize = "1x1" - requestTypeStandard = 1 - requestTypeOneCode = 2 - requestTypeTest = 3 - prebidServerIntegrationType = "4" + adapterVersion = "6.0" ) -var ( - errSiteNill = errors.New("site cannot be nill") - errImpNotFound = errors.New("imp not found") - errNotSupportedFormat = errors.New("bid format is not supported") +type ( + adapter struct { + endpoint string + } + requestInfo struct { + PbsEntryPoint metrics.RequestType + } + requestData struct { + Request *openrtb2.BidRequest `json:"bidRequest"` + RequestInfo *requestInfo `json:"requestInfo"` + } ) -// mcAd defines the MC payload for banner ads. -type mcAd struct { - Id string `json:"id"` - Seat string `json:"seat"` - SeatBid []openrtb2.SeatBid `json:"seatbid"` -} - -// adSlotData defines struct used for the oneCode detection. -type adSlotData struct { - PbSlot string `json:"pbslot"` - PbSize string `json:"pbsize"` -} - -// templatePayload represents the banner template payload. -type templatePayload struct { - SiteId string `json:"siteid"` - SlotId string `json:"slotid"` - AdLabel string `json:"adlabel"` - PubId string `json:"pubid"` - Page string `json:"page"` - Referer string `json:"referer"` - McAd mcAd `json:"mcad"` - Inver string `json:"inver"` -} - -// requestImpExt represents the ext field of the request imp field. -type requestImpExt struct { - Data adSlotData `json:"data"` -} - -// responseExt represents ext data added by proxy. -type responseExt struct { - AdLabel string `json:"adlabel"` - PublisherId string `json:"pubid"` - SiteId string `json:"siteid"` - SlotId string `json:"slotid"` -} - -type adapter struct { - endpoint string - bannerTemplate *template.Template -} - // ---------------ADAPTER INTERFACE------------------ // Builder builds a new instance of the sspBC adapter -func Builder(_ openrtb_ext.BidderName, config config.Adapter, server config.Server) (adapters.Bidder, error) { - // HTML template used to create banner ads - const bannerHTML = `
` - - bannerTemplate, err := template.New("banner").Parse(bannerHTML) +func Builder(_ openrtb_ext.BidderName, config config.Adapter, _ config.Server) (adapters.Bidder, error) { + endpoint, err := buildAdapterEndpoint(config.Endpoint, adapterVersion) if err != nil { - return nil, err + return nil, fmt.Errorf("unable to build sspbc adapter endpoint: %w", err) } bidder := &adapter{ - endpoint: config.Endpoint, - bannerTemplate: bannerTemplate, + endpoint: endpoint, } return bidder, nil } -func (a *adapter) MakeRequests(request *openrtb2.BidRequest, requestInfo *adapters.ExtraRequestInfo) ([]*adapters.RequestData, []error) { - formattedRequest, err := formatSspBcRequest(request) - if err != nil { - return nil, []error{err} - } - - requestJSON, err := json.Marshal(formattedRequest) - if err != nil { - return nil, []error{err} +func (a *adapter) MakeRequests(request *openrtb2.BidRequest, extraRequestInfo *adapters.ExtraRequestInfo) ([]*adapters.RequestData, []error) { + sspBcRequest := &requestData{ + Request: request, + RequestInfo: &requestInfo{ + PbsEntryPoint: extraRequestInfo.PbsEntryPoint, + }, } - requestURL, err := url.Parse(a.endpoint) + requestJSON, err := json.Marshal(sspBcRequest) if err != nil { return nil, []error{err} } - // add query parameters to request - queryParams := requestURL.Query() - queryParams.Add("bdver", adapterVersion) - queryParams.Add("inver", prebidServerIntegrationType) - requestURL.RawQuery = queryParams.Encode() - requestData := &adapters.RequestData{ Method: http.MethodPost, - Uri: requestURL.String(), + Uri: a.endpoint, Body: requestJSON, - ImpIDs: getImpIDs(formattedRequest.Imp), + ImpIDs: openrtb_ext.GetImpIDs(request.Imp), } return []*adapters.RequestData{requestData}, nil @@ -142,7 +77,7 @@ func (a *adapter) MakeBids(internalRequest *openrtb2.BidRequest, externalRequest if externalResponse.StatusCode != http.StatusOK { err := &errortypes.BadServerResponse{ - Message: fmt.Sprintf("Unexpected status code: %d.", externalResponse.StatusCode), + Message: fmt.Sprintf("unexpected status code: %d.", externalResponse.StatusCode), } return nil, []error{err} } @@ -157,253 +92,49 @@ func (a *adapter) MakeBids(internalRequest *openrtb2.BidRequest, externalRequest var errors []error for _, seatBid := range response.SeatBid { - for _, bid := range seatBid.Bid { - if err := a.impToBid(internalRequest, seatBid, bid, bidResponse); err != nil { - errors = append(errors, err) + for i := range seatBid.Bid { + bid := seatBid.Bid[i] + bidType, err := getBidType(bid) + if err != nil { + return nil, []error{err} } - } - } - - return bidResponse, errors -} - -func (a *adapter) impToBid(internalRequest *openrtb2.BidRequest, seatBid openrtb2.SeatBid, bid openrtb2.Bid, - bidResponse *adapters.BidderResponse) error { - var bidType openrtb_ext.BidType - - /* - Determine bid type - At this moment we only check if bid contains Adm property - - Later updates will check for video & native data - */ - if bid.AdM != "" { - bidType = openrtb_ext.BidTypeBanner - } - - /* - Recover original ImpID - (stored on request in TagID) - */ - impID, err := getOriginalImpID(bid.ImpID, internalRequest.Imp) - if err != nil { - return err - } - bid.ImpID = impID - - // read additional data from proxy - var bidDataExt responseExt - if err := jsonutil.Unmarshal(bid.Ext, &bidDataExt); err != nil { - return err - } - /* - use correct ad creation method for a detected bid type - right now, we are only creating banner ads - if type is not detected / supported, throw error - */ - if bidType != openrtb_ext.BidTypeBanner { - return errNotSupportedFormat - } - - var adCreationError error - bid.AdM, adCreationError = a.createBannerAd(bid, bidDataExt, internalRequest, seatBid.Seat) - if adCreationError != nil { - return adCreationError - } - // append bid to responses - bidResponse.Bids = append(bidResponse.Bids, &adapters.TypedBid{ - Bid: &bid, - BidType: bidType, - }) - - return nil -} - -func getOriginalImpID(impID string, imps []openrtb2.Imp) (string, error) { - for _, imp := range imps { - if imp.ID == impID { - return imp.TagID, nil - } - } - - return "", errImpNotFound -} - -func (a *adapter) createBannerAd(bid openrtb2.Bid, ext responseExt, request *openrtb2.BidRequest, seat string) (string, error) { - if strings.Contains(bid.AdM, "") { - // Banner ad is already formatted - return bid.AdM, nil - } - - // create McAd payload - var mcad = mcAd{ - Id: request.ID, - Seat: seat, - SeatBid: []openrtb2.SeatBid{ - {Bid: []openrtb2.Bid{bid}}, - }, - } - - bannerData := &templatePayload{ - SiteId: ext.SiteId, - SlotId: ext.SlotId, - AdLabel: ext.AdLabel, - PubId: ext.PublisherId, - Page: request.Site.Page, - Referer: request.Site.Ref, - McAd: mcad, - Inver: prebidServerIntegrationType, - } - - var filledTemplate bytes.Buffer - if err := a.bannerTemplate.Execute(&filledTemplate, bannerData); err != nil { - return "", err - } - - return filledTemplate.String(), nil -} - -func getImpSize(imp openrtb2.Imp) string { - if imp.Banner == nil || len(imp.Banner.Format) == 0 { - return impFallbackSize - } - - var ( - areaMax int64 - impSize = impFallbackSize - ) - for _, size := range imp.Banner.Format { - area := size.W * size.H - if area > areaMax { - areaMax = area - impSize = fmt.Sprintf("%dx%d", size.W, size.H) + bidResponse.Bids = append(bidResponse.Bids, &adapters.TypedBid{ + Bid: &bid, + BidType: bidType, + }) } } - return impSize -} - -// getBidParameters reads additional data for this imp (site id , placement id, test) -// Errors in parameters do not break imp flow, and thus are not returned -func getBidParameters(imp openrtb2.Imp) openrtb_ext.ExtImpSspbc { - var extBidder adapters.ExtImpBidder - var extSSP openrtb_ext.ExtImpSspbc - - if err := jsonutil.Unmarshal(imp.Ext, &extBidder); err == nil { - _ = jsonutil.Unmarshal(extBidder.Bidder, &extSSP) - } - - return extSSP + return bidResponse, errors } -// getRequestType checks what kind of request we have. It can either be: -// - a standard request, where all Imps have complete site / placement data -// - a oneCodeRequest, where site / placement data has to be determined by server -// - a test request, where server returns fixed example ads -func getRequestType(request *openrtb2.BidRequest) int { - incompleteImps := 0 - - for _, imp := range request.Imp { - // Read data for this imp - extSSP := getBidParameters(imp) - - if extSSP.IsTest != 0 { - return requestTypeTest - } - - if extSSP.SiteId == "" || extSSP.Id == "" { - incompleteImps += 1 +func getBidType(bid openrtb2.Bid) (openrtb_ext.BidType, error) { + switch bid.MType { + case openrtb2.MarkupBanner: + return openrtb_ext.BidTypeBanner, nil + case openrtb2.MarkupVideo: + return openrtb_ext.BidTypeVideo, nil + case openrtb2.MarkupAudio: + return openrtb_ext.BidTypeAudio, nil + case openrtb2.MarkupNative: + return openrtb_ext.BidTypeNative, nil + default: + return "", &errortypes.BadServerResponse{ + Message: fmt.Sprintf("unsupported MType: %d.", bid.MType), } } - - if incompleteImps > 0 { - return requestTypeOneCode - } - - return requestTypeStandard } -func formatSspBcRequest(request *openrtb2.BidRequest) (*openrtb2.BidRequest, error) { - if request.Site == nil { - return nil, errSiteNill - } - - var siteID string - - // determine what kind of request we are dealing with - requestType := getRequestType(request) - - for i, imp := range request.Imp { - // read ext data for the impression - extSSP := getBidParameters(imp) - - // store SiteID - if extSSP.SiteId != "" { - siteID = extSSP.SiteId - } - - // save current imp.id (adUnit name) as imp.tagid - // we will recover it in makeBids - imp.TagID = imp.ID - - // if there is a placement id, and this is not a oneCodeRequest, use it in imp.id - if extSSP.Id != "" && requestType != requestTypeOneCode { - imp.ID = extSSP.Id - } - - // check imp size and update e.ext - send pbslot, pbsize - // inability to set bid.ext will cause request to be invalid - impSize := getImpSize(imp) - impExt := requestImpExt{ - Data: adSlotData{ - PbSlot: imp.TagID, - PbSize: impSize, - }, - } - - impExtJSON, err := json.Marshal(impExt) - if err != nil { - return nil, err - } - imp.Ext = impExtJSON - // save updated imp - request.Imp[i] = imp - } - - siteCopy := *request.Site - request.Site = &siteCopy - - /* - update site ID - for oneCode request it has to be blank - for other requests it should be equal to - SiteId from one of the bids - */ - if requestType == requestTypeOneCode || siteID == "" { - request.Site.ID = "" - } else { - request.Site.ID = siteID - } - - // add domain info - if siteURL, err := url.Parse(request.Site.Page); err == nil { - request.Site.Domain = siteURL.Hostname() - } - - // set TEST Flag - if requestType == requestTypeTest { - request.Test = 1 +func buildAdapterEndpoint(endpoint string, adapterVersion string) (string, error) { + endpointURL, err := url.Parse(endpoint) + if err != nil { + return "", fmt.Errorf("unable to parse endpoint URL: %w", err) } - return request, nil -} + params := endpointURL.Query() + params.Add("bdver", adapterVersion) + endpointURL.RawQuery = params.Encode() -// getImpIDs uses imp.TagID instead of imp.ID as formattedRequest stores imp.ID in imp.TagID -func getImpIDs(imps []openrtb2.Imp) []string { - impIDs := make([]string, len(imps)) - for i := range imps { - impIDs[i] = imps[i].TagID - } - return impIDs + return endpointURL.String(), nil } diff --git a/adapters/sspBC/sspbctest/exemplary/banner-fromtemplate.json b/adapters/sspBC/sspbctest/exemplary/banner-fromtemplate.json deleted file mode 100644 index a8af9496124..00000000000 --- a/adapters/sspBC/sspbctest/exemplary/banner-fromtemplate.json +++ /dev/null @@ -1,153 +0,0 @@ -{ - "mockBidRequest": { - "id": "test-request", - "imp": [ - { - "id": "slot", - "ext": { - "bidder": { - "siteId": "237503", - "id": "005" - } - }, - "secure": 1, - "banner": { - "format": [ - { - "w": 300, - "h": 250 - } - ] - } - } - ], - "site": { - "domain": "test.page", - "page": "https://test.page/", - "ref": "https://test.referer/" - }, - "regs": { - "ext": { - "gdpr": 1 - } - }, - "user": { - "ext": { - "consent": "test_consent" - }, - "buyeruid": "test_user" - } - }, - "httpCalls": [ - { - "expectedRequest": { - "uri": "http://ssp.wp.test/bidder/?bdver=5.8&inver=4", - "body": { - "id": "test-request", - "imp": [ - { - "id": "005", - "banner": { - "format": [ - { - "w": 300, - "h": 250 - } - ] - }, - "tagid": "slot", - "secure": 1, - "ext": { - "data": { - "pbslot": "slot", - "pbsize": "300x250" - } - } - } - ], - "site": { - "id": "237503", - "domain": "test.page", - "page": "https://test.page/", - "ref": "https://test.referer/" - }, - "user": { - "ext": { - "consent": "test_consent" - }, - "buyeruid": "test_user" - }, - "regs": { - "ext": { - "gdpr": 1 - } - } - }, - "impIDs":["slot"] - }, - "mockResponse": { - "status": 200, - "body": { - "cur": "USD", - "id": "test-request", - "seatbid": [ - { - "bid": [ - { - "adm": "some-test-ad", - "adomain": [ - "sspbc-test" - ], - "crid": "1234", - "ext": { - "adlabel": "Reklama", - "pubid": "431", - "siteid": "237503", - "slotid": "005", - "tagid": "slot" - }, - "w": 300, - "h": 250, - "id": "response-005", - "impid": "005", - "price": 20 - } - ], - "seat": "sspbc-test" - } - ], - "sn": "sspbc-test" - } - } - } - ], - "expectedBidResponses": [ - { - "currency": "USD", - "bids": [ - { - "bid": { - "id": "response-005", - "impid": "slot", - "price": 20, - "adm": "<\/title><meta charset=\"UTF-8\"><meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"><style> body { background-color: transparent; margin: 0; padding: 0; }<\/style><script> window.rekid = \"237503\"; window.slot = \"005\"; window.adlabel = 'Reklama'; window.pubid = '431'; window.wp_sn = 'sspbc_go'; window.page = 'https:\\\/\\\/test.page\\\/'; window.ref = 'https:\\\/\\\/test.referer\\\/'; window.mcad = {\"id\":\"test-request\",\"seat\":\"sspbc-test\",\"seatbid\":[{\"bid\":[{\"id\":\"response-005\",\"impid\":\"slot\",\"price\":20,\"adm\":\"some-test-ad\",\"adomain\":[\"sspbc-test\"],\"crid\":\"1234\",\"w\":300,\"h\":250,\"ext\":{\"adlabel\":\"Reklama\",\"pubid\":\"431\",\"siteid\":\"237503\",\"slotid\":\"005\",\"tagid\":\"slot\"}}]}]}; window.inver = '4'; <\/script><\/head><body><div id=\"c\"><\/div><script async crossorigin nomodule src=\"\/\/std.wpcdn.pl\/wpjslib\/wpjslib-inline.js\" id=\"wpjslib\"><\/script><script async crossorigin type=\"module\" src=\"\/\/std.wpcdn.pl\/wpjslib6\/wpjslib-inline.js\" id=\"wpjslib6\"><\/script><\/body><\/html>", - "adomain": [ - "sspbc-test" - ], - "crid": "1234", - "w": 300, - "h": 250, - "ext": { - "adlabel": "Reklama", - "pubid": "431", - "siteid": "237503", - "slotid": "005", - "tagid": "slot" - } - }, - "type": "banner" - } - ] - } - ] -} \ No newline at end of file diff --git a/adapters/sspBC/sspbctest/exemplary/banner-preformatted-multiple-imps.json b/adapters/sspBC/sspbctest/exemplary/banner-multiple-imps.json similarity index 59% rename from adapters/sspBC/sspbctest/exemplary/banner-preformatted-multiple-imps.json rename to adapters/sspBC/sspbctest/exemplary/banner-multiple-imps.json index 15856d4ae4a..94821abdda7 100644 --- a/adapters/sspBC/sspbctest/exemplary/banner-preformatted-multiple-imps.json +++ b/adapters/sspBC/sspbctest/exemplary/banner-multiple-imps.json @@ -18,7 +18,8 @@ "h": 250 } ] - } + }, + "tagid": "ad-test1" }, { "id": "slot2", @@ -36,7 +37,8 @@ "h": 600 } ] - } + }, + "tagid": "ad-test2" } ], "site": { @@ -59,65 +61,69 @@ "httpCalls": [ { "expectedRequest": { - "uri": "http://ssp.wp.test/bidder/?bdver=5.8&inver=4", + "uri": "http://ssp.wp.test/bidder/?bdver=6.0", "body": { - "id": "test-request", - "imp": [ - { - "id": "005", - "banner": { - "format": [ - { - "w": 300, - "h": 250 + "bidRequest": { + "id": "test-request", + "imp": [ + { + "id": "slot1", + "banner": { + "format": [ + { + "w": 300, + "h": 250 + } + ] + }, + "tagid": "ad-test1", + "secure": 1, + "ext": { + "bidder": { + "siteId": "237503", + "id": "005" } - ] + } }, - "tagid": "slot1", - "secure": 1, - "ext": { - "data": { - "pbslot": "slot1", - "pbsize": "300x250" + { + "id": "slot2", + "banner": { + "format": [ + { + "w": 300, + "h": 600 + } + ] + }, + "tagid": "ad-test2", + "secure": 1, + "ext": { + "bidder": { + "siteId": "237503", + "id": "037" + } } } + ], + "site": { + "domain": "test.page", + "page": "https://test.page/", + "ref": "https://test.referer/" }, - { - "id": "037", - "banner": { - "format": [ - { - "w": 300, - "h": 600 - } - ] + "user": { + "ext": { + "consent": "test_consent" }, - "tagid": "slot2", - "secure": 1, + "buyeruid": "test_user" + }, + "regs": { "ext": { - "data": { - "pbslot": "slot2", - "pbsize": "300x600" - } + "gdpr": 1 } } - ], - "site": { - "id": "237503", - "domain": "test.page", - "page": "https://test.page/", - "ref": "https://test.referer/" - }, - "user": { - "ext": { - "consent": "test_consent" - }, - "buyeruid": "test_user" }, - "regs": { - "ext": { - "gdpr": 1 - } + "requestInfo": { + "PbsEntryPoint": "" } }, "impIDs":["slot1","slot2"] @@ -132,22 +138,26 @@ "bid": [ { "adm": "<!--preformatted-->test_ad_1", + "nurl": "www.test.com", "adomain": [ "sspbc-test" ], "crid": "1234", "ext": { - "adlabel": "Reklama", + "external": "1", + "platform": "prebidserver", + "pricepl": 0.123, "pubid": "431", "siteid": "237503", "slotid": "005", - "tagid": "slot1" + "tagid": "ad-test1" }, "w": 300, "h": 250, "id": "response-005", - "impid": "005", - "price": 20 + "impid": "slot1", + "price": 20, + "mtype": 1 } ], "seat": "sspbc-test" @@ -156,28 +166,31 @@ "bid": [ { "adm": "<!--preformatted-->test_ad_2", + "nurl": "www.test.com", "adomain": [ "sspbc-test" ], "crid": "5678", "ext": { - "adlabel": "Reklama", + "external": "1", + "platform": "prebidserver", + "pricepl": 0.123, "pubid": "431", "siteid": "237503", "slotid": "037", - "tagid": "slot2" + "tagid": "ad-test2" }, "w": 300, "h": 600, "id": "response-037", - "impid": "037", - "price": 10 + "impid": "slot2", + "price": 10, + "mtype": 1 } ], "seat": "sspbc-test" } - ], - "sn": "sspbc-test" + ] } } } @@ -192,6 +205,7 @@ "impid": "slot1", "price": 20, "adm": "<!--preformatted-->test_ad_1", + "nurl": "www.test.com", "adomain": [ "sspbc-test" ], @@ -199,12 +213,15 @@ "w": 300, "h": 250, "ext": { - "adlabel": "Reklama", + "external": "1", + "platform": "prebidserver", + "pricepl": 0.123, "pubid": "431", "siteid": "237503", "slotid": "005", - "tagid": "slot1" - } + "tagid": "ad-test1" + }, + "mtype": 1 }, "type": "banner" }, @@ -214,6 +231,7 @@ "impid": "slot2", "price": 10, "adm": "<!--preformatted-->test_ad_2", + "nurl": "www.test.com", "adomain": [ "sspbc-test" ], @@ -221,12 +239,15 @@ "w": 300, "h": 600, "ext": { - "adlabel": "Reklama", + "external": "1", + "platform": "prebidserver", + "pricepl": 0.123, "pubid": "431", "siteid": "237503", "slotid": "037", - "tagid": "slot2" - } + "tagid": "ad-test2" + }, + "mtype": 1 }, "type": "banner" } diff --git a/adapters/sspBC/sspbctest/exemplary/banner-preformatted-onecode.json b/adapters/sspBC/sspbctest/exemplary/banner-onecode.json similarity index 61% rename from adapters/sspBC/sspbctest/exemplary/banner-preformatted-onecode.json rename to adapters/sspBC/sspbctest/exemplary/banner-onecode.json index c700d9e584e..c7ded494c63 100644 --- a/adapters/sspBC/sspbctest/exemplary/banner-preformatted-onecode.json +++ b/adapters/sspBC/sspbctest/exemplary/banner-onecode.json @@ -13,7 +13,8 @@ "h": 250 } ] - } + }, + "tagid": "ad-test1" } ], "site": { @@ -36,45 +37,45 @@ "httpCalls": [ { "expectedRequest": { - "uri": "http://ssp.wp.test/bidder/?bdver=5.8&inver=4", + "uri": "http://ssp.wp.test/bidder/?bdver=6.0", "body": { - "id": "test-request", - "imp": [ - { - "id": "slot", - "banner": { - "format": [ - { - "w": 300, - "h": 250 - } - ] + "bidRequest": { + "id": "test-request", + "imp": [ + { + "id": "slot", + "banner": { + "format": [ + { + "w": 300, + "h": 250 + } + ] + }, + "tagid": "ad-test1", + "secure": 1, + "ext": {} + } + ], + "site": { + "domain": "test.page", + "page": "https://test.page/", + "ref": "https://test.referer/" + }, + "user": { + "ext": { + "consent": "test_consent" }, - "tagid": "slot", - "secure": 1, + "buyeruid": "test_user" + }, + "regs": { "ext": { - "data": { - "pbslot": "slot", - "pbsize": "300x250" - } + "gdpr": 1 } } - ], - "site": { - "domain": "test.page", - "page": "https://test.page/", - "ref": "https://test.referer/" - }, - "user": { - "ext": { - "consent": "test_consent" - }, - "buyeruid": "test_user" }, - "regs": { - "ext": { - "gdpr": 1 - } + "requestInfo": { + "PbsEntryPoint": "" } }, "impIDs":["slot"] @@ -94,17 +95,20 @@ ], "crid": "1234", "ext": { - "adlabel": "Reklama", + "external": "1", + "platform": "prebidserver", + "pricepl": 0.123, "pubid": "431", "siteid": "237503", "slotid": "005", - "tagid": "slot" + "tagid": "ad-test1" }, "w": 300, "h": 250, "id": "response-005", "impid": "slot", - "price": 20 + "price": 20, + "mtype": 1 } ], "seat": "sspbc-test" @@ -132,12 +136,15 @@ "w": 300, "h": 250, "ext": { - "adlabel": "Reklama", + "external": "1", + "platform": "prebidserver", + "pricepl": 0.123, "pubid": "431", "siteid": "237503", "slotid": "005", - "tagid": "slot" - } + "tagid": "ad-test1" + }, + "mtype": 1 }, "type": "banner" } diff --git a/adapters/sspBC/sspbctest/exemplary/banner-preformatted.json b/adapters/sspBC/sspbctest/exemplary/banner.json similarity index 60% rename from adapters/sspBC/sspbctest/exemplary/banner-preformatted.json rename to adapters/sspBC/sspbctest/exemplary/banner.json index 1a9b22e7801..b93d75108e1 100644 --- a/adapters/sspBC/sspbctest/exemplary/banner-preformatted.json +++ b/adapters/sspBC/sspbctest/exemplary/banner.json @@ -18,7 +18,8 @@ "h": 250 } ] - } + }, + "tagid": "ad-test1" } ], "site": { @@ -41,46 +42,50 @@ "httpCalls": [ { "expectedRequest": { - "uri": "http://ssp.wp.test/bidder/?bdver=5.8&inver=4", + "uri": "http://ssp.wp.test/bidder/?bdver=6.0", "body": { - "id": "test-request", - "imp": [ - { - "id": "005", - "banner": { - "format": [ - { - "w": 300, - "h": 250 + "bidRequest": { + "id": "test-request", + "imp": [ + { + "id": "slot", + "banner": { + "format": [ + { + "w": 300, + "h": 250 + } + ] + }, + "tagid": "ad-test1", + "secure": 1, + "ext": { + "bidder": { + "siteId": "237503", + "id": "005" } - ] + } + } + ], + "site": { + "domain": "test.page", + "page": "https://test.page/", + "ref": "https://test.referer/" + }, + "user": { + "ext": { + "consent": "test_consent" }, - "tagid": "slot", - "secure": 1, + "buyeruid": "test_user" + }, + "regs": { "ext": { - "data": { - "pbslot": "slot", - "pbsize": "300x250" - } + "gdpr": 1 } } - ], - "site": { - "id": "237503", - "domain": "test.page", - "page": "https://test.page/", - "ref": "https://test.referer/" - }, - "user": { - "ext": { - "consent": "test_consent" - }, - "buyeruid": "test_user" }, - "regs": { - "ext": { - "gdpr": 1 - } + "requestInfo": { + "PbsEntryPoint": "" } }, "impIDs":["slot"] @@ -100,17 +105,20 @@ ], "crid": "1234", "ext": { - "adlabel": "Reklama", + "external": "1", + "platform": "prebidserver", + "pricepl": 0.123, "pubid": "431", "siteid": "237503", "slotid": "005", - "tagid": "slot" + "tagid": "ad-test1" }, "w": 300, "h": 250, "id": "response-005", - "impid": "005", - "price": 20 + "impid": "slot", + "price": 20, + "mtype": 1 } ], "seat": "sspbc-test" @@ -138,12 +146,15 @@ "w": 300, "h": 250, "ext": { - "adlabel": "Reklama", + "external": "1", + "platform": "prebidserver", + "pricepl": 0.123, "pubid": "431", "siteid": "237503", "slotid": "005", - "tagid": "slot" - } + "tagid": "ad-test1" + }, + "mtype": 1 }, "type": "banner" } diff --git a/adapters/sspBC/sspbctest/supplemental/bad_request_without_site.json b/adapters/sspBC/sspbctest/supplemental/bad_request_without_site.json deleted file mode 100644 index c8acc0c82f7..00000000000 --- a/adapters/sspBC/sspbctest/supplemental/bad_request_without_site.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "mockBidRequest": { - "id": "test-request", - "imp": [ - { - "id": "slot", - "ext": { - "bidder": { - "siteId": "237503", - "id": "005" - } - }, - "secure": 1, - "banner": { - "format": [ - { - "w": 300, - "h": 250 - } - ] - } - } - ], - "regs": { - "ext": { - "gdpr": 1 - } - }, - "user": { - "ext": { - "consent": "test_consent" - }, - "buyeruid": "test_user" - } - }, - "expectedMakeRequestsErrors": [ - { - "value": "site cannot be nill", - "comparison": "literal" - } - ] -} \ No newline at end of file diff --git a/adapters/sspBC/sspbctest/supplemental/bad_response.json b/adapters/sspBC/sspbctest/supplemental/bad_response.json index 14f7d4ddb11..73f4239c93b 100644 --- a/adapters/sspBC/sspbctest/supplemental/bad_response.json +++ b/adapters/sspBC/sspbctest/supplemental/bad_response.json @@ -18,7 +18,8 @@ "h": 250 } ] - } + }, + "tagid": "ad-test1" } ], "site": { @@ -41,46 +42,50 @@ "httpCalls": [ { "expectedRequest": { - "uri": "http://ssp.wp.test/bidder/?bdver=5.8&inver=4", + "uri": "http://ssp.wp.test/bidder/?bdver=6.0", "body": { - "id": "test-request", - "imp": [ - { - "id": "005", - "banner": { - "format": [ - { - "w": 300, - "h": 250 + "bidRequest": { + "id": "test-request", + "imp": [ + { + "id": "slot", + "banner": { + "format": [ + { + "w": 300, + "h": 250 + } + ] + }, + "tagid": "ad-test1", + "secure": 1, + "ext": { + "bidder": { + "siteId": "237503", + "id": "005" } - ] + } + } + ], + "site": { + "domain": "test.page", + "page": "https://test.page/", + "ref": "https://test.referer/" + }, + "user": { + "ext": { + "consent": "test_consent" }, - "tagid": "slot", - "secure": 1, + "buyeruid": "test_user" + }, + "regs": { "ext": { - "data": { - "pbslot": "slot", - "pbsize": "300x250" - } + "gdpr": 1 } } - ], - "site": { - "id": "237503", - "domain": "test.page", - "page": "https://test.page/", - "ref": "https://test.referer/" }, - "user": { - "ext": { - "consent": "test_consent" - }, - "buyeruid": "test_user" - }, - "regs": { - "ext": { - "gdpr": 1 - } + "requestInfo": { + "PbsEntryPoint": "" } }, "impIDs":["slot"] diff --git a/adapters/sspBC/sspbctest/supplemental/bad_response_without_adm.json b/adapters/sspBC/sspbctest/supplemental/bad_response_with_incorrect_bid_type.json similarity index 56% rename from adapters/sspBC/sspbctest/supplemental/bad_response_without_adm.json rename to adapters/sspBC/sspbctest/supplemental/bad_response_with_incorrect_bid_type.json index f975b66d2cf..9b27921099a 100644 --- a/adapters/sspBC/sspbctest/supplemental/bad_response_without_adm.json +++ b/adapters/sspBC/sspbctest/supplemental/bad_response_with_incorrect_bid_type.json @@ -18,7 +18,8 @@ "h": 250 } ] - } + }, + "tagid": "ad-test1" } ], "site": { @@ -41,46 +42,50 @@ "httpCalls": [ { "expectedRequest": { - "uri": "http://ssp.wp.test/bidder/?bdver=5.8&inver=4", + "uri": "http://ssp.wp.test/bidder/?bdver=6.0", "body": { - "id": "test-request", - "imp": [ - { - "id": "005", - "banner": { - "format": [ - { - "w": 300, - "h": 250 + "bidRequest": { + "id": "test-request", + "imp": [ + { + "id": "slot", + "banner": { + "format": [ + { + "w": 300, + "h": 250 + } + ] + }, + "tagid": "ad-test1", + "secure": 1, + "ext": { + "bidder": { + "siteId": "237503", + "id": "005" } - ] + } + } + ], + "site": { + "domain": "test.page", + "page": "https://test.page/", + "ref": "https://test.referer/" + }, + "user": { + "ext": { + "consent": "test_consent" }, - "tagid": "slot", - "secure": 1, + "buyeruid": "test_user" + }, + "regs": { "ext": { - "data": { - "pbslot": "slot", - "pbsize": "300x250" - } + "gdpr": 1 } } - ], - "site": { - "id": "237503", - "domain": "test.page", - "page": "https://test.page/", - "ref": "https://test.referer/" }, - "user": { - "ext": { - "consent": "test_consent" - }, - "buyeruid": "test_user" - }, - "regs": { - "ext": { - "gdpr": 1 - } + "requestInfo": { + "PbsEntryPoint": "" } }, "impIDs":["slot"] @@ -100,17 +105,20 @@ ], "crid": "1234", "ext": { - "adlabel": "Reklama", + "external": "1", + "platform": "prebidserver", + "pricepl": 0.123, "pubid": "431", "siteid": "237503", "slotid": "005", - "tagid": "slot" + "tagid": "ad-test1" }, "w": 300, "h": 250, "id": "response-005", - "impid": "005", - "price": 20 + "impid": "slot", + "price": 20, + "mtype": 0 } ], "seat": "sspbc-test" @@ -121,10 +129,9 @@ } } ], - "expectedBidResponses": [{"currency":"USD","bids":[]}], "expectedMakeBidsErrors": [ { - "value": "bid format is not supported", + "value": "unsupported MType: 0.", "comparison": "literal" } ] diff --git a/adapters/sspBC/sspbctest/supplemental/bad_response_with_incorrect_impid.json b/adapters/sspBC/sspbctest/supplemental/bad_response_with_incorrect_impid.json deleted file mode 100644 index 26c9e42cf6c..00000000000 --- a/adapters/sspBC/sspbctest/supplemental/bad_response_with_incorrect_impid.json +++ /dev/null @@ -1,136 +0,0 @@ -{ - "mockBidRequest": { - "id": "test-request", - "imp": [ - { - "id": "slot", - "ext": { - "bidder": { - "siteId": "237503", - "id": "005" - } - }, - "secure": 1, - "banner": { - "format": [ - { - "w": 300, - "h": 250 - } - ] - } - } - ], - "site": { - "domain": "test.page", - "page": "https://test.page/", - "ref": "https://test.referer/" - }, - "regs": { - "ext": { - "gdpr": 1 - } - }, - "user": { - "ext": { - "consent": "test_consent" - }, - "buyeruid": "test_user" - } - }, - "httpCalls": [ - { - "expectedRequest": { - "uri": "http://ssp.wp.test/bidder/?bdver=5.8&inver=4", - "body": { - "id": "test-request", - "imp": [ - { - "id": "005", - "banner": { - "format": [ - { - "w": 300, - "h": 250 - } - ] - }, - "tagid": "slot", - "secure": 1, - "ext": { - "data": { - "pbslot": "slot", - "pbsize": "300x250" - } - } - } - ], - "site": { - "id": "237503", - "domain": "test.page", - "page": "https://test.page/", - "ref": "https://test.referer/" - }, - "user": { - "ext": { - "consent": "test_consent" - }, - "buyeruid": "test_user" - }, - "regs": { - "ext": { - "gdpr": 1 - } - } - }, - "impIDs":["slot"] - }, - "mockResponse": { - "status": 200, - "body": { - "cur": "USD", - "id": "test-request", - "seatbid": [ - { - "bid": [ - { - "adm": "{\"bunch\":\"237503\",\"capping\":\"\",\"server\":\"s\",\"campaign\":\"c\",\"score\":\"1\",\"creations\":[{\"type\":\"image\",\"src\":\"https:\/\/bdr.wpcdn.pl\/tests\/test-300x250.png\",\"trackers\":{},\"width\":300,\"height\":250}],\"code\":\"1\",\"aabVendors\":false,\"slot\":\"005\",\"redir\":\"https:\/\/www.wp.pl\",\"wpclid\":\"1\"}", - "adomain": [ - "sspbc-test" - ], - "crid": "1234", - "ext": { - "adlabel": "Reklama", - "pubid": "431", - "siteid": "237503", - "slotid": "005", - "tagid": "slot" - }, - "w": 300, - "h": 250, - "id": "response-005", - "impid": "incorrect-imp-id", - "price": 20 - } - ], - "seat": "sspbc-test" - } - ], - "sn": "sspbc-test" - } - } - } - ], - "expectedBidResponses": [ - { - "currency": "USD", - "bids": [] - } - ], - "expectedMakeBidsErrors": [ - { - "value": "imp not found", - "comparison": "literal" - } - ] -} \ No newline at end of file diff --git a/adapters/sspBC/sspbctest/supplemental/request_with_diffrent_siteid.json b/adapters/sspBC/sspbctest/supplemental/request_with_diffrent_siteid.json deleted file mode 100644 index 92a77fa8405..00000000000 --- a/adapters/sspBC/sspbctest/supplemental/request_with_diffrent_siteid.json +++ /dev/null @@ -1,154 +0,0 @@ -{ - "mockBidRequest": { - "id": "test-request", - "imp": [ - { - "id": "slot", - "ext": { - "bidder": { - "siteId": "237503", - "id": "005" - } - }, - "secure": 1, - "banner": { - "format": [ - { - "w": 300, - "h": 250 - } - ] - } - } - ], - "site": { - "id": "diffrent", - "domain": "test.page", - "page": "https://test.page/", - "ref": "https://test.referer/" - }, - "regs": { - "ext": { - "gdpr": 1 - } - }, - "user": { - "ext": { - "consent": "test_consent" - }, - "buyeruid": "test_user" - } - }, - "httpCalls": [ - { - "expectedRequest": { - "uri": "http://ssp.wp.test/bidder/?bdver=5.8&inver=4", - "body": { - "id": "test-request", - "imp": [ - { - "id": "005", - "banner": { - "format": [ - { - "w": 300, - "h": 250 - } - ] - }, - "tagid": "slot", - "secure": 1, - "ext": { - "data": { - "pbslot": "slot", - "pbsize": "300x250" - } - } - } - ], - "site": { - "id": "237503", - "domain": "test.page", - "page": "https://test.page/", - "ref": "https://test.referer/" - }, - "user": { - "ext": { - "consent": "test_consent" - }, - "buyeruid": "test_user" - }, - "regs": { - "ext": { - "gdpr": 1 - } - } - }, - "impIDs":["slot"] - }, - "mockResponse": { - "status": 200, - "body": { - "cur": "USD", - "id": "test-request", - "seatbid": [ - { - "bid": [ - { - "adm": "{\"bunch\":\"237503\",\"capping\":\"\",\"server\":\"s\",\"campaign\":\"c\",\"score\":\"1\",\"creations\":[{\"type\":\"image\",\"src\":\"https:\/\/bdr.wpcdn.pl\/tests\/test-300x250.png\",\"trackers\":{},\"width\":300,\"height\":250}],\"code\":\"1\",\"aabVendors\":false,\"slot\":\"005\",\"redir\":\"https:\/\/www.wp.pl\",\"wpclid\":\"1\"}", - "adomain": [ - "sspbc-test" - ], - "crid": "1234", - "ext": { - "adlabel": "Reklama", - "pubid": "431", - "siteid": "237503", - "slotid": "005", - "tagid": "slot" - }, - "w": 300, - "h": 250, - "id": "response-005", - "impid": "005", - "price": 20 - } - ], - "seat": "sspbc-test" - } - ], - "sn": "sspbc-test" - } - } - } - ], - "expectedBidResponses": [ - { - "currency": "USD", - "bids": [ - { - "bid": { - "id": "response-005", - "impid": "slot", - "price": 20, - "adm": "<html><head><title><\/title><meta charset=\"UTF-8\"><meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"><style> body { background-color: transparent; margin: 0; padding: 0; }<\/style><script> window.rekid = \"237503\"; window.slot = \"005\"; window.adlabel = 'Reklama'; window.pubid = '431'; window.wp_sn = 'sspbc_go'; window.page = 'https:\\\/\\\/test.page\\\/'; window.ref = 'https:\\\/\\\/test.referer\\\/'; window.mcad = {\"id\":\"test-request\",\"seat\":\"sspbc-test\",\"seatbid\":[{\"bid\":[{\"id\":\"response-005\",\"impid\":\"slot\",\"price\":20,\"adm\":\"{\\\"bunch\\\":\\\"237503\\\",\\\"capping\\\":\\\"\\\",\\\"server\\\":\\\"s\\\",\\\"campaign\\\":\\\"c\\\",\\\"score\\\":\\\"1\\\",\\\"creations\\\":[{\\\"type\\\":\\\"image\\\",\\\"src\\\":\\\"https://bdr.wpcdn.pl/tests/test-300x250.png\\\",\\\"trackers\\\":{},\\\"width\\\":300,\\\"height\\\":250}],\\\"code\\\":\\\"1\\\",\\\"aabVendors\\\":false,\\\"slot\\\":\\\"005\\\",\\\"redir\\\":\\\"https://www.wp.pl\\\",\\\"wpclid\\\":\\\"1\\\"}\",\"adomain\":[\"sspbc-test\"],\"crid\":\"1234\",\"w\":300,\"h\":250,\"ext\":{\"adlabel\":\"Reklama\",\"pubid\":\"431\",\"siteid\":\"237503\",\"slotid\":\"005\",\"tagid\":\"slot\"}}]}]}; window.inver = '4'; <\/script><\/head><body><div id=\"c\"><\/div><script async crossorigin nomodule src=\"\/\/std.wpcdn.pl\/wpjslib\/wpjslib-inline.js\" id=\"wpjslib\"><\/script><script async crossorigin type=\"module\" src=\"\/\/std.wpcdn.pl\/wpjslib6\/wpjslib-inline.js\" id=\"wpjslib6\"><\/script><\/body><\/html>", - "adomain": [ - "sspbc-test" - ], - "crid": "1234", - "w": 300, - "h": 250, - "ext": { - "adlabel": "Reklama", - "pubid": "431", - "siteid": "237503", - "slotid": "005", - "tagid": "slot" - } - }, - "type": "banner" - } - ] - } - ] -} \ No newline at end of file diff --git a/adapters/sspBC/sspbctest/supplemental/request_with_incorrect_imp_bidder_ext.json b/adapters/sspBC/sspbctest/supplemental/request_with_incorrect_imp_bidder_ext.json deleted file mode 100644 index 8e089cfefda..00000000000 --- a/adapters/sspBC/sspbctest/supplemental/request_with_incorrect_imp_bidder_ext.json +++ /dev/null @@ -1,149 +0,0 @@ -{ - "mockBidRequest": { - "id": "test-request", - "imp": [ - { - "id": "slot", - "ext": { - "bidder": "incorrect" - }, - "secure": 1, - "banner": { - "format": [ - { - "w": 300, - "h": 250 - } - ] - } - } - ], - "site": { - "domain": "test.page", - "page": "https://test.page/", - "ref": "https://test.referer/" - }, - "regs": { - "ext": { - "gdpr": 1 - } - }, - "user": { - "ext": { - "consent": "test_consent" - }, - "buyeruid": "test_user" - } - }, - "httpCalls": [ - { - "expectedRequest": { - "uri": "http://ssp.wp.test/bidder/?bdver=5.8&inver=4", - "body": { - "id": "test-request", - "imp": [ - { - "id": "slot", - "banner": { - "format": [ - { - "w": 300, - "h": 250 - } - ] - }, - "tagid": "slot", - "secure": 1, - "ext": { - "data": { - "pbslot": "slot", - "pbsize": "300x250" - } - } - } - ], - "site": { - "domain": "test.page", - "page": "https://test.page/", - "ref": "https://test.referer/" - }, - "user": { - "ext": { - "consent": "test_consent" - }, - "buyeruid": "test_user" - }, - "regs": { - "ext": { - "gdpr": 1 - } - } - }, - "impIDs":["slot"] - }, - "mockResponse": { - "status": 200, - "body": { - "cur": "USD", - "id": "test-request", - "seatbid": [ - { - "bid": [ - { - "adm": "{\"bunch\":\"237503\",\"capping\":\"\",\"server\":\"s\",\"campaign\":\"c\",\"score\":\"1\",\"creations\":[{\"type\":\"image\",\"src\":\"https:\/\/bdr.wpcdn.pl\/tests\/test-300x250.png\",\"trackers\":{},\"width\":300,\"height\":250}],\"code\":\"1\",\"aabVendors\":false,\"slot\":\"005\",\"redir\":\"https:\/\/www.wp.pl\",\"wpclid\":\"1\"}", - "adomain": [ - "sspbc-test" - ], - "crid": "1234", - "ext": { - "adlabel": "Reklama", - "pubid": "431", - "siteid": "237503", - "slotid": "005", - "tagid": "slot" - }, - "w": 300, - "h": 250, - "id": "response-005", - "impid": "slot", - "price": 20 - } - ], - "seat": "sspbc-test" - } - ], - "sn": "sspbc-test" - } - } - } - ], - "expectedBidResponses": [ - { - "currency": "USD", - "bids": [ - { - "bid": { - "id": "response-005", - "impid": "slot", - "price": 20, - "adm": "<html><head><title><\/title><meta charset=\"UTF-8\"><meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"><style> body { background-color: transparent; margin: 0; padding: 0; }<\/style><script> window.rekid = \"237503\"; window.slot = \"005\"; window.adlabel = 'Reklama'; window.pubid = '431'; window.wp_sn = 'sspbc_go'; window.page = 'https:\\\/\\\/test.page\\\/'; window.ref = 'https:\\\/\\\/test.referer\\\/'; window.mcad = {\"id\":\"test-request\",\"seat\":\"sspbc-test\",\"seatbid\":[{\"bid\":[{\"id\":\"response-005\",\"impid\":\"slot\",\"price\":20,\"adm\":\"{\\\"bunch\\\":\\\"237503\\\",\\\"capping\\\":\\\"\\\",\\\"server\\\":\\\"s\\\",\\\"campaign\\\":\\\"c\\\",\\\"score\\\":\\\"1\\\",\\\"creations\\\":[{\\\"type\\\":\\\"image\\\",\\\"src\\\":\\\"https://bdr.wpcdn.pl/tests/test-300x250.png\\\",\\\"trackers\\\":{},\\\"width\\\":300,\\\"height\\\":250}],\\\"code\\\":\\\"1\\\",\\\"aabVendors\\\":false,\\\"slot\\\":\\\"005\\\",\\\"redir\\\":\\\"https://www.wp.pl\\\",\\\"wpclid\\\":\\\"1\\\"}\",\"adomain\":[\"sspbc-test\"],\"crid\":\"1234\",\"w\":300,\"h\":250,\"ext\":{\"adlabel\":\"Reklama\",\"pubid\":\"431\",\"siteid\":\"237503\",\"slotid\":\"005\",\"tagid\":\"slot\"}}]}]}; window.inver = '4'; <\/script><\/head><body><div id=\"c\"><\/div><script async crossorigin nomodule src=\"\/\/std.wpcdn.pl\/wpjslib\/wpjslib-inline.js\" id=\"wpjslib\"><\/script><script async crossorigin type=\"module\" src=\"\/\/std.wpcdn.pl\/wpjslib6\/wpjslib-inline.js\" id=\"wpjslib6\"><\/script><\/body><\/html>", - "adomain": [ - "sspbc-test" - ], - "crid": "1234", - "w": 300, - "h": 250, - "ext": { - "adlabel": "Reklama", - "pubid": "431", - "siteid": "237503", - "slotid": "005", - "tagid": "slot" - } - }, - "type": "banner" - } - ] - } - ] -} \ No newline at end of file diff --git a/adapters/sspBC/sspbctest/supplemental/request_with_incorrect_imp_ext.json b/adapters/sspBC/sspbctest/supplemental/request_with_incorrect_imp_ext.json deleted file mode 100644 index 3ab3f998ba9..00000000000 --- a/adapters/sspBC/sspbctest/supplemental/request_with_incorrect_imp_ext.json +++ /dev/null @@ -1,147 +0,0 @@ -{ - "mockBidRequest": { - "id": "test-request", - "imp": [ - { - "id": "slot", - "ext": "incorrect", - "secure": 1, - "banner": { - "format": [ - { - "w": 300, - "h": 250 - } - ] - } - } - ], - "site": { - "domain": "test.page", - "page": "https://test.page/", - "ref": "https://test.referer/" - }, - "regs": { - "ext": { - "gdpr": 1 - } - }, - "user": { - "ext": { - "consent": "test_consent" - }, - "buyeruid": "test_user" - } - }, - "httpCalls": [ - { - "expectedRequest": { - "uri": "http://ssp.wp.test/bidder/?bdver=5.8&inver=4", - "body": { - "id": "test-request", - "imp": [ - { - "id": "slot", - "banner": { - "format": [ - { - "w": 300, - "h": 250 - } - ] - }, - "tagid": "slot", - "secure": 1, - "ext": { - "data": { - "pbslot": "slot", - "pbsize": "300x250" - } - } - } - ], - "site": { - "domain": "test.page", - "page": "https://test.page/", - "ref": "https://test.referer/" - }, - "user": { - "ext": { - "consent": "test_consent" - }, - "buyeruid": "test_user" - }, - "regs": { - "ext": { - "gdpr": 1 - } - } - }, - "impIDs":["slot"] - }, - "mockResponse": { - "status": 200, - "body": { - "cur": "USD", - "id": "test-request", - "seatbid": [ - { - "bid": [ - { - "adm": "{\"bunch\":\"237503\",\"capping\":\"\",\"server\":\"s\",\"campaign\":\"c\",\"score\":\"1\",\"creations\":[{\"type\":\"image\",\"src\":\"https:\/\/bdr.wpcdn.pl\/tests\/test-300x250.png\",\"trackers\":{},\"width\":300,\"height\":250}],\"code\":\"1\",\"aabVendors\":false,\"slot\":\"005\",\"redir\":\"https:\/\/www.wp.pl\",\"wpclid\":\"1\"}", - "adomain": [ - "sspbc-test" - ], - "crid": "1234", - "ext": { - "adlabel": "Reklama", - "pubid": "431", - "siteid": "237503", - "slotid": "005", - "tagid": "slot" - }, - "w": 300, - "h": 250, - "id": "response-005", - "impid": "slot", - "price": 20 - } - ], - "seat": "sspbc-test" - } - ], - "sn": "sspbc-test" - } - } - } - ], - "expectedBidResponses": [ - { - "currency": "USD", - "bids": [ - { - "bid": { - "id": "response-005", - "impid": "slot", - "price": 20, - "adm": "<html><head><title><\/title><meta charset=\"UTF-8\"><meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"><style> body { background-color: transparent; margin: 0; padding: 0; }<\/style><script> window.rekid = \"237503\"; window.slot = \"005\"; window.adlabel = 'Reklama'; window.pubid = '431'; window.wp_sn = 'sspbc_go'; window.page = 'https:\\\/\\\/test.page\\\/'; window.ref = 'https:\\\/\\\/test.referer\\\/'; window.mcad = {\"id\":\"test-request\",\"seat\":\"sspbc-test\",\"seatbid\":[{\"bid\":[{\"id\":\"response-005\",\"impid\":\"slot\",\"price\":20,\"adm\":\"{\\\"bunch\\\":\\\"237503\\\",\\\"capping\\\":\\\"\\\",\\\"server\\\":\\\"s\\\",\\\"campaign\\\":\\\"c\\\",\\\"score\\\":\\\"1\\\",\\\"creations\\\":[{\\\"type\\\":\\\"image\\\",\\\"src\\\":\\\"https://bdr.wpcdn.pl/tests/test-300x250.png\\\",\\\"trackers\\\":{},\\\"width\\\":300,\\\"height\\\":250}],\\\"code\\\":\\\"1\\\",\\\"aabVendors\\\":false,\\\"slot\\\":\\\"005\\\",\\\"redir\\\":\\\"https://www.wp.pl\\\",\\\"wpclid\\\":\\\"1\\\"}\",\"adomain\":[\"sspbc-test\"],\"crid\":\"1234\",\"w\":300,\"h\":250,\"ext\":{\"adlabel\":\"Reklama\",\"pubid\":\"431\",\"siteid\":\"237503\",\"slotid\":\"005\",\"tagid\":\"slot\"}}]}]}; window.inver = '4'; <\/script><\/head><body><div id=\"c\"><\/div><script async crossorigin nomodule src=\"\/\/std.wpcdn.pl\/wpjslib\/wpjslib-inline.js\" id=\"wpjslib\"><\/script><script async crossorigin type=\"module\" src=\"\/\/std.wpcdn.pl\/wpjslib6\/wpjslib-inline.js\" id=\"wpjslib6\"><\/script><\/body><\/html>", - "adomain": [ - "sspbc-test" - ], - "crid": "1234", - "w": 300, - "h": 250, - "ext": { - "adlabel": "Reklama", - "pubid": "431", - "siteid": "237503", - "slotid": "005", - "tagid": "slot" - } - }, - "type": "banner" - } - ] - } - ] -} \ No newline at end of file diff --git a/adapters/sspBC/sspbctest/supplemental/request_with_standard_and_onecode_imp.json b/adapters/sspBC/sspbctest/supplemental/request_with_standard_and_onecode_imp.json index 7c864f8c9a5..4784ce59682 100644 --- a/adapters/sspBC/sspbctest/supplemental/request_with_standard_and_onecode_imp.json +++ b/adapters/sspBC/sspbctest/supplemental/request_with_standard_and_onecode_imp.json @@ -18,7 +18,8 @@ "h": 250 } ] - } + }, + "tagid": "ad-slot-standard" }, { "id": "slot-onecode", @@ -31,7 +32,8 @@ "h": 600 } ] - } + }, + "tagid": "ad-slot-onecode" } ], "site": { @@ -54,64 +56,64 @@ "httpCalls": [ { "expectedRequest": { - "uri": "http://ssp.wp.test/bidder/?bdver=5.8&inver=4", + "uri": "http://ssp.wp.test/bidder/?bdver=6.0", "body": { - "id": "test-request", - "imp": [ - { - "id": "slot-standard", - "banner": { - "format": [ - { - "w": 300, - "h": 250 + "bidRequest": { + "id": "test-request", + "imp": [ + { + "id": "slot-standard", + "banner": { + "format": [ + { + "w": 300, + "h": 250 + } + ] + }, + "tagid": "ad-slot-standard", + "secure": 1, + "ext": { + "bidder": { + "siteId": "237503", + "id": "005" } - ] - }, - "tagid": "slot-standard", - "secure": 1, - "ext": { - "data": { - "pbslot": "slot-standard", - "pbsize": "300x250" } + }, + { + "id": "slot-onecode", + "banner": { + "format": [ + { + "w": 300, + "h": 600 + } + ] + }, + "tagid": "ad-slot-onecode", + "secure": 1, + "ext": {} } + ], + "site": { + "domain": "test.page", + "page": "https://test.page/", + "ref": "https://test.referer/" }, - { - "id": "slot-onecode", - "banner": { - "format": [ - { - "w": 300, - "h": 600 - } - ] + "user": { + "ext": { + "consent": "test_consent" }, - "tagid": "slot-onecode", - "secure": 1, + "buyeruid": "test_user" + }, + "regs": { "ext": { - "data": { - "pbslot": "slot-onecode", - "pbsize": "300x600" - } + "gdpr": 1 } } - ], - "site": { - "domain": "test.page", - "page": "https://test.page/", - "ref": "https://test.referer/" - }, - "user": { - "ext": { - "consent": "test_consent" - }, - "buyeruid": "test_user" }, - "regs": { - "ext": { - "gdpr": 1 - } + "requestInfo": { + "PbsEntryPoint": "" } }, "impIDs":["slot-standard","slot-onecode"] @@ -131,7 +133,9 @@ ], "crid": "1234", "ext": { - "adlabel": "Reklama", + "external": "1", + "platform": "prebidserver", + "pricepl": 0.123, "pubid": "431", "siteid": "237503", "slotid": "005", @@ -141,7 +145,8 @@ "h": 250, "id": "response-005", "impid": "slot-standard", - "price": 20 + "price": 20, + "mtype": 1 } ], "seat": "sspbc-test" @@ -155,7 +160,9 @@ ], "crid": "5678", "ext": { - "adlabel": "Reklama", + "external": "1", + "platform": "prebidserver", + "pricepl": 0.123, "pubid": "431", "siteid": "237503", "slotid": "037", @@ -165,7 +172,8 @@ "h": 600, "id": "response-037", "impid": "slot-onecode", - "price": 10 + "price": 10, + "mtype": 1 } ], "seat": "sspbc-test" @@ -193,12 +201,15 @@ "w": 300, "h": 250, "ext": { - "adlabel": "Reklama", + "external": "1", + "platform": "prebidserver", + "pricepl": 0.123, "pubid": "431", "siteid": "237503", "slotid": "005", "tagid": "slot-standard" - } + }, + "mtype": 1 }, "type": "banner" }, @@ -215,12 +226,15 @@ "w": 300, "h": 600, "ext": { - "adlabel": "Reklama", + "external": "1", + "platform": "prebidserver", + "pricepl": 0.123, "pubid": "431", "siteid": "237503", "slotid": "037", "tagid": "slot-onecode" - } + }, + "mtype": 1 }, "type": "banner" } diff --git a/adapters/sspBC/sspbctest/supplemental/request_with_test.json b/adapters/sspBC/sspbctest/supplemental/request_with_test.json deleted file mode 100644 index 70f740b4b6c..00000000000 --- a/adapters/sspBC/sspbctest/supplemental/request_with_test.json +++ /dev/null @@ -1,156 +0,0 @@ -{ - "mockBidRequest": { - "id": "test-request", - "imp": [ - { - "id": "slot", - "ext": { - "bidder": { - "siteId": "237503", - "id": "005", - "test": 1 - } - }, - "secure": 1, - "banner": { - "format": [ - { - "w": 300, - "h": 250 - } - ] - } - } - ], - "site": { - "id": "237503", - "domain": "test.page", - "page": "https://test.page/", - "ref": "https://test.referer/" - }, - "regs": { - "ext": { - "gdpr": 1 - } - }, - "user": { - "ext": { - "consent": "test_consent" - }, - "buyeruid": "test_user" - } - }, - "httpCalls": [ - { - "expectedRequest": { - "uri": "http://ssp.wp.test/bidder/?bdver=5.8&inver=4", - "body": { - "id": "test-request", - "imp": [ - { - "id": "005", - "banner": { - "format": [ - { - "w": 300, - "h": 250 - } - ] - }, - "tagid": "slot", - "secure": 1, - "ext": { - "data": { - "pbslot": "slot", - "pbsize": "300x250" - } - } - } - ], - "site": { - "id": "237503", - "domain": "test.page", - "page": "https://test.page/", - "ref": "https://test.referer/" - }, - "user": { - "ext": { - "consent": "test_consent" - }, - "buyeruid": "test_user" - }, - "test": 1, - "regs": { - "ext": { - "gdpr": 1 - } - } - }, - "impIDs":["slot"] - }, - "mockResponse": { - "status": 200, - "body": { - "cur": "USD", - "id": "test-request", - "seatbid": [ - { - "bid": [ - { - "adm": "{\"bunch\":\"237503\",\"capping\":\"\",\"server\":\"s\",\"campaign\":\"c\",\"score\":\"1\",\"creations\":[{\"type\":\"image\",\"src\":\"https:\/\/bdr.wpcdn.pl\/tests\/test-300x250.png\",\"trackers\":{},\"width\":300,\"height\":250}],\"code\":\"1\",\"aabVendors\":false,\"slot\":\"005\",\"redir\":\"https:\/\/www.wp.pl\",\"wpclid\":\"1\"}", - "adomain": [ - "sspbc-test" - ], - "crid": "1234", - "ext": { - "adlabel": "Reklama", - "pubid": "431", - "siteid": "237503", - "slotid": "005", - "tagid": "slot" - }, - "w": 300, - "h": 250, - "id": "response-005", - "impid": "005", - "price": 20 - } - ], - "seat": "sspbc-test" - } - ], - "sn": "sspbc-test" - } - } - } - ], - "expectedBidResponses": [ - { - "currency": "USD", - "bids": [ - { - "bid": { - "id": "response-005", - "impid": "slot", - "price": 20, - "adm": "<html><head><title><\/title><meta charset=\"UTF-8\"><meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"><style> body { background-color: transparent; margin: 0; padding: 0; }<\/style><script> window.rekid = \"237503\"; window.slot = \"005\"; window.adlabel = 'Reklama'; window.pubid = '431'; window.wp_sn = 'sspbc_go'; window.page = 'https:\\\/\\\/test.page\\\/'; window.ref = 'https:\\\/\\\/test.referer\\\/'; window.mcad = {\"id\":\"test-request\",\"seat\":\"sspbc-test\",\"seatbid\":[{\"bid\":[{\"id\":\"response-005\",\"impid\":\"slot\",\"price\":20,\"adm\":\"{\\\"bunch\\\":\\\"237503\\\",\\\"capping\\\":\\\"\\\",\\\"server\\\":\\\"s\\\",\\\"campaign\\\":\\\"c\\\",\\\"score\\\":\\\"1\\\",\\\"creations\\\":[{\\\"type\\\":\\\"image\\\",\\\"src\\\":\\\"https://bdr.wpcdn.pl/tests/test-300x250.png\\\",\\\"trackers\\\":{},\\\"width\\\":300,\\\"height\\\":250}],\\\"code\\\":\\\"1\\\",\\\"aabVendors\\\":false,\\\"slot\\\":\\\"005\\\",\\\"redir\\\":\\\"https://www.wp.pl\\\",\\\"wpclid\\\":\\\"1\\\"}\",\"adomain\":[\"sspbc-test\"],\"crid\":\"1234\",\"w\":300,\"h\":250,\"ext\":{\"adlabel\":\"Reklama\",\"pubid\":\"431\",\"siteid\":\"237503\",\"slotid\":\"005\",\"tagid\":\"slot\"}}]}]}; window.inver = '4'; <\/script><\/head><body><div id=\"c\"><\/div><script async crossorigin nomodule src=\"\/\/std.wpcdn.pl\/wpjslib\/wpjslib-inline.js\" id=\"wpjslib\"><\/script><script async crossorigin type=\"module\" src=\"\/\/std.wpcdn.pl\/wpjslib6\/wpjslib-inline.js\" id=\"wpjslib6\"><\/script><\/body><\/html>", - "adomain": [ - "sspbc-test" - ], - "crid": "1234", - "w": 300, - "h": 250, - "ext": { - "adlabel": "Reklama", - "pubid": "431", - "siteid": "237503", - "slotid": "005", - "tagid": "slot" - } - }, - "type": "banner" - } - ] - } - ] -} \ No newline at end of file diff --git a/adapters/sspBC/sspbctest/supplemental/request_without_banner_format.json b/adapters/sspBC/sspbctest/supplemental/request_without_banner_format.json index 7572f88cacd..96c1eaab703 100644 --- a/adapters/sspBC/sspbctest/supplemental/request_without_banner_format.json +++ b/adapters/sspBC/sspbctest/supplemental/request_without_banner_format.json @@ -13,7 +13,8 @@ "secure": 1, "banner": { "format": [] - } + }, + "tagid": "ad-test1" } ], "site": { @@ -37,40 +38,45 @@ "httpCalls": [ { "expectedRequest": { - "uri": "http://ssp.wp.test/bidder/?bdver=5.8&inver=4", + "uri": "http://ssp.wp.test/bidder/?bdver=6.0", "body": { - "id": "test-request", - "imp": [ - { - "id": "005", - "banner": {}, - "tagid": "slot", - "secure": 1, - "ext": { - "data": { - "pbslot": "slot", - "pbsize": "1x1" + "bidRequest": { + "id": "test-request", + "imp": [ + { + "id": "slot", + "banner": {}, + "tagid": "ad-test1", + "secure": 1, + "ext": { + "bidder": { + "siteId": "237503", + "id": "005" + } } } - } - ], - "site": { - "id": "237503", - "domain": "test.page", - "page": "https://test.page/", - "ref": "https://test.referer/" - }, - "user": { - "ext": { - "consent": "test_consent" + ], + "site": { + "id": "237503", + "domain": "test.page", + "page": "https://test.page/", + "ref": "https://test.referer/" }, - "buyeruid": "test_user" - }, - "regs": { - "ext": { - "gdpr": 1 + "user": { + "ext": { + "consent": "test_consent" + }, + "buyeruid": "test_user" + }, + "regs": { + "ext": { + "gdpr": 1 + } } - } + }, + "requestInfo": { + "PbsEntryPoint": "" + } }, "impIDs":["slot"] }, @@ -83,23 +89,26 @@ { "bid": [ { - "adm": "{\"bunch\":\"237503\",\"capping\":\"\",\"server\":\"s\",\"campaign\":\"c\",\"score\":\"1\",\"creations\":[{\"type\":\"image\",\"src\":\"https:\/\/bdr.wpcdn.pl\/tests\/test-300x250.png\",\"trackers\":{},\"width\":300,\"height\":250}],\"code\":\"1\",\"aabVendors\":false,\"slot\":\"005\",\"redir\":\"https:\/\/www.wp.pl\",\"wpclid\":\"1\"}", + "adm": "<!--preformatted-->test_ad", "adomain": [ "sspbc-test" ], "crid": "1234", "ext": { - "adlabel": "Reklama", + "external": "1", + "platform": "prebidserver", + "pricepl": 0.123, "pubid": "431", "siteid": "237503", "slotid": "005", - "tagid": "slot" + "tagid": "ad-test1" }, "w": 300, "h": 250, "id": "response-005", - "impid": "005", - "price": 20 + "impid": "slot", + "price": 20, + "mtype": 1 } ], "seat": "sspbc-test" @@ -119,7 +128,7 @@ "id": "response-005", "impid": "slot", "price": 20, - "adm": "<html><head><title><\/title><meta charset=\"UTF-8\"><meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"><style> body { background-color: transparent; margin: 0; padding: 0; }<\/style><script> window.rekid = \"237503\"; window.slot = \"005\"; window.adlabel = 'Reklama'; window.pubid = '431'; window.wp_sn = 'sspbc_go'; window.page = 'https:\\\/\\\/test.page\\\/'; window.ref = 'https:\\\/\\\/test.referer\\\/'; window.mcad = {\"id\":\"test-request\",\"seat\":\"sspbc-test\",\"seatbid\":[{\"bid\":[{\"id\":\"response-005\",\"impid\":\"slot\",\"price\":20,\"adm\":\"{\\\"bunch\\\":\\\"237503\\\",\\\"capping\\\":\\\"\\\",\\\"server\\\":\\\"s\\\",\\\"campaign\\\":\\\"c\\\",\\\"score\\\":\\\"1\\\",\\\"creations\\\":[{\\\"type\\\":\\\"image\\\",\\\"src\\\":\\\"https://bdr.wpcdn.pl/tests/test-300x250.png\\\",\\\"trackers\\\":{},\\\"width\\\":300,\\\"height\\\":250}],\\\"code\\\":\\\"1\\\",\\\"aabVendors\\\":false,\\\"slot\\\":\\\"005\\\",\\\"redir\\\":\\\"https://www.wp.pl\\\",\\\"wpclid\\\":\\\"1\\\"}\",\"adomain\":[\"sspbc-test\"],\"crid\":\"1234\",\"w\":300,\"h\":250,\"ext\":{\"adlabel\":\"Reklama\",\"pubid\":\"431\",\"siteid\":\"237503\",\"slotid\":\"005\",\"tagid\":\"slot\"}}]}]}; window.inver = '4'; <\/script><\/head><body><div id=\"c\"><\/div><script async crossorigin nomodule src=\"\/\/std.wpcdn.pl\/wpjslib\/wpjslib-inline.js\" id=\"wpjslib\"><\/script><script async crossorigin type=\"module\" src=\"\/\/std.wpcdn.pl\/wpjslib6\/wpjslib-inline.js\" id=\"wpjslib6\"><\/script><\/body><\/html>", + "adm": "<!--preformatted-->test_ad", "adomain": [ "sspbc-test" ], @@ -127,12 +136,15 @@ "w": 300, "h": 250, "ext": { - "adlabel": "Reklama", + "external": "1", + "platform": "prebidserver", + "pricepl": 0.123, "pubid": "431", "siteid": "237503", "slotid": "005", - "tagid": "slot" - } + "tagid": "ad-test1" + }, + "mtype": 1 }, "type": "banner" } diff --git a/adapters/sspBC/sspbctest/supplemental/request_without_ext_id.json b/adapters/sspBC/sspbctest/supplemental/request_without_ext_id.json deleted file mode 100644 index f7692a91b0e..00000000000 --- a/adapters/sspBC/sspbctest/supplemental/request_without_ext_id.json +++ /dev/null @@ -1,151 +0,0 @@ -{ - "mockBidRequest": { - "id": "test-request", - "imp": [ - { - "id": "slot", - "ext": { - "bidder": { - "siteId": "237503" - } - }, - "secure": 1, - "banner": { - "format": [ - { - "w": 300, - "h": 250 - } - ] - } - } - ], - "site": { - "domain": "test.page", - "page": "https://test.page/", - "ref": "https://test.referer/" - }, - "regs": { - "ext": { - "gdpr": 1 - } - }, - "user": { - "ext": { - "consent": "test_consent" - }, - "buyeruid": "test_user" - } - }, - "httpCalls": [ - { - "expectedRequest": { - "uri": "http://ssp.wp.test/bidder/?bdver=5.8&inver=4", - "body": { - "id": "test-request", - "imp": [ - { - "id": "slot", - "banner": { - "format": [ - { - "w": 300, - "h": 250 - } - ] - }, - "tagid": "slot", - "secure": 1, - "ext": { - "data": { - "pbslot": "slot", - "pbsize": "300x250" - } - } - } - ], - "site": { - "domain": "test.page", - "page": "https://test.page/", - "ref": "https://test.referer/" - }, - "user": { - "ext": { - "consent": "test_consent" - }, - "buyeruid": "test_user" - }, - "regs": { - "ext": { - "gdpr": 1 - } - } - }, - "impIDs":["slot"] - }, - "mockResponse": { - "status": 200, - "body": { - "cur": "USD", - "id": "test-request", - "seatbid": [ - { - "bid": [ - { - "adm": "{\"bunch\":\"237503\",\"capping\":\"\",\"server\":\"s\",\"campaign\":\"c\",\"score\":\"1\",\"creations\":[{\"type\":\"image\",\"src\":\"https:\/\/bdr.wpcdn.pl\/tests\/test-300x250.png\",\"trackers\":{},\"width\":300,\"height\":250}],\"code\":\"1\",\"aabVendors\":false,\"slot\":\"005\",\"redir\":\"https:\/\/www.wp.pl\",\"wpclid\":\"1\"}", - "adomain": [ - "sspbc-test" - ], - "crid": "1234", - "ext": { - "adlabel": "Reklama", - "pubid": "431", - "siteid": "237503", - "slotid": "005", - "tagid": "slot" - }, - "w": 300, - "h": 250, - "id": "response-005", - "impid": "slot", - "price": 20 - } - ], - "seat": "sspbc-test" - } - ], - "sn": "sspbc-test" - } - } - } - ], - "expectedBidResponses": [ - { - "currency": "USD", - "bids": [ - { - "bid": { - "id": "response-005", - "impid": "slot", - "price": 20, - "adm": "<html><head><title><\/title><meta charset=\"UTF-8\"><meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"><style> body { background-color: transparent; margin: 0; padding: 0; }<\/style><script> window.rekid = \"237503\"; window.slot = \"005\"; window.adlabel = 'Reklama'; window.pubid = '431'; window.wp_sn = 'sspbc_go'; window.page = 'https:\\\/\\\/test.page\\\/'; window.ref = 'https:\\\/\\\/test.referer\\\/'; window.mcad = {\"id\":\"test-request\",\"seat\":\"sspbc-test\",\"seatbid\":[{\"bid\":[{\"id\":\"response-005\",\"impid\":\"slot\",\"price\":20,\"adm\":\"{\\\"bunch\\\":\\\"237503\\\",\\\"capping\\\":\\\"\\\",\\\"server\\\":\\\"s\\\",\\\"campaign\\\":\\\"c\\\",\\\"score\\\":\\\"1\\\",\\\"creations\\\":[{\\\"type\\\":\\\"image\\\",\\\"src\\\":\\\"https://bdr.wpcdn.pl/tests/test-300x250.png\\\",\\\"trackers\\\":{},\\\"width\\\":300,\\\"height\\\":250}],\\\"code\\\":\\\"1\\\",\\\"aabVendors\\\":false,\\\"slot\\\":\\\"005\\\",\\\"redir\\\":\\\"https://www.wp.pl\\\",\\\"wpclid\\\":\\\"1\\\"}\",\"adomain\":[\"sspbc-test\"],\"crid\":\"1234\",\"w\":300,\"h\":250,\"ext\":{\"adlabel\":\"Reklama\",\"pubid\":\"431\",\"siteid\":\"237503\",\"slotid\":\"005\",\"tagid\":\"slot\"}}]}]}; window.inver = '4'; <\/script><\/head><body><div id=\"c\"><\/div><script async crossorigin nomodule src=\"\/\/std.wpcdn.pl\/wpjslib\/wpjslib-inline.js\" id=\"wpjslib\"><\/script><script async crossorigin type=\"module\" src=\"\/\/std.wpcdn.pl\/wpjslib6\/wpjslib-inline.js\" id=\"wpjslib6\"><\/script><\/body><\/html>", - "adomain": [ - "sspbc-test" - ], - "crid": "1234", - "w": 300, - "h": 250, - "ext": { - "adlabel": "Reklama", - "pubid": "431", - "siteid": "237503", - "slotid": "005", - "tagid": "slot" - } - }, - "type": "banner" - } - ] - } - ] -} \ No newline at end of file diff --git a/adapters/sspBC/sspbctest/supplemental/request_without_ext_site_id.json b/adapters/sspBC/sspbctest/supplemental/request_without_ext_site_id.json deleted file mode 100644 index eb04d2f7c72..00000000000 --- a/adapters/sspBC/sspbctest/supplemental/request_without_ext_site_id.json +++ /dev/null @@ -1,152 +0,0 @@ -{ - "mockBidRequest": { - "id": "test-request", - "imp": [ - { - "id": "slot", - "ext": { - "bidder": { - "siteId": "", - "id": "005" - } - }, - "secure": 1, - "banner": { - "format": [ - { - "w": 300, - "h": 250 - } - ] - } - } - ], - "site": { - "domain": "test.page", - "page": "https://test.page/", - "ref": "https://test.referer/" - }, - "regs": { - "ext": { - "gdpr": 1 - } - }, - "user": { - "ext": { - "consent": "test_consent" - }, - "buyeruid": "test_user" - } - }, - "httpCalls": [ - { - "expectedRequest": { - "uri": "http://ssp.wp.test/bidder/?bdver=5.8&inver=4", - "body": { - "id": "test-request", - "imp": [ - { - "id": "slot", - "banner": { - "format": [ - { - "w": 300, - "h": 250 - } - ] - }, - "tagid": "slot", - "secure": 1, - "ext": { - "data": { - "pbslot": "slot", - "pbsize": "300x250" - } - } - } - ], - "site": { - "domain": "test.page", - "page": "https://test.page/", - "ref": "https://test.referer/" - }, - "user": { - "ext": { - "consent": "test_consent" - }, - "buyeruid": "test_user" - }, - "regs": { - "ext": { - "gdpr": 1 - } - } - }, - "impIDs":["slot"] - }, - "mockResponse": { - "status": 200, - "body": { - "cur": "USD", - "id": "test-request", - "seatbid": [ - { - "bid": [ - { - "adm": "{\"bunch\":\"237503\",\"capping\":\"\",\"server\":\"s\",\"campaign\":\"c\",\"score\":\"1\",\"creations\":[{\"type\":\"image\",\"src\":\"https:\/\/bdr.wpcdn.pl\/tests\/test-300x250.png\",\"trackers\":{},\"width\":300,\"height\":250}],\"code\":\"1\",\"aabVendors\":false,\"slot\":\"005\",\"redir\":\"https:\/\/www.wp.pl\",\"wpclid\":\"1\"}", - "adomain": [ - "sspbc-test" - ], - "crid": "1234", - "ext": { - "adlabel": "Reklama", - "pubid": "431", - "siteid": "237503", - "slotid": "005", - "tagid": "slot" - }, - "w": 300, - "h": 250, - "id": "response-005", - "impid": "slot", - "price": 20 - } - ], - "seat": "sspbc-test" - } - ], - "sn": "sspbc-test" - } - } - } - ], - "expectedBidResponses": [ - { - "currency": "USD", - "bids": [ - { - "bid": { - "id": "response-005", - "impid": "slot", - "price": 20, - "adm": "<html><head><title><\/title><meta charset=\"UTF-8\"><meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"><style> body { background-color: transparent; margin: 0; padding: 0; }<\/style><script> window.rekid = \"237503\"; window.slot = \"005\"; window.adlabel = 'Reklama'; window.pubid = '431'; window.wp_sn = 'sspbc_go'; window.page = 'https:\\\/\\\/test.page\\\/'; window.ref = 'https:\\\/\\\/test.referer\\\/'; window.mcad = {\"id\":\"test-request\",\"seat\":\"sspbc-test\",\"seatbid\":[{\"bid\":[{\"id\":\"response-005\",\"impid\":\"slot\",\"price\":20,\"adm\":\"{\\\"bunch\\\":\\\"237503\\\",\\\"capping\\\":\\\"\\\",\\\"server\\\":\\\"s\\\",\\\"campaign\\\":\\\"c\\\",\\\"score\\\":\\\"1\\\",\\\"creations\\\":[{\\\"type\\\":\\\"image\\\",\\\"src\\\":\\\"https://bdr.wpcdn.pl/tests/test-300x250.png\\\",\\\"trackers\\\":{},\\\"width\\\":300,\\\"height\\\":250}],\\\"code\\\":\\\"1\\\",\\\"aabVendors\\\":false,\\\"slot\\\":\\\"005\\\",\\\"redir\\\":\\\"https://www.wp.pl\\\",\\\"wpclid\\\":\\\"1\\\"}\",\"adomain\":[\"sspbc-test\"],\"crid\":\"1234\",\"w\":300,\"h\":250,\"ext\":{\"adlabel\":\"Reklama\",\"pubid\":\"431\",\"siteid\":\"237503\",\"slotid\":\"005\",\"tagid\":\"slot\"}}]}]}; window.inver = '4'; <\/script><\/head><body><div id=\"c\"><\/div><script async crossorigin nomodule src=\"\/\/std.wpcdn.pl\/wpjslib\/wpjslib-inline.js\" id=\"wpjslib\"><\/script><script async crossorigin type=\"module\" src=\"\/\/std.wpcdn.pl\/wpjslib6\/wpjslib-inline.js\" id=\"wpjslib6\"><\/script><\/body><\/html>", - "adomain": [ - "sspbc-test" - ], - "crid": "1234", - "w": 300, - "h": 250, - "ext": { - "adlabel": "Reklama", - "pubid": "431", - "siteid": "237503", - "slotid": "005", - "tagid": "slot" - } - }, - "type": "banner" - } - ] - } - ] -} \ No newline at end of file diff --git a/adapters/sspBC/sspbctest/supplemental/status_204.json b/adapters/sspBC/sspbctest/supplemental/status_204.json index f26421a6356..6e4b3c52ae0 100644 --- a/adapters/sspBC/sspbctest/supplemental/status_204.json +++ b/adapters/sspBC/sspbctest/supplemental/status_204.json @@ -18,11 +18,11 @@ "h": 250 } ] - } + }, + "tagid": "ad-test1" } ], "site": { - "id": "237503", "domain": "test.page", "page": "https://test.page/", "ref": "https://test.referer/" @@ -42,46 +42,50 @@ "httpCalls": [ { "expectedRequest": { - "uri": "http://ssp.wp.test/bidder/?bdver=5.8&inver=4", + "uri": "http://ssp.wp.test/bidder/?bdver=6.0", "body": { - "id": "test-request", - "imp": [ - { - "id": "005", - "banner": { - "format": [ - { - "w": 300, - "h": 250 + "bidRequest": { + "id": "test-request", + "imp": [ + { + "id": "slot", + "banner": { + "format": [ + { + "w": 300, + "h": 250 + } + ] + }, + "tagid": "ad-test1", + "secure": 1, + "ext": { + "bidder": { + "siteId": "237503", + "id": "005" } - ] + } + } + ], + "site": { + "domain": "test.page", + "page": "https://test.page/", + "ref": "https://test.referer/" + }, + "user": { + "ext": { + "consent": "test_consent" }, - "tagid": "slot", - "secure": 1, + "buyeruid": "test_user" + }, + "regs": { "ext": { - "data": { - "pbslot": "slot", - "pbsize": "300x250" - } + "gdpr": 1 } } - ], - "site": { - "id": "237503", - "domain": "test.page", - "page": "https://test.page/", - "ref": "https://test.referer/" }, - "user": { - "ext": { - "consent": "test_consent" - }, - "buyeruid": "test_user" - }, - "regs": { - "ext": { - "gdpr": 1 - } + "requestInfo": { + "PbsEntryPoint": "" } }, "impIDs":["slot"] diff --git a/adapters/sspBC/sspbctest/supplemental/status_400.json b/adapters/sspBC/sspbctest/supplemental/status_400.json index adf79df5d22..ee6d0b3663b 100644 --- a/adapters/sspBC/sspbctest/supplemental/status_400.json +++ b/adapters/sspBC/sspbctest/supplemental/status_400.json @@ -18,11 +18,11 @@ "h": 250 } ] - } + }, + "tagid": "ad-test1" } ], "site": { - "id": "237503", "domain": "test.page", "page": "https://test.page/", "ref": "https://test.referer/" @@ -42,46 +42,50 @@ "httpCalls": [ { "expectedRequest": { - "uri": "http://ssp.wp.test/bidder/?bdver=5.8&inver=4", + "uri": "http://ssp.wp.test/bidder/?bdver=6.0", "body": { - "id": "test-request", - "imp": [ - { - "id": "005", - "banner": { - "format": [ - { - "w": 300, - "h": 250 + "bidRequest": { + "id": "test-request", + "imp": [ + { + "id": "slot", + "banner": { + "format": [ + { + "w": 300, + "h": 250 + } + ] + }, + "tagid": "ad-test1", + "secure": 1, + "ext": { + "bidder": { + "siteId": "237503", + "id": "005" } - ] + } + } + ], + "site": { + "domain": "test.page", + "page": "https://test.page/", + "ref": "https://test.referer/" + }, + "user": { + "ext": { + "consent": "test_consent" }, - "tagid": "slot", - "secure": 1, + "buyeruid": "test_user" + }, + "regs": { "ext": { - "data": { - "pbslot": "slot", - "pbsize": "300x250" - } + "gdpr": 1 } } - ], - "site": { - "id": "237503", - "domain": "test.page", - "page": "https://test.page/", - "ref": "https://test.referer/" }, - "user": { - "ext": { - "consent": "test_consent" - }, - "buyeruid": "test_user" - }, - "regs": { - "ext": { - "gdpr": 1 - } + "requestInfo": { + "PbsEntryPoint": "" } }, "impIDs":["slot"] @@ -94,7 +98,7 @@ ], "expectedMakeBidsErrors": [ { - "value": "Unexpected status code: 400.", + "value": "unexpected status code: 400.", "comparison": "literal" } ] diff --git a/static/bidder-info/sspBC.yaml b/static/bidder-info/sspBC.yaml index 97da8b497cd..d1855ec9fec 100644 --- a/static/bidder-info/sspBC.yaml +++ b/static/bidder-info/sspBC.yaml @@ -1,4 +1,4 @@ -endpoint: "https://ssp.wp.pl/v1/bidder/prebidserver" +endpoint: "https://ssp.wp.pl/v2/bidder/prebidserver" maintainer: email: "prebid-dev@grupawp.pl" gvlVendorID: 676 @@ -11,3 +11,6 @@ userSync: iframe: url: https://ssp.wp.pl/bidder/usersync?tcf=2&redirect={{.RedirectURL}} userMacro: $UID + redirect: + url: https://ssp.wp.pl/v1/sync/prebid-server/pixel?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&redirect={{.RedirectURL}} + userMacro: $UID