Adding watchOS support to Auth.

Author: ryanwilson

FirebaseAuth.podspec

@@ -20,6 +20,7 @@ supports email and password accounts, as well as several 3rd party authenticatio
   s.ios.deployment_target = '8.0'
   s.osx.deployment_target = '10.11'
   s.tvos.deployment_target = '10.0'
+  s.watchos.deployment_target = '6.0'
 
   s.cocoapods_version = '>= 1.4.0'
   s.static_framework = true
@@ -44,10 +45,12 @@ supports email and password accounts, as well as several 3rd party authenticatio
   s.dependency 'FirebaseAuthInterop', '~> 1.0'
   s.dependency 'FirebaseCore', '~> 6.6'
   s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 6.5'
-  s.dependency 'GoogleUtilities/Environment', '~> 6.5'
+  s.dependency 'GoogleUtilities/Environment', '~> 6.6'
   s.dependency 'GTMSessionFetcher/Core', '~> 1.1'
 
   s.test_spec 'unit' do |unit_tests|
+    # Unit tests can't run on watchOS.
+    unit_tests.platforms = {:ios => '8.0', :osx => '10.11', :tvos => '10.0'}
     unit_tests.source_files = 'FirebaseAuth/Tests/Unit/*.[mh]'
     unit_tests.osx.exclude_files = [
       'FirebaseAuth/Tests/Unit/FIRAuthAPNSTokenManagerTests.m',

FirebaseAuth/Sources/Auth/FIRAuth.m

@@ -32,6 +32,7 @@
 #import <GoogleUtilities/GULAppDelegateSwizzler.h>
 #import <GoogleUtilities/GULAppEnvironmentUtil.h>
 #import <GoogleUtilities/GULSceneDelegateSwizzler.h>
+#import <GoogleUtilities/GULSecureCoding.h>
 
 #import "FirebaseAuth/Sources/Auth/FIRAuthDataResult_Internal.h"
 #import "FirebaseAuth/Sources/Auth/FIRAuthDispatcher.h"
@@ -2005,16 +2006,13 @@ - (BOOL)saveUser:(nullable FIRUser *)user error:(NSError *_Nullable *_Nullable)o
     if (!user) {
       success = [_keychainServices removeDataForKey:userKey error:outError];
     } else {
-      // Encode the user object.
-      NSMutableData *archiveData = [NSMutableData data];
-// iOS 12 deprecation
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-      NSKeyedArchiver *archiver =
-          [[NSKeyedArchiver alloc] initForWritingWithMutableData:archiveData];
-#pragma clang diagnostic pop
-      [archiver encodeObject:user forKey:userKey];
-      [archiver finishEncoding];
+      NSData *archiveData = [GULSecureCoding archivedDataWithObject:user
+                                                            toKey:userKey
+                                                            error:outError];
+      if (outError && *outError) {
+        // Error archiving the data.
+        return NO;
+      }
 
       // Save the user object's encoded value.
       success = [_keychainServices setData:archiveData forKey:userKey error:outError];
@@ -2058,13 +2056,15 @@ - (BOOL)getUser:(FIRUser *_Nullable *)outUser error:(NSError *_Nullable *_Nullab
       *outUser = nil;
       return YES;
     }
-// iOS 12 deprecation
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    NSKeyedUnarchiver *unarchiver =
-        [[NSKeyedUnarchiver alloc] initForReadingWithData:encodedUserData];
-#pragma clang diagnostic pop
-    FIRUser *user = [unarchiver decodeObjectOfClass:[FIRUser class] forKey:userKey];
+    FIRUser *user = [GULSecureCoding unarchivedObjectOfClass:[FIRUser class]
+                                                    fromData:encodedUserData
+                                                         key:userKey
+                                                       error:error];
+    if (error && *error) {
+      // An error occurred when unarchiving the user, operation failed.
+      return NO;
+    }
+
     user.auth = self;
     *outUser = user;
 
@@ -2230,13 +2230,10 @@ - (nullable FIRUser *)getStoredUserForAccessGroup:(NSString *_Nullable)accessGro
       return nil;
     }
 
-// iOS 12 deprecation
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    NSKeyedUnarchiver *unarchiver =
-        [[NSKeyedUnarchiver alloc] initForReadingWithData:encodedUserData];
-#pragma clang diagnostic pop
-    user = [unarchiver decodeObjectOfClass:[FIRUser class] forKey:userKey];
+    user = [GULSecureCoding unarchivedObjectOfClass:[FIRUser class]
+                                           fromData:encodedUserData
+                                                key:userKey
+                                              error:outError];
   } else {
     user = [self.storedUserManager getStoredUserForAccessGroup:self.userAccessGroup
                                              projectIdentifier:self.app.options.APIKey

FirebaseAuth/Sources/Public/FIRAuth.h

@@ -456,7 +456,7 @@ NS_SWIFT_NAME(Auth)
 
 - (void)signInWithEmail:(NSString *)email
                    link:(NSString *)link
-             completion:(nullable FIRAuthDataResultCallback)completion;
+             completion:(nullable FIRAuthDataResultCallback)completion API_AVAILABLE(ios(8.0), macos(10.10));
 
 /** @fn signInWithProvider:UIDelegate:completion:
     @brief Signs in using the provided auth provider instance.
@@ -736,7 +736,8 @@ NS_SWIFT_NAME(Auth)
  */
 - (void)sendSignInLinkToEmail:(NSString *)email
            actionCodeSettings:(FIRActionCodeSettings *)actionCodeSettings
-                   completion:(nullable FIRSendSignInLinkToEmailCallback)completion;
+                   completion:(nullable FIRSendSignInLinkToEmailCallback)completion
+API_AVAILABLE(ios(8.0), macos(10.10));
 
 /** @fn signOut:
     @brief Signs out the current user.

FirebaseAuth/Sources/Public/FIRGameCenterAuthProvider.h

@@ -41,8 +41,10 @@ typedef void (^FIRGameCenterCredentialCallback)(FIRAuthCredential *_Nullable cre
     NS_SWIFT_NAME(GameCenterCredentialCallback);
 
 /** @class FIRGameCenterAuthProvider
-    @brief A concrete implementation of @c FIRAuthProvider for Game Center Sign In.
+    @brief A concrete implementation of @c FIRAuthProvider for Game Center Sign In. Not available on
+           watchOS.
  */
+API_AVAILABLE(ios(8.0), macosx(10.11), tvos(10.0))
 NS_SWIFT_NAME(GameCenterAuthProvider)
 @interface FIRGameCenterAuthProvider : NSObject
 

FirebaseAuth/Sources/SystemService/FIRAuthAPNSTokenManager.h

@@ -18,7 +18,11 @@
 #if !TARGET_OS_OSX
 
 #import <Foundation/Foundation.h>
+#if TARGET_OS_WATCH
+#import <WatchKit/WatchKit.h>
+#else
 #import <UIKit/UIKit.h>
+#endif  // TARGET_OS_WATCH
 
 @class FIRAuthAPNSToken;
 
@@ -56,12 +60,21 @@ typedef void (^FIRAuthAPNSTokenCallback)(FIRAuthAPNSToken *_Nullable token,
  */
 - (instancetype)init NS_UNAVAILABLE;
 
-/** @fn initWithApplication:bundle
+#if TARGET_OS_WATCH
+/** @fn initWithApplication:
+    @brief Initializes the instance.
+    @param application The @c WKExtension  to request the token from.
+    @return The initialized instance.
+ */
+- (instancetype)initWithApplication:(WKExtension *)application NS_DESIGNATED_INITIALIZER;
+#else
+/** @fn initWithApplication:
     @brief Initializes the instance.
     @param application The @c UIApplication to request the token from.
     @return The initialized instance.
  */
 - (instancetype)initWithApplication:(UIApplication *)application NS_DESIGNATED_INITIALIZER;
+#endif  // TARGET_OS_WATCH
 
 /** @fn getTokenWithCallback:
     @brief Attempts to get the APNs token.

FirebaseAuth/Sources/SystemService/FIRAuthAPNSTokenManager.m

@@ -39,18 +39,29 @@
 static const NSTimeInterval kLegacyRegistrationTimeout = 30;
 
 @implementation FIRAuthAPNSTokenManager {
+#if TARGET_OS_WATCH
+  /** @var _application
+      @brief The @c WKExtension to request the token from.
+  */
+  WKExtension *_application;
+#else
   /** @var _application
       @brief The @c UIApplication to request the token from.
    */
   UIApplication *_application;
+#endif  // TARGET_OS_WATCH
 
   /** @var _pendingCallbacks
       @brief The list of all pending callbacks for the APNs token.
    */
   NSMutableArray<FIRAuthAPNSTokenCallback> *_pendingCallbacks;
 }
 
+#if TARGET_OS_WATCH
+- (instancetype)initWithApplication:(WKExtension *)application {
+#else
 - (instancetype)initWithApplication:(UIApplication *)application {
+#endif  // TARGET_OS_WATCH
   self = [super init];
   if (self) {
     _application = application;

FirebaseAuth/Sources/SystemService/FIRAuthAppCredentialManager.m

@@ -22,6 +22,8 @@
 #import "FirebaseAuth/Sources/SystemService/FIRAuthAppCredential.h"
 #import "FirebaseAuth/Sources/SystemService/FIRAuthAppCredentialManager.h"
 
+#import <GoogleUtilities/GULSecureCoding.h>
+
 NS_ASSUME_NONNULL_BEGIN
 
 /** @var kKeychainDataKey
@@ -69,22 +71,24 @@ - (instancetype)initWithKeychain:(FIRAuthKeychainServices *)keychain {
     NSError *error;
     NSData *encodedData = [_keychainServices dataForKey:kKeychainDataKey error:&error];
     if (!error && encodedData) {
-// iOS 12 deprecation
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-      NSKeyedUnarchiver *unarchiver =
-          [[NSKeyedUnarchiver alloc] initForReadingWithData:encodedData];
-#pragma clang diagnostic pop
-      FIRAuthAppCredential *credential =
-          [unarchiver decodeObjectOfClass:[FIRAuthAppCredential class] forKey:kFullCredentialKey];
-      if ([credential isKindOfClass:[FIRAuthAppCredential class]]) {
+      NSError *credentialError;
+      FIRAuthAppCredential *credential = [GULSecureCoding unarchivedObjectOfClass:[FIRAuthAppCredential class]
+                                                                         fromData:encodedData
+                                                                              key:kFullCredentialKey
+                                                                            error:&credentialError];
+
+      if ([credential isKindOfClass:[FIRAuthAppCredential class]] && !credentialError) {
         _credential = credential;
       }
+
+      NSError *receiptsError;
       NSSet<Class> *allowedClasses =
           [NSSet<Class> setWithObjects:[NSArray class], [NSString class], nil];
-      NSArray<NSString *> *pendingReceipts = [unarchiver decodeObjectOfClasses:allowedClasses
-                                                                        forKey:kPendingReceiptsKey];
-      if ([pendingReceipts isKindOfClass:[NSArray class]]) {
+      NSArray<NSString *> *pendingReceipts = [GULSecureCoding unarchivedObjectOfClasses:allowedClasses
+                                                                               fromData:encodedData
+                                                                                    key:kPendingReceiptsKey
+                                                                                  error:&receiptsError];
+      if ([pendingReceipts isKindOfClass:[NSArray class]] && !receiptsError) {
         _pendingReceipts = [pendingReceipts mutableCopy];
       }
     }

FirebaseAuth/Sources/SystemService/FIRAuthNotificationManager.h

@@ -18,7 +18,11 @@
 #if !TARGET_OS_OSX
 
 #import <Foundation/Foundation.h>
+#if TARGET_OS_WATCH
+#import <WatchKit/WatchKit.h>
+#else
 #import <UIKit/UIKit.h>
+#endif
 
 @class FIRAuthAppCredentialManager;
 
@@ -40,6 +44,17 @@ typedef void (^FIRAuthNotificationForwardingCallback)(BOOL isNotificationBeingFo
  */
 @property(nonatomic, assign) NSTimeInterval timeout;
 
+#if TARGET_OS_WATCH
+/** @fn initWithApplication:appCredentialManager:
+    @brief Initializes the instance.
+    @param application The extension.
+    @param appCredentialManager The object to handle app credentials delivered via notification.
+    @return The initialized instance.
+ */
+- (instancetype)initWithApplication:(WKExtension *)application
+               appCredentialManager:(FIRAuthAppCredentialManager *)appCredentialManager
+    NS_DESIGNATED_INITIALIZER;
+#else
 /** @fn initWithApplication:appCredentialManager:
     @brief Initializes the instance.
     @param application The application.
@@ -49,6 +64,7 @@ typedef void (^FIRAuthNotificationForwardingCallback)(BOOL isNotificationBeingFo
 - (instancetype)initWithApplication:(UIApplication *)application
                appCredentialManager:(FIRAuthAppCredentialManager *)appCredentialManager
     NS_DESIGNATED_INITIALIZER;
+#endif  // TARGET_OS_WATCH
 
 /** @fn init
     @brief please use initWithAppCredentialManager: instead.

FirebaseAuth/Sources/SystemService/FIRAuthNotificationManager.m

@@ -52,10 +52,17 @@
 static const NSTimeInterval kProbingTimeout = 1;
 
 @implementation FIRAuthNotificationManager {
+#if TARGET_OS_WATCH
+  /** @var _application
+      @brief The extension.
+   */
+  WKExtension *_application;
+#else
   /** @var _application
       @brief The application.
    */
   UIApplication *_application;
+#endif
 
   /** @var _appCredentialManager
       @brief The object to handle app credentials delivered via notification.
@@ -78,7 +85,11 @@ @implementation FIRAuthNotificationManager {
   NSMutableArray<FIRAuthNotificationForwardingCallback> *_pendingCallbacks;
 }
 
+#if TARGET_OS_WATCH
+- (instancetype)initWithApplication:(WKExtension *)application
+#else
 - (instancetype)initWithApplication:(UIApplication *)application
+#endif
                appCredentialManager:(FIRAuthAppCredentialManager *)appCredentialManager {
   self = [super init];
   if (self) {
@@ -107,23 +118,34 @@ - (void)checkNotificationForwardingWithCallback:(FIRAuthNotificationForwardingCa
         kNotificationProberKey : @"This fake notification should be forwarded to Firebase Auth."
       }
     };
+#if TARGET_OS_WATCH
+    if ([self->_application.delegate respondsToSelector:@selector(didReceiveRemoteNotification:
+                                                                        fetchCompletionHandler:)]) {
+      [self->_application.delegate didReceiveRemoteNotification:proberNotification
+                                         fetchCompletionHandler:^(WKBackgroundFetchResult result){
+                                         }];
+    }
+#else
     if ([self->_application.delegate
             respondsToSelector:@selector(application:
                                    didReceiveRemoteNotification:fetchCompletionHandler:)]) {
       [self->_application.delegate application:self->_application
                   didReceiveRemoteNotification:proberNotification
                         fetchCompletionHandler:^(UIBackgroundFetchResult result){
                         }];
-#if !TARGET_OS_TV
-    } else if ([self->_application.delegate
-                   respondsToSelector:@selector(application:didReceiveRemoteNotification:)]) {
+    }
+#endif
+#if !TARGET_OS_TV && !TARGET_OS_WATCH
+    // Broke `else if` style guidelines to make it more readable with the platform conditionals.
+    else if ([self->_application.delegate respondsToSelector:@selector(application:
+                                                                 didReceiveRemoteNotification:)]) {
 // iOS 10 deprecation
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
       [self->_application.delegate application:self->_application
                   didReceiveRemoteNotification:proberNotification];
 #pragma clang diagnostic pop
-#endif
+#endif  // !TARGET_OS_TV && !TARGET_OS_WATCH
     } else {
       FIRLogWarning(kFIRLoggerAuth, @"I-AUT000015",
                     @"The UIApplicationDelegate must handle remote notification for phone number "

FirebaseAuth/Sources/SystemService/FIRAuthStoredUserManager.h

@@ -66,9 +66,9 @@ NS_ASSUME_NONNULL_BEGIN
         we use API KEY.
     @param outError Return value for any error which occurs.
  */
-- (FIRUser *)getStoredUserForAccessGroup:(NSString *)accessGroup
-                       projectIdentifier:(NSString *)projectIdentifier
-                                   error:(NSError *_Nullable *_Nullable)outError;
+- (FIRUser *_Nullable)getStoredUserForAccessGroup:(NSString *)accessGroup
+                                projectIdentifier:(NSString *)projectIdentifier
+                                            error:(NSError *_Nullable *_Nullable)outError;
 
 /** @fn setStoredUser:forAccessGroup:projectID:error:
     @brief The setter of the user stored locally.