review auth_integration.diff for tmroeder