Skip to content

Commit 3e5d73b

Browse files
committed
Refresh dependencies when user logs in
1 parent d211e3e commit 3e5d73b

1 file changed

Lines changed: 16 additions & 4 deletions

File tree

libs/SalesforceSDKCore/SalesforceSDKCore/Classes/PushNotification/PushNotificationManager.swift

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@ public class PushNotificationManager: NSObject {
7979

8080
var isSimulator: Bool = false
8181
private let notificationRegister: RemoteNotificationRegistering
82-
private let apiVersion: String
83-
private let restClient: RestClient?
84-
private let currentUser: UserAccount?
85-
private let preferences: SFPreferences?
82+
private var apiVersion: String
83+
private var restClient: RestClient?
84+
private var currentUser: UserAccount?
85+
private var preferences: SFPreferences?
8686

8787
/// Convenience initializer that sets up the PushNotificationManager with default values:
8888
/// - notificationRegister: DefaultRemoteNotificationRegistrar() - Handles APNS registration
@@ -457,6 +457,8 @@ public class PushNotificationManager: NSObject {
457457

458458
private extension PushNotificationManager {
459459
@objc private func onUserLoggedIn(_ notification: Notification) {
460+
refreshDependencies()
461+
460462
if deviceToken != nil {
461463
SFSDKCoreLogger.i(Self.self, message: "User logged in, registering push")
462464
_ = registerSalesforceNotifications(completionBlock: nil, failBlock: nil)
@@ -473,4 +475,14 @@ private extension PushNotificationManager {
473475
SFSDKCoreLogger.i(Self.self, message: "App entering foreground, re-registering push")
474476
_ = registerSalesforceNotifications(completionBlock: nil, failBlock: nil)
475477
}
478+
479+
func refreshDependencies() {
480+
// Refresh dependencies now that user is logged in
481+
let restClient = RestClient.shared
482+
let user = UserAccountManager.shared.currentUserAccount
483+
484+
self.restClient = restClient
485+
self.apiVersion = restClient.apiVersion
486+
self.currentUser = user
487+
}
476488
}

0 commit comments

Comments
 (0)