PR Feedback

Author: bstpierr

Example/Auth/Tests/FIRAuthTests.m

@@ -2269,9 +2269,8 @@ - (void)mockSecureTokenResponseWithError:(nullable NSError *)error {
  */
 - (void)enableAutoTokenRefresh {
   XCTestExpectation *expectation = [self expectationWithDescription:@"autoTokenRefreshcallback"];
-  id<FIRAuthInterop> auth = (id<FIRAuthInterop>)[FIRAuth auth];
-  [auth getTokenForcingRefresh:NO withCallback:^(NSString *_Nullable token,
-                                                 NSError *_Nullable error) {
+  [[FIRAuth auth] getTokenForcingRefresh:NO withCallback:^(NSString *_Nullable token,
+                                                           NSError *_Nullable error) {
     [expectation fulfill];
   }];
   [self waitForExpectationsWithTimeout:kExpectationTimeout handler:nil];

Firebase/Auth/Source/FIRAuth.m

@@ -22,7 +22,6 @@
 #import <UIKit/UIKit.h>
 #endif
 
-#import <FirebaseAuthInterop/FIRAuthInterop.h>
 #import <FirebaseCore/FIRAppAssociationRegistration.h>
 #import <FirebaseCore/FIRAppInternal.h>
 #import <FirebaseCore/FIRComponent.h>
@@ -226,9 +225,9 @@ + (FIRActionCodeOperation)actionCodeOperationForRequestType:(NSString *)requestT
 #pragma mark - FIRAuth
 
 #if TARGET_OS_IOS
-@interface FIRAuth () <FIRAuthAppDelegateHandler, FIRAuthInterop, FIRComponentRegistrant, FIRCoreConfigurable, FIRComponentLifecycleMaintainer>
+@interface FIRAuth () <FIRAuthAppDelegateHandler, FIRComponentRegistrant, FIRCoreConfigurable, FIRComponentLifecycleMaintainer>
 #else
-@interface FIRAuth () <FIRAuthInterop, FIRComponentRegistrant, FIRCoreConfigurable, FIRComponentLifecycleMaintainer>
+@interface FIRAuth () <FIRComponentRegistrant, FIRCoreConfigurable, FIRComponentLifecycleMaintainer>
 #endif
 
 /** @property firebaseAppId

Firebase/Auth/Source/FIRAuth_Internal.h

@@ -18,6 +18,8 @@
 
 #import "FIRAuth.h"
 
+#import <FirebaseAuthInterop/FIRAuthInterop.h>
+
 @class FIRAuthRequestConfiguration;
 
 #if TARGET_OS_IOS
@@ -29,7 +31,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface FIRAuth ()
+@interface FIRAuth () <FIRAuthInterop>
 
 /** @property requestConfiguration
     @brief The configuration object comprising of paramters needed to make a request to Firebase