Merge pull request #901 from OneSignal/outcomes

iOS bridge for Outcomes

Author: jkasten2

examples/RNOneSignal/App.js

@@ -113,6 +113,9 @@ export default class App extends Component {
 
   oneSignalInAppMessagingExamples() {
     // Add a single trigger with a value associated with it
+    OneSignal.addTrigger('trigger1', 'one');
+
+    // Get trigger value for the key
     OneSignal.getTriggerValueForKey('trigger1')
       .then(response => {
         console.log('trigger1 value: ' + response);

index.js

@@ -475,11 +475,6 @@ export default class OneSignal {
     static sendOutcome(name, callback=function(){}) {
         if (!checkIfInitialized()) return;
 
-        if (Platform.OS === "ios") {
-            console.warn("OneSignal.sendOutcome is not yet supported on iOS");
-            return;
-        }
-
         invariant(
             typeof callback === 'function',
             'Must provide a valid callback'
@@ -491,11 +486,6 @@ export default class OneSignal {
     static sendUniqueOutcome(name, callback=function(){}) {
         if (!checkIfInitialized()) return;
 
-        if (Platform.OS === "ios") {
-            console.warn("OneSignal.sendUniqueOutcome is not yet supported on iOS");
-            return;
-        }
-
         invariant(
             typeof callback === 'function',
             'Must provide a valid callback'
@@ -507,11 +497,6 @@ export default class OneSignal {
     static sendOutcomeWithValue(name, value, callback=function(){}) {
         if (!checkIfInitialized()) return;
 
-        if (Platform.OS === "ios") {
-            console.warn("OneSignal.sendOutcomeWithValue is not yet supported on iOS");
-            return;
-        }
-
         invariant(
             typeof callback === 'function',
             'Must provide a valid callback'

ios/RCTOneSignal/RCTOneSignalEventEmitter.m

@@ -377,8 +377,8 @@ + (void)sendEventWithName:(NSString *)name withBody:(NSDictionary *)body {
     [OneSignal removeTriggerForKey:key];
 }
 
-RCT_REMAP_METHOD(getTriggerValueForKey, 
-                key:(NSString *)key 
+RCT_REMAP_METHOD(getTriggerValueForKey,
+                key:(NSString *)key
                 getTriggerValueForKeyResolver:(RCTPromiseResolveBlock)resolve
                 rejecter:(RCTPromiseRejectBlock)reject) {
 
@@ -404,42 +404,30 @@ + (void)sendEventWithName:(NSString *)name withBody:(NSDictionary *)body {
          @"clickUrl" : action.clickUrl.absoluteString ?: [NSNull null],
          @"firstClick" : @(action.firstClick),
          @"closesMessage" : @(action.closesMessage)
-        }; 
+        };
         [RCTOneSignalEventEmitter sendEventWithName:@"OneSignal-inAppMessageClicked" withBody:result];
     }];
 }
 
 /*
  * Outcomes
  */
-RCT_EXPORT_METHOD(sendOutcome:(NSString *)name withCallback:(RCTResponseSenderBlock)callback) {
-    [OneSignal onesignal_Log:ONE_S_LL_ERROR message:@"Not implemented for iOS"];
-
-    //  [OneSignal sendUniqueOutcome:name onSuccess:^(NSDictionary *result) {
-    //      callback(@[result]);
-    //  } onFailure:^(NSError *error){
-    //      callback(@[error.userInfo[@"error"] ?: error.localizedDescription]);
-    //  }];
+RCT_EXPORT_METHOD(sendOutcome:(NSString *)name :(RCTResponseSenderBlock)callback) {
+    [OneSignal sendOutcome:name onSuccess:^(OSOutcomeEvent *outcome){
+        callback(@[[outcome jsonRepresentation]]);
+    }];
 }
 
-RCT_EXPORT_METHOD(sendUniqueOutcome:(NSString *)name withCallback:(RCTResponseSenderBlock)callback) {
-    [OneSignal onesignal_Log:ONE_S_LL_ERROR message:@"Not implemented for iOS"];
-
-    //  [OneSignal sendUniqueOutcome:name onSuccess:^(NSDictionary *result) {
-    //      callback(@[result]);
-    //  } onFailure:^(NSError *error){
-    //      callback(@[error.userInfo[@"error"] ?: error.localizedDescription]);
-    //  }];
+RCT_EXPORT_METHOD(sendUniqueOutcome:(NSString *)name :(RCTResponseSenderBlock)callback) {
+    [OneSignal sendUniqueOutcome:name onSuccess:^(OSOutcomeEvent *outcome){
+        callback(@[[outcome jsonRepresentation]]);
+    }];
 }
 
-RCT_EXPORT_METHOD(sendOutcomeWithValue:(NSString *)name withValue:(float)value withCallback:(RCTResponseSenderBlock)callback) {
-    [OneSignal onesignal_Log:ONE_S_LL_ERROR message:@"Not implemented for iOS"];
-
-    //  [OneSignal sendOutcomeWithValue:name  onSuccess:^(NSDictionary *result) {
-    //      callback(@[result]);
-    //  } onFailure:^(NSError *error){
-    //      callback(@[error.userInfo[@"error"] ?: error.localizedDescription]);
-    //  }];
+RCT_EXPORT_METHOD(sendOutcomeWithValue:(NSString *)name :(NSNumber * _Nonnull)value :(RCTResponseSenderBlock)callback) {
+    [OneSignal sendOutcomeWithValue:name value:value onSuccess:^(OSOutcomeEvent *outcome){
+        callback(@[[outcome jsonRepresentation]]);
+    }];
 }
 
 @end

react-native-onesignal.podspec

@@ -22,5 +22,5 @@ Pod::Spec.new do |s|
   # pod 'React', :path => '../node_modules/react-native/'
 
   # The Native OneSignal-iOS-SDK from cocoapods.
-  s.dependency 'OneSignal', '2.11.2'
+  s.dependency 'OneSignal', '2.12.2'
 end