merge Token class into OAuthCredential