Fixes Auth build when module is disabled (#231)

* Changes "@import" to "@import" to make the code buildable when module is disabled.
Also rearranges code to merge two #if blocks.

* Makes comments more accurate.

* Fixes comments.

3 files changed, 11 insertions, 12 deletions

diff --git a/Firebase/Auth/Source/FIRAuthURLPresenter.m b/Firebase/Auth/Source/FIRAuthURLPresenter.m
index fc84383..138a71a 100644
--- a/Firebase/Auth/Source/FIRAuthURLPresenter.m
+++ b/Firebase/Auth/Source/FIRAuthURLPresenter.m
@@ -16,11 +16,11 @@
 
 #import "FIRAuthURLPresenter.h"
 
+#import <SafariServices/SafariServices.h>
+
 #import "FIRAuthErrorUtils.h"
 #import "FIRAuthUIDelegate.h"
 
-@import SafariServices;
-
 NS_ASSUME_NONNULL_BEGIN
 
 @interface FIRAuthDefaultUIDelegate : NSObject <FIRAuthUIDelegate>
diff --git a/Firebase/Auth/Source/FIRAuth_Internal.h b/Firebase/Auth/Source/FIRAuth_Internal.h
index a89ebf9..8f1e315 100644
--- a/Firebase/Auth/Source/FIRAuth_Internal.h
+++ b/Firebase/Auth/Source/FIRAuth_Internal.h
@@ -31,13 +31,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface FIRAuth ()
 
-#if TARGET_OS_IOS
-/** @property authURLPresenter
-    @brief An object that takes care of presenting URLs via the auth instance.
- */
-@property(nonatomic, strong, readonly) FIRAuthURLPresenter *authURLPresenter;
-#endif
-
 /** @property requestConfiguration
     @brief The configuration object comprising of paramters needed to make a request to Firebase
         Auth's backend.
@@ -45,6 +38,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic, copy, readonly) FIRAuthRequestConfiguration *requestConfiguration;
 
 #if TARGET_OS_IOS
+
 /** @property tokenManager
     @brief The manager for APNs tokens used by phone number auth.
  */
@@ -59,7 +53,13 @@ NS_ASSUME_NONNULL_BEGIN
     @brief The manager for remote notifications used by phone number auth.
  */
 @property(nonatomic, strong, readonly) FIRAuthNotificationManager *notificationManager;
-#endif
+
+/** @property authURLPresenter
+    @brief An object that takes care of presenting URLs via the auth instance.
+ */
+@property(nonatomic, strong, readonly) FIRAuthURLPresenter *authURLPresenter;
+
+#endif // TARGET_OS_IOS
 
 /** @fn initWithAPIKey:appName:
     @brief Designated initializer.
diff --git a/Firebase/Auth/Source/Public/FIRPhoneAuthProvider.h b/Firebase/Auth/Source/Public/FIRPhoneAuthProvider.h
index 5acc500..05cb5dc 100644
--- a/Firebase/Auth/Source/Public/FIRPhoneAuthProvider.h
+++ b/Firebase/Auth/Source/Public/FIRPhoneAuthProvider.h
@@ -90,8 +90,7 @@ FIR_SWIFT_NAME(PhoneAuthProvider)
     @brief Starts the phone number authentication flow by sending a verifcation code to the
         specified phone number.
     @param phoneNumber The phone number to be verified.
-    @param UIDelegate A view controller object used to present the SFSafariViewController or
-        WKWebview.
+    @param UIDelegate An object used to present the SFSafariViewController.
     @param completion The callback to be invoked when the verification flow is finished.
     @remarks Possible error codes:
     <ul>