Refactor async auth callbacks