FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2025-02-03 20:37:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Backout Reddit token changes

Browse Source
This commit is contained in:
Maurice Parker 2020-07-21 20:42:10 -05:00
parent a90930c7f9
commit 613c6a5155
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Frameworks/Account/FeedProvider/Reddit/RedditFeedProvider.swift
View File

@ -50,7 +50,6 @@ public final class RedditFeedProvider: FeedProvider {
public var username: String? public var username: String?
private var refreshingAuthToken = false
private var oauthToken: String private var oauthToken: String
private var oauthRefreshToken: String private var oauthRefreshToken: String
@ -411,37 +410,27 @@ private extension RedditFeedProvider {
func handleFailure(error: OAuthSwiftError, completion: @escaping (Error?) -> Void) { func handleFailure(error: OAuthSwiftError, completion: @escaping (Error?) -> Void) {
if case .tokenExpired = error { if case .tokenExpired = error {
if refreshingAuthToken {
DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
completion(nil)
}
}
refreshingAuthToken = true
os_log(.debug, log: self.log, "Access token expired, attempting to renew...") os_log(.debug, log: self.log, "Access token expired, attempting to renew...")
oauthSwift?.renewAccessToken(withRefreshToken: oauthRefreshToken) { [weak self] result in oauthSwift?.renewAccessToken(withRefreshToken: oauthRefreshToken) { [weak self] result in
guard let self = self, let username = self.username else { guard let strongSelf = self, let username = strongSelf.username else {
completion(nil) completion(nil)
return return
} }
switch result { switch result {
case .success(let tokenSuccess): case .success(let tokenSuccess):
self.oauthToken = tokenSuccess.credential.oauthToken strongSelf.oauthToken = tokenSuccess.credential.oauthToken
self.oauthRefreshToken = tokenSuccess.credential.oauthRefreshToken strongSelf.oauthRefreshToken = tokenSuccess.credential.oauthRefreshToken
do { do {
try Self.storeCredentials(username: username, oauthToken: self.oauthToken, oauthRefreshToken: self.oauthRefreshToken) try Self.storeCredentials(username: username, oauthToken: strongSelf.oauthToken, oauthRefreshToken: strongSelf.oauthRefreshToken)
os_log(.debug, log: self.log, "Access token renewed.") os_log(.debug, log: strongSelf.log, "Access token renewed.")
} catch { } catch {
self.refreshingAuthToken = false
completion(error) completion(error)
return return
} }
self.refreshingAuthToken = false
completion(nil) completion(nil)
case .failure(let oathError): case .failure(let oathError):
self.refreshingAuthToken = false
completion(oathError) completion(oathError)
} }
} }