WIP oauth2-upgrade: oauth2 upgrade and REST fixes

ok! It is better!