[AppCheck] DeviceCheck provider is supported by watchOS 9.0+ (#10094)

* [AppCheck] DeviceCheck provider is supported by watchOS 9.0+ * Update CHANGELOG * trailing whitespace * Review
firebase · Aug 12, 2022 · 62c7752 · 62c7752
1 parent 45ee209
commit 62c7752
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 10 deletions.
diff --git a/FirebaseAppCheck/CHANGELOG.md b/FirebaseAppCheck/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 9.5.0
+- [added] AppCheck's DeviceCheck provider is available for watchOS 9.0+.
+
 # 9.0.0
 - [added] **Breaking change:** `FirebaseAppCheck` has exited beta and is now
   generally available for use.

diff --git a/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckAvailability.h b/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckAvailability.h
@@ -16,17 +16,34 @@
 
 // Availability conditions for different App Check SDK components.
 
+#import <Foundation/Foundation.h>
 #import <TargetConditionals.h>
 
 #pragma mark - DeviceCheck
 
+// DeviceCheck availability was extended to watchOS in Xcode 14.
+#if defined(__WATCHOS_9_0) && __WATCH_OS_VERSION_MAX_ALLOWED >= __WATCHOS_9_0
+
+// Targets where DeviceCheck framework is available to be used in preprocessor conditions.
+#define FIR_DEVICE_CHECK_SUPPORTED_TARGETS \
+  TARGET_OS_IOS || TARGET_OS_OSX || TARGET_OS_TV || TARGET_OS_WATCH
+
+// `DeviceCheckProvider` availability.
+#define FIR_DEVICE_CHECK_PROVIDER_AVAILABILITY \
+  API_AVAILABLE(ios(11.0), macos(10.15), tvos(11.0), watchos(9.0))
+
+// TODO(ncooke3): Remove `#else` clause when Xcode 14 is the minimum supported Xcode.
+#else  // defined(__WATCHOS_9_0) && __WATCH_OS_VERSION_MAX_ALLOWED >= __WATCHOS_9_0
+
 // Targets where DeviceCheck framework is available to be used in preprocessor conditions.
 #define FIR_DEVICE_CHECK_SUPPORTED_TARGETS TARGET_OS_IOS || TARGET_OS_OSX || TARGET_OS_TV
 
 // `DeviceCheckProvider` availability.
 #define FIR_DEVICE_CHECK_PROVIDER_AVAILABILITY \
   API_AVAILABLE(ios(11.0), macos(10.15), tvos(11.0)) API_UNAVAILABLE(watchos)
 
+#endif  // defined(__WATCHOS_9_0) && __WATCH_OS_VERSION_MAX_ALLOWED >= __WATCHOS_9_0
+
 #pragma mark - App Attest
 
 // App Attest availability was extended to macOS and Mac Catalyst in Xcode 12.5.

diff --git a/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckTests.m b/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckTests.m
@@ -38,6 +38,10 @@
 
 #import "FirebaseCore/Extension/FirebaseCoreInternal.h"
 
+// Since DeviceCheck is the default attestation provider for AppCheck, disable
+// test cases that may be dependent on DeviceCheck being available.
+#if FIR_DEVICE_CHECK_SUPPORTED_TARGETS
+
 // The FAC token value returned when an error occurs.
 static NSString *const kDummyToken = @"eyJlcnJvciI6IlVOS05PV05fRVJST1IifQ==";
 
@@ -1009,3 +1013,5 @@ - (void)verifyAllMocks {
 }
 
 @end
+
+#endif  // FIR_DEVICE_CHECK_SUPPORTED_TARGETS
diff --git a/FirebaseAppCheck/Tests/Unit/DeviceCheckProvider/FIRDeviceCheckProviderTests.m b/FirebaseAppCheck/Tests/Unit/DeviceCheckProvider/FIRDeviceCheckProviderTests.m
@@ -28,17 +28,9 @@
 
 #import "SharedTestUtilities/AppCheckBackoffWrapperFake/FIRAppCheckBackoffWrapperFake.h"
 
-API_AVAILABLE(ios(11.0), macos(10.15), tvos(11.0))
-API_UNAVAILABLE(watchos)
-@interface FIRDeviceCheckProviderTests : XCTestCase
-
-@property(nonatomic) FIRDeviceCheckProvider *provider;
-@property(nonatomic) id fakeAPIService;
-@property(nonatomic) id fakeTokenGenerator;
-@property(nonatomic) FIRAppCheckBackoffWrapperFake *fakeBackoffWrapper;
-
-@end
+#if FIR_DEVICE_CHECK_SUPPORTED_TARGETS
 
+FIR_DEVICE_CHECK_PROVIDER_AVAILABILITY
 @interface FIRDeviceCheckProvider (Tests)
 
 - (instancetype)initWithAPIService:(id<FIRDeviceCheckAPIServiceProtocol>)APIService
@@ -47,6 +39,16 @@ - (instancetype)initWithAPIService:(id<FIRDeviceCheckAPIServiceProtocol>)APIServ
 
 @end
 
+FIR_DEVICE_CHECK_PROVIDER_AVAILABILITY
+@interface FIRDeviceCheckProviderTests : XCTestCase
+
+@property(nonatomic) FIRDeviceCheckProvider *provider;
+@property(nonatomic) id fakeAPIService;
+@property(nonatomic) id fakeTokenGenerator;
+@property(nonatomic) FIRAppCheckBackoffWrapperFake *fakeBackoffWrapper;
+
+@end
+
 @implementation FIRDeviceCheckProviderTests
 
 - (void)setUp {
@@ -268,3 +270,5 @@ - (void)testGetTokenBackoff {
 }
 
 @end
+
+#endif  // FIR_DEVICE_CHECK_SUPPORTED_TARGETS