Skip to content

Login: retain email address after failed Google login attempts #8021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nheagy merged 2 commits into from
Oct 23, 2017
Merged

Login: retain email address after failed Google login attempts #8021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3828004
Stop clearing email when social signin fails
nheagy Oct 19, 2017
e21cad1
Fix behaviour of email field after Google login fails
nheagy Oct 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,11 +476,11 @@ extension LoginEmailViewController: GIDSignInDelegate {

extension LoginEmailViewController: LoginSocialErrorViewControllerDelegate {
private func cleanupAfterSocialErrors() {
loginFields.username = ""

@aerych aerych Oct 20, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we'd still want to do this from retryWithEmail... otherwise it might seem a bit weird to tap the "Try with another email" option and see that address in the text field.

dismiss(animated: true) {}
}

func retryWithEmail() {
loginFields.username = ""
cleanupAfterSocialErrors()
}
func retryWithAddress() {
Expand All @@ -491,6 +491,7 @@ extension LoginEmailViewController: LoginSocialErrorViewControllerDelegate {
cleanupAfterSocialErrors()
let storyboard = UIStoryboard(name: "Login", bundle: nil)
if let controller = storyboard.instantiateViewController(withIdentifier: "SignupViewController") as? NUXAbstractViewController {
controller.loginFields = loginFields
navigationController?.pushViewController(controller, animated: true)
}
}
Expand Down
1 change: 1 addition & 0 deletions WordPress/Classes/ViewRelated/NUX/SignupViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ import WordPressShared

// Update special case login fields.
loginFields.meta.userIsDotCom = true
emailField.text = loginFields.emailAddress

configureLayoutForSmallScreensIfNeeded()
configureSubmitButton(animating: false)
Expand Down