diff --git a/etc/firebase-admin.auth.api.md b/etc/firebase-admin.auth.api.md
index ca4eaac8fc..563e2204bb 100644
--- a/etc/firebase-admin.auth.api.md
+++ b/etc/firebase-admin.auth.api.md
@@ -70,11 +70,30 @@ export abstract class BaseAuth {
     verifySessionCookie(sessionCookie: string, checkRevoked?: boolean): Promise<DecodedIdToken>;
 }
 
+// @public
+export interface BaseAuthProviderConfig {
+    displayName?: string;
+    enabled: boolean;
+    providerId: string;
+}
+
+// @public
+export interface BaseCreateMultiFactorInfoRequest {
+    displayName?: string;
+    factorId: string;
+}
+
+// @public
+export interface BaseUpdateMultiFactorInfoRequest {
+    displayName?: string;
+    enrollmentTime?: string;
+    factorId: string;
+    uid?: string;
+}
+
 // @public
 export type CreateMultiFactorInfoRequest = CreatePhoneMultiFactorInfoRequest;
 
-// Warning: (ae-forgotten-export) The symbol "BaseCreateMultiFactorInfoRequest" needs to be exported by the entry point index.d.ts
-//
 // @public
 export interface CreatePhoneMultiFactorInfoRequest extends BaseCreateMultiFactorInfoRequest {
     phoneNumber: string;
@@ -199,14 +218,17 @@ export interface MultiFactorUpdateSettings {
     enrolledFactors: UpdateMultiFactorInfoRequest[] | null;
 }
 
-// Warning: (ae-forgotten-export) The symbol "BaseAuthProviderConfig" needs to be exported by the entry point index.d.ts
-//
+// @public
+export interface OAuthResponseType {
+    code?: boolean;
+    idToken?: boolean;
+}
+
 // @public
 export interface OIDCAuthProviderConfig extends BaseAuthProviderConfig {
     clientId: string;
     clientSecret?: string;
     issuer: string;
-    // Warning: (ae-forgotten-export) The symbol "OAuthResponseType" needs to be exported by the entry point index.d.ts
     responseType?: OAuthResponseType;
 }
 
@@ -309,8 +331,6 @@ export type UpdateAuthProviderRequest = SAMLUpdateAuthProviderRequest | OIDCUpda
 // @public
 export type UpdateMultiFactorInfoRequest = UpdatePhoneMultiFactorInfoRequest;
 
-// Warning: (ae-forgotten-export) The symbol "BaseUpdateMultiFactorInfoRequest" needs to be exported by the entry point index.d.ts
-//
 // @public
 export interface UpdatePhoneMultiFactorInfoRequest extends BaseUpdateMultiFactorInfoRequest {
     phoneNumber: string;
diff --git a/src/auth/index.ts b/src/auth/index.ts
index afbbe780ca..b189e1ac56 100644
--- a/src/auth/index.ts
+++ b/src/auth/index.ts
@@ -64,6 +64,9 @@ export {
   AuthFactorType,
   AuthProviderConfig,
   AuthProviderConfigFilter,
+  BaseAuthProviderConfig,
+  BaseCreateMultiFactorInfoRequest,
+  BaseUpdateMultiFactorInfoRequest,
   CreateMultiFactorInfoRequest,
   CreatePhoneMultiFactorInfoRequest,
   CreateRequest,
@@ -73,6 +76,7 @@ export {
   MultiFactorConfigState,
   MultiFactorCreateSettings,
   MultiFactorUpdateSettings,
+  OAuthResponseType,
   OIDCAuthProviderConfig,
   OIDCUpdateAuthProviderRequest,
   SAMLAuthProviderConfig,
diff --git a/src/auth/token-verifier.ts b/src/auth/token-verifier.ts
index 0e93a25933..4a88420f5a 100644
--- a/src/auth/token-verifier.ts
+++ b/src/auth/token-verifier.ts
@@ -370,7 +370,7 @@ export class FirebaseTokenVerifier {
     fullDecodedToken: DecodedToken,
     projectId: string | null,
     isEmulator: boolean): void {
-  
+
     const header = fullDecodedToken && fullDecodedToken.header;
     const payload = fullDecodedToken && fullDecodedToken.payload;
 
@@ -430,7 +430,7 @@ export class FirebaseTokenVerifier {
 
   /**
    * Maps JwtError to FirebaseAuthError
-   * 
+   *
    * @param error JwtError to be mapped.
    * @returns FirebaseAuthError or Error instance.
    */