Skip to content

Conversation

@AmandaRiu
Copy link
Contributor

This PR merges the woocommerce-android changes to the login library from this PR. There were several new interface methods added existing classes:

LoginAnalyticsListener

  • trackConnectedSiteInfoRequested
  • trackConnectedSiteInfoFailed
  • trackConnectedSiteInfoSucceeded

LoginListener

  • showHelpFindingConnectedEmail
  • gotConnectedSiteInfo

I've implemented these new interface methods in LoginActivity and LoginAnalyticsTracker but there is no logic needed since none of them are currently being used in WPAndroid. Those are the only two changes to WPAndroid directly.

Full documentation around the changes to login library are documented in this PR, but the WPAndroid app should see no difference in the login experience.

Recommended Test Scenarios

  • Verify login flow is unchanged from the current login flow of WPAndroid
  • Verify the text in each of the login views is also unchanged
  • Login with email
  • Login by site url
  • Login w/ Magic Link
  • Login w/ Google

To test:

Update release notes:

  • If there are user facing changes, I have added an item to RELEASE-NOTES.txt.

AmandaRiu added 3 commits July 3, 2019 15:01
979ddf4aec Merge commit '827a47189094a6bc7800eaccc3ed069841251373' into sync-login-lib
df3c11ed09 added textAlignment property to secondary button in login
da783ea3c7 Login screens: added textAlignment property to labels
6d486bbf6b Merge pull request #21 from wordpress-mobile/merge-wpa-develop
57a2d00b14 Update login lib standalone FluxC hash
0ea2405def Merge commit 'ad485b27b26ffb38b8718940b0b7556b902dc28c' into sync-login-lib
6df15ab86b Update 2FA unavailable API error message
eefd72f317 Show error and continue login on OAuth client 2FA error
ca3b68e817 Merge branch 'amanda/signin-has-woo' into amanda/signin-tracks-events
4755048046 Remove part of login site error msg and add help button
3cc4f31b3b Refresh branch with AndroidX changes in develop
76c40f3034 Fixed incorrect ordering of imports in login library
08a9f0c65a First pass at AndroidX migration. Used the migration wizard then did far too much cleanup.
a46ceeb96b Track connected site info requests, success, and failures
47528a1c33 Special handling for atomic sites
578dca7f29 Update androidx dependencies
1d09d1536d Fix AndroidX import order
48df84638f Fix import ordering for androidx
d3dc35035a Migrate to AndroidX
e9e219db2f Add logic to get connected site info for woo login mode.
873db9b385 Add new logic to change the label to show the site logging into
9f442e9a2f Add new WOO_LOGIN_MODE
309eeda212 Add new string to handle non-WordPress site error
dfc6991275 Revert "Add new loginMode for woo and update related error strings"
9b44d78d3e Add debug property to populate site address during login
45ae481c03 Add new loginMode for woo and update related error strings
91731b6196 Add a way to hide the option to login by site address
4d6c83f111 Merge pull request #9890 from wordpress-mobile/update-dagger-version-to-v2.22.1
9cbf3f17ff Merge pull request #9885 from wordpress-mobile/update-login-library
0ddf4dcdbd Update Glide version to 4.9.0
f7860b9861 Updated Dagger in the login library
1c311d430c Updated Dagger in the login library
79dd984392 Updated login library to Glide 4.9.0
e995e12f02 Revert sdk change for login library
954e7ddebc Updated targetSdkVersion to 28
7ee1e1c003 Added another catch block to handle NoActivityFoundException
804225d94f Merge commit 'a9cf59e44590548a123efeb521f9ff99b3277072' into update-login-lib

git-subtree-dir: libs/login
git-subtree-split: 979ddf4aec664cf9afafa1cdf7d99599488f1eee
…oo-login-test-wp

# Conflicts:
#	libs/login/gradle.properties-example
These methods are not used by the WordPress app so they don't do
anything and are only implemented to allow a successful build. These
new methods were added for the Woo app.
@AmandaRiu AmandaRiu added the Login label Jul 3, 2019
@peril-wordpress-mobile
Copy link

Warnings
⚠️ PR is not assigned to a milestone.
Messages
📖

This PR contains changes in the subtree libs/login/. It is your responsibility to ensure these changes are merged back into WordPress-Login-Flow-Android. Follow these handy steps!
WARNING: Make sure your git version is 2.19.x or lower - there is currently a bug in later versions that will corrupt the subtree history!

  1. cd WordPress-Android
  2. git checkout amanda/woo-login-test-wp
  3. git subtree push --prefix=libs/login/ https://github.com/wordpress-mobile/WordPress-Login-Flow-Android.git merge/WordPress-Android/10149
  4. Browse to https://github.com/wordpress-mobile/WordPress-Login-Flow-Android/pull/new/merge/WordPress-Android/10149 and open a new PR.

Generated by 🚫 dangerJS

@aforcier
Copy link
Contributor

aforcier commented Jul 3, 2019

It looks like this branch was created with git 2.20.1 (I should've been clearer that it was still unsafe to merge anything created with that version when I suggested making a test branch, sorry).

This is what happens if you try to git subtree pull again on this branch (with a working version of git):

git subtree pull --prefix=libs/login loginlib develop --squash
remote: Enumerating objects: 1, done.
remote: Total 1 (delta 0), reused 0 (delta 0), pack-reused 1
Unpacking objects: 100% (1/1), done.
From github.com:wordpress-mobile/WordPress-Login-Flow-Android
 * branch                  develop    -> FETCH_HEAD
   78c5307f7a..6d486bbf6b  develop    -> loginlib/develop
fatal: ambiguous argument '979ddf4aec664cf9afafa1cdf7d99599488f1eee^0': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
could not rev-parse split hash 979ddf4aec664cf9afafa1cdf7d99599488f1eee from commit 43aef9534664821893f4a65ac7fb52b2e8c01eee
Can't squash-merge: 'libs/login' was never added.

Slacked you with updated instructions, going to close this just to be safe.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants