diff --git a/Mastodon/Scene/Onboarding/ConfirmEmail/MastodonConfirmEmailViewController.swift b/Mastodon/Scene/Onboarding/ConfirmEmail/MastodonConfirmEmailViewController.swift index 1c36c6cf6..ad51a7e1e 100644 --- a/Mastodon/Scene/Onboarding/ConfirmEmail/MastodonConfirmEmailViewController.swift +++ b/Mastodon/Scene/Onboarding/ConfirmEmail/MastodonConfirmEmailViewController.swift @@ -128,7 +128,7 @@ extension MastodonConfirmEmailViewController { } .store(in: &self.context.disposeBag) // execute in the background } // end switch - } receiveValue: { response in + } receiveValue: { _ in self.coordinator.setup() // self.dismiss(animated: true, completion: nil) } diff --git a/Mastodon/Scene/Onboarding/Share/AuthenticationViewModel.swift b/Mastodon/Scene/Onboarding/Share/AuthenticationViewModel.swift index 07d74f49d..b03bb816a 100644 --- a/Mastodon/Scene/Onboarding/Share/AuthenticationViewModel.swift +++ b/Mastodon/Scene/Onboarding/Share/AuthenticationViewModel.swift @@ -175,14 +175,14 @@ extension AuthenticationViewModel { context: AppContext, info: AuthenticateInfo, userToken: Mastodon.Entity.Token - ) -> AnyPublisher, Error> { + ) -> AnyPublisher { let authorization = Mastodon.API.OAuth.Authorization(accessToken: userToken.accessToken) return APIService.shared.accountVerifyCredentials( domain: info.domain, authorization: authorization ) - .tryMap { response -> Mastodon.Response.Content in + .tryMap { response -> MastodonAuthentication in let account = response.value let authentication = MastodonAuthentication.createFrom(domain: info.domain, @@ -198,8 +198,7 @@ extension AuthenticationViewModel { .authentications .insert(authentication, at: 0) - - return response + return authentication } .eraseToAnyPublisher() }