more changes to tokenmgr
add support for just id_token or token