Refactored social auth and connect