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

Don't allow duplicate Feedly Accounts. Issue #2448

This commit is contained in:
Maurice Parker 2020-09-24 18:02:33 -05:00
parent 3ea9157b02
commit fff256f361
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Frameworks/Account/Feedly/OAuthAccountAuthorizationOperation.swift
View File

@ -15,6 +15,13 @@ public protocol OAuthAccountAuthorizationOperationDelegate: class {
func oauthAccountAuthorizationOperation(_ operation: OAuthAccountAuthorizationOperation, didFailWith error: Error) func oauthAccountAuthorizationOperation(_ operation: OAuthAccountAuthorizationOperation, didFailWith error: Error)
} }
public enum OAuthAccountAuthorizationOperationError: LocalizedError {
case duplicateAccount
public var errorDescription: String? {
return NSLocalizedString("There is already a Feedly account with that username created.", comment: "Duplicate Error")
}
}
@objc public final class OAuthAccountAuthorizationOperation: NSObject, MainThreadOperation, ASWebAuthenticationPresentationContextProviding { @objc public final class OAuthAccountAuthorizationOperation: NSObject, MainThreadOperation, ASWebAuthenticationPresentationContextProviding {
public var isCanceled: Bool = false { public var isCanceled: Bool = false {
@ -122,7 +129,11 @@ public protocol OAuthAccountAuthorizationOperationDelegate: class {
} }
private func saveAccount(for grant: OAuthAuthorizationGrant) { private func saveAccount(for grant: OAuthAuthorizationGrant) {
// TODO: Find an already existing account for this username? guard !AccountManager.shared.duplicateServiceAccount(type: .feedly, username: grant.accessToken.username) else {
didFinish(OAuthAccountAuthorizationOperationError.duplicateAccount)
return
}
let account = AccountManager.shared.createAccount(type: .feedly) let account = AccountManager.shared.createAccount(type: .feedly)
do { do {