refactor GooglePlusOAuthClient