demo app: add jwt buttons to login, updatetoken

Author: nan-li

examples/demo/App/Models/AppModels.swift

@@ -80,6 +80,7 @@ enum AddItemType {
     case tag
     case trigger
     case externalUserId
+    case updateJwt
 
     var title: String {
         switch self {
@@ -89,20 +90,31 @@ enum AddItemType {
         case .tag: return "Add Tag"
         case .trigger: return "Add Trigger"
         case .externalUserId: return "Login User"
+        case .updateJwt: return "Update JWT"
         }
     }
 
     var requiresKeyValue: Bool {
         switch self {
-        case .alias, .tag, .trigger: return true
-        case .email, .sms, .externalUserId: return false
+        case .alias, .tag, .trigger, .externalUserId, .updateJwt: return true
+        case .email, .sms: return false
+        }
+    }
+
+    /// When true the second field may be left blank (confirm stays enabled).
+    /// Used by Login, where the JWT token is optional.
+    var optionalValue: Bool {
+        switch self {
+        case .externalUserId: return true
+        default: return false
         }
     }
 
     var keyPlaceholder: String {
         switch self {
         case .alias: return "Label"
         case .tag, .trigger: return "Key"
+        case .externalUserId, .updateJwt: return "External User Id"
         default: return "Key"
         }
     }
@@ -113,7 +125,8 @@ enum AddItemType {
         case .email: return "Email Address"
         case .sms: return "Phone Number"
         case .tag, .trigger: return "Value"
-        case .externalUserId: return "External User Id"
+        case .externalUserId: return "JWT Token (optional)"
+        case .updateJwt: return "JWT Token"
         }
     }
 
@@ -128,6 +141,7 @@ enum AddItemType {
     var confirmLabel: String {
         switch self {
         case .externalUserId: return "Login"
+        case .updateJwt: return "Update"
         default: return "Add"
         }
     }
@@ -141,6 +155,7 @@ enum AddItemType {
         case .tag: return "tag"
         case .trigger: return "trigger"
         case .externalUserId: return "login_user_id"
+        case .updateJwt: return "update_jwt"
         }
     }
 
@@ -152,6 +167,8 @@ enum AddItemType {
         case .alias: return "alias_label_input"
         case .tag: return "tag_key_input"
         case .trigger: return "trigger_key_input"
+        case .externalUserId: return "login_user_id_input"
+        case .updateJwt: return "update_jwt_external_id_input"
         default: return "\(accessibilityKey)_key_input"
         }
     }
@@ -165,6 +182,8 @@ enum AddItemType {
         case .alias: return "alias_id_input"
         case .tag: return "tag_value_input"
         case .trigger: return "trigger_value_input"
+        case .externalUserId: return "login_user_jwt_input"
+        case .updateJwt: return "update_jwt_token_input"
         default: return "\(accessibilityKey)_input"
         }
     }

examples/demo/App/Services/OneSignalService.swift

@@ -96,9 +96,13 @@ final class OneSignalService {
 
     // MARK: - User
 
-    func login(externalId: String) {
+    func login(externalId: String, token: String? = nil) {
         prefs.setExternalUserId(externalId)
-        OneSignal.login(externalId)
+        OneSignal.login(externalId: externalId, token: token)
+    }
+
+    func updateUserJwt(externalId: String, token: String) {
+        OneSignal.updateUserJwt(externalId: externalId, token: token)
     }
 
     func logout() {

examples/demo/App/ViewModels/OneSignalViewModel.swift

@@ -67,8 +67,6 @@ final class OneSignalViewModel: ObservableObject {
 
     // MARK: - UI State
 
-    @Published var isLoading: Bool = false
-
     @Published var activeTooltip: TooltipData?
 
     // MARK: - Computed
@@ -129,7 +127,6 @@ final class OneSignalViewModel: ObservableObject {
         guard let onesignalId = service.onesignalId else { return }
         requestSequence &+= 1
         let captured = requestSequence
-        isLoading = true
 
         let userData = await UserFetchService.shared.fetchUser(appId: appId, onesignalId: onesignalId)
 
@@ -145,7 +142,6 @@ final class OneSignalViewModel: ObservableObject {
                 externalUserId = extId
             }
         }
-        isLoading = false
     }
 
     // MARK: - Consent
@@ -166,15 +162,22 @@ final class OneSignalViewModel: ObservableObject {
 
     // MARK: - User
 
-    func login(externalId: String) {
+    func login(externalId: String, token: String? = nil) {
         let trimmed = externalId.trimmingCharacters(in: .whitespacesAndNewlines)
         guard !trimmed.isEmpty else { return }
-        isLoading = true
-        service.login(externalId: trimmed)
+        let trimmedToken = token?.trimmingCharacters(in: .whitespacesAndNewlines)
+        service.login(externalId: trimmed, token: (trimmedToken?.isEmpty ?? true) ? nil : trimmedToken)
         externalUserId = trimmed
         clearUserData()
     }
 
+    func updateUserJwt(externalId: String, token: String) {
+        let trimmedId = externalId.trimmingCharacters(in: .whitespacesAndNewlines)
+        let trimmedToken = token.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !trimmedId.isEmpty, !trimmedToken.isEmpty else { return }
+        service.updateUserJwt(externalId: trimmedId, token: trimmedToken)
+    }
+
     func logout() {
         service.logout()
         externalUserId = nil

examples/demo/App/Views/Components/AddItemDialog.swift

@@ -80,8 +80,9 @@ struct AddItemDialog: 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
+            if itemType.optionalValue { return keyOK }
+            return keyOK && !valueText.trimmingCharacters(in: .whitespaces).isEmpty
         }
         return !valueText.trimmingCharacters(in: .whitespaces).isEmpty
     }

examples/demo/App/Views/Sections/UserSection.swift

@@ -31,6 +31,7 @@ import SwiftUI
 struct UserSection: View {
     @EnvironmentObject var viewModel: OneSignalViewModel
     @State private var loginOpen = false
+    @State private var updateJwtOpen = false
 
     var body: some View {
         SectionCard(title: "USER", sectionKey: "user") {
@@ -55,6 +56,14 @@ struct UserSection: View {
                 loginOpen = true
             }
 
+            ActionButton(
+                "UPDATE JWT",
+                style: .outline,
+                accessibilityID: "update_jwt_button"
+            ) {
+                updateJwtOpen = true
+            }
+
             if viewModel.isLoggedIn {
                 ActionButton(
                     "LOGOUT USER",
@@ -68,12 +77,22 @@ struct UserSection: View {
         .osCenteredDialog(isPresented: $loginOpen) {
             AddItemDialog(
                 itemType: .externalUserId,
-                onAdd: { _, value in
-                    viewModel.login(externalId: value)
+                onAdd: { externalId, token in
+                    viewModel.login(externalId: externalId, token: token.isEmpty ? nil : token)
                     loginOpen = false
                 },
                 onCancel: { loginOpen = false }
             )
         }
+        .osCenteredDialog(isPresented: $updateJwtOpen) {
+            AddItemDialog(
+                itemType: .updateJwt,
+                onAdd: { externalId, token in
+                    viewModel.updateUserJwt(externalId: externalId, token: token)
+                    updateJwtOpen = false
+                },
+                onCancel: { updateJwtOpen = false }
+            )
+        }
     }
 }