Merge "refactor(auth): remove return_if_error() macro" into integration