Merge pull request #20832 from aaronlehmann/login-endpoint-refactor

Update login to use token handling code from distribution