Merge pull request #5342 from brave/ios-custom-agent

Add ability to set custom user agent for ledger
brave · Apr 23, 2020 · 515a277 · 515a277
2 parents cf42188 + 0dbd75c
commit 515a277
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/vendor/brave-ios/Ledger/BATBraveLedger.h b/vendor/brave-ios/Ledger/BATBraveLedger.h
@@ -284,6 +284,8 @@ NS_SWIFT_NAME(BraveLedger)
 @property (nonatomic, assign) double contributionAmount;
 /// Whether or not the user will automatically contribute
 @property (nonatomic, assign, getter=isAutoContributeEnabled) BOOL autoContributeEnabled;
+/// A custom user agent for network operations on ledger
+@property (nonatomic, copy, nullable) NSString *customUserAgent;
 
 #pragma mark - Ads & Confirmations
 

diff --git a/vendor/brave-ios/Ledger/BATBraveLedger.mm b/vendor/brave-ios/Ledger/BATBraveLedger.mm
@@ -1792,6 +1792,16 @@ - (void)killTimer:(const uint32_t)timer_id
 
 #pragma mark - Network
 
+- (NSString *)customUserAgent
+{
+  return self.commonOps.customUserAgent;
+}
+
+- (void)setCustomUserAgent:(NSString *)customUserAgent
+{
+  self.commonOps.customUserAgent = [customUserAgent stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+}
+
 - (void)loadURL:(const std::string &)url headers:(const std::vector<std::string> &)headers content:(const std::string &)content contentType:(const std::string &)contentType method:(const ledger::UrlMethod)method callback:(ledger::LoadURLCallback)callback
 {
   std::map<ledger::UrlMethod, std::string> methodMap {

diff --git a/vendor/brave-ios/Shared/BATCommonOperations.h b/vendor/brave-ios/Shared/BATCommonOperations.h
@@ -36,6 +36,8 @@ typedef void (^BATNetworkCompletionBlock)(int statusCode,
 
 #pragma mark - Network
 
+@property (nonatomic, copy, nullable) NSString *customUserAgent;
+
 /// Loads a URL request
 - (void)loadURLRequest:(const std::string&)url
                headers:(const std::vector<std::string>&)headers

diff --git a/vendor/brave-ios/Shared/BATCommonOperations.mm b/vendor/brave-ios/Shared/BATCommonOperations.mm
@@ -97,7 +97,12 @@ - (void)loadURLRequest:(const std::string &)url headers:(const std::vector<std::
       auto value = [split.lastObject stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
       [request setValue:value forHTTPHeaderField:name];
     }
-   }
+  }
+
+  if (self.customUserAgent != nil &&
+      self.customUserAgent.length > 0) {
+    [request setValue:self.customUserAgent forHTTPHeaderField:@"User-Agent"];
+  }
 
   if (content_type.length() > 0) {
     [request setValue:[NSString stringWithUTF8String:content_type.c_str()] forHTTPHeaderField:@"Content-Type"];