refactoring OAuth2Client dependency