-
Notifications
You must be signed in to change notification settings - Fork 130
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
[Login] Show magic link screen for suspicious emails #13335
[Login] Show magic link screen for suspicious emails #13335
Conversation
Generated by 🚫 Danger |
Project dependencies changesThe following changes in project dependencies were detected (configuration list
tree +--- com.google.firebase:firebase-messaging -> 23.4.0
-| +--- com.google.android.gms:play-services-basement:18.1.0 -> 18.2.0
+| +--- com.google.android.gms:play-services-basement:18.1.0
| +--- com.google.android.gms:play-services-tasks:18.0.1 -> 18.0.2
-| | \--- com.google.android.gms:play-services-basement:18.1.0 -> 18.2.0 (*)
+| | \--- com.google.android.gms:play-services-basement:18.1.0 (*)
| +--- com.google.firebase:firebase-iid-interop:17.1.0
-| | \--- com.google.android.gms:play-services-basement:17.0.0 -> 18.2.0 (*)
+| | \--- com.google.android.gms:play-services-basement:17.0.0 -> 18.1.0 (*)
| +--- com.google.android.gms:play-services-base:18.0.1 -> 18.1.0
-| | \--- com.google.android.gms:play-services-basement:18.1.0 -> 18.2.0 (*)
+| | \--- com.google.android.gms:play-services-basement:18.1.0 (*)
| +--- com.google.android.gms:play-services-cloud-messaging:17.1.0
-| | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.2.0 (*)
+| | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.1.0 (*)
| +--- com.google.android.gms:play-services-stats:17.0.2
-| | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.2.0 (*)
+| | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.1.0 (*)
| +--- com.google.firebase:firebase-measurement-connector:19.0.0
-| | \--- com.google.android.gms:play-services-basement:17.0.0 -> 18.2.0 (*)
+| | \--- com.google.android.gms:play-services-basement:17.0.0 -> 18.1.0 (*)
| \--- com.google.firebase:firebase-common:20.4.2
-| \--- com.google.android.gms:play-services-basement:18.1.0 -> 18.2.0 (*)
+| \--- com.google.android.gms:play-services-basement:18.1.0 (*)
+--- com.google.firebase:firebase-config -> 21.6.0
| \--- com.google.firebase:firebase-abt:21.1.1
-| \--- com.google.android.gms:play-services-basement:18.1.0 -> 18.2.0 (*)
+| \--- com.google.android.gms:play-services-basement:18.1.0 (*)
+--- com.google.firebase:firebase-analytics -> 21.5.0
| +--- com.google.android.gms:play-services-measurement:21.5.0
| | +--- com.google.android.gms:play-services-ads-identifier:18.0.0
-| | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.2.0 (*)
+| | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.1.0 (*)
-| | +--- com.google.android.gms:play-services-basement:18.1.0 -> 18.2.0 (*)
+| | +--- com.google.android.gms:play-services-basement:18.1.0 (*)
| | +--- com.google.android.gms:play-services-measurement-base:21.5.0
-| | | \--- com.google.android.gms:play-services-basement:18.1.0 -> 18.2.0 (*)
+| | | \--- com.google.android.gms:play-services-basement:18.1.0 (*)
| | \--- com.google.android.gms:play-services-measurement-impl:21.5.0
-| | \--- com.google.android.gms:play-services-basement:18.1.0 -> 18.2.0 (*)
+| | \--- com.google.android.gms:play-services-basement:18.1.0 (*)
| +--- com.google.android.gms:play-services-measurement-api:21.5.0
-| | +--- com.google.android.gms:play-services-basement:18.1.0 -> 18.2.0 (*)
+| | +--- com.google.android.gms:play-services-basement:18.1.0 (*)
| | \--- com.google.android.gms:play-services-measurement-sdk-api:21.5.0
-| | \--- com.google.android.gms:play-services-basement:18.1.0 -> 18.2.0 (*)
+| | \--- com.google.android.gms:play-services-basement:18.1.0 (*)
| \--- com.google.android.gms:play-services-measurement-sdk:21.5.0
-| \--- com.google.android.gms:play-services-basement:18.1.0 -> 18.2.0 (*)
+| \--- com.google.android.gms:play-services-basement:18.1.0 (*)
-+--- com.google.android.gms:play-services-auth:20.2.0 -> 20.7.0
-| +--- androidx.fragment:fragment:1.0.0 -> 1.8.5 (*)
-| +--- androidx.loader:loader:1.0.0 (*)
-| +--- com.google.android.gms:play-services-auth-api-phone:18.0.1
-| | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.1.0 (*)
-| | +--- com.google.android.gms:play-services-basement:18.0.0 -> 18.2.0 (*)
-| | \--- com.google.android.gms:play-services-tasks:18.0.1 -> 18.0.2 (*)
-| +--- com.google.android.gms:play-services-auth-base:18.0.4
-| | +--- androidx.collection:collection:1.0.0 -> 1.4.0 (*)
-| | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.1.0 (*)
-| | +--- com.google.android.gms:play-services-basement:18.0.0 -> 18.2.0 (*)
-| | \--- com.google.android.gms:play-services-tasks:18.0.1 -> 18.0.2 (*)
-| +--- com.google.android.gms:play-services-base:18.0.1 -> 18.1.0 (*)
-| +--- com.google.android.gms:play-services-basement:18.2.0 (*)
-| +--- com.google.android.gms:play-services-fido:20.0.1 -> 20.1.0
-| | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.1.0 (*)
-| | +--- com.google.android.gms:play-services-basement:18.0.0 -> 18.2.0 (*)
-| | \--- com.google.android.gms:play-services-tasks:18.0.1 -> 18.0.2 (*)
-| \--- com.google.android.gms:play-services-tasks:18.0.1 -> 18.0.2 (*)
++--- com.google.android.gms:play-services-auth:20.2.0
+| +--- androidx.fragment:fragment:1.0.0 -> 1.8.5 (*)
+| +--- androidx.loader:loader:1.0.0 (*)
+| +--- com.google.android.gms:play-services-auth-api-phone:18.0.1
+| | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.1.0 (*)
+| | +--- com.google.android.gms:play-services-basement:18.0.0 -> 18.1.0 (*)
+| | \--- com.google.android.gms:play-services-tasks:18.0.1 -> 18.0.2 (*)
+| +--- com.google.android.gms:play-services-auth-base:18.0.1
+| | +--- androidx.collection:collection:1.0.0 -> 1.4.0 (*)
+| | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.1.0 (*)
+| | +--- com.google.android.gms:play-services-basement:18.0.0 -> 18.1.0 (*)
+| | \--- com.google.android.gms:play-services-tasks:18.0.1 -> 18.0.2 (*)
+| +--- com.google.android.gms:play-services-base:18.0.1 -> 18.1.0 (*)
+| +--- com.google.android.gms:play-services-basement:18.0.0 -> 18.1.0 (*)
+| \--- com.google.android.gms:play-services-tasks:18.0.1 -> 18.0.2 (*)
-+--- org.wordpress:login:1.19.0
-| +--- com.gravatar:gravatar:0.2.0
-| | +--- com.squareup.okhttp3:okhttp:4.12.0 (*)
-| | +--- com.squareup.retrofit2:retrofit:2.9.0
-| | | \--- com.squareup.okhttp3:okhttp:3.14.9 -> 4.12.0 (*)
-| | +--- com.squareup.retrofit2:converter-gson:2.9.0
-| | | +--- com.squareup.retrofit2:retrofit:2.9.0 (*)
-| | | \--- com.google.code.gson:gson:2.8.5 -> 2.10.1
-| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 -> 1.8.1 (*)
-| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.22 -> 2.0.21 (*)
-| +--- androidx.appcompat:appcompat:1.6.1 (*)
-| +--- androidx.constraintlayout:constraintlayout:2.0.4 -> 2.1.4 (*)
-| +--- com.google.android.material:material:1.2.1 -> 1.12.0 (*)
-| +--- androidx.core:core:1.12.0 -> 1.13.1 (*)
-| +--- com.github.bumptech.glide:glide:4.12.0 -> 4.16.0
-| | +--- com.github.bumptech.glide:gifdecoder:4.16.0
-| | | \--- androidx.annotation:annotation:1.5.0 -> 1.8.1 (*)
-| | +--- com.github.bumptech.glide:disklrucache:4.16.0
-| | +--- com.github.bumptech.glide:annotations:4.16.0
-| | +--- androidx.fragment:fragment:1.3.6 -> 1.8.5 (*)
-| | +--- androidx.vectordrawable:vectordrawable-animated:1.1.0 (*)
-| | +--- androidx.exifinterface:exifinterface:1.3.6 (*)
-| | \--- androidx.tracing:tracing:1.0.0 (*)
-| +--- androidx.credentials:credentials:1.2.0
-| | +--- androidx.annotation:annotation:1.5.0 -> 1.8.1 (*)
-| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.0.21 (*)
-| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 -> 1.8.1 (*)
-| | \--- androidx.credentials:credentials-play-services-auth:1.2.0 (c)
-| +--- androidx.credentials:credentials-play-services-auth:1.2.0
-| | +--- androidx.credentials:credentials:1.2.0 (*)
-| | +--- com.google.android.gms:play-services-auth:20.7.0 (*)
-| | +--- com.google.android.gms:play-services-fido:20.1.0 (*)
-| | +--- com.google.android.libraries.identity.googleid:googleid:1.1.0
-| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.0 -> 2.0.21 (*)
-| | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0 -> 1.9.10 (*)
-| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.0.21 (*)
-| | \--- androidx.credentials:credentials:1.2.0 (c)
-| +--- com.google.dagger:dagger:2.47 -> 2.51.1 (*)
-| +--- com.google.dagger:dagger-android-support:2.47 -> 2.50
-| | +--- com.google.dagger:dagger:2.50 -> 2.51.1 (*)
-| | +--- com.google.dagger:dagger-android:2.50
-| | | +--- com.google.dagger:dagger:2.50 -> 2.51.1 (*)
-| | | +--- com.google.dagger:dagger-lint-aar:2.50
-| | | +--- androidx.annotation:annotation:1.2.0 -> 1.8.1 (*)
-| | | \--- javax.inject:javax.inject:1
-| | +--- com.google.dagger:dagger-lint-aar:2.50
-| | +--- androidx.activity:activity:1.5.1 -> 1.8.1 (*)
-| | +--- androidx.annotation:annotation:1.2.0 -> 1.8.1 (*)
-| | +--- androidx.appcompat:appcompat:1.3.1 -> 1.6.1 (*)
-| | +--- androidx.fragment:fragment:1.5.1 -> 1.8.5 (*)
-| | +--- androidx.lifecycle:lifecycle-common:2.5.1 -> 2.8.7 (*)
-| | +--- androidx.lifecycle:lifecycle-viewmodel:2.5.1 -> 2.8.7 (*)
-| | +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1 -> 2.8.7 (*)
-| | \--- javax.inject:javax.inject:1
-| +--- com.google.android.gms:play-services-auth:18.1.0 -> 20.7.0 (*)
-| \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 -> 2.0.21 (*)
++--- org.wordpress:login:156-98aa2c6174009b24253133b6733be119b70b7178 FAILED
+--- org.wordpress.aztec:glide-loader:v2.1.4
-| \--- com.github.bumptech.glide:glide:4.10.0 -> 4.16.0 (*)
+| \--- com.github.bumptech.glide:glide:4.10.0 -> 4.16.0
+| +--- com.github.bumptech.glide:gifdecoder:4.16.0
+| | \--- androidx.annotation:annotation:1.5.0 -> 1.8.1 (*)
+| +--- com.github.bumptech.glide:disklrucache:4.16.0
+| +--- com.github.bumptech.glide:annotations:4.16.0
+| +--- androidx.fragment:fragment:1.3.6 -> 1.8.5 (*)
+| +--- androidx.vectordrawable:vectordrawable-animated:1.1.0 (*)
+| +--- androidx.exifinterface:exifinterface:1.3.6 (*)
+| \--- androidx.tracing:tracing:1.0.0 (*)
-+--- com.gravatar:gravatar:0.2.0 (*)
++--- com.gravatar:gravatar:0.2.0
+| +--- com.squareup.okhttp3:okhttp:4.12.0 (*)
+| +--- com.squareup.retrofit2:retrofit:2.9.0
+| | \--- com.squareup.okhttp3:okhttp:3.14.9 -> 4.12.0 (*)
+| +--- com.squareup.retrofit2:converter-gson:2.9.0
+| | +--- com.squareup.retrofit2:retrofit:2.9.0 (*)
+| | \--- com.google.code.gson:gson:2.8.5 -> 2.10.1
+| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 -> 1.8.1 (*)
+| \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.22 -> 2.0.21 (*)
+--- project :libs:cardreader
| \--- com.stripe:stripeterminal-localmobile:3.7.1
| +--- com.google.android.gms:play-services-safetynet:18.0.1
-| | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.2.0 (*)
+| | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.1.0 (*)
| \--- com.google.android.play:integrity:1.1.0
-| \--- com.google.android.gms:play-services-basement:18.1.0 -> 18.2.0 (*)
+| \--- com.google.android.gms:play-services-basement:18.1.0 (*)
-+--- com.google.dagger:dagger-android-support:2.50 (*)
++--- com.google.dagger:dagger-android-support:2.50
+| +--- com.google.dagger:dagger:2.50 -> 2.51.1 (*)
+| +--- com.google.dagger:dagger-android:2.50
+| | +--- com.google.dagger:dagger:2.50 -> 2.51.1 (*)
+| | +--- com.google.dagger:dagger-lint-aar:2.50
+| | +--- androidx.annotation:annotation:1.2.0 -> 1.8.1 (*)
+| | \--- javax.inject:javax.inject:1
+| +--- com.google.dagger:dagger-lint-aar:2.50
+| +--- androidx.activity:activity:1.5.1 -> 1.8.1 (*)
+| +--- androidx.annotation:annotation:1.2.0 -> 1.8.1 (*)
+| +--- androidx.appcompat:appcompat:1.3.1 -> 1.6.1 (*)
+| +--- androidx.fragment:fragment:1.5.1 -> 1.8.5 (*)
+| +--- androidx.lifecycle:lifecycle-common:2.5.1 -> 2.8.7 (*)
+| +--- androidx.lifecycle:lifecycle-viewmodel:2.5.1 -> 2.8.7 (*)
+| +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1 -> 2.8.7 (*)
+| \--- javax.inject:javax.inject:1
+--- com.google.android.play:app-update:2.1.0
-| \--- com.google.android.gms:play-services-basement:18.1.0 -> 18.2.0 (*)
+| \--- com.google.android.gms:play-services-basement:18.1.0 (*)
+--- com.google.android.play:review:2.0.1
-| \--- com.google.android.gms:play-services-basement:18.1.0 -> 18.2.0 (*)
+| \--- com.google.android.gms:play-services-basement:18.1.0 (*)
+--- com.google.android.gms:play-services-code-scanner:16.1.0
-| +--- com.google.android.gms:play-services-basement:18.1.0 -> 18.2.0 (*)
+| +--- com.google.android.gms:play-services-basement:18.1.0 (*)
| \--- com.google.mlkit:barcode-scanning-common:17.0.0
-| +--- com.google.android.gms:play-services-basement:18.0.0 -> 18.2.0 (*)
+| +--- com.google.android.gms:play-services-basement:18.0.0 -> 18.1.0 (*)
| \--- com.google.mlkit:vision-common:17.0.0 -> 17.3.0
-| +--- com.google.android.gms:play-services-basement:18.1.0 -> 18.2.0 (*)
+| +--- com.google.android.gms:play-services-basement:18.1.0 (*)
| \--- com.google.mlkit:common:18.6.0 -> 18.9.0
-| \--- com.google.android.gms:play-services-basement:18.1.0 -> 18.2.0 (*)
+| \--- com.google.android.gms:play-services-basement:18.1.0 (*)
+--- com.google.mlkit:text-recognition:16.0.0
-| +--- com.google.android.gms:play-services-basement:18.1.0 -> 18.2.0 (*)
+| +--- com.google.android.gms:play-services-basement:18.1.0 (*)
| +--- com.google.android.gms:play-services-mlkit-text-recognition:19.0.0
-| | +--- com.google.android.gms:play-services-basement:18.1.0 -> 18.2.0 (*)
+| | +--- com.google.android.gms:play-services-basement:18.1.0 (*)
| | \--- com.google.android.gms:play-services-mlkit-text-recognition-common:19.0.0
-| | +--- com.google.android.gms:play-services-basement:18.1.0 -> 18.2.0 (*)
+| | +--- com.google.android.gms:play-services-basement:18.1.0 (*)
| | \--- com.google.mlkit:vision-interfaces:16.2.0
-| | \--- com.google.android.gms:play-services-basement:18.1.0 -> 18.2.0 (*)
+| | \--- com.google.android.gms:play-services-basement:18.1.0 (*)
| \--- com.google.mlkit:text-recognition-bundled-common:16.0.0
-| \--- com.google.android.gms:play-services-basement:18.1.0 -> 18.2.0 (*)
+| \--- com.google.android.gms:play-services-basement:18.1.0 (*)
+--- com.google.android.gms:play-services-mlkit-text-recognition-japanese:16.0.0
-| \--- com.google.android.gms:play-services-basement:18.1.0 -> 18.2.0 (*)
+| \--- com.google.android.gms:play-services-basement:18.1.0 (*)
+--- com.google.android.gms:play-services-mlkit-text-recognition-chinese:16.0.0
-| \--- com.google.android.gms:play-services-basement:18.1.0 -> 18.2.0 (*)
+| \--- com.google.android.gms:play-services-basement:18.1.0 (*)
+--- com.google.android.gms:play-services-mlkit-text-recognition-korean:16.0.0
-| \--- com.google.android.gms:play-services-basement:18.1.0 -> 18.2.0 (*)
+| \--- com.google.android.gms:play-services-basement:18.1.0 (*)
+--- com.google.mlkit:barcode-scanning:17.2.0
-| +--- com.google.android.gms:play-services-basement:18.1.0 -> 18.2.0 (*)
+| +--- com.google.android.gms:play-services-basement:18.1.0 (*)
| \--- com.google.android.gms:play-services-mlkit-barcode-scanning:18.3.0
-| \--- com.google.android.gms:play-services-basement:18.1.0 -> 18.2.0 (*)
+| \--- com.google.android.gms:play-services-basement:18.1.0 (*)
\--- com.google.android.gms:play-services-wearable:18.1.0
- \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.2.0 (*)
+ \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.1.0 (*) |
📲 You can test the changes from this Pull Request in WooCommerce-Wear Android by scanning the QR code below to install the corresponding build.
|
private fun showEmailPasswordScreen( | ||
email: String?, | ||
verifyEmail: Boolean, | ||
password: String? = null |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This part about prefilling the password was used just for the account signup, given we don't support this anymore, I deleted it, and deleted its code from the Fragment as well.
📲 You can test the changes from this Pull Request in WooCommerce Android by scanning the QR code below to install the corresponding build.
|
.../src/main/kotlin/com/woocommerce/android/ui/login/overrides/WooLoginEmailPasswordFragment.kt
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It works as expected. LGTM! 👍🏻
…picious-emails [Login] Use Magic Link for suspicious emails [Part 2]
# Conflicts: # WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/LoginActivity.kt
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## trunk #13335 +/- ##
=========================================
Coverage 41.16% 41.17%
Complexity 6440 6440
=========================================
Files 1323 1323
Lines 77246 77247 +1
Branches 10669 10669
=========================================
+ Hits 31802 31804 +2
+ Misses 42616 42615 -1
Partials 2828 2828 ☔ View full report in Codecov by Sentry. |
Closes: #13331
Depends on wordpress-mobile/WordPress-Login-Flow-Android#156
Description
This PR updates the login library to bring the changes of the above PR, which implements the first part of improving the login flow for suspicious emails.
Steps to reproduce
Testing information
The tests that have been performed
^
Images/gif
RELEASE-NOTES.txt
if necessary. Use the "[Internal]" label for non-user-facing changes.Reviewer (or Author, in the case of optional code reviews):
Please make sure these conditions are met before approving the PR, or request changes if the PR needs improvement: