Change internal refresh token logic.

Author: odimitrov

Source/Core/API/Account/INPAccountService.swift

@@ -488,6 +488,7 @@ private enum AccountAPIRouter: INPAPIConfiguration {
              .forgotPassword,
              .authenticate,
              .authenticateClientCredentials,
+             .refreshToken,
              .getRegisterFields,
              .getSocialURLs:
             return false

Source/Core/API/INPAuthHandler.swift

@@ -34,8 +34,7 @@ final class INPAuthHandler: RequestInterceptor {
         var adaptedRequest = urlRequest
         if let authenticationType = adaptedRequest.value(forHTTPHeaderField: NetworkConstants.HeaderParameters.authenticationType),
             authenticationType == NetworkConstants.HeaderParameters.refreshToken {
-            completion(.success(adaptedRequest))
-            return
+            return completion(.success(adaptedRequest))
         }
         guard
             let accessToken = InPlayer.Account.getCredentials()?.accessToken,
@@ -63,13 +62,24 @@ final class INPAuthHandler: RequestInterceptor {
         else {
             return completion(.doNotRetry)
         }
-        requestToRetry.append(completion)
+        
+        if let credentials = InPlayer.Account.getCredentials() {
+            if Date().timeIntervalSince1970.isLess(than: credentials.expires) {
+                
+                // token is not expired, but invalidated. Remove from storage and do not retry
+                InPlayer.Account.removeCredentials()
+                
+                return completion(.doNotRetry)
+            } else {
+                requestToRetry.append(completion)
 
-        if !isRefreshing {
-            refreshTokens { [weak self] (succeeded, accessToken, refreshToken) in
-                guard let strongSelf = self else { return }
-                strongSelf.requestToRetry.forEach { $0(.retryWithDelay(0.25)) }
-                strongSelf.requestToRetry.removeAll()
+                if !isRefreshing {
+                    refreshTokens { [weak self] (succeeded, accessToken, refreshToken) in
+                        guard let strongSelf = self else { return }
+                        strongSelf.requestToRetry.forEach { $0(.retryWithDelay(0.25)) }
+                        strongSelf.requestToRetry.removeAll()
+                    }
+                }
             }
         }
     }

Source/Core/API/NetworkDataSource.swift

@@ -23,9 +23,6 @@ class NetworkDataSource {
                                             route: INPAPIConfiguration,
                                             decoder: JSONDecoder = JSONDecoder(),
                                             completion: @escaping RequestCompletion<T>) {
-        if route.requiresAuthorization, !session.isAuthorized {
-            return completion(nil, InPlayerUnauthorizedError())
-        }
 
         session.request(route).validate().responseDecodable(decoder: decoder) { (response: DataResponse<T, AFError>) in
             switch response.result {

Source/Core/Account.swift

@@ -27,6 +27,14 @@ public extension InPlayer {
             return UserDefaults.credentials
         }
 
+        /**
+         Removes account and user credentials
+         */
+        public static func removeCredentials() {
+            UserDefaults.credentials = nil
+            UserDefaults.account = nil
+        }
+        
         /**
          Get account if logged in, else it returns nil
          - Returns: Account or nil