@cloudbase/oauth 2.17.17 → 2.18.1

package/src/oauth2client/oauth2client.ts

@@ -502,15 +502,20 @@ export class OAuth2Client implements AuthClient {
       return this.unAuthenticatedError('credentials not found')
     }
     if (isCredentialsExpired(credentials)) {
-      if (credentials && credentials.scope === 'anonymous') {
-        if (this.anonymousSignInFunc) {
-          const c = await this.anonymousSignInFunc(credentials)
-          credentials = c || (await this.localCredentials.getCredentials())
-        } else {
-          credentials = await this.anonymousSignIn(credentials)
+      if (credentials.refresh_token) {
+        try {
+          credentials = await this.refreshToken(credentials)
+        } catch (error) {
+          if (credentials.scope === 'anonymous') {
+            credentials = await this.anonymousLogin(credentials)
+          } else {
+            return Promise.reject(error)
+          }
         }
+      } else if (credentials.scope === 'anonymous') {
+        credentials = await this.anonymousLogin(credentials)
       } else {
-        credentials = await this.refreshToken(credentials)
+        return this.unAuthenticatedError('no refresh token found in credentials')
       }
     }
     return credentials
@@ -568,6 +573,19 @@ export class OAuth2Client implements AuthClient {
     })
   }
 
+  private async anonymousLogin(credentials: Credentials) {
+    return this.singlePromise.run('_anonymousLogin', async () => {
+      if (this.anonymousSignInFunc) {
+        const c = await this.anonymousSignInFunc(credentials)
+        credentials = c || (await this.localCredentials.getCredentials())
+      } else {
+        credentials = await this.anonymousSignIn(credentials)
+      }
+
+      return credentials
+    })
+  }
+
   /**
    * Check retry value.
    * @param {number} retry