AGP9 Phase 4-5

.buildkite/commands/run-unit-tests.sh

@@ -14,12 +14,10 @@ set +e
   :libs:processors:test \
   :libs:image-editor:testDebugUnitTest \
   :libs:fluxc:testDebugUnitTest \
-  :libs:login:testDebugUnitTest \
   koverXmlReportWordpressDebug \
   :libs:processors:koverXmlReportJvm \
   :libs:image-editor:koverXmlReportDebug \
-  :libs:fluxc:koverXmlReportDebug \
-  :libs:login:koverXmlReportDebug
+  :libs:fluxc:koverXmlReportDebug
 TESTS_EXIT_STATUS=$?
 set -e
 echo ""
@@ -49,7 +47,6 @@ declare -A TEST_RESULT_DIRS=(
   ["processors"]="libs/processors/build/test-results/test"
   ["image-editor"]="libs/image-editor/build/test-results/testDebugUnitTest"
   ["fluxc"]="libs/fluxc/build/test-results/testDebugUnitTest"
-  ["login"]="libs/login/build/test-results/testDebugUnitTest"
 )
 
 # Create temporary directory for collecting all test results

Gemfile.lock

@@ -263,7 +263,7 @@ GEM
       concurrent-ruby (~> 1.0)
     java-properties (0.3.0)
     jmespath (1.6.2)
-    json (2.18.1)
+    json (2.19.2)
     jwt (2.10.2)
       base64
     kramdown (2.5.1)

RELEASE-NOTES.txt

@@ -10,7 +10,7 @@
 
 26.6
 -----
-
+* [**] Improved the login experience – it now works edge-to-edge and should be easier to read.
 
 26.5
 -----

WordPress/build.gradle

@@ -171,7 +171,6 @@ android {
         // Override these constants in jetpack product flavor to enable/ disable features
         buildConfigField "boolean", "ENABLE_SITE_CREATION", "true"
         buildConfigField "boolean", "ENABLE_ADD_SELF_HOSTED_SITE", "true"
-        buildConfigField "boolean", "ENABLE_SIGNUP", "true"
         buildConfigField "boolean", "ENABLE_READER", "true"
         buildConfigField "boolean", "ENABLE_CREATE_FAB", "true"
         buildConfigField "boolean", "ENABLE_FOLLOWED_SITES_SETTINGS", "true"
@@ -224,7 +223,6 @@ android {
             buildConfigField "boolean", "IS_JETPACK_APP", "true"
             buildConfigField "boolean", "ENABLE_SITE_CREATION", "true"
             buildConfigField "boolean", "ENABLE_ADD_SELF_HOSTED_SITE", "true"
-            buildConfigField "boolean", "ENABLE_SIGNUP", "true"
             buildConfigField "boolean", "ENABLE_READER", "true"
             buildConfigField "boolean", "ENABLE_CREATE_FAB", "true"
             buildConfigField "boolean", "ENABLE_FOLLOWED_SITES_SETTINGS", "true"
@@ -376,7 +374,6 @@ dependencies {
             strictly libs.wordpress.utils.get().version
         }
     }
-    implementation project(":libs:login")
     implementation project(":libs:posttypes")
     implementation("$gradle.ext.aboutAutomatticBinaryPath:${libs.versions.automattic.about.get()}")
 
@@ -418,7 +415,6 @@ dependencies {
     implementation(libs.androidx.lifecycle.process)
     implementation(libs.android.volley)
     implementation(libs.google.play.review)
-    implementation(libs.google.play.services.auth)
     implementation(libs.google.mlkit.barcode.scanning.common)
     implementation(libs.google.mlkit.text.recognition)
     implementation(libs.google.mlkit.barcode.scanning.main)
@@ -590,10 +586,6 @@ if (!file("google-services.json").exists()) {
     }
 }
 
-// Print warning message if example Google services file is used.
-if ((file('google-services.json').text) == (file('google-services.json-example').text)) {
-    println("WARNING: You're using the example google-services.json file. Google login will fail.")
-}
 
 tasks.register("printVersionName") {
     def versionName = android.defaultConfig.versionName

WordPress/src/androidTest/java/org/wordpress/android/e2e/LoginTests.kt

@@ -6,7 +6,6 @@ import org.junit.Test
 import org.wordpress.android.e2e.flows.LoginFlow
 import org.wordpress.android.support.BaseTest
 import org.wordpress.android.support.ComposeEspressoLink
-import org.wordpress.android.support.E2ECredentials
 
 @HiltAndroidTest
 class LoginTests : BaseTest() {
@@ -16,61 +15,11 @@ class LoginTests : BaseTest() {
         logoutIfNecessary()
     }
 
-    @Test
-    fun e2eLoginWithEmailPassword() {
-        LoginFlow().chooseContinueWithWpCom(super.mComposeTestRule)
-            .enterEmailAddress(E2ECredentials.WP_COM_USER_EMAIL)
-            .enterPassword(E2ECredentials.WP_COM_USER_PASSWORD)
-            .confirmLogin()
-
-        ComposeEspressoLink().unregister()
-    }
-
-    @Test
-    fun e2eLoginWithPasswordlessAccount() {
-        LoginFlow().chooseContinueWithWpCom(super.mComposeTestRule)
-            .enterEmailAddress(E2ECredentials.WP_COM_PASSWORDLESS_USER_EMAIL)
-            .openMagicLink()
-            .confirmLogin()
-
-        ComposeEspressoLink().unregister()
-    }
-
     @Test
     fun e2eLoginWithSiteAddress() {
+        // Self-hosted login now uses application passwords via Custom Tabs,
+        // so this test only verifies navigation to the site address screen
         LoginFlow().chooseEnterYourSiteAddress(super.mComposeTestRule)
-            .enterSiteAddress(E2ECredentials.WP_COM_USER_SITE_ADDRESS)
-            .enterEmailAddress(E2ECredentials.WP_COM_USER_EMAIL)
-            .enterPassword(E2ECredentials.WP_COM_USER_PASSWORD)
-            .confirmLogin()
-
-        ComposeEspressoLink().unregister()
-    }
-
-    @Test
-    fun e2eLoginWithMagicLink() {
-        try {
-            LoginFlow().chooseContinueWithWpCom(super.mComposeTestRule)
-                .enterEmailAddress(E2ECredentials.WP_COM_USER_EMAIL)
-                .chooseMagicLink()
-                .openMagicLink()
-                .confirmLogin()
-
-            ComposeEspressoLink().unregister()
-        } finally {
-            logoutIfNecessary()
-        }
-    }
-
-    @Test
-    fun e2eLoginWithSelfHostedAccount() {
-        LoginFlow().chooseEnterYourSiteAddress(super.mComposeTestRule)
-            .enterSiteAddress(E2ECredentials.SELF_HOSTED_USER_SITE_ADDRESS)
-            .enterUsernameAndPassword(
-                E2ECredentials.SELF_HOSTED_USER_USERNAME,
-                E2ECredentials.SELF_HOSTED_USER_PASSWORD
-            )
-            .confirmLogin()
 
         ComposeEspressoLink().unregister()
     }

WordPress/src/androidTest/java/org/wordpress/android/e2e/flows/LoginFlow.kt

@@ -1,113 +1,28 @@
 package org.wordpress.android.e2e.flows
 
-import android.app.Activity
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.widget.EditText
 import androidx.compose.ui.test.junit4.ComposeTestRule
-import androidx.test.core.app.ActivityScenario
-import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso
 import androidx.test.espresso.matcher.ViewMatchers
-import org.hamcrest.CoreMatchers
-import org.hamcrest.Matchers
-import org.wordpress.android.BuildConfig
 import org.wordpress.android.R
 import org.wordpress.android.e2e.pages.HelpScreen
 import org.wordpress.android.e2e.pages.LandingPage.tapContinueWithWpCom
 import org.wordpress.android.e2e.pages.LandingPage.tapEnterYourSiteAddress
 import org.wordpress.android.support.WPSupportUtils
-import org.wordpress.android.login.R as LoginR
 
 class LoginFlow {
     fun chooseContinueWithWpCom(composeTestRule: ComposeTestRule?): LoginFlow {
         // Login Prologue – We want to Continue with WordPress.com, not a site address
+        // Note: WP.com login now uses web-based OAuth flow via Custom Tabs
         tapContinueWithWpCom(composeTestRule!!)
         return this
     }
 
-    fun enterEmailAddress(emailAddress: String?): LoginFlow {
-        // Email Address Screen – Fill it in and click "Continue"
-        // See LoginEmailFragment
-        WPSupportUtils.populateTextField(R.id.input, emailAddress)
-        WPSupportUtils.clickOn(LoginR.id.login_continue_button)
-        return this
-    }
-
-    fun enterPassword(password: String?): LoginFlow {
-        // Password Screen – Fill it in and click "Continue"
-        // See LoginEmailPasswordFragment
-        WPSupportUtils.populateTextField(R.id.input, password)
-        WPSupportUtils.clickOn(R.id.bottom_button)
-        return this
-    }
-
-    fun chooseMagicLink(): LoginFlow {
-        // Password Screen – Choose "Get a login link by email"
-        // See LoginEmailPasswordFragment
-        WPSupportUtils.clickOn(LoginR.id.login_get_email_link)
-        return this
-    }
-
-    fun openMagicLink(): LoginFlow {
-        // Magic Link Sent Screen – Should see "Check email" button
-        // See LoginMagicLinkSentFragment
-        WPSupportUtils.waitForElementToBeDisplayed(LoginR.id.login_open_email_client)
-
-        // Follow the magic link to continue login
-        // Intent is invoked directly rather than through a browser as WireMock is unavailable once in the background
-        val appVariant = BuildConfig.FLAVOR
-        val intent =
-            Intent(Intent.ACTION_VIEW, Uri.parse("$appVariant://magic-login?token=valid_token"))
-                .setPackage(ApplicationProvider.getApplicationContext<Context>().packageName)
-        ActivityScenario.launch<Activity>(intent)
-        return this
-    }
-
-    fun enterUsernameAndPassword(username: String, password: String): LoginFlow {
-        val usernameElement = Espresso.onView(
-            CoreMatchers.allOf(
-                ViewMatchers.isDescendantOfA(ViewMatchers.withId(LoginR.id.login_username_row)),
-                Matchers.instanceOf(EditText::class.java)
-            )
-        )
-        val passwordElement = Espresso.onView(
-            CoreMatchers.allOf(
-                ViewMatchers.isDescendantOfA(ViewMatchers.withId(LoginR.id.login_password_row)),
-                Matchers.instanceOf(EditText::class.java)
-            )
-        )
-        WPSupportUtils.populateTextField(
-            usernameElement, """
-     $username
-
-     """.trimIndent()
-        )
-        WPSupportUtils.populateTextField(
-            passwordElement, """
-     $password
-
-     """.trimIndent()
-        )
-        WPSupportUtils.clickOn(R.id.bottom_button)
-        return this
-    }
-
     fun chooseEnterYourSiteAddress(composeTestRule: ComposeTestRule?): LoginFlow {
         // Login Prologue – We want to continue with a site address not a WordPress.com account
         tapEnterYourSiteAddress(composeTestRule!!)
         return this
     }
 
-    fun enterSiteAddress(siteAddress: String?): LoginFlow {
-        // Site Address Screen – Fill it in and click "Continue"
-        // See LoginSiteApplicationPasswordFragment
-        WPSupportUtils.populateTextField(R.id.input, siteAddress)
-        WPSupportUtils.clickOn(R.id.bottom_button)
-        return this
-    }
-
     fun tapHelp(): HelpScreen {
         WPSupportUtils.clickOn(Espresso.onView(ViewMatchers.withId(R.id.help)))
         return HelpScreen()