Rework auth infrastructure to support non-facebook login