Merge pull request #403 from intercom/feature/update-examples

mapierce · web-flow · commit d844363d036d · 2022-03-31T17:20:39.000+01:00
Update example projects
diff --git a/Examples/Sample-ObjC/Sample-ObjC/ITCAppDelegate.m b/Examples/Sample-ObjC/Sample-ObjC/ITCAppDelegate.m
@@ -28,7 +28,13 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     
     NSString *email = [[NSUserDefaults standardUserDefaults] objectForKey:@"email"];
     if (email.length > 0) { //There is a user logged in
-        [Intercom registerUserWithEmail:email];
+        ICMUserAttributes *attributes = [ICMUserAttributes new];
+        attributes.email = email;
+        [Intercom loginUserWithUserAttributes:attributes success:^{
+            NSLog(@"Successfully logged in %@", email);
+        } failure:^(NSError * _Nonnull error) {
+            NSLog(@"Error logging in: %@", error.localizedDescription);
+        }];
     }
 
     return YES;
@@ -47,7 +53,9 @@ - (void)applicationDidBecomeActive:(UIApplication *)application {
 }
 
 - (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
-    [Intercom setDeviceToken:deviceToken];
+    [Intercom setDeviceToken:deviceToken failure:^(NSError * _Nullable error) {
+        NSLog(@"Error setting device token: %@", error.localizedDescription);
+    }];
 }
 
 @end
diff --git a/Examples/Sample-ObjC/Sample-ObjC/ITCViewController.m b/Examples/Sample-ObjC/Sample-ObjC/ITCViewController.m
@@ -81,13 +81,16 @@ - (void)handleUserLogin:(UIAlertController *)alertController {
     NSString *email = emailField.text;
     if (email.length > 0) {
         //Start tracking the user with Intercom
-        [Intercom registerUserWithEmail:email];
-        
-        //Save email so we know the user is logged in
-        [[NSUserDefaults standardUserDefaults] setObject:email forKey:@"email"];
-        [[NSUserDefaults standardUserDefaults] synchronize];
-        
-        self.loggedIn = YES;
+        ICMUserAttributes *attributes = [ICMUserAttributes new];
+        attributes.email = email;
+        [Intercom loginUserWithUserAttributes:attributes success:^{
+            //Save email so we know the user is logged in
+            [[NSUserDefaults standardUserDefaults] setObject:email forKey:@"email"];
+            [[NSUserDefaults standardUserDefaults] synchronize];
+            self.loggedIn = YES;
+        } failure:^(NSError * _Nonnull error) {
+            NSLog(@"Error logging in: %@", error.localizedDescription);
+        }];
     }
 
 }
diff --git a/Examples/Sample-Swift-UISceneDelegate/Sample-Swift-UISceneDelegate/AppDelegate.swift b/Examples/Sample-Swift-UISceneDelegate/Sample-Swift-UISceneDelegate/AppDelegate.swift
@@ -18,7 +18,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     }
     
     func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
-        Intercom.setDeviceToken(deviceToken)
+        Intercom.setDeviceToken(deviceToken) { error in
+            guard let error = error else { return }
+            print("Error setting device token: \(error.localizedDescription)")
+        }
     }
 
     // MARK: UISceneSession Lifecycle
diff --git a/Examples/Sample-Swift-UISceneDelegate/Sample-Swift-UISceneDelegate/SceneDelegate.swift b/Examples/Sample-Swift-UISceneDelegate/Sample-Swift-UISceneDelegate/SceneDelegate.swift
@@ -28,7 +28,14 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         
         let defaults = UserDefaults.standard
         if let email = defaults.string(forKey: emailKey) {
-            Intercom.registerUser(withEmail: email)
+            let attributes = ICMUserAttributes()
+            attributes.email = email
+            Intercom.loginUser(with: attributes) { result in
+                switch result {
+                case .success: print("Successfully logged in \(email)")
+                case .failure(let error): print("Error logging in: \(error.localizedDescription)")
+                }
+            }
         }
     }
 
diff --git a/Examples/Sample-Swift-UISceneDelegate/Sample-Swift-UISceneDelegate/ViewController.swift b/Examples/Sample-Swift-UISceneDelegate/Sample-Swift-UISceneDelegate/ViewController.swift
@@ -74,10 +74,16 @@ class ViewController: UIViewController {
         let textField = (alertController.textFields?.first)!
         if !(textField.text?.isEmpty ?? false) {
             //Start tracking the user with Intercom
-            Intercom.registerUser(withEmail: textField.text!)
-            
-            UserDefaults.standard.set(textField.text, forKey: emailKey)
-            loggedIn = true
+            let attributes = ICMUserAttributes()
+            attributes.email = textField.text!
+            Intercom.loginUser(with: attributes) { [unowned self] result in
+                switch result {
+                case .success:
+                    UserDefaults.standard.set(textField.text, forKey: emailKey)
+                    loggedIn = true
+                case .failure(let error): print("Error logging in: \(error.localizedDescription)")
+                }
+            }
         }
     }
 }
diff --git a/Examples/Sample-SwiftUI/iOS/AppDelegate.swift b/Examples/Sample-SwiftUI/iOS/AppDelegate.swift
@@ -18,7 +18,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
     
     func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
         // Set device token for push notifications.
-        Intercom.setDeviceToken(deviceToken)
+        Intercom.setDeviceToken(deviceToken) { error in
+            guard let error = error else { return }
+            print("Error setting device token: \(error.localizedDescription)")
+        }
     }
     
     // MARK: UISceneSession Lifecycle
diff --git a/Examples/Sample-SwiftUI/iOS/SceneDelegate.swift b/Examples/Sample-SwiftUI/iOS/SceneDelegate.swift
@@ -29,7 +29,14 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         
         let defaults = UserDefaults.standard
         if let email = defaults.string(forKey: emailKey) {
-            Intercom.registerUser(withEmail: email)
+            let attributes = ICMUserAttributes()
+            attributes.email = email
+            Intercom.loginUser(with: attributes) { result in
+                switch result {
+                case .success: print("Successfully logged in \(email)")
+                case .failure(let error): print("Error logging in: \(error.localizedDescription)")
+                }
+            }
         }
     }
 
diff --git a/Examples/Sample-SwiftUI/iOS/Views/LoggedOutView.swift b/Examples/Sample-SwiftUI/iOS/Views/LoggedOutView.swift
@@ -24,11 +24,17 @@ struct LoggedOutView: View {
     
     func loginToIntercom() {
         // Start tracking the user with Intercom
-        Intercom.registerUser(withEmail: email)
-        
-        let defaults = UserDefaults.standard
-        defaults.set(email, forKey: emailKey)
-        loggedIn = true
+        let attributes = ICMUserAttributes()
+        attributes.email = email
+        Intercom.loginUser(with: attributes) { result in
+            switch result {
+            case .success:
+                let defaults = UserDefaults.standard
+                defaults.set(email, forKey: emailKey)
+                loggedIn = true
+            case .failure(let error): print("Error logging in: \(error.localizedDescription)")
+            }
+        }
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {`
`21`		`- Intercom.setDeviceToken(deviceToken)`
	`21`	`+ Intercom.setDeviceToken(deviceToken) { error in`
	`22`	`+ guard let error = error else { return }`
	`23`	`+ print("Error setting device token: \(error.localizedDescription)")`
	`24`	`+ }`
`22`	`25`	`}`
`23`	`26`
`24`	`27`	`// MARK: UISceneSession Lifecycle`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,14 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {`
`28`	`28`
`29`	`29`	`let defaults = UserDefaults.standard`
`30`	`30`	`if let email = defaults.string(forKey: emailKey) {`
`31`		`- Intercom.registerUser(withEmail: email)`
	`31`	`+ let attributes = ICMUserAttributes()`
	`32`	`+ attributes.email = email`
	`33`	`+ Intercom.loginUser(with: attributes) { result in`
	`34`	`+ switch result {`
	`35`	`+ case .success: print("Successfully logged in \(email)")`
	`36`	`+ case .failure(let error): print("Error logging in: \(error.localizedDescription)")`
	`37`	`+ }`
	`38`	`+ }`
`32`	`39`	`}`
`33`	`40`	`}`
`34`	`41`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,14 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {`
`29`	`29`
`30`	`30`	`let defaults = UserDefaults.standard`
`31`	`31`	`if let email = defaults.string(forKey: emailKey) {`
`32`		`- Intercom.registerUser(withEmail: email)`
	`32`	`+ let attributes = ICMUserAttributes()`
	`33`	`+ attributes.email = email`
	`34`	`+ Intercom.loginUser(with: attributes) { result in`
	`35`	`+ switch result {`
	`36`	`+ case .success: print("Successfully logged in \(email)")`
	`37`	`+ case .failure(let error): print("Error logging in: \(error.localizedDescription)")`
	`38`	`+ }`
	`39`	`+ }`
`33`	`40`	`}`
`34`	`41`	`}`
`35`	`42`