#6 handle refresh token
#6 merge