fix: more potential merging issues

Author: feywind

src/auth/defaultawssecuritycredentialssupplier.ts

@@ -194,7 +194,6 @@ export class DefaultAwsSecurityCredentialsSupplier
    */
   async #getImdsV2SessionToken(transporter: Gaxios): Promise<string> {
     const request = {
-      ...this.additionalGaxiosOptions,
       url: this.imdsV2SessionTokenUrl,
       method: 'PUT',
       headers: {'x-aws-ec2-metadata-token-ttl-seconds': '300'},
@@ -261,8 +260,8 @@ export class DefaultAwsSecurityCredentialsSupplier
     };
     this.log.info('#retrieveAwsSecurityCredentials %j', request);
     const response = await transporter.request<AwsSecurityCredentialsResponse>({
-      ...request,
       ...this.additionalGaxiosOptions,
+      ...request,
     });
     this.log.info('#retrieveAwsSecurityCredentials %s', response.data);
     return response.data;

src/auth/oauth2client.ts

@@ -758,9 +758,9 @@ export class OAuth2Client extends AuthClient {
     this.log.info('getTokenAsync %j', request);
 
     const res = await this.transporter.request<CredentialRequest>({
-      ...request,
       ...OAuth2Client.RETRY_CONFIG,
       method: 'POST',
+      ...request,
     });
     const tokens = res.data as Credentials;
     this.log.info('getTokenAsync success %j', tokens);
@@ -828,9 +828,9 @@ export class OAuth2Client extends AuthClient {
     try {
       // request for new token
       res = await this.transporter.request<CredentialRequest>({
-        ...request,
         ...OAuth2Client.RETRY_CONFIG,
         method: 'POST',
+        ...request,
       });
     } catch (exc) {
       const e = exc as Error;
@@ -1065,7 +1065,7 @@ export class OAuth2Client extends AuthClient {
       }, callback);
     } else {
       return this.transporter.request<RevokeCredentialsResult>(opts).then(r => {
-        this.log.info('revokeToken success %j', r.data);
+        this.log.info('revokeToken success %s', r.data ?? '');
         return r;
       });
     }

src/auth/refreshclient.ts

@@ -102,7 +102,6 @@ export class UserRefreshClient extends OAuth2Client {
   async fetchIdToken(targetAudience: string): Promise<string> {
     const request = {
       url: this.endpoints.oauth2TokenUrl,
-      method: 'POST',
       data: new URLSearchParams({
         client_id: this._clientId,
         client_secret: this._clientSecret,
@@ -114,9 +113,9 @@ export class UserRefreshClient extends OAuth2Client {
     this.log.info('fetchIdToken %j', request);
 
     const res = await this.transporter.request<CredentialRequest>({
-      ...request,
       ...UserRefreshClient.RETRY_CONFIG,
       method: 'POST',
+      ...request,
     });
 
     this.log.info('fetchIdToken success %s', res?.data?.id_token);

src/auth/stscredentials.ts

@@ -220,9 +220,9 @@ export class StsCredentials extends OAuthClientAuthHandler {
     this.log.info('exchangeToken %j', request);
 
     const opts: GaxiosOptions = {
-      ...request,
       ...StsCredentials.RETRY_CONFIG,
       method: 'POST',
+      ...request,
     };
     // Apply OAuth client authentication.
     this.applyClientAuthenticationOptions(opts);

src/auth/urlsubjecttokensupplier.ts

@@ -91,9 +91,9 @@ export class UrlSubjectTokenSupplier implements SubjectTokenSupplier {
     this.log.info('getSubjectToken %j', request);
 
     const opts: GaxiosOptions = {
-      ...request,
       ...this.additionalGaxiosOptions,
       method: 'GET',
+      ...request,
     };
     let subjectToken: string | undefined;
     if (this.formatType === 'text') {