fix: throw on missing refresh token in all cases (#670)

googleapis · Apr 16, 2019 · 0a02946 · 0a02946
1 parent 8cc5522
commit 0a02946
Show file tree

Hide file tree

Showing 2 changed files with 1,027 additions and 991 deletions.
diff --git a/src/auth/oauth2client.ts b/src/auth/oauth2client.ts
@@ -565,6 +565,9 @@ export class OAuth2Client extends AuthClient {
 
   protected async refreshTokenNoCache(refreshToken?: string|
                                       null): Promise<GetTokenResponse> {
+    if (!refreshToken) {
+      throw new Error('No refresh token is set.');
+    }
     const url = OAuth2Client.GOOGLE_OAUTH2_TOKEN_URL_;
     const data = {
       refresh_token: refreshToken,
@@ -612,9 +615,6 @@ export class OAuth2Client extends AuthClient {
   }
 
   private async refreshAccessTokenAsync() {
-    if (!this.credentials.refresh_token) {
-      throw new Error('No refresh token is set.');
-    }
     const r = await this.refreshToken(this.credentials.refresh_token);
     const tokens = r.tokens as Credentials;
     tokens.refresh_token = this.credentials.refresh_token;