Refactoring oauth FB/Google