@attentive-mobile/attentive-react-native-sdk 1.0.3-beta.1 → 2.0.0-beta.1

package/ios/AttentiveReactNativeSdk.mm

@@ -6,6 +6,7 @@
 //
 
 #import "AttentiveReactNativeSdk.h"
+#import <UserNotifications/UserNotifications.h>
 
 #if __has_include(<AttentiveReactNativeSdk-Swift.h>)
 #import "AttentiveReactNativeSdk-Swift.h"
@@ -20,65 +21,354 @@
 
 RCT_EXPORT_MODULE()
 
-RCT_EXPORT_METHOD(initialize:(NSDictionary*)configuration) {
-    _sdk = [[ATTNNativeSDK alloc] initWithDomain:configuration[@"attentiveDomain"] mode:configuration[@"mode"] skipFatigueOnCreatives:configuration[@"skipFatigueOnCreatives"]];
+#ifdef RCT_NEW_ARCH_ENABLED
+// New Architecture implementation with flattened parameters
+- (void)initialize:(NSString *)attentiveDomain
+              mode:(NSString *)mode
+skipFatigueOnCreatives:(BOOL)skipFatigueOnCreatives
+    enableDebugger:(BOOL)enableDebugger {
+    _sdk = [[ATTNNativeSDK alloc] initWithDomain:attentiveDomain
+                                            mode:mode
+                         skipFatigueOnCreatives:skipFatigueOnCreatives
+                                  enableDebugger:enableDebugger];
+
+    // Make SDK instance accessible from native code (e.g., AppDelegate)
+    [AttentiveSDKManager shared].sdk = _sdk;
+}
+
+- (void)identify:(NSString *)phone
+           email:(NSString *)email
+       klaviyoId:(NSString *)klaviyoId
+       shopifyId:(NSString *)shopifyId
+    clientUserId:(NSString *)clientUserId
+customIdentifiers:(NSDictionary *)customIdentifiers {
+    NSMutableDictionary *identifiers = [NSMutableDictionary new];
+    if (phone && ![phone isEqual:[NSNull null]]) identifiers[@"phone"] = phone;
+    if (email && ![email isEqual:[NSNull null]]) identifiers[@"email"] = email;
+    if (klaviyoId && ![klaviyoId isEqual:[NSNull null]]) identifiers[@"klaviyoId"] = klaviyoId;
+    if (shopifyId && ![shopifyId isEqual:[NSNull null]]) identifiers[@"shopifyId"] = shopifyId;
+    if (clientUserId && ![clientUserId isEqual:[NSNull null]]) identifiers[@"clientUserId"] = clientUserId;
+    if (customIdentifiers && ![customIdentifiers isEqual:[NSNull null]]) identifiers[@"customIdentifiers"] = customIdentifiers;
+
+    [_sdk identify:identifiers];
+}
+
+- (void)recordAddToCartEvent:(NSArray *)items
+                     deeplink:(NSString *)deeplink {
+    NSMutableDictionary *attrs = [NSMutableDictionary new];
+    attrs[@"items"] = items;
+    if (deeplink && ![deeplink isEqual:[NSNull null]]) attrs[@"deeplink"] = deeplink;
+    [_sdk recordAddToCartEvent:attrs];
+}
+
+- (void)recordProductViewEvent:(NSArray *)items
+                       deeplink:(NSString *)deeplink {
+    NSMutableDictionary *attrs = [NSMutableDictionary new];
+    attrs[@"items"] = items;
+    if (deeplink && ![deeplink isEqual:[NSNull null]]) attrs[@"deeplink"] = deeplink;
+    [_sdk recordProductViewEvent:attrs];
+}
+
+- (void)recordPurchaseEvent:(NSArray *)items
+                    orderId:(NSString *)orderId
+                     cartId:(NSString *)cartId
+                 cartCoupon:(NSString *)cartCoupon {
+    NSMutableDictionary *attrs = [NSMutableDictionary new];
+    attrs[@"items"] = items;
+    attrs[@"orderId"] = orderId;
+    if (cartId && ![cartId isEqual:[NSNull null]]) attrs[@"cartId"] = cartId;
+    if (cartCoupon && ![cartCoupon isEqual:[NSNull null]]) attrs[@"cartCoupon"] = cartCoupon;
+    [_sdk recordPurchaseEvent:attrs];
+}
+
+- (void)recordCustomEvent:(NSString *)type
+               properties:(NSDictionary *)properties {
+    NSMutableDictionary *attrs = [NSMutableDictionary new];
+    attrs[@"type"] = type;
+    attrs[@"properties"] = properties;
+    [_sdk recordCustomEvent:attrs];
+}
+
+// Push Notification Methods (New Architecture)
+- (void)registerForPushNotifications {
+    [_sdk registerForPushNotifications];
+}
+
+- (void)registerDeviceToken:(NSString *)token
+       authorizationStatus:(NSString *)authorizationStatus {
+    [_sdk registerDeviceToken:token authorizationStatus:authorizationStatus];
+}
+
+- (void)registerDeviceTokenWithCallback:(NSString *)token
+                   authorizationStatus:(NSString *)authorizationStatus
+                              callback:(RCTResponseSenderBlock)callback {
+    // Convert hex string token to Data
+    NSMutableData *tokenData = [[NSMutableData alloc] init];
+    unsigned char byte;
+    for (NSUInteger i = 0; i < token.length; i += 2) {
+        NSString *hex = [token substringWithRange:NSMakeRange(i, 2)];
+        if ([[NSScanner scannerWithString:hex] scanHexInt:(unsigned int *)&byte]) {
+            [tokenData appendBytes:&byte length:1];
+        }
+    }
+
+    // Convert string authorization status to UNAuthorizationStatus enum
+    UNAuthorizationStatus authStatus = [self authorizationStatusFromString:authorizationStatus];
+
+    // Call the Swift method with callback (note: selector is registerDeviceTokenWithCallback:authorizationStatus:callback:)
+    [_sdk registerDeviceTokenWithCallback:tokenData
+                     authorizationStatus:authStatus
+                                callback:^(NSData * _Nullable data, NSURL * _Nullable url, NSURLResponse * _Nullable response, NSError * _Nullable error) {
+        // Convert response to JavaScript-compatible objects
+        NSDictionary *dataDict = nil;
+        if (data) {
+            NSString *dataString = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
+            if (dataString) {
+                dataDict = @{@"string": dataString, @"length": @(data.length)};
+            }
+        }
+
+        NSString *urlString = url ? [url absoluteString] : nil;
+
+        NSDictionary *responseDict = nil;
+        if ([response isKindOfClass:[NSHTTPURLResponse class]]) {
+            NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)response;
+            responseDict = @{
+                @"statusCode": @(httpResponse.statusCode),
+                @"headers": httpResponse.allHeaderFields ?: @{}
+            };
+        }
+
+        NSDictionary *errorDict = nil;
+        if (error) {
+            errorDict = @{
+                @"code": @(error.code),
+                @"domain": error.domain,
+                @"description": error.localizedDescription
+            };
+        }
+
+        // Invoke the callback with the results
+        callback(@[dataDict ?: [NSNull null],
+                   urlString ?: [NSNull null],
+                   responseDict ?: [NSNull null],
+                   errorDict ?: [NSNull null]]);
+    }];
+}
+
+- (void)handleRegularOpen:(NSString *)authorizationStatus {
+    UNAuthorizationStatus authStatus = [self authorizationStatusFromString:authorizationStatus];
+    [_sdk handleRegularOpen:authStatus];
+}
+
+- (void)handlePushOpened:(NSDictionary *)userInfo
+        applicationState:(NSString *)applicationState
+    authorizationStatus:(NSString *)authorizationStatus {
+    [_sdk handlePushOpened:userInfo applicationState:applicationState authorizationStatus:authorizationStatus];
+}
+
+- (void)handleForegroundNotification:(NSDictionary *)userInfo {
+    [_sdk handleForegroundNotification:userInfo];
+}
+
+- (void)handleForegroundPush:(NSDictionary *)userInfo
+        authorizationStatus:(NSString *)authorizationStatus {
+    [_sdk handleForegroundPushFromRN:userInfo authorizationStatus:authorizationStatus];
+}
+
+- (void)handlePushOpen:(NSDictionary *)userInfo
+   authorizationStatus:(NSString *)authorizationStatus {
+    [_sdk handlePushOpenFromRN:userInfo authorizationStatus:authorizationStatus];
+}
+
+// Helper method to convert string to UNAuthorizationStatus
+- (UNAuthorizationStatus)authorizationStatusFromString:(NSString *)statusString {
+    if ([statusString isEqualToString:@"authorized"]) {
+        return UNAuthorizationStatusAuthorized;
+    } else if ([statusString isEqualToString:@"denied"]) {
+        return UNAuthorizationStatusDenied;
+    } else if ([statusString isEqualToString:@"notDetermined"]) {
+        return UNAuthorizationStatusNotDetermined;
+    } else if ([statusString isEqualToString:@"provisional"]) {
+        if (@available(iOS 12.0, *)) {
+            return UNAuthorizationStatusProvisional;
+        }
+        return UNAuthorizationStatusNotDetermined;
+    } else if ([statusString isEqualToString:@"ephemeral"]) {
+        if (@available(iOS 14.0, *)) {
+            return UNAuthorizationStatusEphemeral;
+        }
+        return UNAuthorizationStatusNotDetermined;
+    }
+    return UNAuthorizationStatusNotDetermined;
+}
+
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
+{
+    return std::make_shared<facebook::react::NativeAttentiveReactNativeSdkSpecJSI>(params);
+}
+
+#else
+// Old Architecture implementation with dictionary parameters
+- (void)initialize:(NSDictionary*)configuration {
+    _sdk = [[ATTNNativeSDK alloc] initWithDomain:configuration[@"attentiveDomain"]
+                                            mode:configuration[@"mode"]
+                         skipFatigueOnCreatives:configuration[@"skipFatigueOnCreatives"]
+                                  enableDebugger:configuration[@"enableDebugger"]];
+
+    // Make SDK instance accessible from native code (e.g., AppDelegate)
+    [AttentiveSDKManager shared].sdk = _sdk;
+}
+
+- (void)identify:(NSDictionary*)identifiers {
+    [_sdk identify:identifiers];
+}
+
+- (void)recordAddToCartEvent:(NSDictionary*)attrs {
+    [_sdk recordAddToCartEvent:attrs];
+}
+
+- (void)recordProductViewEvent:(NSDictionary*)attrs {
+    [_sdk recordProductViewEvent:attrs];
+}
+
+- (void)recordPurchaseEvent:(NSDictionary*)attrs {
+    [_sdk recordPurchaseEvent:attrs];
+}
+
+- (void)recordCustomEvent:(NSDictionary*)attrs {
+    [_sdk recordCustomEvent:attrs];
+}
+
+// Push Notification Methods (Old Architecture)
+- (void)registerForPushNotifications {
+    [_sdk registerForPushNotifications];
+}
+
+- (void)registerDeviceToken:(NSString *)token
+       authorizationStatus:(NSString *)authorizationStatus {
+    [_sdk registerDeviceToken:token authorizationStatus:authorizationStatus];
+}
+
+- (void)registerDeviceTokenWithCallback:(NSString *)token
+                   authorizationStatus:(NSString *)authorizationStatus
+                              callback:(RCTResponseSenderBlock)callback {
+    // Convert hex string token to Data
+    NSMutableData *tokenData = [[NSMutableData alloc] init];
+    unsigned char byte;
+    for (NSUInteger i = 0; i < token.length; i += 2) {
+        NSString *hex = [token substringWithRange:NSMakeRange(i, 2)];
+        if ([[NSScanner scannerWithString:hex] scanHexInt:(unsigned int *)&byte]) {
+            [tokenData appendBytes:&byte length:1];
+        }
+    }
+
+    // Convert string authorization status to UNAuthorizationStatus enum
+    UNAuthorizationStatus authStatus = [self authorizationStatusFromString:authorizationStatus];
+
+    // Call the Swift method with callback (note: selector is registerDeviceTokenWithCallback:authorizationStatus:callback:)
+    [_sdk registerDeviceTokenWithCallback:tokenData
+                     authorizationStatus:authStatus
+                                callback:^(NSData * _Nullable data, NSURL * _Nullable url, NSURLResponse * _Nullable response, NSError * _Nullable error) {
+        // Convert response to JavaScript-compatible objects
+        NSDictionary *dataDict = nil;
+        if (data) {
+            NSString *dataString = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
+            if (dataString) {
+                dataDict = @{@"string": dataString, @"length": @(data.length)};
+            }
+        }
+
+        NSString *urlString = url ? [url absoluteString] : nil;
+
+        NSDictionary *responseDict = nil;
+        if ([response isKindOfClass:[NSHTTPURLResponse class]]) {
+            NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)response;
+            responseDict = @{
+                @"statusCode": @(httpResponse.statusCode),
+                @"headers": httpResponse.allHeaderFields ?: @{}
+            };
+        }
+
+        NSDictionary *errorDict = nil;
+        if (error) {
+            errorDict = @{
+                @"code": @(error.code),
+                @"domain": error.domain,
+                @"description": error.localizedDescription
+            };
+        }
+
+        // Invoke the callback with the results
+        callback(@[dataDict ?: [NSNull null],
+                   urlString ?: [NSNull null],
+                   responseDict ?: [NSNull null],
+                   errorDict ?: [NSNull null]]);
+    }];
+}
+
+- (void)handleRegularOpen:(NSString *)authorizationStatus {
+    UNAuthorizationStatus authStatus = [self authorizationStatusFromString:authorizationStatus];
+    [_sdk handleRegularOpen:authStatus];
+}
+
+- (void)handlePushOpened:(NSDictionary *)userInfo
+        applicationState:(NSString *)applicationState
+    authorizationStatus:(NSString *)authorizationStatus {
+    [_sdk handlePushOpened:userInfo applicationState:applicationState authorizationStatus:authorizationStatus];
+}
+
+- (void)handleForegroundNotification:(NSDictionary *)userInfo {
+    [_sdk handleForegroundNotification:userInfo];
 }
 
-RCT_EXPORT_METHOD(triggerCreative) {
-  [self triggerCreative:nil];
+- (void)handleForegroundPush:(NSDictionary *)userInfo
+        authorizationStatus:(NSString *)authorizationStatus {
+    [_sdk handleForegroundPushFromRN:userInfo authorizationStatus:authorizationStatus];
 }
 
-RCT_EXPORT_METHOD(triggerCreative:(NSString *)creativeId) {
+- (void)handlePushOpen:(NSDictionary *)userInfo
+   authorizationStatus:(NSString *)authorizationStatus {
+    [_sdk handlePushOpenFromRN:userInfo authorizationStatus:authorizationStatus];
+}
+#endif
+
+- (void)triggerCreative:(NSString *)creativeId {
   dispatch_async(dispatch_get_main_queue(), ^{
     UIWindow *window = [[UIApplication sharedApplication] keyWindow];
     UIView *topView = window.rootViewController.view;
-    [self->_sdk trigger:topView creativeId:creativeId];
+    if (creativeId == nil) {
+      [self->_sdk trigger:topView];
+    } else {
+      [self->_sdk trigger:topView creativeId:creativeId];
+    }
   });
 }
 
-RCT_EXPORT_METHOD(destroyCreative) {
+- (void)destroyCreative {
   dispatch_async(dispatch_get_main_queue(), ^{
 //    [self->_sdk closeCreative]
   });
 }
 
-RCT_EXPORT_METHOD(updateDomain:(NSString *)domain) {
+- (void)updateDomain:(NSString *)domain {
   [_sdk updateDomain:domain];
 }
 
-RCT_EXPORT_METHOD(identify:(NSDictionary*)identifiers) {
-  // The dictionary already has the correct keys from the React code, so no translating necessary
-  [_sdk identify:identifiers];
-}
-
-RCT_EXPORT_METHOD(clearUser) {
+- (void)clearUser {
   [_sdk clearUser];
 }
 
-RCT_EXPORT_METHOD(recordAddToCartEvent:(NSDictionary*)attrs) {
-  [_sdk recordAddToCartEvent:attrs];
+- (void)invokeAttentiveDebugHelper {
+  [_sdk invokeAttentiveDebugHelper];
 }
 
-RCT_EXPORT_METHOD(recordProductViewEvent:(NSDictionary*)attrs) {
-  [_sdk recordProductViewEvent:attrs];
+- (void)exportDebugLogs:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject {
+  NSString *exportContent = [_sdk exportDebugLogs];
+  resolve(exportContent);
 }
 
-RCT_EXPORT_METHOD(recordPurchaseEvent:(NSDictionary*)attrs) {
-  [_sdk recordPurchaseEvent:attrs];
-}
-
-RCT_EXPORT_METHOD(recordCustomEvent:(NSDictionary*)attrs) {
-  [_sdk recordCustomEvent:attrs];
-}
-
-// Don't compile this code when we build for the old architecture.
-//#ifdef RCT_NEW_ARCH_ENABLED
-//- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
-//    (const facebook::react::ObjCTurboModule::InitParams &)params
-//{
-//    return std::make_shared<facebook::react::NativeAttentiveReactNativeSdkSpecJSI>(params);
-//}
-//#endif
-
 @end
 

package/ios/AttentiveReactNativeSdk.xcodeproj/project.pbxproj

@@ -193,7 +193,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
@@ -247,7 +247,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_LDFLAGS = (
 					"$(inherited)",