Show the site selector and set up my site screen after the application password login #21968

adalpari · 2025-06-23T14:12:08Z

Description

This PR is showing the site selector screen after the user log into the app by using the Application Password flow

Testing instructions

Regular login

Log into the app using a self-hosted site

Verify the log and the functionality works as expected (test any feature inside the app)

Enable the Application Password experimental feature
Open MySite page
Click on the Application Password card, and follow the login form

Verify it works as expected and the functionalities work as well

Uninstall the app
Modify ExperimentalFeatures.isEnabled() as follows to force the login in a new installation

    fun isEnabled(feature: Feature) : Boolean {
        if (feature == Feature.EXPERIMENTAL_APPLICATION_PASSWORD_FEATURE) {
            return true
        }
        return appPrefsWrapper.getExperimentalFeatureConfig(feature.prefKey)
    }

Log into the self-hosted site again

Verify you now see the Application Password (webview) flow
Verify you see the Site selection screen after the login
Verify the functionalities work

Screen.Recording.2025-06-23.at.16.42.46.mov

…eStore.kt Co-authored-by: Copilot <[email protected]>

…-the-site-selector-and-set-up-MySite-screen-after-the-Application-Login # Conflicts: # WordPress/src/main/java/org/wordpress/android/ui/accounts/applicationpassword/ApplicationPasswordLoginActivity.kt # WordPress/src/main/java/org/wordpress/android/ui/accounts/applicationpassword/ApplicationPasswordLoginViewModel.kt

dangermattic · 2025-06-23T14:13:03Z

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

Generated by 🚫 Danger

wpmobilebot · 2025-06-23T14:32:38Z

📲 You can test the changes from this Pull Request in Jetpack by scanning the QR code below to install the corresponding build.

	App Name	Jetpack
	Flavor	Jalapeno
	Build Type	Debug
	Version	pr21968-495bc0c
	Commit	`495bc0c`
	Direct Download	`jetpack-prototype-build-pr21968-495bc0c.apk`

Note: Google Login is not supported on these builds.

wpmobilebot · 2025-06-23T14:33:13Z

📲 You can test the changes from this Pull Request in WordPress by scanning the QR code below to install the corresponding build.

	App Name	WordPress
	Flavor	Jalapeno
	Build Type	Debug
	Version	pr21968-495bc0c
	Commit	`495bc0c`
	Direct Download	`wordpress-prototype-build-pr21968-495bc0c.apk`

Note: Google Login is not supported on these builds.

codecov · 2025-06-23T14:33:26Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 39.10%. Comparing base (1ea4458) to head (495bc0c).
Report is 2 commits behind head on trunk.

Additional details and impacted files

@@           Coverage Diff           @@
##            trunk   #21968   +/-   ##
=======================================
  Coverage   39.10%   39.10%           
=======================================
  Files        2150     2150           
  Lines      101026   101026           
  Branches    15521    15521           
=======================================
  Hits        39504    39504           
  Misses      58034    58034           
  Partials     3488     3488

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Copilot

Pull Request Overview

This PR enables a new flow after application password login by displaying the site selector or post-signup interstitial, depending on various credential and site configuration outcomes. Key changes include:

Updates to the ApplicationPasswordLoginViewModel to support different navigation outcomes through a NavigationActionData object.
Refactoring of test cases in ApplicationPasswordLoginViewModelTest for improved clarity and naming.
Adjustments to the ApplicationPasswordLoginHelper and ApplicationPasswordLoginActivity to support the new site selection and profile fetching flow.

Reviewed Changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated no comments.

File	Description
WordPress/src/test/java/org/wordpress/android/ui/accounts/applicationpassword/ApplicationPasswordLoginViewModelTest.kt	Updated test names and assertions to use NavigationActionData and variable renaming from uriLogin to urlLogin
WordPress/src/main/java/org/wordpress/android/ui/accounts/login/ApplicationPasswordLoginHelper.kt	Introduced URL normalization before comparing sites
WordPress/src/main/java/org/wordpress/android/ui/accounts/applicationpassword/ApplicationPasswordLoginViewModel.kt	Reworked setupSite flow, error handling, and added EventBus subscribers for site changes and profile fetches
WordPress/src/main/java/org/wordpress/android/ui/accounts/applicationpassword/ApplicationPasswordLoginActivity.kt	Refactored navigation logic in openMainActivity to handle different navigation actions

Comments suppressed due to low confidence (2)

WordPress/src/main/java/org/wordpress/android/ui/accounts/applicationpassword/ApplicationPasswordLoginViewModel.kt:138

In the fetchSites function's catch block, the logged message 'Error storing credentials' is misleading because the function is responsible for fetching sites. Consider updating the log message to 'Error fetching sites' to clearly indicate the operation in error.

WordPress/src/main/java/org/wordpress/android/ui/accounts/applicationpassword/ApplicationPasswordLoginViewModel.kt:125

In the fetchSites function, the error log 'Cannot store credentials: rawData is empty' should be rephrased to reflect the actual context. A message like 'Insufficient login data for fetching sites' would more accurately describe the error condition.

                emitErrorFetching(urlLogin)

…set-up-MySite-screen-after-the-Application-Login

nbradbury · 2025-06-23T19:52:11Z

...a/org/wordpress/android/ui/accounts/applicationpassword/ApplicationPasswordLoginViewModel.kt

    /**
     * This method is called to set up the site with the provided raw data.
     *
     * @param rawData The raw data containing the callback data from the application password login.
     */
    fun setupSite(rawData: String) {
        viewModelScope.launch {
+            if (rawData.isEmpty()) {
+                Log.e(TAG, "Cannot store credentials: rawData is empty")


NP: I think we want to use appLogWrapper for logging.

Out of curiosity: what's the purpose of using that wrapper? I don't see it taking any extra action like sending the log to crashlytics or similar, plus I see a couple of disadvantages:

We need to use a set of predefined tags. Which is ok, but creates a big logs scope when debugging

We can not include a stacktrace as an extra argument

Honestly, I don't have any context about this class other than it seems to have been created to enable mocking for tests. Including a stack trace would be simple to add.

So, related question: do we have any logger to send the logs to crashlytics or sentry?

I'm pretty sure AppLog does this. It also enables users to view the app log if needed via AppLogViewerActivity (Me > Help & Support > Logs).

nbradbury · 2025-06-23T19:55:39Z

...a/org/wordpress/android/ui/accounts/applicationpassword/ApplicationPasswordLoginViewModel.kt

+        val isError: Boolean
+    )
+
+    class AppPrefsWrapper @Inject constructor() {


I'm confused by this. We already have an AppPrefsWrapper class with shouldShowPostSignupInterstitial.

Ahh, I didn't realise there was already a wrapper. I created a new internal one to be able to inject it in tests instead of using the static access to the Android sdk
Done: 4dab50b

nbradbury

@adalpari This tested fine and overall looks good, but I think we'll want to address the AppPrefsWrapper issue.

…e-screen-after-the-Application-Login' of https://github.com/wordpress-mobile/WordPress-Android into feature/CMM-519-Show-the-site-selector-and-set-up-MySite-screen-after-the-Application-Login

…set-up-MySite-screen-after-the-Application-Login

…e-screen-after-the-Application-Login' of https://github.com/wordpress-mobile/WordPress-Android into feature/CMM-519-Show-the-site-selector-and-set-up-MySite-screen-after-the-Application-Login

…set-up-MySite-screen-after-the-Application-Login

sonarqubecloud · 2025-06-25T12:40:32Z

Quality Gate passed

Issues
2 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

nbradbury

All good!

adalpari and others added 18 commits June 19, 2025 20:25

Re adding the site store calls

4b65418

Making it work with XML-RPC

762343e

Properly saving the site

59be3dc

Adding toasts

57e4381

Adding tests

a90c3ca

detekt

c9c2bdc

Removing debug code

688a30f

Update libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/Sit…

74d2404

…eStore.kt Co-authored-by: Copilot <[email protected]>

typos

8f8a096

Listen for when the site is fetched

c7b4355

Fetching profile

66d73c8

Correctly handling the url

dcd4618

Opening login epilogue

49ad92f

detekt

412863b

Adding tests

c00c67b

detekt

9180e5b

Removing debug code

d25f8c4

adalpari added 3 commits June 23, 2025 16:34

Some fixes

2621cb1

Fixing tests

7581317

Adding ProgressIndicator

522904e

adalpari requested a review from Copilot June 23, 2025 14:43

Copilot AI reviewed Jun 23, 2025

View reviewed changes

adalpari marked this pull request as ready for review June 23, 2025 14:44

adalpari requested a review from nbradbury June 23, 2025 14:44

adalpari added the [Type] Task label Jun 23, 2025

adalpari added 2 commits June 23, 2025 16:58

Clear flags for MainActivity

963ef5c

Merge branch 'trunk' into feature/CMM-519-Show-the-site-selector-and-…

a2d7b09

…set-up-MySite-screen-after-the-Application-Login

nbradbury self-assigned this Jun 23, 2025

nbradbury reviewed Jun 23, 2025

View reviewed changes

nbradbury requested changes Jun 23, 2025

View reviewed changes

adalpari added 6 commits June 24, 2025 09:46

Using the already existing AppPrefsWrapper

4dab50b

Merge branch 'feature/CMM-519-Show-the-site-selector-and-set-up-MySit…

5b47d80

…e-screen-after-the-Application-Login' of https://github.com/wordpress-mobile/WordPress-Android into feature/CMM-519-Show-the-site-selector-and-set-up-MySite-screen-after-the-Application-Login

Merge branch 'trunk' into feature/CMM-519-Show-the-site-selector-and-…

0df300e

…set-up-MySite-screen-after-the-Application-Login

Merge branch 'trunk' into feature/CMM-519-Show-the-site-selector-and-…

35f7818

…set-up-MySite-screen-after-the-Application-Login

Using AppLogWrapper for loiging

fbb1250

Merge branch 'feature/CMM-519-Show-the-site-selector-and-set-up-MySit…

27be1a7

…e-screen-after-the-Application-Login' of https://github.com/wordpress-mobile/WordPress-Android into feature/CMM-519-Show-the-site-selector-and-set-up-MySite-screen-after-the-Application-Login

adalpari requested a review from nbradbury June 24, 2025 14:30

Merge branch 'trunk' into feature/CMM-519-Show-the-site-selector-and-…

495bc0c

…set-up-MySite-screen-after-the-Application-Login

nbradbury approved these changes Jun 25, 2025

View reviewed changes

adalpari enabled auto-merge (squash) June 25, 2025 12:47

adalpari merged commit acb1161 into trunk Jun 25, 2025
26 checks passed

adalpari deleted the feature/CMM-519-Show-the-site-selector-and-set-up-MySite-screen-after-the-Application-Login branch June 25, 2025 12:58

Show the site selector and set up my site screen after the application password login #21968

Show the site selector and set up my site screen after the application password login #21968

Uh oh!

Conversation

adalpari commented Jun 23, 2025 • edited by nbradbury Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Testing instructions

Uh oh!

dangermattic commented Jun 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Jun 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Jun 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Jun 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

nbradbury Jun 23, 2025

Choose a reason for hiding this comment

Uh oh!

adalpari Jun 24, 2025

Choose a reason for hiding this comment

Uh oh!

nbradbury Jun 24, 2025

Choose a reason for hiding this comment

Uh oh!

adalpari Jun 24, 2025

Choose a reason for hiding this comment

Uh oh!

nbradbury Jun 24, 2025

Choose a reason for hiding this comment

Uh oh!

nbradbury Jun 23, 2025

Choose a reason for hiding this comment

Uh oh!

adalpari Jun 24, 2025

Choose a reason for hiding this comment

Uh oh!

nbradbury left a comment

Choose a reason for hiding this comment

Uh oh!

sonarqubecloud bot commented Jun 25, 2025

Quality Gate passed

Uh oh!

nbradbury left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

adalpari commented Jun 23, 2025 •

edited by nbradbury

Loading

dangermattic commented Jun 23, 2025 •

edited

Loading

wpmobilebot commented Jun 23, 2025 •

edited

Loading

wpmobilebot commented Jun 23, 2025 •

edited

Loading

codecov bot commented Jun 23, 2025 •

edited

Loading