Remove message for invalid handler

Author: emawby

iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.m

@@ -76,13 +76,11 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     [OneSignal.User addObserver:self];
     [OneSignal.Notifications addPermissionObserver:self];
     [OneSignal.InAppMessages addClickListener:self];
+
 
-    JwtExpiredBlock expiredBlock = ^(NSString *externalId, JwtCompletionBlock completion){
-        NSLog(@"JWT expired for external id: %@", externalId);
-        completion(@"test");
-    };
-    
-    [OneSignal.User onJwtExpiredWithExpiredHandler:expiredBlock];
+    [OneSignal.User onJwtInvalidatedWithInvalidatedHandler:^(OSJwtInvalidatedEvent * _Nonnull invalidatedEvent) {
+        NSLog(@"JWT INVALIDATED CALLBACK FOR: %@", invalidatedEvent.externalId);
+    }];
 
     NSLog(@"UNUserNotificationCenter.delegate: %@", UNUserNotificationCenter.currentNotificationCenter.delegate);
 

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSJwtInvalidatedEvent.swift

@@ -30,10 +30,8 @@ import Foundation
 
 @objc public class OSJwtInvalidatedEvent: NSObject {
     @objc public let externalId: String
-    @objc public let message: String
-    
-    init(externalId: String, message: String) {
+
+    init(externalId: String) {
         self.externalId = externalId
-        self.message = message
     }
 }

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OneSignalUserManagerImpl.swift

@@ -674,22 +674,21 @@ extension OneSignalUserManagerImpl {
 
     @objc
     public func invalidateJwtForExternalId(externalId: String, error: NSError) {
-        guard let identityModel = identityModelRepo.get(externalId: externalId) else {
+        guard jwtConfig.isRequired == true, let identityModel = identityModelRepo.get(externalId: externalId) else {
             OneSignalLog.onesignalLog(.LL_ERROR, message: "Unable to find identity model for externalId: \(externalId)")
             return
         }
         identityModel.jwtBearerToken = nil
 
-        let message = getMessageFromJwtError(error)
-        fireJwtExpired(externalId: externalId, message: message)
+        fireJwtExpired(externalId: externalId)
     }
 
 
-    private func fireJwtExpired(externalId: String, message: String) {
+    private func fireJwtExpired(externalId: String) {
         guard let jwtInvalidatedHandler = self.jwtInvalidatedHandler else {
             return
         }
-        let invalidatedEvent = OSJwtInvalidatedEvent(externalId: externalId, message: message)
+        let invalidatedEvent = OSJwtInvalidatedEvent(externalId: externalId)
 
         jwtInvalidatedHandler(invalidatedEvent)
     }