@@ -43,6 +43,7 @@ final class OneSignalViewModel: ObservableObject {
4343
4444 @ Published var externalUserId : String ?
4545 @ Published var aliases : [ KeyValueItem ] = [ ]
46+ @ Published var useIdentityVerification : Bool = false
4647
4748 // MARK: - Push
4849
@@ -99,14 +100,20 @@ final class OneSignalViewModel: ObservableObject {
99100 self . appId = service . appId
100101 self . consentRequired = service . consentRequired
101102 self . consentGiven = service . consentGiven
103+ self . useIdentityVerification = service . useIdentityVerification
102104 self . externalUserId = service . externalId ?? prefs . getExternalUserId ( )
103105 self . hasNotificationPermission = service . hasNotificationPermission
104106 refreshState ( )
105107 setupObservers ( )
106108
107109 TooltipService . shared . loadIfNeeded ( )
108110
109- if service . onesignalId != nil {
111+ // Demo REST hydrate only — does not call login / updateUserJwt with a cached JWT.
112+ if useIdentityVerification {
113+ if externalUserId != nil || service . externalId != nil {
114+ Task { await fetchUserDataFromApi ( ) }
115+ }
116+ } else if service . onesignalId != nil {
110117 Task { await fetchUserDataFromApi ( ) }
111118 }
112119 }
@@ -119,19 +126,43 @@ final class OneSignalViewModel: ObservableObject {
119126 isInAppMessagesPaused = service . isInAppMessagesPaused
120127 isLocationShared = service . isLocationShared
121128 hasNotificationPermission = service . hasNotificationPermission
122- externalUserId = service . externalId
129+ externalUserId = service . externalId ?? prefs . getExternalUserId ( )
123130
124131 let sdkTags = service . getTags ( )
125132 tags = sdkTags . map { KeyValueItem ( key : $0 . key , value : $0 . value ) }
126133 }
127134
128135 func fetchUserDataFromApi ( ) async {
129- guard let onesignalId = service . onesignalId else { return }
136+ let aliasLabel : String
137+ let aliasValue : String
138+ let jwt : String ?
139+
140+ if useIdentityVerification {
141+ guard let externalId = externalUserId ?? service . externalId , ! externalId . isEmpty else {
142+ return
143+ }
144+ aliasLabel = " external_id "
145+ aliasValue = externalId
146+ jwt = service . sessionJwtToken
147+ } else {
148+ guard let onesignalId = service . onesignalId , ! onesignalId . isEmpty else {
149+ return
150+ }
151+ aliasLabel = " onesignal_id "
152+ aliasValue = onesignalId
153+ jwt = nil
154+ }
155+
130156 requestSequence &+= 1
131157 let captured = requestSequence
132158 isLoading = true
133159
134- let userData = await UserFetchService . shared . fetchUser ( appId : appId , onesignalId : onesignalId )
160+ let userData = await UserFetchService . shared . fetchUser (
161+ appId : appId ,
162+ aliasLabel : aliasLabel ,
163+ aliasValue : aliasValue ,
164+ jwt : jwt
165+ )
135166
136167 // Drop the result if a newer fetch has started while this one was in flight.
137168 guard captured == requestSequence else { return }
@@ -166,21 +197,35 @@ final class OneSignalViewModel: ObservableObject {
166197
167198 // MARK: - User
168199
169- func login ( externalId : String ) {
200+ func login ( externalId : String , jwtToken : String ? = nil ) {
170201 let trimmed = externalId . trimmingCharacters ( in : . whitespacesAndNewlines )
171202 guard ! trimmed . isEmpty else { return }
172203 isLoading = true
173- service . login ( externalId : trimmed )
204+ service . login ( externalId : trimmed , jwtToken : jwtToken )
174205 externalUserId = trimmed
175206 clearUserData ( )
176207 }
177208
209+ func updateUserJwt ( externalId : String , token : String ) {
210+ let trimmedId = externalId . trimmingCharacters ( in : . whitespacesAndNewlines )
211+ let trimmedToken = token . trimmingCharacters ( in : . whitespacesAndNewlines )
212+ guard ! trimmedId . isEmpty , ! trimmedToken . isEmpty else { return }
213+ service . updateUserJwt ( externalId : trimmedId , token : trimmedToken )
214+ print ( " [OneSignal] Updated JWT for: \( trimmedId ) " )
215+ }
216+
178217 func logout ( ) {
179218 service . logout ( )
180219 externalUserId = nil
181220 clearUserData ( )
182221 }
183222
223+ func setUseIdentityVerification ( _ enabled : Bool ) {
224+ useIdentityVerification = enabled
225+ service . useIdentityVerification = enabled
226+ print ( " [OneSignal] Identity verification \( enabled ? " enabled " : " disabled " ) " )
227+ }
228+
184229 private func clearUserData ( ) {
185230 aliases . removeAll ( )
186231 emails . removeAll ( )
@@ -445,12 +490,17 @@ final class OneSignalViewModel: ObservableObject {
445490 service . addPushSubscriptionObserver ( observers )
446491 service . addUserObserver ( observers )
447492 service . addPermissionObserver ( observers )
493+ service . addUserJwtInvalidatedListener ( observers )
448494 }
449495}
450496
451497// MARK: - Observer Bridge
452498
453- private final class Observers : NSObject , OSPushSubscriptionObserver , OSUserStateObserver , OSNotificationPermissionObserver {
499+ private final class Observers : NSObject ,
500+ OSPushSubscriptionObserver ,
501+ OSUserStateObserver ,
502+ OSNotificationPermissionObserver ,
503+ OSUserJwtInvalidatedListener {
454504 weak var viewModel : OneSignalViewModel ?
455505
456506 func onPushSubscriptionDidChange ( state : OSPushSubscriptionChangedState ) {
@@ -472,4 +522,8 @@ private final class Observers: NSObject, OSPushSubscriptionObserver, OSUserState
472522 viewModel ? . isPushEnabled = OneSignal . User . pushSubscription . optedIn
473523 }
474524 }
525+
526+ func onUserJwtInvalidated ( event : OSUserJwtInvalidatedEvent ) {
527+ print ( " [OneSignal] JWT invalidated for externalId: \( event . externalId ) " )
528+ }
475529}
0 commit comments