auth services refactor