Fixed duplicate oauth fetch along with DRY improvement #1858

Fixes the duplicate Oauth issue.
It's just there to make sure we re-fetch the access token 10 seconds before it's actually expired -- just to make sure we don't cut it too close. I'll add a comment.