fix basic auth api
merge
merge