Skip to content
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.

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

Check the login mode before exiting when already logged in (25.7) #21695

Merged
merged 1 commit into from
Feb 21, 2025

Conversation

nbradbury
Copy link
Contributor

@nbradbury nbradbury commented Feb 19, 2025

Fixes #21694

Note: This targets the release/25.7 branch.

The problem was caused by always exiting the login screen when the user is already logged in. There are cases where the login screen is shown even when logged in, in this situation when adding a self-hosted site from the site picker.

Test A:

  • From "My Site" choose to add a site
  • When the site picker appears, select "Add a site"
  • Choose "Add self-hosted site"
  • Verify that a self-hosted site can be added

Test B:

  • Clear storage or do a fresh install
  • Verify that initial login works

It's recommended to run each test in both WPAndroid and JPAndroid.

@dangermattic
Copy link
Collaborator

dangermattic commented Feb 19, 2025

1 Warning
⚠️ PR is not assigned to a milestone.

Generated by 🚫 Danger

@nbradbury nbradbury marked this pull request as ready for review February 19, 2025 16:49
@nbradbury nbradbury requested a review from jkmassel February 19, 2025 16:49
@wpmobilebot
Copy link
Contributor

WordPress📲 You can test the changes from this Pull Request in WordPress by scanning the QR code below to install the corresponding build.
App NameWordPress WordPress
FlavorJalapeno
Build TypeDebug
Versionpr21695-8738e60
Commit8738e60
Direct Downloadwordpress-prototype-build-pr21695-8738e60.apk
Note: Google Login is not supported on these builds.

@wpmobilebot
Copy link
Contributor

Jetpack📲 You can test the changes from this Pull Request in Jetpack by scanning the QR code below to install the corresponding build.
App NameJetpack Jetpack
FlavorJalapeno
Build TypeDebug
Versionpr21695-8738e60
Commit8738e60
Direct Downloadjetpack-prototype-build-pr21695-8738e60.apk
Note: Google Login is not supported on these builds.

@jkmassel
Copy link
Contributor

This worked well for me – I tested:

  1. Logging into WP.com
  2. Logging into a self-hosted site
  3. Checking that I can then log into another self-hosted site

on both WP and JP.

One thing I noticed (which might be pre-existing). If I sign into a self-hosted site first on WordPress, I can't sign into WordPress.com later because the "Me" tab is gone. Might just be something to look at later.

Semi-related, I think the only way to remove a site from the app is to go to the site list and long-press the list item? If so, we should probably have a big "Disconnect Site" button under "Site Settings"

@nbradbury
Copy link
Contributor Author

One thing I noticed (which might be pre-existing). If I sign into a self-hosted site first on WordPress, I can't sign into WordPress.com later because the "Me" tab is gone. Might just be something to look at later.

Interesting - glad you noticed this. I filed this issue for it.

Semi-related, I think the only way to remove a site from the app is to go to the site list and long-press the list item? If so, we should probably have a big "Disconnect Site" button under "Site Settings"

Yes, that really is buried. Issue filed here.

@nbradbury nbradbury merged commit ae20186 into release/25.7 Feb 21, 2025
26 checks passed
@nbradbury nbradbury deleted the issue/21694-cant-add-self-hosted-site-25.7 branch February 21, 2025 18:22
oguzkocer added a commit that referenced this pull request Feb 21, 2025
* Check the login mode before exiting when already logged in (#21695)

* Manually bump version number for 25.7-rc-2

* Update translations

* Update WordPress metadata translations for 25.7

---------

Co-authored-by: Nick Bradbury <[email protected]>
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.

4 participants