[AppCheck] Migrate to GoogleUtilities's storage container (#12773)

firebase · Apr 12, 2024 · b6e5270 · b6e5270
1 parent 3211a7f
commit b6e5270
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/FirebaseAppCheck.podspec b/FirebaseAppCheck.podspec
@@ -48,7 +48,8 @@ Pod::Spec.new do |s|
   s.dependency 'FirebaseAppCheckInterop', '~> 10.17'
   s.dependency 'FirebaseCore', '~> 10.0'
   s.dependency 'PromisesObjC', '~> 2.1'
-  s.dependency 'GoogleUtilities/Environment', '~> 7.8'
+  s.dependency 'GoogleUtilities/Environment', '~> 7.13'
+  s.dependency 'GoogleUtilities/UserDefaults', '~> 7.13'
 
   s.pod_target_xcconfig = {
     'GCC_C_LANGUAGE_STANDARD' => 'c99',

diff --git a/FirebaseAppCheck/Sources/Core/FIRAppCheck.m b/FirebaseAppCheck/Sources/Core/FIRAppCheck.m
@@ -18,6 +18,7 @@
 
 #import <AppCheckCore/AppCheckCore.h>
 #import <FirebaseAppCheckInterop/FirebaseAppCheckInterop.h>
+#import <GoogleUtilities/GULUserDefaults.h>
 
 #import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckErrors.h"
 #import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckProvider.h"
@@ -92,7 +93,7 @@ - (nullable instancetype)initWithApp:(FIRApp *)app {
       [[FIRInternalAppCheckProvider alloc] initWithAppCheckProvider:appCheckProvider];
   FIRAppCheckSettings *settings =
       [[FIRAppCheckSettings alloc] initWithApp:app
-                                   userDefault:[NSUserDefaults standardUserDefaults]
+                                   userDefault:[GULUserDefaults standardUserDefaults]
                                     mainBundle:[NSBundle mainBundle]];
 
   GACAppCheck *appCheckCore = [[GACAppCheck alloc] initWithServiceName:serviceName

diff --git a/FirebaseAppCheck/Sources/Core/FIRAppCheckSettings.h b/FirebaseAppCheck/Sources/Core/FIRAppCheckSettings.h
@@ -19,6 +19,7 @@
 #import <AppCheckCore/AppCheckCore.h>
 
 @class FIRApp;
+@class GULUserDefaults;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -32,7 +33,7 @@ FOUNDATION_EXPORT NSString *const kFIRAppCheckTokenAutoRefreshEnabledInfoPlistKe
 @property(nonatomic, assign) BOOL isTokenAutoRefreshEnabled;
 
 - (instancetype)initWithApp:(FIRApp *)firebaseApp
-                userDefault:(NSUserDefaults *)userDefaults
+                userDefault:(GULUserDefaults *)userDefaults
                  mainBundle:(NSBundle *)mainBundle NS_DESIGNATED_INITIALIZER;
 
 - (instancetype)init NS_UNAVAILABLE;

diff --git a/FirebaseAppCheck/Sources/Core/FIRAppCheckSettings.m b/FirebaseAppCheck/Sources/Core/FIRAppCheckSettings.m
@@ -16,6 +16,8 @@
 
 #import "FirebaseAppCheck/Sources/Core/FIRAppCheckSettings.h"
 
+#import <GoogleUtilities/GULUserDefaults.h>
+
 #import "FirebaseCore/Extension/FirebaseCoreInternal.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -28,7 +30,7 @@
 @interface FIRAppCheckSettings ()
 
 @property(nonatomic, weak, readonly) FIRApp *firebaseApp;
-@property(nonatomic, readonly) NSUserDefaults *userDefaults;
+@property(nonatomic, readonly) GULUserDefaults *userDefaults;
 @property(nonatomic, readonly) NSBundle *mainBundle;
 @property(nonatomic, readonly) NSString *userDefaultKey;
 @property(nonatomic, assign) BOOL isTokenAutoRefreshConfigured;
@@ -38,7 +40,7 @@ @interface FIRAppCheckSettings ()
 @implementation FIRAppCheckSettings
 
 - (instancetype)initWithApp:(FIRApp *)firebaseApp
-                userDefault:(NSUserDefaults *)userDefaults
+                userDefault:(GULUserDefaults *)userDefaults
                  mainBundle:(NSBundle *)mainBundle {
   self = [super init];
   if (self) {

diff --git a/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckSettingsTests.m b/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckSettingsTests.m
@@ -16,6 +16,7 @@
 
 #import <XCTest/XCTest.h>
 
+#import <GoogleUtilities/GULUserDefaults.h>
 #import <OCMock/OCMock.h>
 
 #import "FirebaseAppCheck/Sources/Core/FIRAppCheckSettings.h"
@@ -46,7 +47,7 @@ - (void)setUp {
 
   self.mockApp = OCMClassMock([FIRApp class]);
   OCMStub([self.mockApp name]).andReturn(self.appName);
-  self.mockUserDefaults = OCMClassMock([NSUserDefaults class]);
+  self.mockUserDefaults = OCMClassMock([GULUserDefaults class]);
   self.bundleMock = OCMClassMock([NSBundle class]);
 
   self.settings = [[FIRAppCheckSettings alloc] initWithApp:self.mockApp

diff --git a/Package.swift b/Package.swift
@@ -1290,6 +1290,7 @@ let package = Package(
               .product(name: "AppCheckCore", package: "app-check"),
               .product(name: "FBLPromises", package: "Promises"),
               .product(name: "GULEnvironment", package: "GoogleUtilities"),
+              .product(name: "GULUserDefaults", package: "GoogleUtilities"),
             ],
             path: "FirebaseAppCheck/Sources",
             publicHeadersPath: "Public",