From e56f7a73b874f5f44f0280f1c0d843df892540ae Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Wed, 1 May 2024 20:49:09 -0700
Subject: [PATCH] Delete FeedlyAccountDelegate+OAuth.swift.

---
 .../FeedlyAccountDelegate+OAuth.swift         | 33 -------------------
 .../FeedlyAccountDelegate.swift               |  2 +-
 Feedly/Sources/Feedly/FeedlyAPICaller.swift   | 17 ++++++++++
 3 files changed, 18 insertions(+), 34 deletions(-)
 delete mode 100644 Account/Sources/Account/AccountDelegates/FeedlyAccountDelegate+OAuth.swift

diff --git a/Account/Sources/Account/AccountDelegates/FeedlyAccountDelegate+OAuth.swift b/Account/Sources/Account/AccountDelegates/FeedlyAccountDelegate+OAuth.swift
deleted file mode 100644
index e3a7acf95..000000000
--- a/Account/Sources/Account/AccountDelegates/FeedlyAccountDelegate+OAuth.swift
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-//  FeedlyAccountDelegate+OAuth.swift
-//  Account
-//
-//  Created by Kiel Gillard on 14/9/19.
-//  Copyright © 2019 Ranchero Software, LLC. All rights reserved.
-//
-
-import Foundation
-import Web
-import Secrets
-import Feedly
-
-extension FeedlyAccountDelegate {
-
-	func refreshAccessToken(with refreshToken: String, client: OAuthAuthorizationClient) async throws -> OAuthAuthorizationGrant {
-
-		let request = OAuthRefreshAccessTokenRequest(refreshToken: refreshToken, scope: nil, client: client)
-		let response = try await caller.refreshAccessToken(request)
-
-		let accessToken = Credentials(type: .oauthAccessToken, username: response.id, secret: response.accessToken)
-		let refreshToken: Credentials? = {
-			guard let token = response.refreshToken else {
-				return nil
-			}
-			return Credentials(type: .oauthRefreshToken, username: response.id, secret: token)
-		}()
-
-		let grant = OAuthAuthorizationGrant(accessToken: accessToken, refreshToken: refreshToken)
-
-		return grant
-	}
-}
diff --git a/Account/Sources/Account/AccountDelegates/FeedlyAccountDelegate.swift b/Account/Sources/Account/AccountDelegates/FeedlyAccountDelegate.swift
index ea94a9b45..691df611c 100644
--- a/Account/Sources/Account/AccountDelegates/FeedlyAccountDelegate.swift
+++ b/Account/Sources/Account/AccountDelegates/FeedlyAccountDelegate.swift
@@ -964,7 +964,7 @@ extension FeedlyAccountDelegate: FeedlyAPICallerDelegate {
 		}
 
 		os_log(.debug, log: log, "Refreshing access token.")
-		let grant = try await refreshAccessToken(with: credentials.secret, client: oauthAuthorizationClient)
+		let grant = try await caller.refreshAccessToken(with: credentials.secret, client: oauthAuthorizationClient)
 
 		os_log(.debug, log: log, "Storing refresh token.")
 		if let refreshToken = grant.refreshToken {
diff --git a/Feedly/Sources/Feedly/FeedlyAPICaller.swift b/Feedly/Sources/Feedly/FeedlyAPICaller.swift
index ddec70c68..363f1e39b 100644
--- a/Feedly/Sources/Feedly/FeedlyAPICaller.swift
+++ b/Feedly/Sources/Feedly/FeedlyAPICaller.swift
@@ -617,6 +617,23 @@ extension FeedlyAPICaller {
 
 		return grant
 	}
+
+	public func refreshAccessToken(with refreshToken: String, client: OAuthAuthorizationClient) async throws -> OAuthAuthorizationGrant {
+
+		let request = OAuthRefreshAccessTokenRequest(refreshToken: refreshToken, scope: nil, client: client)
+		let response = try await refreshAccessToken(request)
+
+		let accessToken = Credentials(type: .oauthAccessToken, username: response.id, secret: response.accessToken)
+		let refreshToken: Credentials? = {
+			guard let token = response.refreshToken else {
+				return nil
+			}
+			return Credentials(type: .oauthRefreshToken, username: response.id, secret: token)
+		}()
+
+		let grant = OAuthAuthorizationGrant(accessToken: accessToken, refreshToken: refreshToken)
+		return grant
+	}
 }
 
 private extension FeedlyAPICaller {