Cleanup

* Rename discoverOAuthService to discoverUserInfoService
* Split up getUserInfoForClient from getEmailForClient