Fb auth refactor