FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't allow duplicate Feedly or FeedWrangler accounts. Issue

Browse Source
This commit is contained in:
Maurice Parker 2020-09-24 18:02:12 -05:00
parent 0708ffcec8
commit 59d427d626
2 changed files with 18 additions and 7 deletions

11
iOS/Account/FeedWranglerAccountViewController.swift

@ -72,17 +72,22 @@ class FeedWranglerAccountViewController: UITableViewController {
} }
@IBAction func action(_ sender: Any) { @IBAction func action(_ sender: Any) {
guard let email = emailTextField.text, let password = passwordTextField.text else { guard let email = emailTextField.text, let password = passwordTextField.text else {
showError(NSLocalizedString("Username & password required.", comment: "Credentials Error")) showError(NSLocalizedString("Username & password required.", comment: "Credentials Error"))
return return
} }
// When you fill in the email address via auto-complete it adds extra whitespace
let trimmedEmail = email.trimmingCharacters(in: .whitespaces)
guard !AccountManager.shared.duplicateServiceAccount(type: .feedWrangler, username: trimmedEmail) else {
showError(NSLocalizedString("There is already a FeedWrangler account with that username created.", comment: "Duplicate Error"))
return
}
resignFirstResponder() resignFirstResponder()
toggleActivityIndicatorAnimation(visible: true) toggleActivityIndicatorAnimation(visible: true)
setNavigationEnabled(to: false) setNavigationEnabled(to: false)
// When you fill in the email address via auto-complete it adds extra whitespace
let trimmedEmail = email.trimmingCharacters(in: .whitespaces)
let credentials = Credentials(type: .feedWranglerBasic, username: trimmedEmail, secret: password) let credentials = Credentials(type: .feedWranglerBasic, username: trimmedEmail, secret: password)
Account.validateCredentials(type: .feedWrangler, credentials: credentials) { result in Account.validateCredentials(type: .feedWrangler, credentials: credentials) { result in

12
iOS/Account/FeedbinAccountViewController.swift

@ -73,17 +73,23 @@ class FeedbinAccountViewController: UITableViewController {
} }
@IBAction func action(_ sender: Any) { @IBAction func action(_ sender: Any) {
guard let email = emailTextField.text, let password = passwordTextField.text else { guard let email = emailTextField.text, let password = passwordTextField.text else {
showError(NSLocalizedString("Username & password required.", comment: "Credentials Error")) showError(NSLocalizedString("Username & password required.", comment: "Credentials Error"))
return return
} }
// When you fill in the email address via auto-complete it adds extra whitespace
let trimmedEmail = email.trimmingCharacters(in: .whitespaces)
guard !AccountManager.shared.duplicateServiceAccount(type: .feedbin, username: trimmedEmail) else {
showError(NSLocalizedString("There is already a Feedbin account with that username created.", comment: "Duplicate Error"))
return
}
resignFirstResponder() resignFirstResponder()
toggleActivityIndicatorAnimation(visible: true) toggleActivityIndicatorAnimation(visible: true)
setNavigationEnabled(to: false) setNavigationEnabled(to: false)
// When you fill in the email address via auto-complete it adds extra whitespace
let trimmedEmail = email.trimmingCharacters(in: .whitespaces)
let credentials = Credentials(type: .basic, username: trimmedEmail, secret: password) let credentials = Credentials(type: .basic, username: trimmedEmail, secret: password)
Account.validateCredentials(type: .feedbin, credentials: credentials) { result in Account.validateCredentials(type: .feedbin, credentials: credentials) { result in
self.toggleActivityIndicatorAnimation(visible: false) self.toggleActivityIndicatorAnimation(visible: false)