zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 20 Releases Wiki Activity

Add login (#540)

This commit is contained in:
Nathan Mattes 2022-11-13 14:22:50 +01:00
parent a910d67876
commit f293d17884
2 changed files with 75 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
Mastodon/Scene/Onboarding/Login/MastodonLoginViewController.swift
View File

@ -9,6 +9,8 @@ import UIKit
import MastodonSDK import MastodonSDK
import MastodonCore import MastodonCore
import MastodonAsset import MastodonAsset
import Combine
import AuthenticationServices
protocol MastodonLoginViewControllerDelegate: AnyObject { protocol MastodonLoginViewControllerDelegate: AnyObject {
func backButtonPressed(_ viewController: MastodonLoginViewController) func backButtonPressed(_ viewController: MastodonLoginViewController)
@ -25,7 +27,10 @@ class MastodonLoginViewController: UIViewController {
var dataSource: UITableViewDiffableDataSource<MastodonLoginViewSection, Mastodon.Entity.Server>? var dataSource: UITableViewDiffableDataSource<MastodonLoginViewSection, Mastodon.Entity.Server>?
let viewModel: MastodonLoginViewModel let viewModel: MastodonLoginViewModel
let authenticationViewModel: AuthenticationViewModel let authenticationViewModel: AuthenticationViewModel
var mastodonAuthenticationController: MastodonAuthenticationController?
weak var appContext: AppContext? weak var appContext: AppContext?
var disposeBag = Set<AnyCancellable>()
var contentView: MastodonLoginView { var contentView: MastodonLoginView {
view as! MastodonLoginView view as! MastodonLoginView
@ -109,6 +114,12 @@ class MastodonLoginViewController: UIViewController {
viewModel.updateServers() viewModel.updateServers()
} }
override func viewDidAppear(_ animated: Bool) {
super.viewDidAppear(animated)
contentView.searchTextField.becomeFirstResponder()
}
//MARK: - Actions //MARK: - Actions
@objc func backButtonPressed(_ sender: Any) { @objc func backButtonPressed(_ sender: Any) {
@ -116,65 +127,76 @@ class MastodonLoginViewController: UIViewController {
} }
@objc func nextButtonPressed(_ sender: Any) { @objc func nextButtonPressed(_ sender: Any) {
delegate?.nextButtonPressed(self) login(sender)
} }
@objc func login(_ sender: Any) { @objc func login(_ sender: Any) {
// guard let server = viewModel.selectedServer.value else { return } guard let server = viewModel.selectedServer else { return }
// authenticationViewModel.isAuthenticating.send(true)
// context.apiService.createApplication(domain: server.domain) authenticationViewModel.isAuthenticating.send(true)
// .tryMap { response -> AuthenticationViewModel.AuthenticateInfo in appContext?.apiService.createApplication(domain: server.domain)
// let application = response.value .tryMap { response -> AuthenticationViewModel.AuthenticateInfo in
// guard let info = AuthenticationViewModel.AuthenticateInfo( let application = response.value
// domain: server.domain, guard let info = AuthenticationViewModel.AuthenticateInfo(
// application: application, domain: server.domain,
// redirectURI: response.value.redirectURI ?? APIService.oauthCallbackURL application: application,
// ) else { redirectURI: response.value.redirectURI ?? APIService.oauthCallbackURL
// throw APIService.APIError.explicit(.badResponse) ) else {
// } throw APIService.APIError.explicit(.badResponse)
// return info }
// } return info
// .receive(on: DispatchQueue.main) }
// .sink { [weak self] completion in .receive(on: DispatchQueue.main)
// guard let self = self else { return } .sink { [weak self] completion in
// self.authenticationViewModel.isAuthenticating.send(false) guard let self = self else { return }
// self.authenticationViewModel.isAuthenticating.send(false)
// switch completion {
// case .failure(let error): switch completion {
// os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s: sign in fail: %s", ((#file as NSString).lastPathComponent), #line, #function, error.localizedDescription) case .failure(let error):
// self.viewModel.error.send(error) // self.viewModel.error.send(error)
// case .finished: break
// break case .finished:
// } break
// } receiveValue: { [weak self] info in }
// guard let self = self else { return } } receiveValue: { [weak self] info in
// let authenticationController = MastodonAuthenticationController( guard let self, let appContext = self.appContext else { return }
// context: self.context, let authenticationController = MastodonAuthenticationController(
// authenticateURL: info.authorizeURL context: appContext,
// ) authenticateURL: info.authorizeURL
// )
// self.mastodonAuthenticationController = authenticationController
// authenticationController.authenticationSession?.presentationContextProvider = self self.mastodonAuthenticationController = authenticationController
// authenticationController.authenticationSession?.start() authenticationController.authenticationSession?.presentationContextProvider = self
// authenticationController.authenticationSession?.start()
// self.authenticationViewModel.authenticate(
// info: info, self.authenticationViewModel.authenticate(
// pinCodePublisher: authenticationController.pinCodePublisher info: info,
// ) pinCodePublisher: authenticationController.pinCodePublisher
// } )
// .store(in: &disposeBag) }
.store(in: &disposeBag)
} }
@objc func textfieldDidChange(_ textField: UITextField) { @objc func textfieldDidChange(_ textField: UITextField) {
viewModel.filterServers(withText: textField.text) viewModel.filterServers(withText: textField.text)
contentView.navigationActionView.nextButton.isEnabled = false
if let text = textField.text,
let domain = AuthenticationViewModel.parseDomain(from: text) {
viewModel.selectedServer = .init(domain: domain, instance: .init(domain: domain))
contentView.navigationActionView.nextButton.isEnabled = true
} else {
viewModel.selectedServer = nil
contentView.navigationActionView.nextButton.isEnabled = false
}
} }
} }
// MARK: - OnboardingViewControllerAppearance // MARK: - OnboardingViewControllerAppearance
extension MastodonLoginViewController: OnboardingViewControllerAppearance { } extension MastodonLoginViewController: OnboardingViewControllerAppearance { }
//MARK: - UITableViewDelegate // MARK: - UITableViewDelegate
extension MastodonLoginViewController: UITableViewDelegate { extension MastodonLoginViewController: UITableViewDelegate {
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
let server = viewModel.filteredServers[indexPath.row] let server = viewModel.filteredServers[indexPath.row]
@ -188,6 +210,7 @@ extension MastodonLoginViewController: UITableViewDelegate {
} }
} }
// MARK: - MastodonLoginViewModelDelegate
extension MastodonLoginViewController: MastodonLoginViewModelDelegate { extension MastodonLoginViewController: MastodonLoginViewModelDelegate {
func serversUpdated(_ viewModel: MastodonLoginViewModel) { func serversUpdated(_ viewModel: MastodonLoginViewModel) {
var snapshot = NSDiffableDataSourceSnapshot<MastodonLoginViewSection, Mastodon.Entity.Server>() var snapshot = NSDiffableDataSourceSnapshot<MastodonLoginViewSection, Mastodon.Entity.Server>()
@ -203,3 +226,10 @@ extension MastodonLoginViewController: MastodonLoginViewModelDelegate {
} }
} }
} }
// MARK: - ASWebAuthenticationPresentationContextProviding
extension MastodonLoginViewController: ASWebAuthenticationPresentationContextProviding {
func presentationAnchor(for session: ASWebAuthenticationSession) -> ASPresentationAnchor {
return view.window!
}
}

7
Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewController.swift
View File

@ -452,10 +452,3 @@ extension MastodonPickServerViewController: PickServerServerSectionTableHeaderVi
// MARK: - OnboardingViewControllerAppearance // MARK: - OnboardingViewControllerAppearance
extension MastodonPickServerViewController: OnboardingViewControllerAppearance { } extension MastodonPickServerViewController: OnboardingViewControllerAppearance { }
// MARK: - ASWebAuthenticationPresentationContextProviding
extension MastodonPickServerViewController: ASWebAuthenticationPresentationContextProviding {
func presentationAnchor(for session: ASWebAuthenticationSession) -> ASPresentationAnchor {
return view.window!
}
}