convert to oauth2 ids

@kevlarkevin could you please take a look?