From 133544b748649a1da8fd73fd6acd8d1751d859de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kiel=20Gillard=20=F0=9F=A4=AA?= Date: Wed, 20 May 2020 11:18:09 +1000 Subject: [PATCH] Revert "Add lastCredentialRenewTime and honour it in FeedlyRefreshAccessTokenOperation" This reverts commit 8973adbdbdc9cb85cf9c3f1b0a1e3a6a3816f899. --- Frameworks/Account/AccountMetadata.swift | 11 ---------- .../Feedly/FeedlyAccountDelegate.swift | 2 +- .../FeedlyRefreshAccessTokenOperation.swift | 22 +------------------ 3 files changed, 2 insertions(+), 33 deletions(-) diff --git a/Frameworks/Account/AccountMetadata.swift b/Frameworks/Account/AccountMetadata.swift index 9f5845a64..eaeb71215 100644 --- a/Frameworks/Account/AccountMetadata.swift +++ b/Frameworks/Account/AccountMetadata.swift @@ -23,7 +23,6 @@ final class AccountMetadata: Codable { case lastArticleFetchStartTime = "lastArticleFetch" case lastArticleFetchEndTime case endpointURL - case lastCredentialRenewTime = "lastCredentialRenewTime" case performedApril2020RetentionPolicyChange } @@ -82,16 +81,6 @@ final class AccountMetadata: Codable { } } } - - /// The last moment an account successfully renewed its credentials, or `nil` if no such moment exists. - /// An account delegate can use this value to decide when to next ask the service provider to renew credentials. - var lastCredentialRenewTime: Date? { - didSet { - if lastCredentialRenewTime != oldValue { - valueDidChange(.lastCredentialRenewTime) - } - } - } var performedApril2020RetentionPolicyChange: Bool? { didSet { diff --git a/Frameworks/Account/Feedly/FeedlyAccountDelegate.swift b/Frameworks/Account/Feedly/FeedlyAccountDelegate.swift index 1f5c341ff..cccc52836 100644 --- a/Frameworks/Account/Feedly/FeedlyAccountDelegate.swift +++ b/Frameworks/Account/Feedly/FeedlyAccountDelegate.swift @@ -554,7 +554,7 @@ extension FeedlyAccountDelegate: FeedlyAPICallerDelegate { } } - let refreshAccessToken = FeedlyRefreshAccessTokenOperation(account: account, service: self, oauthClient: oauthAuthorizationClient, refreshDate: Date(), log: log) + let refreshAccessToken = FeedlyRefreshAccessTokenOperation(account: account, service: self, oauthClient: oauthAuthorizationClient, log: log) refreshAccessToken.downloadProgress = refreshProgress /// This must be strongly referenced by the completionBlock of the `FeedlyRefreshAccessTokenOperation`. diff --git a/Frameworks/Account/Feedly/Operations/FeedlyRefreshAccessTokenOperation.swift b/Frameworks/Account/Feedly/Operations/FeedlyRefreshAccessTokenOperation.swift index b4878dc49..d1c68d970 100644 --- a/Frameworks/Account/Feedly/Operations/FeedlyRefreshAccessTokenOperation.swift +++ b/Frameworks/Account/Feedly/Operations/FeedlyRefreshAccessTokenOperation.swift @@ -17,32 +17,14 @@ final class FeedlyRefreshAccessTokenOperation: FeedlyOperation { let account: Account let log: OSLog - /// The moment the refresh is being requested. The token will refresh only if the account's `lastCredentialRenewTime` is not on the same day as this moment. When nil, the operation will always refresh the token. - let refreshDate: Date? - - init(account: Account, service: OAuthAccessTokenRefreshing, oauthClient: OAuthAuthorizationClient, refreshDate: Date?, log: OSLog) { + init(account: Account, service: OAuthAccessTokenRefreshing, oauthClient: OAuthAuthorizationClient, log: OSLog) { self.oauthClient = oauthClient self.service = service self.account = account - self.refreshDate = refreshDate self.log = log } override func run() { - // Only refresh the token if these dates are not on the same day. - let shouldRefresh: Bool = { - guard let date = refreshDate, let lastRenewDate = account.metadata.lastCredentialRenewTime else { - return true - } - return !Calendar.current.isDate(lastRenewDate, equalTo: date, toGranularity: .day) - }() - - guard shouldRefresh else { - os_log(.debug, log: log, "Skipping access token renewal.") - didFinish() - return - } - let refreshToken: Credentials do { @@ -82,8 +64,6 @@ final class FeedlyRefreshAccessTokenOperation: FeedlyOperation { // Now store the access token because we want the account delegate to use it. try account.storeCredentials(grant.accessToken) - account.metadata.lastCredentialRenewTime = Date() - didFinish() } catch { didFinish(with: error)