add test authorization, update test cases.

wwwyyy · Aug 20, 2021 · 2aec272 · 2aec272
1 parent 41244a3
commit 2aec272
Show file tree

Hide file tree

Showing 26 changed files with 92 additions and 43 deletions.
diff --git a/adapters/huaweiads/huaweiads.go b/adapters/huaweiads/huaweiads.go
@@ -270,12 +270,12 @@ func (a *adapter) MakeRequests(openRTBRequest *openrtb2.BidRequest,
 	}
 
 	//	our request header's Authorization is changing by time, cannot verify by a certain string,
-	//	use isAddAuthorization = false only when run testcase
-	var isAddAuthorization = true
-	if huaweiAdsImpExt != nil && huaweiAdsImpExt.IsAddAuthorization == "false" {
-		isAddAuthorization = false
+	//	use isTestAuthorization = true only when run testcase
+	var isTestAuthorization = false
+	if huaweiAdsImpExt != nil && huaweiAdsImpExt.IsTestAuthorization == "true" {
+		isTestAuthorization = true
 	}
-	header = getHeaders(huaweiAdsImpExt, openRTBRequest, isAddAuthorization)
+	header = getHeaders(huaweiAdsImpExt, openRTBRequest, isTestAuthorization)
 	bidRequest := &adapters.RequestData{
 		Method:  http.MethodPost,
 		Uri:     a.endpoint,
@@ -321,17 +321,14 @@ func Builder(bidderName openrtb_ext.BidderName, config config.Adapter) (adapters
 }
 
 // getHeaders: get request header, Authorization -> digest
-func getHeaders(huaweiAdsImpExt *openrtb_ext.ExtImpHuaweiAds, request *openrtb2.BidRequest, isAddAuthorization bool) http.Header {
+func getHeaders(huaweiAdsImpExt *openrtb_ext.ExtImpHuaweiAds, request *openrtb2.BidRequest, isTestAuthorization bool) http.Header {
 	headers := http.Header{}
 	headers.Add("Content-Type", "application/json;charset=utf-8")
 	headers.Add("Accept", "application/json")
 	if huaweiAdsImpExt == nil {
 		return headers
 	}
-
-	if isAddAuthorization {
-		headers.Add("Authorization", getDigestAuthorization(huaweiAdsImpExt))
-	}
+	headers.Add("Authorization", getDigestAuthorization(huaweiAdsImpExt, isTestAuthorization))
 
 	if request.Device != nil && len(request.Device.UA) > 0 {
 		headers.Add("User-Agent", request.Device.UA)
@@ -1281,8 +1278,12 @@ func computeHmacSha256(message string, signKey string) string {
 }
 
 // getDigestAuthorization: get digest authorization for request header
-func getDigestAuthorization(huaweiAdsImpExt *openrtb_ext.ExtImpHuaweiAds) string {
+func getDigestAuthorization(huaweiAdsImpExt *openrtb_ext.ExtImpHuaweiAds, isTestAuthorization bool) string {
 	var nonce = strconv.FormatInt(time.Now().UnixNano()/1e6, 10)
+	// this is for test case, time 2021/8/20 19:30
+	if isTestAuthorization {
+		nonce = "1629473330823"
+	}
 	var apiKey = huaweiAdsImpExt.PublisherId + ":ppsadx/getResult:" + huaweiAdsImpExt.SignKey
 	return "Digest username=" + huaweiAdsImpExt.PublisherId + "," +
 		"realm=ppsadx/getResult," +

diff --git a/adapters/huaweiads/huaweiadstest/exemplary/banner1.json b/adapters/huaweiads/huaweiadstest/exemplary/banner1.json
@@ -21,7 +21,7 @@
             "publisherid": "123",
             "signkey": "signkey",
             "keyid": "41",
-            "isAddAuthorization": "false"
+            "isTestAuthorization": "true"
           }
         }
       }
@@ -85,6 +85,9 @@
           ],
           "User-Agent": [
             "useragent"
+          ],
+          "Authorization": [
+            "Digest username=123,realm=ppsadx/getResult,nonce=1629473330823,response=d1d61a13a83e1468aa4dff5c8a6cee0b8b381173ca3eb6fa9b313937684d87c0,algorithm=HmacSHA256,usertype=1,keyid=41"
           ]
         },
         "body": {

diff --git a/adapters/huaweiads/huaweiadstest/exemplary/banner2.json b/adapters/huaweiads/huaweiadstest/exemplary/banner2.json
@@ -31,7 +31,7 @@
             "publisherid": "123",
             "signkey": "signkey",
             "keyid": "41",
-            "isAddAuthorization": "false"
+            "isTestAuthorization": "true"
           }
         }
       }
@@ -109,6 +109,9 @@
           ],
           "User-Agent": [
             "ua"
+          ],
+          "Authorization": [
+            "Digest username=123,realm=ppsadx/getResult,nonce=1629473330823,response=d1d61a13a83e1468aa4dff5c8a6cee0b8b381173ca3eb6fa9b313937684d87c0,algorithm=HmacSHA256,usertype=1,keyid=41"
           ]
         },
         "body": {

diff --git a/adapters/huaweiads/huaweiadstest/exemplary/nativeIncludeVideo.json b/adapters/huaweiads/huaweiadstest/exemplary/nativeIncludeVideo.json
@@ -15,7 +15,7 @@
             "publisherid": "123",
             "signkey": "signkey",
             "keyid": "41",
-            "isAddAuthorization": "false"
+            "isTestAuthorization": "true"
           }
         }
       }
@@ -75,6 +75,9 @@
           ],
           "User-Agent": [
             "useragent"
+          ],
+          "Authorization": [
+            "Digest username=123,realm=ppsadx/getResult,nonce=1629473330823,response=d1d61a13a83e1468aa4dff5c8a6cee0b8b381173ca3eb6fa9b313937684d87c0,algorithm=HmacSHA256,usertype=1,keyid=41"
           ]
         },
         "body": {

diff --git a/adapters/huaweiads/huaweiadstest/exemplary/nativeSingleImage.json b/adapters/huaweiads/huaweiadstest/exemplary/nativeSingleImage.json
@@ -15,7 +15,7 @@
             "publisherid": "123",
             "signkey": "signkey",
             "keyid": "41",
-            "isAddAuthorization": "false"
+            "isTestAuthorization": "true"
           }
         }
       }
@@ -74,6 +74,9 @@
           ],
           "User-Agent": [
             "useragent"
+          ],
+          "Authorization": [
+            "Digest username=123,realm=ppsadx/getResult,nonce=1629473330823,response=d1d61a13a83e1468aa4dff5c8a6cee0b8b381173ca3eb6fa9b313937684d87c0,algorithm=HmacSHA256,usertype=1,keyid=41"
           ]
         },
         "body": {

diff --git a/adapters/huaweiads/huaweiadstest/exemplary/nativeThreeImage.json b/adapters/huaweiads/huaweiadstest/exemplary/nativeThreeImage.json
@@ -15,7 +15,7 @@
             "publisherid": "123",
             "signkey": "signkey",
             "keyid": "41",
-            "isAddAuthorization": "false"
+            "isTestAuthorization": "true"
           }
         }
       }
@@ -73,6 +73,9 @@
           ],
           "User-Agent": [
             "useragent"
+          ],
+          "Authorization": [
+            "Digest username=123,realm=ppsadx/getResult,nonce=1629473330823,response=d1d61a13a83e1468aa4dff5c8a6cee0b8b381173ca3eb6fa9b313937684d87c0,algorithm=HmacSHA256,usertype=1,keyid=41"
           ]
         },
         "body": {

diff --git a/adapters/huaweiads/huaweiadstest/exemplary/nativeThreeImageIncludeIcon.json b/adapters/huaweiads/huaweiadstest/exemplary/nativeThreeImageIncludeIcon.json
@@ -15,7 +15,7 @@
             "publisherid": "123",
             "signkey": "signkey",
             "keyid": "41",
-            "isAddAuthorization": "false"
+            "isTestAuthorization": "true"
           }
         }
       }
@@ -73,6 +73,9 @@
           ],
           "User-Agent": [
             "useragent"
+          ],
+          "Authorization": [
+            "Digest username=123,realm=ppsadx/getResult,nonce=1629473330823,response=d1d61a13a83e1468aa4dff5c8a6cee0b8b381173ca3eb6fa9b313937684d87c0,algorithm=HmacSHA256,usertype=1,keyid=41"
           ]
         },
         "body": {

diff --git a/adapters/huaweiads/huaweiadstest/exemplary/video.json b/adapters/huaweiads/huaweiadstest/exemplary/video.json
@@ -23,10 +23,10 @@
           "bidder": {
             "slotid": "m8x9x3roll",
             "adtype": "roll",
-            "publisherid": "123",
+            "publisherid": "123123123",
             "signkey": "signkey",
             "keyid": "41",
-            "isAddAuthorization": "false"
+            "isTestAuthorization": "true"
           }
         }
       }
@@ -84,6 +84,9 @@
           ],
           "User-Agent": [
             "useragent"
+          ],
+          "Authorization": [
+            "Digest username=123123123,realm=ppsadx/getResult,nonce=1629473330823,response=6fdc975d3adac426cbe607eec736f40ad3db8413312457431e391580e1b475c4,algorithm=HmacSHA256,usertype=1,keyid=41"
           ]
         },
         "body": {

diff --git a/adapters/huaweiads/huaweiadstest/supplemental/adtype_roll_missing_duration.json b/adapters/huaweiads/huaweiadstest/supplemental/adtype_roll_missing_duration.json
@@ -11,7 +11,7 @@
             "publisherid": "123",
             "signkey": "signkey",
             "keyid": "41",
-            "isAddAuthorization": "false"
+            "isTestAuthorization": "true"
           }
         }
       }

diff --git a/adapters/huaweiads/huaweiadstest/supplemental/bad_response.json b/adapters/huaweiads/huaweiadstest/supplemental/bad_response.json
@@ -21,7 +21,7 @@
             "publisherid": "123",
             "signkey": "signkey",
             "keyid": "41",
-            "isAddAuthorization": "false"
+            "isTestAuthorization": "true"
           }
         }
       }
@@ -79,6 +79,9 @@
           ],
           "User-Agent": [
             "useragent"
+          ],
+          "Authorization": [
+            "Digest username=123,realm=ppsadx/getResult,nonce=1629473330823,response=d1d61a13a83e1468aa4dff5c8a6cee0b8b381173ca3eb6fa9b313937684d87c0,algorithm=HmacSHA256,usertype=1,keyid=41"
           ]
         },
         "body": {

diff --git a/adapters/huaweiads/huaweiadstest/supplemental/bad_response_400.json b/adapters/huaweiads/huaweiadstest/supplemental/bad_response_400.json
@@ -21,7 +21,7 @@
             "publisherid": "123",
             "signkey": "signkey",
             "keyid": "41",
-            "isAddAuthorization": "false"
+            "isTestAuthorization": "true"
           }
         }
       }
@@ -79,6 +79,9 @@
           ],
           "User-Agent": [
             "useragent"
+          ],
+          "Authorization": [
+            "Digest username=123,realm=ppsadx/getResult,nonce=1629473330823,response=d1d61a13a83e1468aa4dff5c8a6cee0b8b381173ca3eb6fa9b313937684d87c0,algorithm=HmacSHA256,usertype=1,keyid=41"
           ]
         },
         "body": {

diff --git a/adapters/huaweiads/huaweiadstest/supplemental/bad_response_503.json b/adapters/huaweiads/huaweiadstest/supplemental/bad_response_503.json
@@ -21,7 +21,7 @@
             "publisherid": "123",
             "signkey": "signkey",
             "keyid": "41",
-            "isAddAuthorization": "false"
+            "isTestAuthorization": "true"
           }
         }
       }
@@ -79,6 +79,9 @@
           ],
           "User-Agent": [
             "useragent"
+          ],
+          "Authorization": [
+            "Digest username=123,realm=ppsadx/getResult,nonce=1629473330823,response=d1d61a13a83e1468aa4dff5c8a6cee0b8b381173ca3eb6fa9b313937684d87c0,algorithm=HmacSHA256,usertype=1,keyid=41"
           ]
         },
         "body": {

diff --git a/adapters/huaweiads/huaweiadstest/supplemental/bad_response_dont_find_impid.json b/adapters/huaweiads/huaweiadstest/supplemental/bad_response_dont_find_impid.json
@@ -21,7 +21,7 @@
             "publisherid": "123",
             "signkey": "signkey",
             "keyid": "41",
-            "isAddAuthorization": "false"
+            "isTestAuthorization": "true"
           }
         }
       },
@@ -44,7 +44,7 @@
             "publisherid": "123",
             "signkey": "signkey",
             "keyid": "41",
-            "isAddAuthorization": "false"
+            "isTestAuthorization": "true"
           }
         }
       }
@@ -102,6 +102,9 @@
           ],
           "User-Agent": [
             "useragent"
+          ],
+          "Authorization": [
+            "Digest username=123,realm=ppsadx/getResult,nonce=1629473330823,response=d1d61a13a83e1468aa4dff5c8a6cee0b8b381173ca3eb6fa9b313937684d87c0,algorithm=HmacSHA256,usertype=1,keyid=41"
           ]
         },
         "body": {

diff --git a/adapters/huaweiads/huaweiadstest/supplemental/bad_response_not_native.json b/adapters/huaweiads/huaweiadstest/supplemental/bad_response_not_native.json
@@ -15,7 +15,7 @@
             "publisherid": "123",
             "signkey": "signkey",
             "keyid": "41",
-            "isAddAuthorization": "false"
+            "isTestAuthorization": "true"
           }
         }
       }
@@ -73,6 +73,9 @@
           ],
           "User-Agent": [
             "useragent"
+          ],
+          "Authorization": [
+            "Digest username=123,realm=ppsadx/getResult,nonce=1629473330823,response=d1d61a13a83e1468aa4dff5c8a6cee0b8b381173ca3eb6fa9b313937684d87c0,algorithm=HmacSHA256,usertype=1,keyid=41"
           ]
         },
         "body": {

diff --git a/adapters/huaweiads/huaweiadstest/supplemental/bad_response_retcode30_204.json b/adapters/huaweiads/huaweiadstest/supplemental/bad_response_retcode30_204.json
@@ -21,7 +21,7 @@
             "publisherid": "123",
             "signkey": "signkey",
             "keyid": "41",
-            "isAddAuthorization": "false"
+            "isTestAuthorization": "true"
           }
         }
       }
@@ -79,6 +79,9 @@
           ],
           "User-Agent": [
             "useragent"
+          ],
+          "Authorization": [
+            "Digest username=123,realm=ppsadx/getResult,nonce=1629473330823,response=d1d61a13a83e1468aa4dff5c8a6cee0b8b381173ca3eb6fa9b313937684d87c0,algorithm=HmacSHA256,usertype=1,keyid=41"
           ]
         },
         "body": {

diff --git a/adapters/huaweiads/huaweiadstest/supplemental/bad_response_retcode_210.json b/adapters/huaweiads/huaweiadstest/supplemental/bad_response_retcode_210.json
@@ -21,7 +21,7 @@
             "publisherid": "123",
             "signkey": "signkey",
             "keyid": "41",
-            "isAddAuthorization": "false"
+            "isTestAuthorization": "true"
           }
         }
       }
@@ -79,6 +79,9 @@
           ],
           "User-Agent": [
             "useragent"
+          ],
+          "Authorization": [
+            "Digest username=123,realm=ppsadx/getResult,nonce=1629473330823,response=d1d61a13a83e1468aa4dff5c8a6cee0b8b381173ca3eb6fa9b313937684d87c0,algorithm=HmacSHA256,usertype=1,keyid=41"
           ]
         },
         "body": {

diff --git a/adapters/huaweiads/huaweiadstest/supplemental/bad_response_retcode_408.json b/adapters/huaweiads/huaweiadstest/supplemental/bad_response_retcode_408.json
@@ -21,7 +21,7 @@
             "publisherid": "123",
             "signkey": "signkey",
             "keyid": "41",
-            "isAddAuthorization": "false"
+            "isTestAuthorization": "true"
           }
         }
       }
@@ -79,6 +79,9 @@
           ],
           "User-Agent": [
             "useragent"
+          ],
+          "Authorization": [
+            "Digest username=123,realm=ppsadx/getResult,nonce=1629473330823,response=d1d61a13a83e1468aa4dff5c8a6cee0b8b381173ca3eb6fa9b313937684d87c0,algorithm=HmacSHA256,usertype=1,keyid=41"
           ]
         },
         "body": {

diff --git a/adapters/huaweiads/huaweiadstest/supplemental/bad_response_retcode_500.json b/adapters/huaweiads/huaweiadstest/supplemental/bad_response_retcode_500.json
@@ -21,7 +21,7 @@
             "publisherid": "123",
             "signkey": "signkey",
             "keyid": "41",
-            "isAddAuthorization": "false"
+            "isTestAuthorization": "true"
           }
         }
       }
@@ -79,6 +79,9 @@
           ],
           "User-Agent": [
             "useragent"
+          ],
+          "Authorization": [
+            "Digest username=123,realm=ppsadx/getResult,nonce=1629473330823,response=d1d61a13a83e1468aa4dff5c8a6cee0b8b381173ca3eb6fa9b313937684d87c0,algorithm=HmacSHA256,usertype=1,keyid=41"
           ]
         },
         "body": {

diff --git a/adapters/huaweiads/huaweiadstest/supplemental/missing_adtype.json b/adapters/huaweiads/huaweiadstest/supplemental/missing_adtype.json
@@ -22,7 +22,7 @@
             "signkey": "signkey",
             "keyid": "12",
             "clienttime": "2018-11-02 16:34:07.981+1300",
-            "isAddAuthorization": "false"
+            "isTestAuthorization": "true"
           }
         }
       }

diff --git a/adapters/huaweiads/huaweiadstest/supplemental/missing_deviceid.json b/adapters/huaweiads/huaweiadstest/supplemental/missing_deviceid.json
@@ -21,7 +21,7 @@
             "publisherid": "123",
             "signkey": "signkey",
             "keyid": "41",
-            "isAddAuthorization": "false"
+            "isTestAuthorization": "true"
           }
         }
       }