@@ -6,12 +6,14 @@ import Foundation
66
77class AuthManager : IterableAuthManagerProtocol {
88 init ( delegate: IterableAuthDelegate ? ,
9+ authRetryPolicy: RetryPolicy ,
910 expirationRefreshPeriod: TimeInterval ,
1011 localStorage: LocalStorageProtocol ,
1112 dateProvider: DateProviderProtocol ) {
1213 ITBInfo ( )
1314
1415 self . delegate = delegate
16+ self . authRetryPolicy = authRetryPolicy
1517 self . localStorage = localStorage
1618 self . dateProvider = dateProvider
1719 self . expirationRefreshPeriod = expirationRefreshPeriod
@@ -35,26 +37,44 @@ class AuthManager: IterableAuthManagerProtocol {
3537 hasFailedPriorAuth = false
3638 }
3739
38- func requestNewAuthToken( hasFailedPriorAuth: Bool = false , onSuccess: AuthTokenRetrievalHandler ? = nil ) {
40+ func requestNewAuthToken( hasFailedPriorAuth: Bool = false ,
41+ onSuccess: AuthTokenRetrievalHandler ? = nil ,
42+ shouldIgnoreRetryPolicy: Bool ) {
3943 ITBInfo ( )
4044
41- guard !pendingAuth else {
42- return
43- }
44-
45- guard !self . hasFailedPriorAuth || !hasFailedPriorAuth else {
45+ if shouldPauseRetry ( shouldIgnoreRetryPolicy) || pendingAuth || hasFailedAuth ( hasFailedPriorAuth) {
4646 return
4747 }
4848
4949 self . hasFailedPriorAuth = hasFailedPriorAuth
50-
5150 pendingAuth = true
5251
52+ if shouldUseLastValidToken ( shouldIgnoreRetryPolicy) {
53+ // if some JWT retry had valid token it will not fetch the auth token again from developer function
54+ onAuthTokenReceived ( retrievedAuthToken: authToken, onSuccess: onSuccess)
55+ return
56+ }
57+
5358 delegate? . onAuthTokenRequested { [ weak self] retrievedAuthToken in
59+ self ? . pendingAuth = false
60+ self ? . retryCount+= 1
5461 self ? . onAuthTokenReceived ( retrievedAuthToken: retrievedAuthToken, onSuccess: onSuccess)
5562 }
5663 }
5764
65+ private func hasFailedAuth( _ hasFailedPriorAuth: Bool ) -> Bool {
66+ return self . hasFailedPriorAuth && hasFailedPriorAuth
67+ }
68+
69+ private func shouldPauseRetry( _ shouldIgnoreRetryPolicy: Bool ) -> Bool {
70+ return ( !shouldIgnoreRetryPolicy && pauseAuthRetry) ||
71+ ( retryCount >= authRetryPolicy. maxRetry && !shouldIgnoreRetryPolicy)
72+ }
73+
74+ private func shouldUseLastValidToken( _ shouldIgnoreRetryPolicy: Bool ) -> Bool {
75+ return isLastAuthTokenValid && !shouldIgnoreRetryPolicy
76+ }
77+
5878 func setNewToken( _ newToken: String ) {
5979 ITBInfo ( )
6080
@@ -69,6 +89,7 @@ class AuthManager: IterableAuthManagerProtocol {
6989 storeAuthToken ( )
7090
7191 clearRefreshTimer ( )
92+ isLastAuthTokenValid = false
7293 }
7394
7495 // MARK: - Private/Internal
@@ -79,11 +100,39 @@ class AuthManager: IterableAuthManagerProtocol {
79100 private var pendingAuth : Bool = false
80101 private var hasFailedPriorAuth : Bool = false
81102
103+ private var authRetryPolicy : RetryPolicy
104+ private var retryCount : Int = 0
105+ private var isLastAuthTokenValid : Bool = false
106+ private var pauseAuthRetry : Bool = false
107+ private var isTimerScheduled : Bool = false
108+
82109 private weak var delegate : IterableAuthDelegate ?
83110 private let expirationRefreshPeriod : TimeInterval
84111 private var localStorage : LocalStorageProtocol
85112 private let dateProvider : DateProviderProtocol
86113
114+ func pauseAuthRetries( _ pauseAuthRetry: Bool ) {
115+ self . pauseAuthRetry = pauseAuthRetry
116+ resetRetryCount ( )
117+ }
118+
119+ func setIsLastAuthTokenValid( _ isValid: Bool ) {
120+ isLastAuthTokenValid = isValid
121+ }
122+
123+ func getNextRetryInterval( ) -> Double {
124+ var nextRetryInterval = Double ( authRetryPolicy. retryInterval)
125+ if authRetryPolicy. retryBackoff == . exponential {
126+ nextRetryInterval = Double ( nextRetryInterval) * pow( Const . exponentialFactor, Double ( retryCount - 1 ) )
127+ }
128+
129+ return nextRetryInterval
130+ }
131+
132+ private func resetRetryCount( ) {
133+ retryCount = 0
134+ }
135+
87136 private func storeAuthToken( ) {
88137 localStorage. authToken = authToken
89138 }
@@ -93,37 +142,34 @@ class AuthManager: IterableAuthManagerProtocol {
93142
94143 authToken = localStorage. authToken
95144
96- queueAuthTokenExpirationRefresh ( authToken)
145+ _ = queueAuthTokenExpirationRefresh ( authToken)
97146 }
98147
99148 private func onAuthTokenReceived( retrievedAuthToken: String ? , onSuccess: AuthTokenRetrievalHandler ? = nil ) {
100149 ITBInfo ( )
101150
102151 pendingAuth = false
103152
104- guard retrievedAuthToken != nil else {
153+ if retrievedAuthToken != nil {
154+ let isRefreshQueued = queueAuthTokenExpirationRefresh ( retrievedAuthToken, onSuccess: onSuccess)
155+ if !isRefreshQueued {
156+ onSuccess ? ( authToken)
157+ }
158+ } else {
105159 handleAuthFailure ( failedAuthToken: nil , reason: . authTokenNull)
106-
107- /// by default, schedule a refresh for 10s
108- scheduleAuthTokenRefreshTimer ( 10 )
109-
110- return
160+ scheduleAuthTokenRefreshTimer ( interval: getNextRetryInterval ( ) , successCallback: onSuccess)
111161 }
112162
113163 authToken = retrievedAuthToken
114164
115165 storeAuthToken ( )
116-
117- queueAuthTokenExpirationRefresh ( authToken)
118-
119- onSuccess ? ( authToken)
120166 }
121167
122168 func handleAuthFailure( failedAuthToken: String ? , reason: AuthFailureReason ) {
123169 delegate? . onAuthFailure ( AuthFailure ( userKey: IterableUtil . getEmailOrUserId ( ) , failedAuthToken: failedAuthToken, failedRequestTime: IterableUtil . secondsFromEpoch ( for: dateProvider. currentDate) , failureReason: reason) )
124170 }
125171
126- private func queueAuthTokenExpirationRefresh( _ authToken: String ? ) {
172+ private func queueAuthTokenExpirationRefresh( _ authToken: String ? , onSuccess : AuthTokenRetrievalHandler ? = nil ) -> Bool {
127173 ITBInfo ( )
128174
129175 clearRefreshTimer ( )
@@ -132,32 +178,47 @@ class AuthManager: IterableAuthManagerProtocol {
132178 handleAuthFailure ( failedAuthToken: authToken, reason: . authTokenPayloadInvalid)
133179
134180 /// schedule a default timer of 10 seconds if we fall into this case
135- scheduleAuthTokenRefreshTimer ( 10 )
181+ scheduleAuthTokenRefreshTimer ( interval : getNextRetryInterval ( ) , successCallback : onSuccess )
136182
137- return
183+ return true
138184 }
139185
140186 let timeIntervalToRefresh = TimeInterval ( expirationDate) - dateProvider. currentDate. timeIntervalSince1970 - expirationRefreshPeriod
141-
142- scheduleAuthTokenRefreshTimer ( timeIntervalToRefresh)
187+ if timeIntervalToRefresh > 0 {
188+ scheduleAuthTokenRefreshTimer ( interval: timeIntervalToRefresh, isScheduledRefresh: true , successCallback: onSuccess)
189+ return true
190+ }
191+ return false
143192 }
144193
145- private func scheduleAuthTokenRefreshTimer( _ interval: TimeInterval ) {
194+ func scheduleAuthTokenRefreshTimer( interval: TimeInterval , isScheduledRefresh : Bool = false , successCallback : AuthTokenRetrievalHandler ? = nil ) {
146195 ITBInfo ( )
196+ if shouldSkipTokenRefresh ( isScheduledRefresh: isScheduledRefresh) {
197+ // we only stop schedule token refresh if it is called from retry (in case of failure). The normal auth token refresh schedule would work
198+ return
199+ }
147200
148201 expirationRefreshTimer = Timer . scheduledTimer ( withTimeInterval: interval, repeats: false ) { [ weak self] _ in
202+ self ? . isTimerScheduled = false
149203 if self ? . localStorage. email != nil || self ? . localStorage. userId != nil {
150- self ? . requestNewAuthToken ( hasFailedPriorAuth: false )
204+ self ? . requestNewAuthToken ( hasFailedPriorAuth: false , onSuccess : successCallback , shouldIgnoreRetryPolicy : isScheduledRefresh )
151205 } else {
152206 ITBDebug ( " Email or userId is not available. Skipping token refresh " )
153207 }
154208 }
209+
210+ isTimerScheduled = true
211+ }
212+
213+ private func shouldSkipTokenRefresh( isScheduledRefresh: Bool ) -> Bool {
214+ return ( pauseAuthRetry && !isScheduledRefresh) || isTimerScheduled
155215 }
156216
157217 private func clearRefreshTimer( ) {
158218 ITBInfo ( )
159219
160220 expirationRefreshTimer? . invalidate ( )
221+ isTimerScheduled = false
161222 expirationRefreshTimer = nil
162223 }
163224
0 commit comments