Skip to content

Commit 7b2a899

Browse files
nan-linan-li
committed
Fixes after rebase with main
remove an unused helper method and arguments that are unused
1 parent a8b8942 commit 7b2a899

7 files changed

Lines changed: 23 additions & 32 deletions

File tree

‎iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.m‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -461,13 +461,13 @@ - (void)fetchInAppMessagesWithoutToken:(NSString *)subscriptionId
461461
OSResponseStatusType responseType = [OSNetworkingUtils getResponseStatusType:error.code];
462462
if (responseType == OSResponseStatusUnauthorized) {
463463
shouldRetryGetInAppMessagesOnJwtUpdated = true;
464-
[self handleUnauthroizedError:error externalId:alias.id];
464+
[self handleUnauthorizedErrorWithExternalId:alias.id];
465465
}
466466
}];
467467
}
468468

469-
- (void)handleUnauthroizedError:(NSError*)error externalId:(NSString *)externalId {
470-
[OneSignalUserManagerImpl.sharedInstance invalidateJwtForExternalIdWithExternalId:externalId error:error];
469+
- (void)handleUnauthorizedErrorWithExternalId:(NSString *)externalId {
470+
[OneSignalUserManagerImpl.sharedInstance invalidateJwtForExternalIdWithExternalId:externalId];
471471
}
472472

473473
- (void)updateInAppMessagesFromServer:(NSArray<OSInAppMessageInternal *> *)newMessages {

‎iOS_SDK/OneSignalSDK/OneSignalUser/Source/Executors/OSIdentityOperationExecutor.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -258,10 +258,10 @@ class OSIdentityOperationExecutor: OSOperationExecutor {
258258
}
259259
}
260260

261-
func handleUnauthorizedError(externalId: String, error: NSError, request: OSUserRequest) {
261+
func handleUnauthorizedError(externalId: String, request: OSUserRequest) {
262262
if jwtConfig.isRequired ?? false {
263263
self.pendRequestUntilAuthUpdated(request, externalId: externalId)
264-
OneSignalUserManagerImpl.sharedInstance.invalidateJwtForExternalId(externalId: externalId, error: error)
264+
OneSignalUserManagerImpl.sharedInstance.invalidateJwtForExternalId(externalId: externalId)
265265
}
266266
}
267267

@@ -329,7 +329,7 @@ class OSIdentityOperationExecutor: OSOperationExecutor {
329329
OneSignalUserManagerImpl.sharedInstance._logout()
330330
} else if responseType == .unauthorized && (self.jwtConfig.isRequired ?? false) {
331331
if let externalId = request.identityModel.externalId {
332-
self.handleUnauthorizedError(externalId: externalId, error: nsError, request: request)
332+
self.handleUnauthorizedError(externalId: externalId, request: request)
333333
}
334334
request.sentToClient = false
335335
} else if responseType != .retryable {
@@ -379,7 +379,7 @@ class OSIdentityOperationExecutor: OSOperationExecutor {
379379
let responseType = OSNetworkingUtils.getResponseStatusType(error.code)
380380
if responseType == .unauthorized && (self.jwtConfig.isRequired ?? false) {
381381
if let externalId = request.identityModel.externalId {
382-
self.handleUnauthorizedError(externalId: externalId, error: nsError, request: request)
382+
self.handleUnauthorizedError(externalId: externalId, request: request)
383383
}
384384
request.sentToClient = false
385385
} else if responseType != .retryable {

‎iOS_SDK/OneSignalSDK/OneSignalUser/Source/Executors/OSPropertyOperationExecutor.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -271,10 +271,10 @@ class OSPropertyOperationExecutor: OSOperationExecutor {
271271
}
272272
}
273273

274-
func handleUnauthorizedError(externalId: String, error: NSError, request: OSRequestUpdateProperties) {
274+
func handleUnauthorizedError(externalId: String, request: OSRequestUpdateProperties) {
275275
if jwtConfig.isRequired ?? false {
276276
self.pendRequestUntilAuthUpdated(request, externalId: externalId)
277-
OneSignalUserManagerImpl.sharedInstance.invalidateJwtForExternalId(externalId: externalId, error: error)
277+
OneSignalUserManagerImpl.sharedInstance.invalidateJwtForExternalId(externalId: externalId)
278278
}
279279
}
280280

@@ -362,7 +362,7 @@ class OSPropertyOperationExecutor: OSOperationExecutor {
362362
OneSignalUserManagerImpl.sharedInstance._logout()
363363
} else if responseType == .unauthorized && (self.jwtConfig.isRequired ?? false) {
364364
if let externalId = request.identityModel.externalId {
365-
self.handleUnauthorizedError(externalId: externalId, error: nsError, request: request)
365+
self.handleUnauthorizedError(externalId: externalId, request: request)
366366
}
367367
request.sentToClient = false
368368
} else if responseType != .retryable {

‎iOS_SDK/OneSignalSDK/OneSignalUser/Source/Executors/OSSubscriptionOperationExecutor.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -410,14 +410,14 @@ extension OSSubscriptionOperationExecutor {
410410
if inBackground {
411411
OSBackgroundTaskManager.endBackgroundTask(backgroundTaskIdentifier)
412412
}
413-
return // TODO: 💛 check where these early returns came from
413+
return
414414
}
415415
// The subscription has been deleted along with the user, so remove the subscription_id but keep the same push subscription model
416416
OneSignalUserManagerImpl.sharedInstance.pushSubscriptionModel?.subscriptionId = nil
417417
OneSignalUserManagerImpl.sharedInstance._logout()
418418
} else if responseType == .unauthorized && (self.jwtConfig.isRequired ?? false) {
419419
if let externalId = request.identityModel.externalId {
420-
self.handleUnauthorizedError(externalId: externalId, error: nsError, request: request)
420+
self.handleUnauthorizedError(externalId: externalId, request: request)
421421
}
422422
request.sentToClient = false
423423
} else if responseType != .retryable {
@@ -467,7 +467,7 @@ extension OSSubscriptionOperationExecutor {
467467
let responseType = OSNetworkingUtils.getResponseStatusType(error.code)
468468
if responseType == .unauthorized && (self.jwtConfig.isRequired ?? false) {
469469
if let externalId = request.identityModel.externalId {
470-
self.handleUnauthorizedError(externalId: externalId, error: nsError, request: request)
470+
self.handleUnauthorizedError(externalId: externalId, request: request)
471471
}
472472
request.sentToClient = false
473473
} else if responseType != .retryable {
@@ -527,7 +527,7 @@ extension OSSubscriptionOperationExecutor {
527527
// TODO: Jwt, do we need to handle this case, as this request does not use user JWT
528528
} else if responseType != .retryable {
529529
// Fail, no retry, remove from cache and queue
530-
self.removeFromRequestQueueAndPersist(request)Add commentMore actions
530+
self.removeFromRequestQueueAndPersist(request)
531531
}
532532
if inBackground {
533533
OSBackgroundTaskManager.endBackgroundTask(backgroundTaskIdentifier)
@@ -548,10 +548,10 @@ extension OSSubscriptionOperationExecutor: OSUserJwtConfigListener {
548548
reQueuePendingRequestsForExternalId(externalId: externalId)
549549
}
550550

551-
func handleUnauthorizedError(externalId: String, error: NSError, request: OSUserRequest) {
551+
func handleUnauthorizedError(externalId: String, request: OSUserRequest) {
552552
if jwtConfig.isRequired ?? false {
553553
self.pendRequestUntilAuthUpdated(request, externalId: externalId)
554-
OneSignalUserManagerImpl.sharedInstance.invalidateJwtForExternalId(externalId: externalId, error: error)
554+
OneSignalUserManagerImpl.sharedInstance.invalidateJwtForExternalId(externalId: externalId)
555555
}
556556
}
557557

‎iOS_SDK/OneSignalSDK/OneSignalUser/Source/Executors/OSUserExecutor.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ extension OSUserExecutor {
417417
OneSignalLog.onesignalLog(.LL_ERROR, message: "OSUserExecutor no externalId for unauthorized request.")
418418
return
419419
}
420-
self.handleUnauthorizedError(externalId: externalId, error: nsError, request: request)
420+
self.handleUnauthorizedError(externalId: externalId, request: request)
421421
request.sentToClient = false
422422
} else if responseType != .retryable {
423423
// A failed create user request would leave the SDK in a bad state
@@ -430,10 +430,10 @@ extension OSUserExecutor {
430430
}
431431
}
432432

433-
func handleUnauthorizedError(externalId: String, error: NSError, request: OSUserRequest) {
433+
func handleUnauthorizedError(externalId: String, request: OSUserRequest) {
434434
if jwtConfig.isRequired ?? false {
435435
self.pendRequestUntilAuthUpdated(request, externalId: externalId)
436-
OneSignalUserManagerImpl.sharedInstance.invalidateJwtForExternalId(externalId: externalId, error: error)
436+
OneSignalUserManagerImpl.sharedInstance.invalidateJwtForExternalId(externalId: externalId)
437437
}
438438
}
439439

@@ -644,7 +644,7 @@ extension OSUserExecutor {
644644
OneSignalUserManagerImpl.sharedInstance._logout()
645645
} else if responseType == .unauthorized && (self.jwtConfig.isRequired ?? false) {
646646
if let externalId = request.identityModel.externalId {
647-
self.handleUnauthorizedError(externalId: externalId, error: nsError, request: request)
647+
self.handleUnauthorizedError(externalId: externalId, request: request)
648648
}
649649
request.sentToClient = false
650650
} else if responseType != .retryable {

‎iOS_SDK/OneSignalSDK/OneSignalUser/Source/Modeling/OSSubscriptionModelStoreListener.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class OSSubscriptionModelStoreListener: OSModelStoreListener {
8989
return nil
9090
}
9191
if let onesignalId = userInstance.identityModel.onesignalId {
92-
let condition = OSIamFetchReadyCondition.sharedInstance(withId: onesignalId) // TODO: 💛 figure out id for condition with JWT / alias / osid
92+
let condition = OSIamFetchReadyCondition.sharedInstance(withId: onesignalId)
9393
condition.setSubscriptionUpdatePending(value: true)
9494
}
9595

‎iOS_SDK/OneSignalSDK/OneSignalUser/Source/OneSignalUserManagerImpl.swift‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ public class OneSignalUserManagerImpl: NSObject, OneSignalUserManager {
247247
OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OneSignal.User login called with externalId: \(externalId)")
248248

249249
pushSubscriptionModel?._isDisabledInternally = false
250-
250+
251251
/*
252252
Logging in to a "new-to-the-sdk" externalId from an anonymous user, if JWT is OFF or UNKNOWN.
253253

@@ -700,7 +700,7 @@ extension OneSignalUserManagerImpl {
700700
}
701701

702702
@objc
703-
public func invalidateJwtForExternalId(externalId: String, error: NSError) {
703+
public func invalidateJwtForExternalId(externalId: String) {
704704
guard jwtConfig.isRequired == true else {
705705
return
706706
}
@@ -723,15 +723,6 @@ extension OneSignalUserManagerImpl {
723723
let event = OSUserJwtInvalidatedEvent(externalId: externalId)
724724
userJwtInvalidatedObserver.notifyChange(event)
725725
}
726-
727-
private func getMessageFromJwtError(_ error: NSError) -> String {
728-
if let returnedObject = error.userInfo["returned"] as? [String: AnyObject] {
729-
if let errors = returnedObject["errors"] as? [[String: AnyObject]] {
730-
return errors[0]["title"] as? String ?? error.localizedDescription
731-
}
732-
}
733-
return error.localizedDescription
734-
}
735726
}
736727

737728
extension OneSignalUserManagerImpl: OSUser {

0 commit comments

Comments
 (0)