models now handle authentication

Multiplatform/Shared/Add/Add Account Models/AddFeedWranglerViewModel.swift

@@ -0,0 +1,69 @@
+//
+//  AddFeedWranglerViewModel.swift
+//  Multiplatform macOS
+//
+//  Created by Stuart Breckenridge on 05/12/2020.
+//  Copyright © 2020 Ranchero Software. All rights reserved.
+//
+
+import SwiftUI
+import Account
+import RSCore
+import RSWeb
+import Secrets
+
+class AddFeedWranglerViewModel: ObservableObject {
+	@Published var isAuthenticating: Bool = false
+	@Published var accountUpdateError: AccountUpdateErrors = .none
+	@Published var showError: Bool = false
+	@Published var username: String = ""
+	@Published var password: String = ""
+	@Published var canDismiss: Bool = false
+	
+	func authenticateFeedWrangler() {
+		
+		isAuthenticating = true
+		let credentials = Credentials(type: .feedWranglerBasic, username: username, secret: password)
+		
+		Account.validateCredentials(type: .feedWrangler, credentials: credentials) { result in
+			
+			
+			self.isAuthenticating = false
+			
+			switch result {
+			case .success(let validatedCredentials):
+				
+				guard let validatedCredentials = validatedCredentials else {
+					self.accountUpdateError = .invalidUsernamePassword
+					self.showError = true
+					return
+				}
+				
+				let account = AccountManager.shared.createAccount(type: .feedWrangler)
+				
+				do {
+					try account.removeCredentials(type: .feedWranglerBasic)
+					try account.removeCredentials(type: .feedWranglerToken)
+					try account.storeCredentials(credentials)
+					try account.storeCredentials(validatedCredentials)
+					self.canDismiss = true
+					account.refreshAll(completion: { result in
+						switch result {
+						case .success:
+							break
+						case .failure(let error):
+							self.accountUpdateError = .other(error: error)
+							self.showError = true
+						}
+					})
+				} catch {
+					self.accountUpdateError = .keyChainError
+					self.showError = true
+				}
+			case .failure:
+				self.accountUpdateError = .networkError
+				self.showError = true
+			}
+		}
+	}
+}

Multiplatform/Shared/Add/Add Account Models/AddFeedbinViewModel.swift

@@ -0,0 +1,67 @@
+//
+//  AddFeedbinViewModel.swift
+//  Multiplatform macOS
+//
+//  Created by Stuart Breckenridge on 05/12/2020.
+//  Copyright © 2020 Ranchero Software. All rights reserved.
+//
+
+import SwiftUI
+import Account
+import RSCore
+import RSWeb
+import Secrets
+
+class AddFeedbinViewModel: ObservableObject {
+	@Published var isAuthenticating: Bool = false
+	@Published var accountUpdateError: AccountUpdateErrors = .none
+	@Published var showError: Bool = false
+	@Published var username: String = ""
+	@Published var password: String = ""
+	@Published var canDismiss: Bool = false
+	
+	func authenticateFeedbin() {
+		isAuthenticating = true
+		let credentials = Credentials(type: .basic, username: username, secret: password)
+		
+		Account.validateCredentials(type: .feedbin, credentials: credentials) { result in
+			self.isAuthenticating = false
+			
+			switch result {
+			case .success(let validatedCredentials):
+				
+				guard let validatedCredentials = validatedCredentials else {
+					self.accountUpdateError = .invalidUsernamePassword
+					self.showError = true
+					return
+				}
+				
+				let account = AccountManager.shared.createAccount(type: .feedbin)
+				
+				do {
+					try account.removeCredentials(type: .basic)
+					try account.storeCredentials(validatedCredentials)
+					self.isAuthenticating = false
+					self.canDismiss = true
+					account.refreshAll(completion: { result in
+						switch result {
+						case .success:
+							break
+						case .failure(let error):
+							self.accountUpdateError = .other(error: error)
+							self.showError = true
+						}
+					})
+					
+				} catch {
+					self.accountUpdateError = .keyChainError
+					self.showError = true
+				}
+				
+			case .failure:
+				self.accountUpdateError = .networkError
+				self.showError = true
+			}
+		}
+	}
+}

Multiplatform/Shared/Add/Add Account Models/AddFeedlyViewModel.swift

@@ -0,0 +1,55 @@
+//
+//  AddFeedlyViewModel.swift
+//  Multiplatform macOS
+//
+//  Created by Stuart Breckenridge on 05/12/2020.
+//  Copyright © 2020 Ranchero Software. All rights reserved.
+//
+
+import SwiftUI
+import Account
+import RSCore
+import RSWeb
+import Secrets
+
+class AddFeedlyViewModel: ObservableObject, OAuthAccountAuthorizationOperationDelegate  {
+	@Published var isAuthenticating: Bool = false
+	@Published var accountUpdateError: AccountUpdateErrors = .none
+	@Published var showError: Bool = false
+	@Published var username: String = ""
+	@Published var password: String = ""
+	
+	func oauthAccountAuthorizationOperation(_ operation: OAuthAccountAuthorizationOperation, didCreate account: Account) {
+		
+		isAuthenticating = false
+		
+		// macOS only: `ASWebAuthenticationSession` leaves the browser in the foreground.
+		// Ensure the app is in the foreground so the user can see their Feedly account load.
+		#if os(macOS)
+		NSApplication.shared.activate(ignoringOtherApps: true)
+		#endif
+		
+		account.refreshAll { [weak self] result in
+			switch result {
+			case .success:
+				break
+			case .failure(let error):
+				self?.accountUpdateError = .other(error: error)
+				self?.showError = true
+			}
+		}
+	}
+	
+	func oauthAccountAuthorizationOperation(_ operation: OAuthAccountAuthorizationOperation, didFailWith error: Error) {
+		isAuthenticating = false
+		
+		// macOS only: `ASWebAuthenticationSession` leaves the browser in the foreground.
+		// Ensure the app is in the foreground so the user can see the error.
+		#if os(macOS)
+		NSApplication.shared.activate(ignoringOtherApps: true)
+		#endif
+		
+		accountUpdateError = .other(error: error)
+		showError = true
+	}
+}

Multiplatform/Shared/Add/Add Account Models/AddNewsBlurViewModel.swift

@@ -0,0 +1,70 @@
+//
+//  AddNewsBlurViewModel.swift
+//  Multiplatform macOS
+//
+//  Created by Stuart Breckenridge on 05/12/2020.
+//  Copyright © 2020 Ranchero Software. All rights reserved.
+//
+
+import SwiftUI
+import Account
+import RSCore
+import RSWeb
+import Secrets
+
+class AddNewsBlurViewModel: ObservableObject {
+	@Published var isAuthenticating: Bool = false
+	@Published var accountUpdateError: AccountUpdateErrors = .none
+	@Published var showError: Bool = false
+	@Published var username: String = ""
+	@Published var password: String = ""
+	@Published var canDismiss: Bool = false
+	
+	func authenticateNewsBlur() {
+		isAuthenticating = true
+		let credentials = Credentials(type: .newsBlurBasic, username: username, secret: password)
+		
+		Account.validateCredentials(type: .newsBlur, credentials: credentials) { result in
+			
+			self.isAuthenticating = false
+			
+			switch result {
+			case .success(let validatedCredentials):
+				
+				guard let validatedCredentials = validatedCredentials else {
+					self.accountUpdateError = .invalidUsernamePassword
+					self.showError = true
+					return
+				}
+				
+				let account = AccountManager.shared.createAccount(type: .newsBlur)
+				
+				do {
+					try account.removeCredentials(type: .newsBlurBasic)
+					try account.removeCredentials(type: .newsBlurSessionId)
+					try account.storeCredentials(credentials)
+					try account.storeCredentials(validatedCredentials)
+					self.canDismiss = true
+					account.refreshAll(completion: { result in
+						switch result {
+						case .success:
+							break
+						case .failure(let error):
+							self.accountUpdateError = .other(error: error)
+							self.showError = true
+						}
+					})
+					
+				} catch {
+					self.accountUpdateError = .keyChainError
+					self.showError = true
+				}
+				
+			case .failure:
+				self.accountUpdateError = .networkError
+				self.showError = true
+			}
+		}
+	}
+	
+}

Multiplatform/Shared/Add/Add Account Models/AddReaderAPIViewModel.swift

@@ -0,0 +1,121 @@
+//
+//  AddReaderAPIViewModel.swift
+//  Multiplatform macOS
+//
+//  Created by Stuart Breckenridge on 05/12/2020.
+//  Copyright © 2020 Ranchero Software. All rights reserved.
+//
+
+import SwiftUI
+import Account
+import RSCore
+import RSWeb
+import Secrets
+
+class AddReaderAPIViewModel: ObservableObject {
+	@Published var isAuthenticating: Bool = false
+	@Published var accountUpdateError: AccountUpdateErrors = .none
+	@Published var showError: Bool = false
+	@Published var username: String = ""
+	@Published var password: String = ""
+	@Published var apiUrl: String = ""
+	@Published var canDismiss: Bool = false
+	
+	func authenticateReaderAccount(_ accountType: AccountType) {
+		isAuthenticating = true
+		
+		let credentials = Credentials(type: .readerBasic, username: username, secret: password)
+		
+		if accountType == .freshRSS {
+			Account.validateCredentials(type: accountType, credentials: credentials, endpoint: URL(string: apiUrl)!) { result in
+				
+				self.isAuthenticating = false
+				
+				switch result {
+				case .success(let validatedCredentials):
+					
+					guard let validatedCredentials = validatedCredentials else {
+						self.accountUpdateError = .invalidUsernamePassword
+						self.showError = true
+						return
+					}
+					
+					let account = AccountManager.shared.createAccount(type: .freshRSS)
+					
+					do {
+						try account.removeCredentials(type: .readerBasic)
+						try account.removeCredentials(type: .readerAPIKey)
+						try account.storeCredentials(credentials)
+						try account.storeCredentials(validatedCredentials)
+						self.canDismiss = true
+						account.refreshAll(completion: { result in
+							switch result {
+							case .success:
+								break
+							case .failure(let error):
+								self.accountUpdateError = .other(error: error)
+								self.showError = true
+							}
+						})
+						
+					} catch {
+						self.accountUpdateError = .keyChainError
+						self.showError = true
+					}
+					
+				case .failure:
+					self.accountUpdateError = .networkError
+					self.showError = true
+				}
+			}
+		}
+		
+		else {
+			
+			Account.validateCredentials(type: accountType, credentials: credentials) { result in
+				
+				self.isAuthenticating = false
+				
+				switch result {
+				case .success(let validatedCredentials):
+					
+					guard let validatedCredentials = validatedCredentials else {
+						self.accountUpdateError = .invalidUsernamePassword
+						self.showError = true
+						return
+					}
+					
+					let account = AccountManager.shared.createAccount(type: .freshRSS)
+					
+					do {
+						try account.removeCredentials(type: .readerBasic)
+						try account.removeCredentials(type: .readerAPIKey)
+						try account.storeCredentials(credentials)
+						try account.storeCredentials(validatedCredentials)
+						self.canDismiss = true
+						account.refreshAll(completion: { result in
+							switch result {
+							case .success:
+								break
+							case .failure(let error):
+								self.accountUpdateError = .other(error: error)
+								self.showError = true
+							}
+						})
+						
+					} catch {
+						self.accountUpdateError = .keyChainError
+						self.showError = true
+					}
+					
+				case .failure:
+					self.accountUpdateError = .networkError
+					self.showError = true
+				}
+			}
+			
+		}
+		
+	}
+	
+}

Multiplatform/Shared/Add/Add Account Sheets/AddCloudKitAccountView.swift

@@ -0,0 +1,126 @@
+//
+//  AddCloudKitAccountView.swift
+//  Multiplatform macOS
+//
+//  Created by Stuart Breckenridge on 03/12/2020.
+//  Copyright © 2020 Ranchero Software. All rights reserved.
+//
+
+import SwiftUI
+import Account
+
+struct AddCloudKitAccountView: View {
+	
+	@Environment (\.presentationMode) var presentationMode
+	
+    var body: some View {
+		
+		#if os(macOS)
+		macBody
+		#else
+		iosBody
+		#endif
+		
+    }
+	
+	#if os(iOS)
+	var iosBody: some View {
+		List {
+			Section(header: formHeader, content: {
+				Button(action: {
+					_ = AccountManager.shared.createAccount(type: .cloudKit)
+					presentationMode.wrappedValue.dismiss()
+				}, label: {
+					Text("Add")
+				})
+			})
+		}.navigationBarItems(leading:
+			Button(action: {
+				presentationMode.wrappedValue.dismiss()
+			}, label: {
+				Text("Dismiss")
+			})
+		 
+		 , trailing:
+			Button(action: {
+				_ = AccountManager.shared.createAccount(type: .cloudKit)
+				presentationMode.wrappedValue.dismiss()
+			}, label: {
+				Text("Add")
+			})
+		)
+	}
+	#endif
+	
+	#if os(macOS)
+	var macBody: some View {
+		VStack {
+			HStack(spacing: 16) {
+				VStack(alignment: .leading) {
+					AccountType.cloudKit.image()
+						.resizable()
+						.frame(width: 50, height: 50)
+					Spacer()
+				}
+				VStack(alignment: .leading, spacing: 8) {
+					Text("Sign in to your iCloud account.")
+						.font(.headline)
+					
+					Text("This account syncs across your Mac and iOS devices using your iCloud account.")
+						.foregroundColor(.secondary)
+						.font(.callout)
+						.lineLimit(2)
+						.padding(.top, 4)
+					
+					Spacer()
+					HStack(spacing: 8) {
+						Spacer()
+						Button(action: {
+							presentationMode.wrappedValue.dismiss()
+						}, label: {
+							Text("Cancel")
+								.frame(width: 60)
+						}).keyboardShortcut(.cancelAction)
+
+						Button(action: {
+							_ = AccountManager.shared.createAccount(type: .cloudKit)
+							presentationMode.wrappedValue.dismiss()
+						}, label: {
+							Text("Create")
+								.frame(width: 60)
+						})
+						.keyboardShortcut(.defaultAction)
+						.disabled(AccountManager.shared.activeAccounts.filter({ $0.type == .cloudKit }).count > 0)
+					}
+				}
+			}
+		}
+		.padding()
+		.frame(minWidth: 400, maxWidth: 400, maxHeight: 150)
+	}
+	#endif
+	
+	var formHeader: some View {
+		HStack {
+			VStack(alignment: .center) {
+				AccountType.cloudKit.image()
+					.resizable()
+					.frame(width: 50, height: 50)
+			Text("Sign in to your iCloud account.")
+				.font(.headline)
+			
+			Text("This account syncs across your Mac and iOS devices using your iCloud account.")
+				.foregroundColor(.secondary)
+				.font(.callout)
+				.lineLimit(2)
+				.padding(.top, 4)
+			}
+		}
+	}
+}
+
+struct AddCloudKitAccountView_Previews: PreviewProvider {
+    static var previews: some View {
+        AddCloudKitAccountView()
+    }
+}

Multiplatform/Shared/Add/Add Account Sheets/AddFeedWranglerAccountView.swift

@@ -0,0 +1,106 @@
+//
+//  AddFeedWranglerAccountView.swift
+//  Multiplatform macOS
+//
+//  Created by Stuart Breckenridge on 03/12/2020.
+//  Copyright © 2020 Ranchero Software. All rights reserved.
+//
+
+import SwiftUI
+import Account
+import RSCore
+import RSWeb
+import Secrets
+
+
+struct AddFeedWranglerAccountView: View {
+    
+	@Environment (\.presentationMode) var presentationMode
+	@StateObject private var model = AddFeedWranglerViewModel()
+	
+	var body: some View {
+		VStack {
+			HStack(spacing: 16) {
+				VStack(alignment: .leading) {
+					AccountType.feedWrangler.image()
+						.resizable()
+						.frame(width: 50, height: 50)
+					Spacer()
+				}
+				VStack(alignment: .leading, spacing: 8) {
+					Text("Sign in to your Feed Wrangler account.")
+						.font(.headline)
+					HStack {
+						Text("Don't have a Feed Wrangler account?")
+							.font(.callout)
+						Button(action: {
+							NSWorkspace.shared.open(URL(string: "https://feedwrangler.net/users/new")!)
+						}, label: {
+							Text("Sign up here.").font(.callout)
+						}).buttonStyle(LinkButtonStyle())
+					}
+					
+					HStack {
+						VStack(alignment: .trailing, spacing: 14) {
+							Text("Email")
+							Text("Password")
+						}
+						VStack(spacing: 8) {
+							TextField("me@email.com", text: $model.username)
+							SecureField("•••••••••••", text: $model.password)
+						}
+					}
+					
+					Text("Your username and password will be encrypted and stored in Keychain.")
+						.foregroundColor(.secondary)
+						.font(.callout)
+						.lineLimit(2)
+						.padding(.top, 4)
+					
+					Spacer()
+					HStack(spacing: 8) {
+						Spacer()
+						ProgressView()
+							.scaleEffect(CGSize(width: 0.5, height: 0.5))
+							.hidden(!model.isAuthenticating)
+						Button(action: {
+							presentationMode.wrappedValue.dismiss()
+						}, label: {
+							Text("Cancel")
+								.frame(width: 60)
+						}).keyboardShortcut(.cancelAction)
+
+						Button(action: {
+							model.authenticateFeedWrangler()
+						}, label: {
+							Text("Sign In")
+								.frame(width: 60)
+						})
+						.keyboardShortcut(.defaultAction)
+						.disabled(model.username.isEmpty || model.password.isEmpty)
+					}
+				}
+			}
+		}
+		.padding()
+		.frame(minWidth: 400, maxWidth: 400, minHeight: 230, maxHeight: 260)
+		.textFieldStyle(RoundedBorderTextFieldStyle())
+		.alert(isPresented: $model.showError, content: {
+			Alert(title: Text("Sign In Error"), message: Text(model.accountUpdateError.description), dismissButton: .cancel())
+		})
+		.onReceive(model.$canDismiss, perform: { value in
+			if value == true {
+				presentationMode.wrappedValue.dismiss()
+			}
+		})
+    }
+	
+	
+	
+}
+
+struct AddFeedWranglerAccountView_Previews: PreviewProvider {
+    static var previews: some View {
+        AddFeedWranglerAccountView()
+    }
+}

Multiplatform/Shared/Add/Add Account Sheets/AddFeedbinAccountView.swift

@@ -0,0 +1,150 @@
+//
+//  AddFeedbinAccountView.swift
+//  Multiplatform macOS
+//
+//  Created by Stuart Breckenridge on 02/12/2020.
+//  Copyright © 2020 Ranchero Software. All rights reserved.
+//
+
+import SwiftUI
+import Account
+import RSCore
+import RSWeb
+import Secrets
+
+struct AddFeedbinAccountView: View {
+	
+	@Environment (\.presentationMode) var presentationMode
+	@StateObject private var model = AddFeedbinViewModel()
+ 
+	var body: some View {
+		#if os(macOS)
+			macBody
+		#else
+			iosBody
+		#endif
+    }
+	
+	#if os(iOS)
+	var iosBody: some View {
+		List {
+			Section(header: formHeader, footer: ProgressView()
+						.scaleEffect(CGSize(width: 0.5, height: 0.5))
+						   .hidden(!model.isAuthenticating) , content: {
+				TextField("me@email.com", text: $model.username)
+				SecureField("•••••••••••", text: $model.password)
+			})
+		}.navigationBarItems(leading:
+			Button(action: {
+				presentationMode.wrappedValue.dismiss()
+			}, label: {
+				Text("Dismiss")
+			})
+		, trailing:
+			Button(action: {
+				model.authenticateFeedbin()
+			}, label: {
+				Text("Add")
+			}).disabled(model.username.isEmpty || model.password.isEmpty)
+		)
+	}
+	#endif
+	
+	#if os(macOS)
+	var macBody: some View {
+		VStack {
+			HStack(spacing: 16) {
+				VStack(alignment: .leading) {
+					AccountType.feedbin.image()
+						.frame(width: 50, height: 50)
+					Spacer()
+				}
+				VStack(alignment: .leading, spacing: 8) {
+					Text("Sign in to your Feedbin account.")
+						.font(.headline)
+					HStack {
+						Text("Don't have a Feedbin account?")
+							.font(.callout)
+						Button(action: {
+							NSWorkspace.shared.open(URL(string: "https://feedbin.com/signup")!)
+						}, label: {
+							Text("Sign up here.").font(.callout)
+						}).buttonStyle(LinkButtonStyle())
+					}
+					
+					HStack {
+						VStack(alignment: .trailing, spacing: 14) {
+							Text("Email")
+							Text("Password")
+						}
+						VStack(spacing: 8) {
+							TextField("me@email.com", text: $model.username)
+							SecureField("•••••••••••", text: $model.password)
+						}
+					}
+					
+					Text("Your username and password will be encrypted and stored in Keychain.")
+						.foregroundColor(.secondary)
+						.font(.callout)
+						.lineLimit(2)
+						.padding(.top, 4)
+					
+					Spacer()
+					HStack(spacing: 8) {
+						Spacer()
+						ProgressView()
+							.scaleEffect(CGSize(width: 0.5, height: 0.5))
+							.hidden(!model.isAuthenticating)
+						Button(action: {
+							presentationMode.wrappedValue.dismiss()
+						}, label: {
+							Text("Cancel")
+								.frame(width: 60)
+						}).keyboardShortcut(.cancelAction)
+
+						Button(action: {
+							model.authenticateFeedbin()
+						}, label: {
+							Text("Sign In")
+								.frame(width: 60)
+						})
+						.keyboardShortcut(.defaultAction)
+						.disabled(model.username.isEmpty || model.password.isEmpty)
+					}
+				}
+			}
+		}
+		.padding()
+		.frame(minWidth: 400, maxWidth: 400, minHeight: 230, maxHeight: 260)
+		.textFieldStyle(RoundedBorderTextFieldStyle())
+		.alert(isPresented: $model.showError, content: {
+			Alert(title: Text("Sign In Error"), message: Text(model.accountUpdateError.description), dismissButton: .cancel())
+		})
+		.onReceive(model.$canDismiss, perform: { value in
+			if value == true {
+				presentationMode.wrappedValue.dismiss()
+			}
+		})
+	}
+	#endif
+	
+	var formHeader: some View {
+		HStack {
+			VStack(alignment: .center) {
+				AccountType.feedbin.image()
+					.resizable()
+					.frame(width: 50, height: 50)
+				Text("Sign in to your Feedbin account.")
+					.font(.headline)
+			}
+		}
+	}
+	
+	
+}
+
+struct AddFeedbinAccountView_Previews: PreviewProvider {
+    static var previews: some View {
+        AddFeedbinAccountView()
+    }
+}

Multiplatform/Shared/Add/Add Account Sheets/AddFeedlyAccountView.swift

@@ -0,0 +1,87 @@
+//
+//  AddFeedlyAccountView.swift
+//  Multiplatform macOS
+//
+//  Created by Stuart Breckenridge on 05/12/2020.
+//  Copyright © 2020 Ranchero Software. All rights reserved.
+//
+
+import SwiftUI
+import Account
+import RSCore
+import RSWeb
+import Secrets
+
+struct AddFeedlyAccountView: View {
+	
+	@Environment (\.presentationMode) var presentationMode
+	@StateObject private var model = AddFeedlyViewModel()
+	
+    var body: some View {
+		VStack {
+			HStack(spacing: 16) {
+				VStack(alignment: .leading) {
+					AccountType.feedly.image()
+						.resizable()
+						.frame(width: 50, height: 50)
+					Spacer()
+				}
+				VStack(alignment: .leading, spacing: 8) {
+					Text("Sign in to your Feedly account.")
+						.font(.headline)
+					HStack {
+						Text("Don't have a Feedly account?")
+							.font(.callout)
+						Button(action: {
+							NSWorkspace.shared.open(URL(string: "https://feedly.com")!)
+						}, label: {
+							Text("Sign up here.").font(.callout)
+						}).buttonStyle(LinkButtonStyle())
+					}
+					
+					Spacer()
+					HStack(spacing: 8) {
+						Spacer()
+						Button(action: {
+							presentationMode.wrappedValue.dismiss()
+						}, label: {
+							Text("Cancel")
+								.frame(width: 60)
+						}).keyboardShortcut(.cancelAction)
+
+						Button(action: {
+							authenticateFeedly()
+							presentationMode.wrappedValue.dismiss()
+						}, label: {
+							Text("Sign In")
+								.frame(width: 60)
+						})
+						.keyboardShortcut(.defaultAction)
+						.disabled(AccountManager.shared.activeAccounts.filter({ $0.type == .cloudKit }).count > 0)
+					}
+				}
+			}
+		}
+		.padding()
+		.frame(minWidth: 400, maxWidth: 400, maxHeight: 150)
+		.alert(isPresented: $model.showError, content: {
+			Alert(title: Text("Sign In Error"), message: Text(model.accountUpdateError.description), dismissButton: .cancel())
+		})
+    }
+	
+	private func authenticateFeedly() {
+		model.isAuthenticating = true
+		let addAccount = OAuthAccountAuthorizationOperation(accountType: .feedly)
+		addAccount.delegate = model
+		#if os(macOS)
+		addAccount.presentationAnchor = NSApplication.shared.windows.last
+		#endif
+		MainThreadOperationQueue.shared.add(addAccount)
+	}
+}
+
+struct AddFeedlyAccountView_Previews: PreviewProvider {
+    static var previews: some View {
+        AddFeedlyAccountView()
+    }
+}

Multiplatform/Shared/Add/Add Account Sheets/AddLocalAccountView.swift

@@ -0,0 +1,120 @@
+//
+//  AddLocalAccountView.swift
+//  Multiplatform macOS
+//
+//  Created by Stuart Breckenridge on 02/12/2020.
+//  Copyright © 2020 Ranchero Software. All rights reserved.
+//
+
+import SwiftUI
+import Account
+import RSCore
+
+struct AddLocalAccountView: View {
+	
+	@State private var newAccountName: String = ""
+	@Environment (\.presentationMode) var presentationMode
+	
+	var body: some View {
+		#if os(macOS)
+		macBody
+		#else
+		iosBody
+		#endif
+	}
+	
+	#if os(iOS)
+	var iosBody: some View {
+		List {
+			Section(header: formHeader, content: {
+				TextField("Account Name", text: $newAccountName)
+			})
+		}.navigationBarItems(leading:
+			Button(action: {
+				presentationMode.wrappedValue.dismiss()
+			}, label: {
+				Text("Dismiss")
+			})
+		 
+		 , trailing:
+			Button(action: {
+				let newAccount = AccountManager.shared.createAccount(type: .onMyMac)
+				newAccount.name = newAccountName
+				presentationMode.wrappedValue.dismiss()
+			}, label: {
+				Text("Add")
+			})
+		)
+	}
+	#endif
+	
+	#if os(macOS)
+	var macBody: some View {
+		VStack {
+			HStack(spacing: 16) {
+				VStack(alignment: .leading) {
+					AccountType.onMyMac.image()
+						.resizable()
+						.frame(width: 50, height: 50)
+					Spacer()
+				}
+				VStack(alignment: .leading, spacing: 8) {
+					Text("Create a local account on your Mac.")
+						.font(.headline)
+					Text("Local accounts store their data on your Mac. They do not sync across your devices.")
+						.font(.callout)
+						.foregroundColor(.secondary)
+					HStack {
+						Text("Name: ")
+						TextField("Account Name", text: $newAccountName)
+					}.padding(.top, 8)
+					Spacer()
+					HStack(spacing: 8) {
+						Spacer()
+						Button(action: {
+							presentationMode.wrappedValue.dismiss()
+						}, label: {
+							Text("Cancel")
+								.frame(width: 60)
+						}).keyboardShortcut(.cancelAction)
+						
+						Button(action: {
+							let newAccount = AccountManager.shared.createAccount(type: .onMyMac)
+							newAccount.name = newAccountName
+							presentationMode.wrappedValue.dismiss()
+						}, label: {
+							Text("Create")
+								.frame(width: 60)
+						}).keyboardShortcut(.defaultAction)
+					}
+				}
+			}
+		}
+		.padding()
+		.frame(minWidth: 400, maxWidth: 400, minHeight: 230, maxHeight: 260)
+		.textFieldStyle(RoundedBorderTextFieldStyle())
+	}
+	#endif
+	
+	var formHeader: some View {
+		HStack {
+			VStack(alignment: .center) {
+				AccountType.onMyMac.image()
+					.resizable()
+					.frame(width: 50, height: 50)
+				Text("Create a local account on your Mac.")
+					.font(.headline)
+				Text("Local accounts store their data on your Mac. They do not sync across your devices.")
+					.font(.callout)
+					.foregroundColor(.secondary)
+			}
+		}
+	}
+	
+}
+
+struct AddLocalAccount_Previews: PreviewProvider {
+	static var previews: some View {
+		AddLocalAccountView()
+	}
+}

Multiplatform/Shared/Add/Add Account Sheets/AddNewsBlurAccountView.swift

@@ -0,0 +1,154 @@
+//
+//  AddNewsBlurAccountView.swift
+//  Multiplatform macOS
+//
+//  Created by Stuart Breckenridge on 03/12/2020.
+//  Copyright © 2020 Ranchero Software. All rights reserved.
+//
+
+import SwiftUI
+import Account
+import RSCore
+import RSWeb
+import Secrets
+
+struct AddNewsBlurAccountView: View {
+	
+	@Environment (\.presentationMode) var presentationMode
+	@StateObject private var model = AddNewsBlurViewModel()
+	
+    var body: some View {
+		#if os(macOS)
+		macBody
+		#else
+		iosBody
+		#endif
+    }
+	
+	#if os(iOS)
+	var iosBody: some View {
+		List {
+			Section(header: formHeader, footer: ProgressView()
+						.scaleEffect(CGSize(width: 0.5, height: 0.5))
+						   .hidden(!model.isAuthenticating) , content: {
+				TextField("me@email.com", text: $model.username)
+				SecureField("•••••••••••", text: $model.password)
+			})
+		}.navigationBarItems(leading:
+			Button(action: {
+				presentationMode.wrappedValue.dismiss()
+			}, label: {
+				Text("Dismiss")
+			})
+		, trailing:
+			Button(action: {
+				authenticateNewsBlur()
+			}, label: {
+				Text("Add")
+			}).disabled(model.username.isEmpty || model.password.isEmpty)
+		)
+	}
+	#endif
+	
+	#if os(macOS)
+	var macBody: some View {
+		VStack {
+			HStack(spacing: 16) {
+				VStack(alignment: .leading) {
+					AccountType.newsBlur.image()
+						.frame(width: 50, height: 50)
+					Spacer()
+				}
+				VStack(alignment: .leading, spacing: 8) {
+					Text("Sign in to your NewsBlur account.")
+						.font(.headline)
+					HStack {
+						Text("Don't have a NewsBlur account?")
+							.font(.callout)
+						Button(action: {
+							NSWorkspace.shared.open(URL(string: "https://newsblur.com")!)
+						}, label: {
+							Text("Sign up here.").font(.callout)
+						}).buttonStyle(LinkButtonStyle())
+					}
+					
+					HStack {
+						VStack(alignment: .trailing, spacing: 14) {
+							Text("Email")
+							Text("Password")
+						}
+						VStack(spacing: 8) {
+							TextField("me@email.com", text: $model.username)
+							SecureField("•••••••••••", text: $model.password)
+						}
+					}
+					
+					Text("Your username and password will be encrypted and stored in Keychain.")
+						.foregroundColor(.secondary)
+						.font(.callout)
+						.lineLimit(2)
+						.padding(.top, 4)
+					
+					Spacer()
+					HStack(spacing: 8) {
+						Spacer()
+						ProgressView()
+							.scaleEffect(CGSize(width: 0.5, height: 0.5))
+							.hidden(!model.isAuthenticating)
+						Button(action: {
+							presentationMode.wrappedValue.dismiss()
+						}, label: {
+							Text("Cancel")
+								.frame(width: 60)
+						}).keyboardShortcut(.cancelAction)
+
+						Button(action: {
+							model.authenticateNewsBlur()
+						}, label: {
+							Text("Sign In")
+								.frame(width: 60)
+						})
+						.keyboardShortcut(.defaultAction)
+						.disabled(model.username.isEmpty || model.password.isEmpty)
+					}
+				}
+			}
+		}
+		.padding()
+		.frame(minWidth: 400, maxWidth: 400, minHeight: 230, maxHeight: 260)
+		.textFieldStyle(RoundedBorderTextFieldStyle())
+		.alert(isPresented: $model.showError, content: {
+			Alert(title: Text("Sign In Error"), message: Text(model.accountUpdateError.description), dismissButton: .cancel())
+		})
+		.onReceive(model.$canDismiss, perform: { value in
+			if value == true {
+				presentationMode.wrappedValue.dismiss()
+			}
+		})
+	}
+	#endif
+	
+	var formHeader: some View {
+		HStack {
+			VStack(alignment: .center) {
+				AccountType.newsBlur.image()
+					.resizable()
+					.frame(width: 50, height: 50)
+			Text("Sign in to your NewsBlur account.")
+				.font(.headline)
+			
+			Text("This account syncs across your subscriptions across devices.")
+				.foregroundColor(.secondary)
+				.font(.callout)
+				.lineLimit(2)
+				.padding(.top, 4)
+			}
+		}
+	}
+}
+
+struct AddNewsBlurAccountView_Previews: PreviewProvider {
+    static var previews: some View {
+        AddNewsBlurAccountView()
+    }
+}

Multiplatform/Shared/Add/Add Account Sheets/AddReaderAPIAccountView.swift

@@ -0,0 +1,157 @@
+//
+//  AddReaderAPIAccountView.swift
+//  Multiplatform macOS
+//
+//  Created by Stuart Breckenridge on 03/12/2020.
+//  Copyright © 2020 Ranchero Software. All rights reserved.
+//
+
+import SwiftUI
+import Account
+import RSCore
+import RSWeb
+import Secrets
+
+struct AddReaderAPIAccountView: View {
+	
+	@Environment (\.presentationMode) var presentationMode
+	@StateObject private var model = AddReaderAPIViewModel()
+	public var accountType: AccountType
+	
+	var body: some View {
+		VStack {
+			HStack(spacing: 16) {
+				VStack(alignment: .leading) {
+					accountType.image()
+						.resizable()
+						.frame(width: 50, height: 50)
+					Spacer()
+				}
+				VStack(alignment: .leading, spacing: 8) {
+					Text("Sign in to your \(accountType.localizedAccountName()) account.")
+						.font(.headline)
+					HStack {
+						if accountType == .freshRSS {
+							Text("Don't have a \(accountType.localizedAccountName()) instance?")
+								.font(.callout)
+						} else {
+							Text("Don't have an \(accountType.localizedAccountName()) account?")
+								.font(.callout)
+						}
+						
+						
+						Button(action: {
+							signUp()
+						}, label: {
+							Text(accountType == .freshRSS ? "Find out more." : "Sign up here.").font(.callout)
+						}).buttonStyle(LinkButtonStyle())
+					}
+					
+					HStack {
+						VStack(alignment: .trailing, spacing: 14) {
+							Text("Email")
+							Text("Password")
+							if accountType == .freshRSS {
+								Text("API URL")
+							}
+						}
+						VStack(spacing: 8) {
+							TextField("me@email.com", text: $model.username)
+							SecureField("•••••••••••", text: $model.password)
+							if accountType == .freshRSS {
+								TextField("https://myfreshrss.rocks", text: $model.apiUrl)
+							}
+						}
+					}
+					
+					Text("Your username and password will be encrypted and stored in Keychain.")
+						.foregroundColor(.secondary)
+						.font(.callout)
+						.lineLimit(2)
+						.padding(.top, 4)
+					
+					Spacer()
+					HStack(spacing: 8) {
+						Spacer()
+						ProgressView()
+							.scaleEffect(CGSize(width: 0.5, height: 0.5))
+							.hidden(!model.isAuthenticating)
+						Button(action: {
+							presentationMode.wrappedValue.dismiss()
+						}, label: {
+							Text("Cancel")
+								.frame(width: 60)
+						}).keyboardShortcut(.cancelAction)
+						
+						Button(action: {
+							model.authenticateReaderAccount(accountType)
+						}, label: {
+							Text("Sign In")
+								.frame(width: 60)
+						})
+						.keyboardShortcut(.defaultAction)
+						.disabled(createDisabled())
+					}
+				}
+			}
+		}
+		.padding()
+		.frame(width: 400, height: height())
+		.textFieldStyle(RoundedBorderTextFieldStyle())
+		.alert(isPresented: $model.showError, content: {
+			Alert(title: Text("Sign In Error"), message: Text(model.accountUpdateError.description), dismissButton: .cancel())
+		})
+		.onReceive(model.$canDismiss, perform: { value in
+			if value == true {
+				presentationMode.wrappedValue.dismiss()
+			}
+		})
+	}
+	
+	func createDisabled() -> Bool {
+		if accountType == .freshRSS {
+			return model.username.isEmpty || model.password.isEmpty || !model.apiUrl.mayBeURL
+		}
+		return model.username.isEmpty || model.password.isEmpty
+	}
+	
+	func height() -> CGFloat {
+		if accountType == .freshRSS {
+			return 260
+		}
+		return 230
+	}
+	
+	private func signUp() {
+		switch accountType {
+		case .freshRSS:
+			#if os(macOS)
+			NSWorkspace.shared.open(URL(string: "https://freshrss.org")!)
+			#endif
+		case .inoreader:
+			#if os(macOS)
+			NSWorkspace.shared.open(URL(string: "https://www.inoreader.com")!)
+			#endif
+		case .bazQux:
+			#if os(macOS)
+			NSWorkspace.shared.open(URL(string: "https://bazqux.com")!)
+			#endif
+		case .theOldReader:
+			#if os(macOS)
+			NSWorkspace.shared.open(URL(string: "https://theoldreader.com")!)
+			#endif
+		default:
+			return
+		}
+	}
+	
+	
+	
+	
+}
+
+struct AddReaderAPIAccountView_Previews: PreviewProvider {
+	static var previews: some View {
+		AddReaderAPIAccountView(accountType: .freshRSS)
+	}
+}

Multiplatform/Shared/Add/Add Account Sheets/Authentication.swift

@@ -0,0 +1,13 @@
+//
+//  Authentication.swift
+//  Multiplatform macOS
+//
+//  Created by Stuart Breckenridge on 05/12/2020.
+//  Copyright © 2020 Ranchero Software. All rights reserved.
+//
+
+import Foundation
+
+protocol AccountUpdater {
+	var authenticationError: AccountUpdateErrors { get set }
+}