Implement FIRAppCheckSettings as subclass (#11597)

Added a class GACAppCheckSettings that conforms to GACAppCheckSettingsProtocol and implemented FIRAppCheckSettings as a subclass of it.

Author: andrewheard

AppCheckCore/Sources/Core/GACAppCheckSettings.m

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import "AppCheckCore/Sources/Public/AppCheckCore/GACAppCheckSettings.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@implementation GACAppCheckSettings
+
+@synthesize isTokenAutoRefreshEnabled = _isTokenAutoRefreshEnabled;
+
+@end
+
+NS_ASSUME_NONNULL_END

AppCheckCore/Sources/Public/AppCheckCore/GACAppCheckSettings.h

@@ -23,8 +23,11 @@ NS_SWIFT_NAME(AppCheckCoreSettingsProtocol)
 @protocol GACAppCheckSettingsProtocol <NSObject>
 
 /// If App Check token auto-refresh is enabled.
-@property(nonatomic, readonly) BOOL isTokenAutoRefreshEnabled;
+@property(nonatomic, assign) BOOL isTokenAutoRefreshEnabled;
 
 @end
 
+@interface GACAppCheckSettings : NSObject <GACAppCheckSettingsProtocol>
+@end
+
 NS_ASSUME_NONNULL_END

FirebaseAppCheck/Sources/Core/FIRAppCheckSettings.h

@@ -26,7 +26,7 @@ FOUNDATION_EXPORT NSString *const kFIRAppCheckTokenAutoRefreshEnabledUserDefault
 FOUNDATION_EXPORT NSString *const kFIRAppCheckTokenAutoRefreshEnabledInfoPlistKey;
 
 /// Handles storing and updating the Firebase app check wide settings and parameters.
-@interface FIRAppCheckSettings : NSObject <GACAppCheckSettingsProtocol>
+@interface FIRAppCheckSettings : GACAppCheckSettings
 
 /// If Firebase app check token auto-refresh is allowed.
 @property(nonatomic, assign) BOOL isTokenAutoRefreshEnabled;

FirebaseAppCheck/Sources/Core/FIRAppCheckSettings.m

@@ -31,7 +31,7 @@ @interface FIRAppCheckSettings ()
 @property(nonatomic, readonly) NSUserDefaults *userDefaults;
 @property(nonatomic, readonly) NSBundle *mainBundle;
 @property(nonatomic, readonly) NSString *userDefaultKey;
-@property(nonatomic, nullable) NSNumber *isTokenAutoRefreshEnabledNumber;
+@property(nonatomic, assign) BOOL isTokenAutoRefreshConfigured;
 
 @end
 
@@ -47,16 +47,18 @@ - (instancetype)initWithApp:(FIRApp *)firebaseApp
     _mainBundle = mainBundle;
     _userDefaultKey = [kFIRAppCheckTokenAutoRefreshEnabledUserDefaultsPrefix
         stringByAppendingString:firebaseApp.name];
+    [super setIsTokenAutoRefreshEnabled:NO];
+    _isTokenAutoRefreshConfigured = NO;
   }
   return self;
 }
 
 - (BOOL)isTokenAutoRefreshEnabled {
   @synchronized(self) {
-    if (self.isTokenAutoRefreshEnabledNumber != nil) {
+    if (self.isTokenAutoRefreshConfigured) {
       // Return value form the in-memory cache to avoid accessing the user default or bundle when
       // not required.
-      return self.isTokenAutoRefreshEnabledNumber.boolValue;
+      return [super isTokenAutoRefreshEnabled];
     }
 
     // Check user defaults for a value set during the previous launch.
@@ -71,9 +73,10 @@ - (BOOL)isTokenAutoRefreshEnabled {
 
     if (isTokenAutoRefreshEnabledNumber != nil) {
       // Update in-memory cache.
-      self.isTokenAutoRefreshEnabledNumber = isTokenAutoRefreshEnabledNumber;
+      self.isTokenAutoRefreshConfigured = YES;
+      self.isTokenAutoRefreshEnabled = isTokenAutoRefreshEnabledNumber.boolValue;
       // Return the value.
-      return isTokenAutoRefreshEnabledNumber.boolValue;
+      return [super isTokenAutoRefreshEnabled];
     }
 
     // Fallback to the global data collection flag.
@@ -89,8 +92,9 @@ - (BOOL)isTokenAutoRefreshEnabled {
 
 - (void)setIsTokenAutoRefreshEnabled:(BOOL)isTokenAutoRefreshEnabled {
   @synchronized(self) {
-    self.isTokenAutoRefreshEnabledNumber = @(isTokenAutoRefreshEnabled);
-    [self.userDefaults setObject:self.isTokenAutoRefreshEnabledNumber forKey:self.userDefaultKey];
+    self.isTokenAutoRefreshConfigured = YES;
+    [super setIsTokenAutoRefreshEnabled:isTokenAutoRefreshEnabled];
+    [self.userDefaults setBool:isTokenAutoRefreshEnabled forKey:self.userDefaultKey];
   }
 }
 

FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckSettingsTests.m

@@ -104,7 +104,7 @@ - (void)testIsTokenAutoRefreshEnabledWhenSetThisAppRun {
   OCMReject([self.mockApp isDataCollectionDefaultEnabled]);
 
   // 1.4. Expect the new value to be saved to the user defaults.
-  OCMExpect([self.mockUserDefaults setObject:@(newFlagValue) forKey:self.userDefaultKey]);
+  OCMExpect([self.mockUserDefaults setBool:newFlagValue forKey:self.userDefaultKey]);
 
   // 2. Set flag value.
   self.settings.isTokenAutoRefreshEnabled = newFlagValue;
@@ -206,7 +206,7 @@ - (void)testIsTokenAutoRefreshEnabledWhenAppDeallocated {
 - (void)testSetIsTokenAutoRefreshEnabled {
   // 1. Set first time.
   // 1.1. Expect the new value to be saved to the user defaults.
-  OCMExpect([self.mockUserDefaults setObject:@(YES) forKey:self.userDefaultKey]);
+  OCMExpect([self.mockUserDefaults setBool:YES forKey:self.userDefaultKey]);
 
   // 1.2 Set.
   self.settings.isTokenAutoRefreshEnabled = YES;
@@ -217,7 +217,7 @@ - (void)testSetIsTokenAutoRefreshEnabled {
 
   // 2. Set second time.
   // 2.1. Expect the new value to be saved to the user defaults.
-  OCMExpect([self.mockUserDefaults setObject:@(NO) forKey:self.userDefaultKey]);
+  OCMExpect([self.mockUserDefaults setBool:NO forKey:self.userDefaultKey]);
 
   // 2.2 Set.
   self.settings.isTokenAutoRefreshEnabled = NO;