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/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

@@ -14,6 +14,46 @@ 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) {
@@ -43,6 +83,7 @@ struct AddCloudKitAccountView: View {
 						}).keyboardShortcut(.cancelAction)
 
 						Button(action: {
+							_ = AccountManager.shared.createAccount(type: .cloudKit)
 							presentationMode.wrappedValue.dismiss()
 						}, label: {
 							Text("Create")
@@ -56,7 +97,26 @@ struct AddCloudKitAccountView: View {
 		}
 		.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 {

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

@@ -71,7 +71,7 @@ struct AddFeedWranglerAccountView: View {
 						}).keyboardShortcut(.cancelAction)
 
 						Button(action: {
-							authenticateFeedWrangler()
+							model.authenticateFeedWrangler()
 						}, label: {
 							Text("Sign In")
 								.frame(width: 60)
@@ -88,56 +88,15 @@ struct AddFeedWranglerAccountView: View {
 		.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()
+			}
+		})
     }
 	
 	
-	private func authenticateFeedWrangler() {
-		
-		model.isAuthenticating = true
-		let credentials = Credentials(type: .feedWranglerBasic, username: model.username, secret: model.password)
-		
-		Account.validateCredentials(type: .feedWrangler, credentials: credentials) { result in
-			
-			
-			self.model.isAuthenticating = false
-			
-			switch result {
-			case .success(let validatedCredentials):
-				
-				guard let validatedCredentials = validatedCredentials else {
-					self.model.accountUpdateError = .invalidUsernamePassword
-					self.model.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)
-					account.refreshAll(completion: { result in
-						switch result {
-						case .success:
-							self.presentationMode.wrappedValue.dismiss()
-						case .failure(let error):
-							self.model.accountUpdateError = .other(error: error)
-							self.model.showError = true
-						}
-					})
-					
-				} catch {
-					self.model.accountUpdateError = .keyChainError
-					self.model.showError = true
-				}
-				
-			case .failure:
-				self.model.accountUpdateError = .networkError
-				self.model.showError = true
-			}
-		}
-	}
+	
 }
 
 struct AddFeedWranglerAccountView_Previews: PreviewProvider {

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

@@ -18,12 +18,45 @@ struct AddFeedbinAccountView: View {
 	@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) {
@@ -70,14 +103,13 @@ struct AddFeedbinAccountView: View {
 						}).keyboardShortcut(.cancelAction)
 
 						Button(action: {
-							authenticateFeedbin()
+							model.authenticateFeedbin()
 						}, label: {
 							Text("Sign In")
 								.frame(width: 60)
 						})
 						.keyboardShortcut(.defaultAction)
 						.disabled(model.username.isEmpty || model.password.isEmpty)
-						
 					}
 				}
 			}
@@ -88,51 +120,27 @@ struct AddFeedbinAccountView: View {
 		.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
 	
-	private func authenticateFeedbin() {
-		model.isAuthenticating = true
-		let credentials = Credentials(type: .basic, username: model.username, secret: model.password)
-		
-		Account.validateCredentials(type: .feedbin, credentials: credentials) { result in
-			self.model.isAuthenticating = false
-			
-			switch result {
-			case .success(let validatedCredentials):
-				
-				guard let validatedCredentials = validatedCredentials else {
-					self.model.accountUpdateError = .invalidUsernamePassword
-					self.model.showError = true
-					return
-				}
-				
-				let account = AccountManager.shared.createAccount(type: .feedbin)
-				
-				do {
-					try account.removeCredentials(type: .basic)
-					try account.storeCredentials(validatedCredentials)
-					self.model.isAuthenticating = false
-					account.refreshAll(completion: { result in
-						switch result {
-						case .success:
-							self.presentationMode.wrappedValue.dismiss()
-						case .failure(let error):
-							self.model.accountUpdateError = .other(error: error)
-							self.model.showError = true
-						}
-					})
-					
-				} catch {
-					self.model.accountUpdateError = .keyChainError
-					self.model.showError = true
-				}
-				
-			case .failure:
-				self.model.accountUpdateError = .networkError
-				self.model.showError = true
+	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 {

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

@@ -15,7 +15,41 @@ struct AddLocalAccountView: View {
 	@State private var newAccountName: String = ""
 	@Environment (\.presentationMode) var presentationMode
 	
-    var body: some View {
+	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) {
@@ -43,7 +77,7 @@ struct AddLocalAccountView: View {
 							Text("Cancel")
 								.frame(width: 60)
 						}).keyboardShortcut(.cancelAction)
-
+						
 						Button(action: {
 							let newAccount = AccountManager.shared.createAccount(type: .onMyMac)
 							newAccount.name = newAccountName
@@ -59,11 +93,28 @@ struct AddLocalAccountView: View {
 		.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()
-    }
+	static var previews: some View {
+		AddLocalAccountView()
+	}
 }

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

@@ -18,6 +18,40 @@ struct AddNewsBlurAccountView: View {
 	@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) {
@@ -69,7 +103,7 @@ struct AddNewsBlurAccountView: View {
 						}).keyboardShortcut(.cancelAction)
 
 						Button(action: {
-							presentationMode.wrappedValue.dismiss()
+							model.authenticateNewsBlur()
 						}, label: {
 							Text("Sign In")
 								.frame(width: 60)
@@ -86,50 +120,28 @@ struct AddNewsBlurAccountView: View {
 		.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
 	
-	private func authenticateNewsBlur() {
-		model.isAuthenticating = true
-		let credentials = Credentials(type: .newsBlurBasic, username: model.username, secret: model.password)
-		
-		Account.validateCredentials(type: .newsBlur, credentials: credentials) { result in
+	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)
 			
-			self.model.isAuthenticating = false
-			
-			switch result {
-			case .success(let validatedCredentials):
-				
-				guard let validatedCredentials = validatedCredentials else {
-					self.model.accountUpdateError = .invalidUsernamePassword
-					self.model.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)
-					account.refreshAll(completion: { result in
-						switch result {
-						case .success:
-							self.presentationMode.wrappedValue.dismiss()
-						case .failure(let error):
-							self.model.accountUpdateError = .other(error: error)
-							self.model.showError = true
-						}
-					})
-					
-				} catch {
-					self.model.accountUpdateError = .keyChainError
-					self.model.showError = true
-				}
-				
-			case .failure:
-				self.model.accountUpdateError = .networkError
-				self.model.showError = true
+			Text("This account syncs across your subscriptions across devices.")
+				.foregroundColor(.secondary)
+				.font(.callout)
+				.lineLimit(2)
+				.padding(.top, 4)
 			}
 		}
 	}

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

@@ -84,7 +84,7 @@ struct AddReaderAPIAccountView: View {
 						}).keyboardShortcut(.cancelAction)
 						
 						Button(action: {
-							authenticateReaderAccount()
+							model.authenticateReaderAccount(accountType)
 						}, label: {
 							Text("Sign In")
 								.frame(width: 60)
@@ -101,6 +101,11 @@ struct AddReaderAPIAccountView: View {
 		.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 {
@@ -140,100 +145,7 @@ struct AddReaderAPIAccountView: View {
 		}
 	}
 	
-	private func authenticateReaderAccount() {
-		model.isAuthenticating = true
-		
-		let credentials = Credentials(type: .readerBasic, username: model.username, secret: model.password)
-		
-		if accountType == .freshRSS {
-			Account.validateCredentials(type: accountType, credentials: credentials, endpoint: URL(string: model.apiUrl)!) { result in
-				
-				self.model.isAuthenticating = false
-				
-				switch result {
-				case .success(let validatedCredentials):
-					
-					guard let validatedCredentials = validatedCredentials else {
-						self.model.accountUpdateError = .invalidUsernamePassword
-						self.model.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)
-						account.refreshAll(completion: { result in
-							switch result {
-							case .success:
-								self.presentationMode.wrappedValue.dismiss()
-							case .failure(let error):
-								self.model.accountUpdateError = .other(error: error)
-								self.model.showError = true
-							}
-						})
-						
-					} catch {
-						self.model.accountUpdateError = .keyChainError
-						self.model.showError = true
-					}
-					
-				case .failure:
-					self.model.accountUpdateError = .networkError
-					self.model.showError = true
-				}
-			}
-		}
-		
-		else {
-			
-			Account.validateCredentials(type: accountType, credentials: credentials) { result in
-				
-				self.model.isAuthenticating = false
-				
-				switch result {
-				case .success(let validatedCredentials):
-					
-					guard let validatedCredentials = validatedCredentials else {
-						self.model.accountUpdateError = .invalidUsernamePassword
-						self.model.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)
-						account.refreshAll(completion: { result in
-							switch result {
-							case .success:
-								self.presentationMode.wrappedValue.dismiss()
-							case .failure(let error):
-								self.model.accountUpdateError = .other(error: error)
-								self.model.showError = true
-							}
-						})
-						
-					} catch {
-						self.model.accountUpdateError = .keyChainError
-						self.model.showError = true
-					}
-					
-				case .failure:
-					self.model.accountUpdateError = .networkError
-					self.model.showError = true
-				}
-			}
-			
-		}
-		
-	}
+	
 	
 	
 }

Multiplatform/iOS/Settings/Accounts/SettingsAddAccountView.swift

@@ -29,7 +29,7 @@ struct SettingsAddAccountView: View {
 		.sheet(isPresented: $model.isAddPresented) {
 			switch model.selectedAccountType {
 			case .onMyMac:
-				SettingsLocalAccountView()
+				AddLocalAccountView()
 			case .feedbin, .feedWrangler, .newsBlur, .freshRSS:
 				SettingsCredentialsAccountView(accountType: model.selectedAccountType!)
 			case .cloudKit:

Multiplatform/macOS/Preferences/Preference Panes/Accounts/Account Preferences/Add Account/Add Account Models/AddFeedWranglerViewModel.swift

@@ -1,21 +0,0 @@
-//
-//  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 = ""
-}

Multiplatform/macOS/Preferences/Preference Panes/Accounts/Account Preferences/Add Account/Add Account Models/AddFeedbinViewModel.swift

@@ -1,21 +0,0 @@
-//
-//  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 = ""
-}

Multiplatform/macOS/Preferences/Preference Panes/Accounts/Account Preferences/Add Account/Add Account Models/AddNewsBlurViewModel.swift

@@ -1,21 +0,0 @@
-//
-//  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 = ""
-}

Multiplatform/macOS/Preferences/Preference Panes/Accounts/Account Preferences/Add Account/Add Account Models/AddReaderAPIViewModel.swift

@@ -1,22 +0,0 @@
-//
-//  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 = ""
-}