Fixed api login result
Fixed auth and user api
Merge branch '1-3' into dev