Add X-Watson-Learning-Opt-Out in headers

germanattanasio · Jul 9, 2016 · afa3b57 · afa3b57
1 parent 96b4ca0
commit afa3b57
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/watsonsdk/AuthConfiguration.h b/watsonsdk/AuthConfiguration.h
@@ -20,12 +20,14 @@
 
 @property NSString* basicAuthUsername;
 @property NSString* basicAuthPassword;
+@property (nonatomic) BOOL xWatsonLearningOptOut;
 
 @property (readonly) NSString *token;
 @property (copy, nonatomic) void (^tokenGenerator) (void (^tokenHandler)(NSString *token));
 
 - (void) invalidateToken;
 - (void) requestToken: (void(^)(AuthConfiguration *config)) completionHandler;
 - (NSDictionary*) createRequestHeaders;
+- (NSDictionary*) createRequestHeadersWithXWatsonLearningOptOut;
 
 @end
diff --git a/watsonsdk/AuthConfiguration.m b/watsonsdk/AuthConfiguration.m
@@ -49,7 +49,7 @@ - (void)requestToken:(void (^)(AuthConfiguration *))completionHandler
     }
 }
 
-- (NSDictionary*) createRequestHeaders {
+- (NSMutableDictionary*) _createRequestHeaders {
     NSMutableDictionary *headers = [[NSMutableDictionary alloc] init];
     if (self.tokenGenerator) {
         if (self.token) {
@@ -65,5 +65,16 @@ - (NSDictionary*) createRequestHeaders {
     return headers;
 }
 
+- (NSDictionary*) createRequestHeaders {
+    return [self _createRequestHeaders];
+}
+
+- (NSDictionary*) createRequestHeadersWithXWatsonLearningOptOut {
+    NSMutableDictionary *headers = [self _createRequestHeaders];
+    if (self.xWatsonLearningOptOut) {
+        [headers setObject:@(YES) forKey:@"X-Watson-Learning-Opt-Out"];
+    }
+    return headers;
+}
 
 @end
diff --git a/watsonsdk/stt/SpeechToText.m b/watsonsdk/stt/SpeechToText.m
@@ -445,7 +445,8 @@ - (void) initializeStreaming {
     // connect if we are not connected
     if(![self.audioStreamer isWebSocketConnected]) {
         [self.config requestToken:^(AuthConfiguration *config) {
-            [self.audioStreamer connect:(STTConfiguration*)config headers:[config createRequestHeaders]];
+            [self.audioStreamer connect:(STTConfiguration*)config
+                                headers:[config createRequestHeadersWithXWatsonLearningOptOut]];
         }];
     }
 

diff --git a/watsonsdk/tts/TextToSpeech.m b/watsonsdk/tts/TextToSpeech.m
@@ -340,7 +340,7 @@ - (void) performDataGet:(void (^)(NSData*, NSError*))handler forURL:(NSURL*)url
         [defaultConfigObject setURLCache:nil];
 
     [self.config requestToken:^(AuthConfiguration *config) {
-        NSDictionary* headers = [config createRequestHeaders];
+        NSDictionary* headers = [config createRequestHeadersWithXWatsonLearningOptOut];
         [defaultConfigObject setHTTPAdditionalHeaders:headers];
         NSURLSession *defaultSession = [NSURLSession sessionWithConfiguration: defaultConfigObject delegate: self delegateQueue: [NSOperationQueue mainQueue]];
         NSURLSessionDataTask * dataTask = [defaultSession dataTaskWithURL:url completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {