renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Get rid of SecretsProvider protocol. Stop passing secretsProvider around — just use SecretKey.whatever static properties.

Browse Source
This commit is contained in:
Brent Simmons
2024-07-07 15:38:45 -07:00
parent 7d40924509
commit 445306ef2a
25 changed files with 61 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
iOS/Account/FeedbinAccountViewController.swift
View File

@@ -30,8 +30,6 @@ class FeedbinAccountViewController: UITableViewController {
weak var account: Account?
weak var delegate: AddAccountDismissDelegate?
var secretsProvider: SecretsProvider!
override func viewDidLoad() {
super.viewDidLoad()
setupFooter()
@@ -129,7 +127,7 @@ class FeedbinAccountViewController: UITableViewController {
var validatedCredentials: Credentials?
do {
validatedCredentials = try await Account.validateCredentials(type: .feedbin, credentials: credentials, secretsProvider: Secrets())
validatedCredentials = try await Account.validateCredentials(type: .feedbin, credentials: credentials)
} catch {
self.showError(error.localizedDescription)
validationDidThrow = true

2
iOS/Account/NewsBlurAccountViewController.swift
View File

@@ -112,7 +112,7 @@ class NewsBlurAccountViewController: UITableViewController {
var validatedCredentials: Credentials?
do {
validatedCredentials = try await Account.validateCredentials(type: .newsBlur, credentials: credentials, secretsProvider: Secrets())
validatedCredentials = try await Account.validateCredentials(type: .newsBlur, credentials: credentials)
} catch {
self.showError(error.localizedDescription)
validationDidThrow = true

2
iOS/Account/ReaderAPIAccountViewController.swift
View File

@@ -165,7 +165,7 @@ class ReaderAPIAccountViewController: UITableViewController {
var validatedCredentials: Credentials?
do {
validatedCredentials = try await Account.validateCredentials(type: type, credentials: credentials, endpoint: url, secretsProvider: Secrets())
validatedCredentials = try await Account.validateCredentials(type: type, credentials: credentials, endpoint: url)
} catch {
self.showError(error.localizedDescription)
validationDidThrow = true

4
iOS/AppDelegate.swift
View File

@@ -56,14 +56,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
let accountManager: AccountManager
private var secretsProvider = Secrets()
override init() {
let documentFolder = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!
let documentAccountsFolder = documentFolder.appendingPathComponent("Accounts").absoluteString
let documentAccountsFolderPath = String(documentAccountsFolder.suffix(from: documentAccountsFolder.index(documentAccountsFolder.startIndex, offsetBy: 7)))
self.accountManager = AccountManager(accountsFolder: documentAccountsFolderPath, secretsProvider: secretsProvider)
self.accountManager = AccountManager(accountsFolder: documentAccountsFolderPath)
AccountManager.shared = accountManager
super.init()

4
iOS/Article/WebViewController.swift
View File

@@ -16,6 +16,7 @@ import Core
import ArticleExtractor
import Images
import Web
import Secrets
protocol WebViewControllerDelegate: AnyObject {
@@ -696,8 +697,7 @@ private extension WebViewController {
func startArticleExtractor() {
guard articleExtractor == nil else { return }
let secrets = Secrets()
if let link = article?.preferredLink, let extractor = ArticleExtractor(link, clientID: secrets.mercuryClientID, clientSecret: secrets.mercuryClientSecret) {
if let link = article?.preferredLink, let extractor = ArticleExtractor(link, clientID: SecretKey.mercuryClientID, clientSecret: SecretKey.mercuryClientSecret) {
extractor.delegate = self
extractor.process()
articleExtractor = extractor

2
iOS/Settings/AddAccountViewController.swift
View File

@@ -200,7 +200,7 @@ final class AddAccountViewController: UITableViewController, AddAccountDismissDe
addViewController.delegate = self
present(navController, animated: true)
case .feedly:
let addAccount = FeedlyOAuthAccountAuthorizationOperation(secretsProvider: Secrets())
let addAccount = FeedlyOAuthAccountAuthorizationOperation()
addAccount.delegate = self
addAccount.presentationAnchor = self.view.window!
feedlyAddAccountOperation = addAccount