Add client/AccountID support into Adoppler adapter. (#1535)

adapters/adoppler/adoppler.go

@@ -6,13 +6,18 @@ import (
 	"fmt"
 	"net/http"
 	"net/url"
+	"text/template"
 
+	"github.com/golang/glog"
 	"github.com/mxmCherry/openrtb"
 	"github.com/prebid/prebid-server/adapters"
 	"github.com/prebid/prebid-server/errortypes"
+	"github.com/prebid/prebid-server/macros"
 	"github.com/prebid/prebid-server/openrtb_ext"
 )
 
+const DefaultClient = "app"
+
 var bidHeaders http.Header = map[string][]string{
 	"Accept":            {"application/json"},
 	"Content-Type":      {"application/json;charset=utf-8"},
@@ -28,11 +33,17 @@ type adsImpExt struct {
 }
 
 type AdopplerAdapter struct {
-	endpoint string
+	endpoint *template.Template
 }
 
 func NewAdopplerBidder(endpoint string) *AdopplerAdapter {
-	return &AdopplerAdapter{endpoint}
+	t, err := template.New("endpoint").Parse(endpoint)
+	if err != nil {
+		glog.Fatalf("Unable to parse endpoint url template: %s", err)
+		return nil
+	}
+
+	return &AdopplerAdapter{t}
 }
 
 func (ads *AdopplerAdapter) MakeRequests(
@@ -65,8 +76,13 @@ func (ads *AdopplerAdapter) MakeRequests(
 			continue
 		}
 
-		uri := fmt.Sprintf("%s/processHeaderBid/%s",
-			ads.endpoint, url.PathEscape(ext.AdUnit))
+		uri, err := ads.bidUri(ext)
+		if err != nil {
+			e := fmt.Sprintf("Unable to build bid URI: %s",
+				err.Error())
+			errs = append(errs, &errortypes.BadInput{e})
+			continue
+		}
 		data := &adapters.RequestData{
 			Method:  "POST",
 			Uri:     uri,
@@ -172,6 +188,18 @@ func (ads *AdopplerAdapter) MakeBids(
 	return adsResp, nil
 }
 
+func (ads *AdopplerAdapter) bidUri(ext *openrtb_ext.ExtImpAdoppler) (string, error) {
+	params := macros.EndpointTemplateParams{}
+	params.AdUnit = url.PathEscape(ext.AdUnit)
+	if ext.Client == "" {
+		params.AccountID = DefaultClient
+	} else {
+		params.AccountID = url.PathEscape(ext.Client)
+	}
+
+	return macros.ResolveMacros(*ads.endpoint, params)
+}
+
 func unmarshalExt(ext json.RawMessage) (*openrtb_ext.ExtImpAdoppler, error) {
 	var bext adapters.ExtImpBidder
 	err := json.Unmarshal(ext, &bext)

adapters/adoppler/adoppler_test.go

@@ -7,6 +7,6 @@ import (
 )
 
 func TestJsonSamples(t *testing.T) {
-	bidder := NewAdopplerBidder("http://adoppler.com")
+	bidder := NewAdopplerBidder("http://{{.AccountID}}.trustedmarketplace.com/processHeaderBid/{{.AdUnit}}")
 	adapterstest.RunJSONBidderTest(t, "adopplertest", bidder)
 }

adapters/adoppler/adopplertest/exemplary/custom-client.json

@@ -0,0 +1,80 @@
+{
+  "mockBidRequest":{
+    "id":"req1",
+    "imp":[
+      {
+        "id":"imp1",
+        "banner":{
+          "w":100,
+          "h":200
+        },
+        "ext":{
+          "bidder":{
+            "adunit":"unit1",
+            "client":"client1"
+          }
+        }
+      }
+    ]
+  },
+  "httpCalls":[
+    {
+      "expectedRequest":{
+        "uri":"http://client1.trustedmarketplace.com/processHeaderBid/unit1",
+        "body":{
+          "id":"req1-unit1",
+          "imp":[
+            {
+              "id":"imp1",
+              "banner":{
+                "w":100,
+                "h":200
+              },
+              "ext":{
+                "bidder":{
+                  "adunit":"unit1",
+                  "client":"client1"
+                }
+              }
+            }
+          ]
+        }
+      },
+      "mockResponse":{
+        "status":200,
+        "body":{
+          "id":"req1-unit1",
+          "seatbid":[
+            {
+              "bid":[
+                {
+                  "id":"req1-unit1-bid1",
+                  "impid":"imp1",
+                  "price":0.12,
+                  "adm":"<b>An ad</b>"
+                }
+              ]
+            }
+          ],
+          "cur":"USD"
+        }
+      }
+    }
+  ],
+  "expectedBidResponses":[
+    {
+      "currency":"USD",
+      "bids":[
+        {
+          "bid":{
+            "id":"req1-unit1-bid1",
+            "impid":"imp1",
+            "price":0.12,
+            "adm":"<b>An ad</b>"
+          },
+          "type":"banner"
+        }
+      ]
+    }
+  ]
+}

adapters/adoppler/adopplertest/exemplary/default-client.json

@@ -0,0 +1,78 @@
+{
+  "mockBidRequest":{
+    "id":"req1",
+    "imp":[
+      {
+        "id":"imp1",
+        "banner":{
+          "w":100,
+          "h":200
+        },
+        "ext":{
+          "bidder":{
+            "adunit":"unit1"
+          }
+        }
+      }
+    ]
+  },
+  "httpCalls":[
+    {
+      "expectedRequest":{
+        "uri":"http://app.trustedmarketplace.com/processHeaderBid/unit1",
+        "body":{
+          "id":"req1-unit1",
+          "imp":[
+            {
+              "id":"imp1",
+              "banner":{
+                "w":100,
+                "h":200
+              },
+              "ext":{
+                "bidder":{
+                  "adunit":"unit1"
+                }
+              }
+            }
+          ]
+        }
+      },
+      "mockResponse":{
+        "status":200,
+        "body":{
+          "id":"req1-unit1",
+          "seatbid":[
+            {
+              "bid":[
+                {
+                  "id":"req1-unit1-bid1",
+                  "impid":"imp1",
+                  "price":0.12,
+                  "adm":"<b>An ad</b>"
+                }
+              ]
+            }
+          ],
+          "cur":"USD"
+        }
+      }
+    }
+  ],
+  "expectedBidResponses":[
+    {
+      "currency":"USD",
+      "bids":[
+        {
+          "bid":{
+            "id":"req1-unit1-bid1",
+            "impid":"imp1",
+            "price":0.12,
+            "adm":"<b>An ad</b>"
+          },
+          "type":"banner"
+        }
+      ]
+    }
+  ]
+}