Skip to content

Conversation

@renanferrari
Copy link
Contributor

@renanferrari renanferrari commented Oct 6, 2020

Fixes #13064

This PR partially reverts the changes made by #12978 in order to redirect a user logging in with a Jetpack site address to the Username/Password screen instead of the Get Started screen, so they can complete the flow using their site credentials instead of their WP.com credentials.

The new behavior is consistent with what we currently have on WPiOS.

To test:

  1. Clear app data.
  2. On the Prologue screen, if the Smart Lock dialog appears, dismiss it.
  3. Tap Enter your site address.
  4. On the Site Address screen, enter a Jetpack site address.
  5. Tap Continue.
  6. Notice the Username/Password screen.
  7. Enter the username and password associated with the site*.
  8. Tap Continue.
  9. Complete the login flow normally.

* These are the site credentials, which are used to login to wp-admin on the web.


PR submission checklist:

  • I have considered adding unit tests where possible.
  • I have considered adding accessibility improvements for my changes.
  • I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

@peril-wordpress-mobile
Copy link

peril-wordpress-mobile bot commented Oct 6, 2020

You can trigger optional UI/connected tests for these changes by visiting CircleCI here.

@peril-wordpress-mobile
Copy link

peril-wordpress-mobile bot commented Oct 6, 2020

Warnings
⚠️ PR is not assigned to a milestone.
Messages
📖

This PR contains changes in the subtree libs/login/. It is your responsibility to ensure these changes are merged back into wordpress-mobile/WordPress-Login-Flow-Android. Follow these handy steps!
WARNING: Make sure your git version is 2.19.x or lower - there is currently a bug in later versions that will corrupt the subtree history!

  1. cd WordPress-Android
  2. git checkout issue/13064-jetpack-site-users
  3. git subtree push --prefix=libs/login/ https://github.com/wordpress-mobile/WordPress-Login-Flow-Android.git merge/WordPress-Android/13065
  4. Browse to https://github.com/wordpress-mobile/WordPress-Login-Flow-Android/pull/new/merge/WordPress-Android/13065 and open a new PR.

Generated by 🚫 dangerJS

@renanferrari renanferrari force-pushed the issue/13064-jetpack-site-users branch 3 times, most recently from 6ed6622 to bd7f201 Compare October 6, 2020 18:15
@renanferrari renanferrari force-pushed the issue/13064-jetpack-site-users branch from bd7f201 to 6d214c4 Compare October 6, 2020 18:18
@peril-wordpress-mobile
Copy link

You can test the changes on this Pull Request by downloading the APK here.

Copy link
Contributor

@khaykov khaykov left a comment

Choose a reason for hiding this comment

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

I can confirm that the test scenario works as expected, and the code looks good 👍

@khaykov khaykov merged commit a986cc7 into hotfix/15.8.1 Oct 7, 2020
@khaykov khaykov deleted the issue/13064-jetpack-site-users branch October 7, 2020 20:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants