Merge pull request #13202 from woocommerce/issue/13192-force-password…

…-screen [Login] Add ability to force using password for login even for passwordless accounts
woocommerce · Jan 16, 2025 · 696e505 · 696e505
2 parents 07de8ee + 20549d2
commit 696e505
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle
@@ -489,8 +489,13 @@ task copyGoogleServicesExampleFile(type: Copy) {
 android.buildTypes.all { buildType ->
     (secretProperties + developerProperties).any { property ->
         if (property.key.toLowerCase().startsWith("wc.")) {
-            buildType.buildConfigField "String", property.key.replace("wc.", "").replace(".", "_").toUpperCase(),
-                    "\"${property.value}\""
+            if (property.value == "true" || property.value == "false") {
+                buildType.buildConfigField "boolean", property.key.replace("wc.", "").replace(".", "_").toUpperCase(),
+                        property.value
+            } else {
+                buildType.buildConfigField "String", property.key.replace("wc.", "").replace(".", "_").toUpperCase(),
+                        "\"${property.value}\""
+            }
         }
         if (property.key.toLowerCase().startsWith("wc.res.")) {
             buildType.resValue "string", property.key.replace("wc.res.", "").replace(".", "_").toLowerCase(),

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/LoginActivity.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/LoginActivity.kt
@@ -15,6 +15,7 @@ import androidx.lifecycle.withStarted
 import com.woocommerce.android.AppPrefsWrapper
 import com.woocommerce.android.AppUrls
 import com.woocommerce.android.AppUrls.LOGIN_WITH_EMAIL_WHAT_IS_WORDPRESS_COM_ACCOUNT
+import com.woocommerce.android.BuildConfig
 import com.woocommerce.android.R
 import com.woocommerce.android.analytics.AnalyticsEvent
 import com.woocommerce.android.analytics.AnalyticsTracker
@@ -350,7 +351,9 @@ class LoginActivity :
         clearCachedSites()
 
         if (authOptions != null) {
-            if (authOptions.isPasswordless) {
+            val forcePasswordLogin = BuildConfig.DEBUG && BuildConfig.FORCE_PASSWORD_LOGIN
+
+            if (authOptions.isPasswordless && !forcePasswordLogin) {
                 showMagicLinkRequestScreen(email, verifyEmail, allowPassword = false, forceRequestAtStart = true)
             } else {
                 showEmailPasswordScreen(email, verifyEmail)

diff --git a/build.gradle b/build.gradle
@@ -41,12 +41,16 @@ measureBuilds {
 }
 
 static def loadPropertiesWithFallback(Logger logger, File fallbackFile, File primaryFile) {
+    def defaultProperties = readPropertiesFromFile(fallbackFile)
+    def primaryProperties
     if (primaryFile.exists()) {
-        return readPropertiesFromFile(primaryFile)
+        primaryProperties = readPropertiesFromFile(primaryFile)
     } else {
         logger.warn("Primary properties file not found: ${primaryFile}. Using fallback: ${fallbackFile}.")
-        return readPropertiesFromFile(fallbackFile)
+        primaryProperties = new Properties()
     }
+
+    return defaultProperties + primaryProperties
 }
 
 static def readPropertiesFromFile(File file) {

diff --git a/developer.properties-example b/developer.properties-example
@@ -1,4 +1,5 @@
 # The type of in app update FLEXIBLE = 0; IMMEDIATE = 1
 wc.in_app_update_type = 0
 wc.jitm_testing_json_file_name=
+wc.force_password_login = false
 enable_leak_canary=true