refactor: Prep for next auth major

gax/src/clientInterface.ts

@@ -18,7 +18,7 @@
 
 import {GrpcClientOptions, ClientStubOptions} from './grpc';
 import * as gax from './gax';
-import {AuthClient, GoogleAuthOptions} from 'google-auth-library';
+import {GoogleAuthOptions} from 'google-auth-library';
 import {
   BundleDescriptor,
   LongrunningDescriptor,
@@ -30,7 +30,7 @@ import * as operationProtos from '../protos/operations';
 
 export interface ClientOptions
   extends GrpcClientOptions,
-    GoogleAuthOptions<AuthClient>,
+    GoogleAuthOptions,
     ClientStubOptions {
   libName?: string;
   libVersion?: string;

gax/src/fallback.ts

@@ -37,7 +37,6 @@ import * as IamProtos from '../protos/iam_service';
 import * as LocationProtos from '../protos/locations';
 import * as operationsProtos from '../protos/operations';
 
-export {AnyAuthClient as AuthClient};
 export {FallbackServiceError};
 export {PathTemplate} from './pathTemplate';
 export {routingHeader};
@@ -79,7 +78,7 @@ export interface ServiceMethods {
 }
 
 export class GrpcClient {
-  auth?: AuthClient | GoogleAuth<AuthClient>;
+  auth?: AuthClient | GoogleAuth;
   authClient?: AuthClient;
   fallback: boolean;
   grpcVersion: string;

gax/src/grpc.ts

@@ -17,7 +17,7 @@
 import * as grpcProtoLoader from '@grpc/proto-loader';
 import {execFile} from 'child_process';
 import * as fs from 'fs';
-import {GoogleAuth, GoogleAuthOptions, AuthClient} from 'google-auth-library';
+import {GoogleAuth, GoogleAuthOptions} from 'google-auth-library';
 import * as grpc from '@grpc/grpc-js';
 import * as os from 'os';
 import {join} from 'path';
@@ -44,8 +44,8 @@ const COMMON_PROTO_FILES: string[] = commonProtoFiles.map(file =>
   file.replace(/[/\\]/g, path.sep)
 );
 
-export interface GrpcClientOptions extends GoogleAuthOptions<AuthClient> {
-  auth?: GoogleAuth<AuthClient>;
+export interface GrpcClientOptions extends GoogleAuthOptions {
+  auth?: GoogleAuth;
   grpc?: GrpcModule;
   protoJson?: protobuf.Root;
   httpRules?: Array<google.api.IHttpRule>;
@@ -113,7 +113,7 @@ export class ClientStub extends grpc.Client {
 }
 
 export class GrpcClient {
-  auth: GoogleAuth<AuthClient>;
+  auth: GoogleAuth;
   grpc: GrpcModule;
   grpcVersion: string;
   fallback: boolean | 'rest' | 'proto';

gax/src/iamService.ts

@@ -40,7 +40,7 @@ export class IamClient {
   private _defaults: {[method: string]: gax.CallSettings};
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   private _protos: any;
-  auth?: GoogleAuth<AuthClient> | AuthClient;
+  auth?: GoogleAuth | AuthClient;
   descriptors: Descriptors = {page: {}, stream: {}, longrunning: {}};
   innerApiCalls: {[name: string]: Function} = {};
   iamPolicyStub?: Promise<{[name: string]: Function}>;

gax/src/operationsClient.ts

@@ -62,7 +62,7 @@ export const ALL_SCOPES: string[] = [];
  * @class
  */
 export class OperationsClient {
-  auth?: GoogleAuth<AuthClient> | AuthClient;
+  auth?: GoogleAuth | AuthClient;
   innerApiCalls: {[name: string]: Function};
   descriptor: {[method: string]: PageDescriptor};
   operationsStub: Promise<{[method: string]: Function}>;