diff --git a/InternalTestApp/PrebidMobileDemoRendering/Model/TestCasesManager.swift b/InternalTestApp/PrebidMobileDemoRendering/Model/TestCasesManager.swift index 72106a742..6db101e31 100644 --- a/InternalTestApp/PrebidMobileDemoRendering/Model/TestCasesManager.swift +++ b/InternalTestApp/PrebidMobileDemoRendering/Model/TestCasesManager.swift @@ -213,9 +213,6 @@ struct TestCaseManager { targeting.userGender = TestCaseManager.strToGender(value) } - if let value = openRtb["buyerid"] as? String { - targeting.buyerUID = value - } if let value = openRtb["xid"] as? String { targeting.userID = value } diff --git a/PrebidMobile/ConfigurationAndTargeting/Targeting.swift b/PrebidMobile/ConfigurationAndTargeting/Targeting.swift index 8d46e5333..eb215ed1f 100644 --- a/PrebidMobile/ConfigurationAndTargeting/Targeting.swift +++ b/PrebidMobile/ConfigurationAndTargeting/Targeting.swift @@ -103,11 +103,6 @@ public class Targeting: NSObject { set { parameterDictionary[PrebidTargetingKey_USER_ID] = newValue } } - /** - Buyer-specific ID for the user as mapped by the exchange for the buyer. - */ - public var buyerUID: String? - /** Optional feature to pass bidder data that was set in the exchange’s cookie. The string must be in base85 cookie safe diff --git a/PrebidMobile/PrebidMobileRendering/Networking/Parameters/PBMParameterBuilderService.m b/PrebidMobile/PrebidMobileRendering/Networking/Parameters/PBMParameterBuilderService.m index be500459d..5790e8009 100644 --- a/PrebidMobile/PrebidMobileRendering/Networking/Parameters/PBMParameterBuilderService.m +++ b/PrebidMobile/PrebidMobileRendering/Networking/Parameters/PBMParameterBuilderService.m @@ -106,7 +106,6 @@ + (nonnull PBMORTBBidRequest *)createORTBBidRequestWithTargeting:(nonnull Target } bidRequest.user.gender = targeting.userGenderDescription; - bidRequest.user.buyeruid = targeting.buyerUID; bidRequest.user.customdata = targeting.userCustomData; bidRequest.user.userid = targeting.userID; diff --git a/PrebidMobile/PrebidMobileRendering/ORTB/PBMORTBUser.h b/PrebidMobile/PrebidMobileRendering/ORTB/PBMORTBUser.h index 7e4916c55..715bac877 100644 --- a/PrebidMobile/PrebidMobileRendering/ORTB/PBMORTBUser.h +++ b/PrebidMobile/PrebidMobileRendering/ORTB/PBMORTBUser.h @@ -32,8 +32,6 @@ NS_ASSUME_NONNULL_BEGIN //id not supported -//Buyer-specific ID for the user as mapped by the exchange for the buyer. At least one of buyerid or id is recommended. -@property (nonatomic, copy, nullable) NSString *buyeruid; //Year of birth as a 4-digit integer @property (nonatomic, strong, nullable) NSNumber *yob; diff --git a/PrebidMobile/PrebidMobileRendering/ORTB/PBMORTBUser.m b/PrebidMobile/PrebidMobileRendering/ORTB/PBMORTBUser.m index c4d7b5462..72b7f8334 100644 --- a/PrebidMobile/PrebidMobileRendering/ORTB/PBMORTBUser.m +++ b/PrebidMobile/PrebidMobileRendering/ORTB/PBMORTBUser.m @@ -36,7 +36,6 @@ - (nonnull PBMJsonDictionary *)toJsonDictionary { ret[@"yob"] = self.yob; ret[@"gender"] = self.gender; - ret[@"buyeruid"] = self.buyeruid; ret[@"keywords"] = self.keywords; ret[@"customdata"] = self.customdata; ret[@"id"] = self.userid; @@ -69,7 +68,6 @@ - (instancetype)initWithJsonDictionary:(nonnull PBMJsonDictionary *)jsonDictiona } _yob = jsonDictionary[@"yob"]; _gender = jsonDictionary[@"gender"]; - _buyeruid = jsonDictionary[@"buyeruid"]; _keywords = jsonDictionary[@"keywords"]; _customdata = jsonDictionary[@"customdata"]; _ext = jsonDictionary[@"ext"]; diff --git a/PrebidMobileTests/RenderingTests/Tests/ParameterBuilderTests/ParameterBuilderServiceTest.swift b/PrebidMobileTests/RenderingTests/Tests/ParameterBuilderTests/ParameterBuilderServiceTest.swift index 191453408..ddbe4c666 100644 --- a/PrebidMobileTests/RenderingTests/Tests/ParameterBuilderTests/ParameterBuilderServiceTest.swift +++ b/PrebidMobileTests/RenderingTests/Tests/ParameterBuilderTests/ParameterBuilderServiceTest.swift @@ -44,7 +44,6 @@ class ParameterBuilderServiceTest : XCTestCase { targeting.parameterDictionary["foo"] = "bar" targeting.coppa = 1 targeting.userGender = .male - targeting.buyerUID = "buyerUID" targeting.storeURL = url targeting.userCustomData = "customDataString" targeting.publisherName = publisherName @@ -155,7 +154,7 @@ class ParameterBuilderServiceTest : XCTestCase { } let expectedOrtb = """ - {\"app\":{\"bundle\":\"Mock.Bundle.Identifier\",\"keywords\":\"appKeyword1,appKeyword2\",\"name\":\"MockBundleDisplayName\",\"publisher\":{\"name\":\"Publisher\"},\"storeurl\":\"https:\\/\\/openx.com\"},\"device\":{\(carrier)\"connectiontype\":2,\(deviceExt)\"geo\":{\"lat\":34.149335,\"lon\":-118.1328249,\"type\":1},\"h\":200,\"hwv\":\"iPhone1,1\",\"ifa\":\"abc123\",\"language\":\"ml\",\"lmt\":0,\"make\":\"MockMake\",\(mccmnc)\"model\":\"MockModel\",\"os\":\"MockOS\",\"osv\":\"1.2.3\",\"w\":100},\"imp\":[{\"clickbrowser\":1,\"displaymanager\":\"prebid-mobile\",\"displaymanagerver\":\"MOCK_SDK_VERSION\",\"ext\":{\"dlp\":1},\"instl\":0,\"secure\":1}],\"regs\":{\"coppa\":1,\"ext\":{\"gdpr\":0}},\"user\":{\"buyeruid\":\"buyerUID\",\"customdata\":\"customDataString\",\"ext\":{\"consent\":\"consentstring\"},\"gender\":\"M\",\"id\":\"userID\",\"keywords\":\"keyword1,keyword2\"}} + {\"app\":{\"bundle\":\"Mock.Bundle.Identifier\",\"keywords\":\"appKeyword1,appKeyword2\",\"name\":\"MockBundleDisplayName\",\"publisher\":{\"name\":\"Publisher\"},\"storeurl\":\"https:\\/\\/openx.com\"},\"device\":{\(carrier)\"connectiontype\":2,\(deviceExt)\"geo\":{\"lat\":34.149335,\"lon\":-118.1328249,\"type\":1},\"h\":200,\"hwv\":\"iPhone1,1\",\"ifa\":\"abc123\",\"language\":\"ml\",\"lmt\":0,\"make\":\"MockMake\",\(mccmnc)\"model\":\"MockModel\",\"os\":\"MockOS\",\"osv\":\"1.2.3\",\"w\":100},\"imp\":[{\"clickbrowser\":1,\"displaymanager\":\"prebid-mobile\",\"displaymanagerver\":\"MOCK_SDK_VERSION\",\"ext\":{\"dlp\":1},\"instl\":0,\"secure\":1}],\"regs\":{\"coppa\":1,\"ext\":{\"gdpr\":0}},\"user\":{\"customdata\":\"customDataString\",\"ext\":{\"consent\":\"consentstring\"},\"gender\":\"M\",\"id\":\"userID\",\"keywords\":\"keyword1,keyword2\"}} """ PBMAssertEq(strORTB, expectedOrtb) } diff --git a/PrebidMobileTests/RenderingTests/Utilities/UtilitiesForTesting.swift b/PrebidMobileTests/RenderingTests/Utilities/UtilitiesForTesting.swift index 42030bb5a..609470559 100644 --- a/PrebidMobileTests/RenderingTests/Utilities/UtilitiesForTesting.swift +++ b/PrebidMobileTests/RenderingTests/Utilities/UtilitiesForTesting.swift @@ -283,7 +283,6 @@ typealias JsonDictionary = [String:Any] targeting.userGender = .unknown targeting.userID = nil - targeting.buyerUID = nil targeting.publisherName = nil targeting.storeURL = nil targeting.userCustomData = nil @@ -324,7 +323,6 @@ typealias JsonDictionary = [String:Any] @objc public class func checkInitialValues(_ targeting: Targeting) { XCTAssertEqual(targeting.userGender, .unknown) XCTAssertNil(targeting.userID) - XCTAssertNil(targeting.buyerUID) XCTAssertNil(targeting.publisherName) XCTAssertNil(targeting.storeURL) XCTAssertNil(targeting.userCustomData) diff --git a/PrebidMobileTests/TargetingTests.swift b/PrebidMobileTests/TargetingTests.swift index 01c1b6d57..78256b272 100644 --- a/PrebidMobileTests/TargetingTests.swift +++ b/PrebidMobileTests/TargetingTests.swift @@ -870,24 +870,6 @@ class TargetingTests: XCTestCase { XCTAssert(Targeting.parameterDictionary == [:], "Dict is \(Targeting.parameterDictionary)") } - func testBuyerUID() { - //Init - //Note: on init, and it never sends a value via an odinary ad request params. - let Targeting = Targeting.shared - XCTAssertNil(Targeting.buyerUID) - XCTAssert(Targeting.parameterDictionary == [:], "Dict is \(Targeting.parameterDictionary)") - - //Set - let buyerUID = "abc123" - Targeting.buyerUID = buyerUID - XCTAssertEqual(Targeting.buyerUID, buyerUID) - XCTAssert(Targeting.parameterDictionary == [:], "Dict is \(Targeting.parameterDictionary)") - - //Unset - Targeting.buyerUID = nil - XCTAssert(Targeting.parameterDictionary == [:], "Dict is \(Targeting.parameterDictionary)") - } - func testUserCustomData() { //Init