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

Make RedditUser fetch reusable

This commit is contained in:
Maurice Parker 2020-05-04 16:08:55 -05:00
parent e8a2b54184
commit baf970745e
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,10 +124,14 @@ public final class RedditFeedProvider: FeedProvider {
let oauthRefreshToken = tokenSuccess.credential.oauthRefreshToken let oauthRefreshToken = tokenSuccess.credential.oauthRefreshToken
let redditFeedProvider = RedditFeedProvider(oauthToken: oauthToken, oauthRefreshToken: oauthRefreshToken) let redditFeedProvider = RedditFeedProvider(oauthToken: oauthToken, oauthRefreshToken: oauthRefreshToken)
redditFeedProvider.retrieveUserName() { result in redditFeedProvider.retrieveUser(api: "/api/v1/me") { result in
switch result { switch result {
case .success(let username): case .success(let user):
guard let username = user.name else {
completion(.failure(RedditFeedProviderError.unknown))
return
}
do { do {
redditFeedProvider.username = username redditFeedProvider.username = username
try storeCredentials(username: username, oauthToken: oauthToken, oauthRefreshToken: oauthRefreshToken) try storeCredentials(username: username, oauthToken: oauthToken, oauthRefreshToken: oauthRefreshToken)
@ -181,17 +185,19 @@ extension RedditFeedProvider: OAuth2SwiftProvider {
private extension RedditFeedProvider { private extension RedditFeedProvider {
func retrieveUserName(completion: @escaping (Result<String, Error>) -> Void) { func retrieveUser(api: String, completion: @escaping (Result<RedditUser, Error>) -> Void) {
guard let client = client else { guard let client = client else {
completion(.failure(RedditFeedProviderError.unknown)) completion(.failure(RedditFeedProviderError.unknown))
return return
} }
let url = "\(Self.apiBase)\(api)"
client.request(Self.apiBase + "/api/v1/me", method: .GET, headers: Self.userAgentHeaders) { result in client.request(url, method: .GET, headers: Self.userAgentHeaders) { result in
switch result { switch result {
case .success(let response): case .success(let response):
if let redditUser = try? JSONDecoder().decode(RedditUser.self, from: response.data), let username = redditUser.name { if let redditUser = try? JSONDecoder().decode(RedditUser.self, from: response.data) {
completion(.success(username)) completion(.success(redditUser))
} else { } else {
completion(.failure(RedditFeedProviderError.unknown)) completion(.failure(RedditFeedProviderError.unknown))
} }