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

Send apiURLString when checking for duplicate accounts.

Browse Source
This commit is contained in:
Brent Simmons
2024-10-27 11:57:54 -07:00
parent 77910eb9a4
commit 8ee58b48cf
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Mac/Preferences/Accounts/AccountsReaderAPIWindowController.swift
View File

@@ -94,18 +94,19 @@ class AccountsReaderAPIWindowController: NSWindowController {
@IBAction func action(_ sender: Any) {
self.errorMessageLabel.stringValue = ""
let apiURLString = apiURLTextField.stringValue
guard !usernameTextField.stringValue.isEmpty && !passwordTextField.stringValue.isEmpty else {
self.errorMessageLabel.stringValue = NSLocalizedString("Username, password & API URL are required.", comment: "Credentials Error")
return
}
guard let accountType = accountType, !(accountType == .freshRSS && apiURLTextField.stringValue.isEmpty) else {
guard let accountType = accountType, !(accountType == .freshRSS && apiURLString.isEmpty) else {
self.errorMessageLabel.stringValue = NSLocalizedString("Username, password & API URL are required.", comment: "Credentials Error")
return
}
guard account != nil || !AccountManager.shared.duplicateServiceAccount(type: accountType, username: usernameTextField.stringValue) else {
guard account != nil || !AccountManager.shared.duplicateServiceAccount(type: accountType, username: usernameTextField.stringValue, apiURL: apiURLString) else {
self.errorMessageLabel.stringValue = NSLocalizedString("There is already an account of this type with that username created.", comment: "Duplicate Error")
return
}
@@ -113,7 +114,7 @@ class AccountsReaderAPIWindowController: NSWindowController {
let apiURL: URL
switch accountType {
case .freshRSS:
guard let inputURL = URL(string: apiURLTextField.stringValue) else {
guard let inputURL = URL(string: apiURLString) else {
self.errorMessageLabel.stringValue = NSLocalizedString("Invalid API URL.", comment: "Invalid API URL")
return
}