[Auth] Fix Firebase Auth build on visionOS (#11488)

andrewheard · web-flow · commit 56cbd2d4d882 · 2023-06-29T15:43:06.000-04:00
Fixed Firebase Auth SDK build issues for visionOS, along with corresponding unit test changes.
diff --git a/FirebaseAuth/Sources/Auth/FIRAuth.m b/FirebaseAuth/Sources/Auth/FIRAuth.m
@@ -469,9 +469,9 @@ - (instancetype)initWithApp:(FIRApp *)app {
                      appCheck:FIR_COMPONENT(FIRAppCheckInterop, app.container)];
   if (self) {
     _app = app;
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
     _authURLPresenter = [[FIRAuthURLPresenter alloc] init];
-#endif
+#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
   }
   return self;
 }
@@ -648,7 +648,7 @@ - (nullable FIRUser *)currentUser {
 - (void)signInWithProvider:(id<FIRFederatedAuthProvider>)provider
                 UIDelegate:(nullable id<FIRAuthUIDelegate>)UIDelegate
                 completion:(nullable FIRAuthDataResultCallback)completion {
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
   dispatch_async(FIRAuthGlobalWorkQueue(), ^{
     FIRAuthDataResultCallback decoratedCallback =
         [self signInFlowAuthDataResultCallbackByDecoratingCallback:completion];
@@ -665,7 +665,7 @@ - (void)signInWithProvider:(id<FIRFederatedAuthProvider>)provider
                                                                         callback:decoratedCallback];
                                }];
   });
-#endif  // TARGET_OS_IOS
+#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
 }
 
 - (void)fetchSignInMethodsForEmail:(nonnull NSString *)email
@@ -1638,9 +1638,11 @@ - (BOOL)canHandleNotification:(NSDictionary *)userInfo {
 
 - (BOOL)canHandleURL:(NSURL *)URL {
   __block BOOL result = NO;
+#if TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
   dispatch_sync(FIRAuthGlobalWorkQueue(), ^{
     result = [self->_authURLPresenter canHandleURL:URL];
   });
+#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
   return result;
 }
 
diff --git a/FirebaseAuth/Sources/AuthProvider/OAuth/FIROAuthProvider.m b/FirebaseAuth/Sources/AuthProvider/OAuth/FIROAuthProvider.m
@@ -149,7 +149,7 @@ + (instancetype)providerWithProviderID:(NSString *)providerID auth:(FIRAuth *)au
   return [[self alloc] initWithProviderID:providerID auth:auth];
 }
 
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
 - (void)getCredentialWithUIDelegate:(nullable id<FIRAuthUIDelegate>)UIDelegate
                          completion:(nullable FIRAuthCredentialCallback)completion {
   if (![FIRAuthWebUtils isCallbackSchemeRegisteredForCustomURLScheme:self->_callbackScheme]) {
@@ -216,7 +216,7 @@ - (void)getCredentialWithUIDelegate:(nullable id<FIRAuthUIDelegate>)UIDelegate
                           }];
   });
 }
-#endif  // TARGET_OS_IOS
+#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
 
 #pragma mark - Internal Methods
 
diff --git a/FirebaseAuth/Sources/AuthProvider/Phone/FIRPhoneAuthProvider.m b/FirebaseAuth/Sources/AuthProvider/Phone/FIRPhoneAuthProvider.m
@@ -15,7 +15,7 @@
  */
 
 #import <TargetConditionals.h>
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
 
 #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRAuthSettings.h"
 #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRMultiFactorResolver.h"
@@ -789,4 +789,4 @@ - (void)reCAPTCHAURLWithEventID:(NSString *)eventID completion:(FIRReCAPTCHAURLC
 
 NS_ASSUME_NONNULL_END
 
-#endif
+#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
diff --git a/FirebaseAuth/Sources/Public/FirebaseAuth/FIRFederatedAuthProvider.h b/FirebaseAuth/Sources/Public/FirebaseAuth/FIRFederatedAuthProvider.h
@@ -47,7 +47,14 @@ typedef void (^FIRAuthCredentialCallback)(FIRAuthCredential *_Nullable credentia
 - (void)getCredentialWithUIDelegate:(nullable id<FIRAuthUIDelegate>)UIDelegate
                          completion:(nullable void (^)(FIRAuthCredential *_Nullable credential,
                                                        NSError *_Nullable error))completion
-    API_UNAVAILABLE(macos, tvos, watchos);
+    API_UNAVAILABLE(macos,
+                    tvos,
+                    watchos
+#if defined(TARGET_OS_XR)
+                    ,
+                    xros
+#endif  // defined(TARGET_OS_XR)
+    );
 
 @end
 
diff --git a/FirebaseAuth/Sources/SystemService/FIRAuthAPNSTokenManager.m b/FirebaseAuth/Sources/SystemService/FIRAuthAPNSTokenManager.m
@@ -79,9 +79,9 @@ - (void)getTokenWithCallback:(FIRAuthAPNSTokenCallback)callback {
     } else {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
       [self->_application registerForRemoteNotificationTypes:UIRemoteNotificationTypeAlert];
-#endif  // TARGET_OS_IOS
+#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
 #pragma clang diagnostic pop
     }
   });
diff --git a/FirebaseAuth/Sources/SystemService/FIRAuthNotificationManager.m b/FirebaseAuth/Sources/SystemService/FIRAuthNotificationManager.m
@@ -115,7 +115,7 @@ - (void)checkNotificationForwardingWithCallback:(FIRAuthNotificationForwardingCa
                   didReceiveRemoteNotification:proberNotification
                         fetchCompletionHandler:^(UIBackgroundFetchResult result){
                         }];
-#if !TARGET_OS_TV
+#if !TARGET_OS_TV && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
     } else if ([self->_application.delegate
                    respondsToSelector:@selector(application:didReceiveRemoteNotification:)]) {
 // iOS 10 deprecation
@@ -124,7 +124,7 @@ - (void)checkNotificationForwardingWithCallback:(FIRAuthNotificationForwardingCa
       [self->_application.delegate application:self->_application
                   didReceiveRemoteNotification:proberNotification];
 #pragma clang diagnostic pop
-#endif
+#endif  // !TARGET_OS_TV && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
     } else {
       FIRLogWarning(kFIRLoggerAuth, @"I-AUT000015",
                     @"The UIApplicationDelegate must handle remote notification for phone number "
diff --git a/FirebaseAuth/Sources/User/FIRUser.m b/FirebaseAuth/Sources/User/FIRUser.m
@@ -850,7 +850,7 @@ - (void)reauthenticateWithCredential:(FIRAuthCredential *)credential
 - (void)reauthenticateWithProvider:(id<FIRFederatedAuthProvider>)provider
                         UIDelegate:(nullable id<FIRAuthUIDelegate>)UIDelegate
                         completion:(nullable FIRAuthDataResultCallback)completion {
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
   dispatch_async(FIRAuthGlobalWorkQueue(), ^{
     [provider getCredentialWithUIDelegate:UIDelegate
                                completion:^(FIRAuthCredential *_Nullable credential,
@@ -863,7 +863,7 @@ - (void)reauthenticateWithProvider:(id<FIRFederatedAuthProvider>)provider
                                                          completion:completion];
                                }];
   });
-#endif  // TARGET_OS_IOS
+#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
 }
 
 - (nullable NSString *)refreshToken {
@@ -1339,7 +1339,7 @@ - (void)linkWithCredential:(FIRAuthCredential *)credential
 - (void)linkWithProvider:(id<FIRFederatedAuthProvider>)provider
               UIDelegate:(nullable id<FIRAuthUIDelegate>)UIDelegate
               completion:(nullable FIRAuthDataResultCallback)completion {
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
   dispatch_async(FIRAuthGlobalWorkQueue(), ^{
     [provider getCredentialWithUIDelegate:UIDelegate
                                completion:^(FIRAuthCredential *_Nullable credential,
@@ -1351,7 +1351,7 @@ - (void)linkWithProvider:(id<FIRFederatedAuthProvider>)provider
                                  [self linkWithCredential:credential completion:completion];
                                }];
   });
-#endif  // TARGET_OS_IOS
+#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
 }
 
 - (void)unlinkFromProvider:(NSString *)provider
diff --git a/FirebaseAuth/Sources/Utilities/FIRAuthDefaultUIDelegate.m b/FirebaseAuth/Sources/Utilities/FIRAuthDefaultUIDelegate.m
@@ -91,12 +91,14 @@ - (void)dismissViewControllerAnimated:(BOOL)flag completion:(nullable void (^)(v
       }
     }
   } else {
+#if TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
     UIApplication *application = [applicationClass sharedApplication];
 // iOS 13 deprecation
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
     topViewController = application.keyWindow.rootViewController;
 #pragma clang diagnostic pop
+#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
   }
 #else
   UIApplication *application = [applicationClass sharedApplication];
diff --git a/FirebaseAuth/Sources/Utilities/FIRAuthURLPresenter.h b/FirebaseAuth/Sources/Utilities/FIRAuthURLPresenter.h
@@ -15,7 +15,7 @@
  */
 
 #import <TargetConditionals.h>
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
 
 #import <Foundation/Foundation.h>
 
@@ -66,4 +66,4 @@ typedef BOOL (^FIRAuthURLCallbackMatcher)(NSURL *_Nullable callbackURL);
 
 NS_ASSUME_NONNULL_END
 
-#endif
+#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
diff --git a/FirebaseAuth/Sources/Utilities/FIRAuthURLPresenter.m b/FirebaseAuth/Sources/Utilities/FIRAuthURLPresenter.m
@@ -15,7 +15,7 @@
  */
 
 #import <TargetConditionals.h>
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
 
 #import <SafariServices/SafariServices.h>
 #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRAuthUIDelegate.h"
@@ -205,4 +205,4 @@ - (void)finishPresentationWithURL:(nullable NSURL *)URL error:(nullable NSError
 
 NS_ASSUME_NONNULL_END
 
-#endif
+#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
diff --git a/FirebaseAuth/Sources/Utilities/FIRAuthWebView.h b/FirebaseAuth/Sources/Utilities/FIRAuthWebView.h
@@ -15,7 +15,7 @@
  */
 
 #import <TargetConditionals.h>
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
 
 #import <UIKit/UIKit.h>
 #import <WebKit/WebKit.h>
@@ -41,4 +41,4 @@ NS_ASSUME_NONNULL_BEGIN
 
 NS_ASSUME_NONNULL_END
 
-#endif
+#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
diff --git a/FirebaseAuth/Sources/Utilities/FIRAuthWebView.m b/FirebaseAuth/Sources/Utilities/FIRAuthWebView.m
@@ -15,7 +15,7 @@
  */
 
 #import <TargetConditionals.h>
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
 
 #import "FirebaseAuth/Sources/Utilities/FIRAuthWebView.h"
 
@@ -101,4 +101,4 @@ - (UIActivityIndicatorView *)createSpinner {
 
 NS_ASSUME_NONNULL_END
 
-#endif
+#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
diff --git a/FirebaseAuth/Sources/Utilities/FIRAuthWebViewController.m b/FirebaseAuth/Sources/Utilities/FIRAuthWebViewController.m
@@ -15,7 +15,7 @@
  */
 
 #import <TargetConditionals.h>
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
 
 #import "FirebaseAuth/Sources/Utilities/FIRAuthWebView.h"
 #import "FirebaseAuth/Sources/Utilities/FIRAuthWebViewController.h"
@@ -115,4 +115,4 @@ - (void)webView:(WKWebView *)webView
 
 NS_ASSUME_NONNULL_END
 
-#endif
+#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
diff --git a/FirebaseAuth/Tests/Unit/FIRAuthAPNSTokenManagerTests.m b/FirebaseAuth/Tests/Unit/FIRAuthAPNSTokenManagerTests.m
@@ -36,6 +36,8 @@
  */
 static const NSTimeInterval kExpectationTimeout = 2;
 
+#if TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
+
 /** @class FIRAuthLegacyUIApplication
     @brief A fake legacy (< iOS 7) UIApplication class.
     @remarks A custom class is needed because `respondsToSelector:` itself cannot be mocked.
@@ -58,6 +60,8 @@ - (void)registerForRemoteNotificationTypes:(UIRemoteNotificationType)types {
 
 @end
 
+#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
+
 /** @class FIRAuthAPNSTokenManagerTests
     @brief Unit tests for @c FIRAuthAPNSTokenManager .
  */
@@ -237,6 +241,8 @@ - (void)testCancel {
   OCMVerifyAll(_mockApplication);
 }
 
+#if TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
+
 /** @fn testLegacyRegistration
     @brief Tests remote notification registration on legacy systems.
  */
@@ -272,8 +278,10 @@ - (void)testLegacyRegistration {
   [self waitForExpectationsWithTimeout:kExpectationTimeout handler:nil];
 }
 
+#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
+
 @end
 
 NS_ASSUME_NONNULL_END
 
-#endif
+#endif  // TARGET_OS_IOS
diff --git a/FirebaseAuth/Tests/Unit/FIRAuthURLPresenterTests.m b/FirebaseAuth/Tests/Unit/FIRAuthURLPresenterTests.m
@@ -15,7 +15,7 @@
  */
 
 #import <TargetConditionals.h>
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
 
 #import <Foundation/Foundation.h>
 #import <OCMock/OCMock.h>
@@ -146,4 +146,4 @@ - (void)testFIRAuthURLPresenterUsingDefaultUIDelegate:(BOOL)usesDefaultUIDelegat
 
 @end
 
-#endif
+#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
diff --git a/FirebaseAuth/Tests/Unit/FIROAuthProviderTests.m b/FirebaseAuth/Tests/Unit/FIROAuthProviderTests.m
@@ -198,10 +198,12 @@ @implementation FIROAuthProviderTests {
    */
   id _mockAuth;
 
+#if !defined(TARGET_OS_XR) || !TARGET_OS_XR
   /** @var _mockURLPresenter
       @brief The mock @c FIRAuthURLPresenter instance associated with @c _mockAuth.
    */
   id _mockURLPresenter;
+#endif  // !defined(TARGET_OS_XR) || !TARGET_OS_XR
 
   /** @var _mockApp
       @brief The mock @c FIRApp instance associated with @c _mockAuth.
@@ -229,8 +231,10 @@ - (void)setUp {
   _mockOptions = OCMClassMock([FIROptions class]);
   OCMStub([(FIRApp *)_mockApp options]).andReturn(_mockOptions);
   OCMStub([_mockOptions googleAppID]).andReturn(kFakeFirebaseAppID);
+#if !defined(TARGET_OS_XR) || !TARGET_OS_XR
   _mockURLPresenter = OCMClassMock([FIRAuthURLPresenter class]);
   OCMStub([_mockAuth authURLPresenter]).andReturn(_mockURLPresenter);
+#endif  // !defined(TARGET_OS_XR) || !TARGET_OS_XR
   _mockRequestConfiguration = OCMClassMock([FIRAuthRequestConfiguration class]);
   OCMStub([_mockAuth requestConfiguration]).andReturn(_mockRequestConfiguration);
   OCMStub([_mockRequestConfiguration APIKey]).andReturn(kFakeAPIKey);
@@ -299,6 +303,8 @@ - (void)testObtainingOAuthProvider {
   XCTAssertEqualObjects(OAuthProvider.providerID, kFakeProviderID);
 }
 
+#if !defined(TARGET_OS_XR) || !TARGET_OS_XR
+
 /** @fn testGetCredentialWithUIDelegateWithClientID
     @brief Tests a successful invocation of @c getCredentialWithUIDelegte:completion:
  */
@@ -1439,6 +1445,8 @@ - (void)testGetCredentialWithUIDelegateWithAppCheckToken {
   OCMVerifyAll(_mockBackend);
 }
 
+#endif  // !defined(TARGET_OS_XR) || !TARGET_OS_XR
+
 @end
 
-#endif
+#endif  // TARGET_OS_IOS
diff --git a/FirebaseAuth/Tests/Unit/FIRPhoneAuthProviderTests.m b/FirebaseAuth/Tests/Unit/FIRPhoneAuthProviderTests.m
@@ -15,7 +15,7 @@
  */
 
 #import <TargetConditionals.h>
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
 
 #import <OCMock/OCMock.h>
 #import <SafariServices/SafariServices.h>
@@ -1659,4 +1659,4 @@ - (void)verifyReCAPTCHAVerificationFlowWithUIDelegateAndAppCheckToken:
 
 NS_ASSUME_NONNULL_END
 
-#endif
+#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ + (instancetype)providerWithProviderID:(NSString )providerID auth:(FIRAuth )au`
`149`	`149`	`return [[self alloc] initWithProviderID:providerID auth:auth];`
`150`	`150`	`}`
`151`	`151`
`152`		`-#if TARGET_OS_IOS`
	`152`	`+#if TARGET_OS_IOS && (!defined(TARGET_OS_XR) \|\| !TARGET_OS_XR)`
`153`	`153`	`- (void)getCredentialWithUIDelegate:(nullable id<FIRAuthUIDelegate>)UIDelegate`
`154`	`154`	`completion:(nullable FIRAuthCredentialCallback)completion {`
`155`	`155`	`if (![FIRAuthWebUtils isCallbackSchemeRegisteredForCustomURLScheme:self->_callbackScheme]) {`
`@@ -216,7 +216,7 @@ - (void)getCredentialWithUIDelegate:(nullable id<FIRAuthUIDelegate>)UIDelegate`
`216`	`216`	`}];`
`217`	`217`	`});`
`218`	`218`	`}`
`219`		`-#endif // TARGET_OS_IOS`
	`219`	`+#endif // TARGET_OS_IOS && (!defined(TARGET_OS_XR) \|\| !TARGET_OS_XR)`
`220`	`220`
`221`	`221`	`#pragma mark - Internal Methods`
`222`	`222`
Original file line number	Diff line number	Diff line change
`@@ -91,12 +91,14 @@ - (void)dismissViewControllerAnimated:(BOOL)flag completion:(nullable void (^)(v`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`	`} else {`
	`94`	`+#if TARGET_OS_IOS && (!defined(TARGET_OS_XR) \|\| !TARGET_OS_XR)`
`94`	`95`	`UIApplication *application = [applicationClass sharedApplication];`
`95`	`96`	`// iOS 13 deprecation`
`96`	`97`	`#pragma clang diagnostic push`
`97`	`98`	`#pragma clang diagnostic ignored "-Wdeprecated-declarations"`
`98`	`99`	`topViewController = application.keyWindow.rootViewController;`
`99`	`100`	`#pragma clang diagnostic pop`
	`101`	`+#endif // TARGET_OS_IOS && (!defined(TARGET_OS_XR) \|\| !TARGET_OS_XR)`
`100`	`102`	`}`
`101`	`103`	`#else`
`102`	`104`	`UIApplication *application = [applicationClass sharedApplication];`