@@ -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,33 +142,32 @@ 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 {
105- delegate? . onTokenRegistrationFailed ( " auth token was nil, scheduling auth token retrieval in 10 seconds " )
153+ if retrievedAuthToken != nil {
154+ let isRefreshQueued = queueAuthTokenExpirationRefresh ( retrievedAuthToken, onSuccess: onSuccess)
155+ if !isRefreshQueued {
156+ onSuccess ? ( authToken)
157+ }
158+ } else {
159+ delegate? . onTokenRegistrationFailed ( " auth token was nil, scheduling auth token retrieval in \( getNextRetryInterval ( ) ) seconds " )
106160
107161 /// by default, schedule a refresh for 10s
108- scheduleAuthTokenRefreshTimer ( 10 )
109-
110- return
162+ scheduleAuthTokenRefreshTimer ( interval: getNextRetryInterval ( ) , successCallback: onSuccess)
111163 }
112164
113165 authToken = retrievedAuthToken
114166
115167 storeAuthToken ( )
116-
117- queueAuthTokenExpirationRefresh ( authToken)
118-
119- onSuccess ? ( authToken)
120168 }
121169
122- private func queueAuthTokenExpirationRefresh( _ authToken: String ? ) {
170+ private func queueAuthTokenExpirationRefresh( _ authToken: String ? , onSuccess : AuthTokenRetrievalHandler ? = nil ) -> Bool {
123171 ITBInfo ( )
124172
125173 clearRefreshTimer ( )
@@ -128,32 +176,47 @@ class AuthManager: IterableAuthManagerProtocol {
128176 delegate? . onTokenRegistrationFailed ( " auth token was nil or could not decode an expiration date, scheduling auth token retrieval in 10 seconds " )
129177
130178 /// schedule a default timer of 10 seconds if we fall into this case
131- scheduleAuthTokenRefreshTimer ( 10 )
179+ scheduleAuthTokenRefreshTimer ( interval : getNextRetryInterval ( ) , successCallback : onSuccess )
132180
133- return
181+ return true
134182 }
135183
136184 let timeIntervalToRefresh = TimeInterval ( expirationDate) - dateProvider. currentDate. timeIntervalSince1970 - expirationRefreshPeriod
137-
138- scheduleAuthTokenRefreshTimer ( timeIntervalToRefresh)
185+ if timeIntervalToRefresh > 0 {
186+ scheduleAuthTokenRefreshTimer ( interval: timeIntervalToRefresh, isScheduledRefresh: true , successCallback: onSuccess)
187+ return true
188+ }
189+ return false
139190 }
140191
141- private func scheduleAuthTokenRefreshTimer( _ interval: TimeInterval ) {
192+ func scheduleAuthTokenRefreshTimer( interval: TimeInterval , isScheduledRefresh : Bool = false , successCallback : AuthTokenRetrievalHandler ? = nil ) {
142193 ITBInfo ( )
194+ if shouldSkipTokenRefresh ( isScheduledRefresh: isScheduledRefresh) {
195+ // we only stop schedule token refresh if it is called from retry (in case of failure). The normal auth token refresh schedule would work
196+ return
197+ }
143198
144199 expirationRefreshTimer = Timer . scheduledTimer ( withTimeInterval: interval, repeats: false ) { [ weak self] _ in
200+ self ? . isTimerScheduled = false
145201 if self ? . localStorage. email != nil || self ? . localStorage. userId != nil {
146- self ? . requestNewAuthToken ( hasFailedPriorAuth: false )
202+ self ? . requestNewAuthToken ( hasFailedPriorAuth: false , onSuccess : successCallback , shouldIgnoreRetryPolicy : isScheduledRefresh )
147203 } else {
148204 ITBDebug ( " Email or userId is not available. Skipping token refresh " )
149205 }
150206 }
207+
208+ isTimerScheduled = true
209+ }
210+
211+ private func shouldSkipTokenRefresh( isScheduledRefresh: Bool ) -> Bool {
212+ return ( pauseAuthRetry && !isScheduledRefresh) || isTimerScheduled
151213 }
152214
153215 private func clearRefreshTimer( ) {
154216 ITBInfo ( )
155217
156218 expirationRefreshTimer? . invalidate ( )
219+ isTimerScheduled = false
157220 expirationRefreshTimer = nil
158221 }
159222
0 commit comments