Fix token refresh

There is an NPE being thrown when the token needs to be refreshed because the refreshToken is assumed to be set in the OAuth2Handler rather than reading it from the AccessToken