FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Convert methods to async await.

This commit is contained in:
Brent Simmons 2024-04-23 21:21:38 -07:00
parent 54dc3ca7fd
commit 42ce0d2f64
2 changed files with 29 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
Account/Sources/Account/Feedly/FeedlyAPICaller.swift
View File

@ -553,42 +553,15 @@ extension FeedlyAPICaller: FeedlySearchService {
extension FeedlyAPICaller: FeedlyLogoutService {
func logout(completion: @escaping (Result<Void, Error>) -> ()) {
guard !isSuspended else {
return DispatchQueue.main.async {
completion(.failure(TransportError.suspended))
}
}
guard let accessToken = credentials?.secret else {
return DispatchQueue.main.async {
completion(.failure(CredentialsError.incompleteCredentials))
}
}
var components = baseURLComponents
components.path = "/v3/auth/logout"
guard let url = components.url else {
fatalError("\(components) does not produce a valid URL.")
}
var request = URLRequest(url: url)
request.httpMethod = "POST"
request.addValue("application/json", forHTTPHeaderField: HTTPRequestHeader.contentType)
request.addValue("application/json", forHTTPHeaderField: "Accept-Type")
request.addValue("OAuth \(accessToken)", forHTTPHeaderField: HTTPRequestHeader.authorization)
send(request: request, resultType: String.self, dateDecoding: .millisecondsSince1970, keyDecoding: .convertFromSnakeCase) { result in
switch result {
case .success(let (httpResponse, _)):
if httpResponse.statusCode == 200 {
completion(.success(()))
} else {
completion(.failure(URLError(.cannotDecodeContentData)))
}
case .failure(let error):
completion(.failure(error))
}
func logout() async throws {
guard !isSuspended else { throw TransportError.suspended }
let request = try urlRequest(path: "/v3/auth/logout", method: HTTPMethod.post, includeJSONHeaders: true, includeOAuthToken: true)
let (httpResponse, _) = try await send(request: request, resultType: String.self)
if httpResponse.statusCode != HTTPResponseCode.OK {
throw URLError(.cannotDecodeContentData)
}
}
}

42
Feedly/Sources/Feedly/Operations/FeedlyLogoutOperation.swift
View File

@ -10,7 +10,8 @@ import Foundation
import os.log
public protocol FeedlyLogoutService {
func logout(completion: @escaping (Result<Void, Error>) -> ())
@MainActor func logout() async throws
}
public final class FeedlyLogoutOperation: FeedlyOperation {
@ -24,27 +25,24 @@ public final class FeedlyLogoutOperation: FeedlyOperation {
}
public override func run() {
os_log("Requesting logout of Feedly account.")
service.logout(completion: didCompleteLogout(_:))
}
func didCompleteLogout(_ result: Result<Void, Error>) {
assert(Thread.isMainThread)
switch result {
case .success:
os_log("Logged out of Feedly account.")
// do {
// // TODO: fix removing credentials
//// try account.removeCredentials(type: .oauthAccessToken)
//// try account.removeCredentials(type: .oauthRefreshToken)
// } catch {
// // oh well, we tried our best.
// }
didFinish()
case .failure(let error):
os_log("Logout failed because %{public}@.", error as NSError)
didFinish(with: error)
Task { @MainActor in
do {
os_log("Requesting logout of Feedly account.")
try await service.logout()
os_log("Logged out of Feedly account.")
// TODO: fix removing credentials
// try account.removeCredentials(type: .oauthAccessToken)
// try account.removeCredentials(type: .oauthRefreshToken)
didFinish()
} catch {
os_log("Logout failed because %{public}@.", error as NSError)
didFinish(with: error)
}
}
}
}