[PATCH] Use generic auth API