demo app: add jwt buttons to login, updatetoken

* Don't hang login now that it can fail with JWT

Author: nan-li

iOS_SDK/OneSignalSwiftUIExample/OneSignalSwiftUIExample/Models/AppModels.swift

@@ -79,6 +79,7 @@ enum AddItemType {
     case tag
     case trigger
     case externalUserId
+    case updateUserJwt
     case customNotification
     case trackEvent
 
@@ -90,15 +91,25 @@ enum AddItemType {
         case .tag: return "Add Tag"
         case .trigger: return "Add Trigger"
         case .externalUserId: return "Login User"
+        case .updateUserJwt: return "Update User JWT"
         case .customNotification: return "Custom Notification"
         case .trackEvent: return "Track Event"
         }
     }
 
     var requiresKeyValue: Bool {
         switch self {
-        case .alias, .tag, .trigger, .customNotification: return true
-        case .email, .sms, .externalUserId, .trackEvent: return false
+        case .alias, .tag, .trigger, .customNotification, .externalUserId, .updateUserJwt: return true
+        case .email, .sms, .trackEvent: return false
+        }
+    }
+
+    /// When true, the second (value) field may be left empty and validation still passes.
+    /// Used for `.externalUserId` where the JWT token is optional.
+    var valueIsOptional: Bool {
+        switch self {
+        case .externalUserId: return true
+        default: return false
         }
     }
 
@@ -108,6 +119,7 @@ enum AddItemType {
         case .tag: return "Key"
         case .trigger: return "Key"
         case .customNotification: return "Title"
+        case .externalUserId, .updateUserJwt: return "External User Id"
         default: return "Key"
         }
     }
@@ -119,7 +131,8 @@ enum AddItemType {
         case .sms: return "SMS"
         case .tag: return "Value"
         case .trigger: return "Value"
-        case .externalUserId: return "External User Id"
+        case .externalUserId: return "JWT Token (Optional)"
+        case .updateUserJwt: return "JWT Token"
         case .customNotification: return "Body"
         case .trackEvent: return "Event Name"
         }

iOS_SDK/OneSignalSwiftUIExample/OneSignalSwiftUIExample/Services/OneSignalService.swift

@@ -87,8 +87,12 @@ final class OneSignalService {
 
     // MARK: - User Management
 
-    func login(externalId: String) {
-        OneSignal.login(externalId)
+    func login(externalId: String, token: String?) {
+        OneSignal.login(externalId: externalId, token: token)
+    }
+
+    func updateUserJwt(externalId: String, token: String) {
+        OneSignal.updateUserJwt(externalId: externalId, token: token)
     }
 
     func logout() {

iOS_SDK/OneSignalSwiftUIExample/OneSignalSwiftUIExample/ViewModels/OneSignalViewModel.swift

@@ -188,12 +188,13 @@ final class OneSignalViewModel: ObservableObject {
 
     // MARK: - User Management
 
-    func login(externalId: String) {
-        isLoading = true
-        service.login(externalId: externalId)
+    func login(externalId: String, token: String? = nil) {
+        service.login(externalId: externalId, token: token)
         externalUserId = externalId
 
         // Clear old data; will be repopulated by fetchUserDataFromApi when user state changes
+        // (or stay empty if login fails — e.g. invalid JWT triggers a 401 and the observer
+        // never fires; that's fine, the UI just shows empty state instead of hanging).
         aliases.removeAll()
         emails.removeAll()
         smsNumbers.removeAll()
@@ -202,6 +203,11 @@ final class OneSignalViewModel: ObservableObject {
         showToast("Logged in as \(externalId)")
     }
 
+    func updateUserJwt(externalId: String, token: String) {
+        service.updateUserJwt(externalId: externalId, token: token)
+        showToast("Updated JWT for \(externalId)")
+    }
+
     func logout() {
         isLoading = true
         service.logout()
@@ -550,7 +556,10 @@ extension OneSignalViewModel {
         case .trigger:
             addTrigger(key: key, value: value)
         case .externalUserId:
-            login(externalId: value)
+            let trimmedToken = value.trimmingCharacters(in: .whitespaces)
+            login(externalId: key, token: trimmedToken.isEmpty ? nil : trimmedToken)
+        case .updateUserJwt:
+            updateUserJwt(externalId: key, token: value)
         case .customNotification:
             sendCustomNotification(title: key, body: value)
         case .trackEvent:

iOS_SDK/OneSignalSwiftUIExample/OneSignalSwiftUIExample/Views/Components/AddItemSheet.swift

@@ -99,7 +99,7 @@ struct AddItemSheet: View {
                     }
                     .foregroundColor(.accentColor)
 
-                    Button(itemType == .externalUserId ? "LOGIN" : "ADD") {
+                    Button(actionButtonTitle) {
                         onAdd(keyText, valueText)
                     }
                     .foregroundColor(isValid ? .accentColor : .gray)
@@ -127,12 +127,22 @@ struct AddItemSheet: View {
 
     private var isValid: Bool {
         if itemType.requiresKeyValue {
-            return !keyText.trimmingCharacters(in: .whitespaces).isEmpty &&
-                   !valueText.trimmingCharacters(in: .whitespaces).isEmpty
+            let keyOk = !keyText.trimmingCharacters(in: .whitespaces).isEmpty
+            let valueOk = itemType.valueIsOptional
+                || !valueText.trimmingCharacters(in: .whitespaces).isEmpty
+            return keyOk && valueOk
         } else {
             return !valueText.trimmingCharacters(in: .whitespaces).isEmpty
         }
     }
+
+    private var actionButtonTitle: String {
+        switch itemType {
+        case .externalUserId: return "LOGIN"
+        case .updateUserJwt: return "UPDATE"
+        default: return "ADD"
+        }
+    }
 }
 
 /// A text field style with an underline instead of a border

iOS_SDK/OneSignalSwiftUIExample/OneSignalSwiftUIExample/Views/Sections/UserSection.swift

@@ -74,6 +74,12 @@ struct UserSection: View {
             }
             .padding(.top, 12)
 
+            // Update User JWT button
+            ActionButton(title: "Update User JWT") {
+                viewModel.showAddSheet(for: .updateUserJwt)
+            }
+            .padding(.top, 8)
+
             // Logout button (outlined, only when logged in)
             if viewModel.isLoggedIn {
                 OutlineActionButton(title: "Logout User") {