Remove Firebase specifics from GACAppCheck (#11368)

Removed Firebase-specific symbols and implementation details from the generic GACAppCheck.

Author: andrewheard

AppCheck.podspec

@@ -37,7 +37,6 @@ Pod::Spec.new do |s|
   s.source_files = [
     base_dir + 'Sources/**/*.[mh]',
     base_dir + 'Interop/*.h',
-    'FirebaseCore/Extension/*.h',
   ]
   s.public_header_files = base_dir + 'Sources/Public/AppCheck/*.h'
 
@@ -46,7 +45,6 @@ Pod::Spec.new do |s|
   s.tvos.weak_framework = 'DeviceCheck'
 
   s.dependency 'AppCheckInterop', '~> 10.11'
-  s.dependency 'FirebaseCore', '~> 10.0'
   s.dependency 'PromisesObjC', '~> 2.1'
   s.dependency 'GoogleUtilities/Environment', '~> 7.8'
 
@@ -72,6 +70,7 @@ Pod::Spec.new do |s|
       ]
 
       unit_tests.resources = base_dir + 'Tests/Fixture/**/*'
+      unit_tests.dependency 'FirebaseCore', '~> 10.0'
       unit_tests.dependency 'OCMock'
       unit_tests.dependency 'HeartbeatLoggingTestUtils'
       unit_tests.requires_app_host = true
@@ -89,6 +88,7 @@ Pod::Spec.new do |s|
       base_dir + 'Tests/Integration/**/*.[mh]',
     ]
     integration_tests.resources = base_dir + 'Tests/Fixture/**/*'
+    integration_tests.dependency 'FirebaseCore', '~> 10.0'
     integration_tests.requires_app_host = true
   end
 
@@ -102,6 +102,7 @@ Pod::Spec.new do |s|
       base_dir + 'Tests/Unit/Swift/**/*.swift',
       base_dir + 'Tests/Unit/Swift/**/*.h',
     ]
+    swift_unit_tests.dependency 'FirebaseCore', '~> 10.0'
   end
 
 end

AppCheck/Interop/GACAppCheckInterop.h

@@ -41,7 +41,7 @@ NS_SWIFT_NAME(InternalAppCheckInterop) @protocol GACAppCheckInterop
 - (NSString *)notificationTokenKey;
 /// `userInfo` key for the `FirebaseApp.name` in a notification for
 /// `tokenDidChangeNotificationName`.
-- (NSString *)notificationAppNameKey;
+- (NSString *)notificationInstanceNameKey;
 
 // MARK: - Optional API
 

AppCheck/Sources/Core/GACAppCheck.m

@@ -37,8 +37,6 @@
 #import "AppCheck/Interop/GACAppCheckInterop.h"
 #import "AppCheck/Interop/GACAppCheckTokenResultInterop.h"
 
-#import "FirebaseCore/Extension/FirebaseCoreInternal.h"
-
 NS_ASSUME_NONNULL_BEGIN
 
 /// A notification with the specified name is sent to the default notification center
@@ -51,8 +49,8 @@
 /// `userInfo` key for the `AppCheckToken` in `appCheckTokenRefreshNotification`.
 NSString *const kGACAppCheckTokenNotificationKey = @"GACAppCheckTokenNotificationKey";
 
-/// `userInfo` key for the `FirebaseApp.name` in `appCheckTokenRefreshNotification`.
-NSString *const kGACAppCheckAppNameNotificationKey = @"GACAppCheckAppNameNotificationKey";
+/// `userInfo` key for the instance name in `appCheckTokenRefreshNotification`.
+NSString *const kGACAppCheckInstanceNameNotificationKey = @"GACAppCheckInstanceNameNotificationKey";
 
 // TODO(andrewheard): Remove from generic App Check SDK.
 // FIREBASE_APP_CHECK_ONLY_BEGIN
@@ -68,7 +66,7 @@
 
 @interface GACAppCheck ()
 
-@property(nonatomic, readonly) NSString *appName;
+@property(nonatomic, readonly) NSString *instanceName;
 @property(nonatomic, readonly) id<GACAppCheckProvider> appCheckProvider;
 @property(nonatomic, readonly) id<GACAppCheckStorageProtocol> storage;
 @property(nonatomic, readonly) NSNotificationCenter *notificationCenter;
@@ -84,15 +82,15 @@ @implementation GACAppCheck
 
 #pragma mark - Internal
 
-- (instancetype)initWithAppName:(NSString *)appName
-               appCheckProvider:(id<GACAppCheckProvider>)appCheckProvider
-                        storage:(id<GACAppCheckStorageProtocol>)storage
-                 tokenRefresher:(id<GACAppCheckTokenRefresherProtocol>)tokenRefresher
-             notificationCenter:(NSNotificationCenter *)notificationCenter
-                       settings:(id<GACAppCheckSettingsProtocol>)settings {
+- (instancetype)initWithInstanceName:(NSString *)instanceName
+                    appCheckProvider:(id<GACAppCheckProvider>)appCheckProvider
+                             storage:(id<GACAppCheckStorageProtocol>)storage
+                      tokenRefresher:(id<GACAppCheckTokenRefresherProtocol>)tokenRefresher
+                  notificationCenter:(NSNotificationCenter *)notificationCenter
+                            settings:(id<GACAppCheckSettingsProtocol>)settings {
   self = [super init];
   if (self) {
-    _appName = appName;
+    _instanceName = instanceName;
     _appCheckProvider = appCheckProvider;
     _storage = storage;
     _tokenRefresher = tokenRefresher;
@@ -110,28 +108,27 @@ - (instancetype)initWithAppName:(NSString *)appName
 
 #pragma mark - Public
 
-- (instancetype)initWithApp:(FIRApp *)app
-           appCheckProvider:(id<GACAppCheckProvider>)appCheckProvider
-                   settings:(id<GACAppCheckSettingsProtocol>)settings {
+- (instancetype)initWithInstanceName:(NSString *)instanceName
+                    appCheckProvider:(id<GACAppCheckProvider>)appCheckProvider
+                            settings:(id<GACAppCheckSettingsProtocol>)settings
+                        resourceName:(NSString *)resourceName
+                 keychainAccessGroup:(nullable NSString *)accessGroup {
   GACAppCheckTokenRefreshResult *refreshResult =
       [[GACAppCheckTokenRefreshResult alloc] initWithStatusNever];
   GACAppCheckTokenRefresher *tokenRefresher =
       [[GACAppCheckTokenRefresher alloc] initWithRefreshResult:refreshResult settings:settings];
 
-  // TODO(andrewheard): Remove from generic App Check SDK.
-  // FIREBASE_APP_CHECK_ONLY_BEGIN
   NSString *tokenKey =
-      [NSString stringWithFormat:@"app_check_token.%@.%@", app.name, app.options.googleAppID];
-  // FIREBASE_APP_CHECK_ONLY_END
-  GACAppCheckStorage *storage =
-      [[GACAppCheckStorage alloc] initWithTokenKey:tokenKey accessGroup:app.options.appGroupID];
-
-  return [self initWithAppName:app.name
-              appCheckProvider:appCheckProvider
-                       storage:storage
-                tokenRefresher:tokenRefresher
-            notificationCenter:NSNotificationCenter.defaultCenter
-                      settings:settings];
+      [NSString stringWithFormat:@"app_check_token.%@.%@", instanceName, resourceName];
+  GACAppCheckStorage *storage = [[GACAppCheckStorage alloc] initWithTokenKey:tokenKey
+                                                                 accessGroup:accessGroup];
+
+  return [self initWithInstanceName:instanceName
+                   appCheckProvider:appCheckProvider
+                            storage:storage
+                     tokenRefresher:tokenRefresher
+                 notificationCenter:NSNotificationCenter.defaultCenter
+                           settings:settings];
 }
 
 - (void)tokenForcingRefresh:(BOOL)forcingRefresh
@@ -204,8 +201,8 @@ - (nonnull NSString *)tokenDidChangeNotificationName {
   return GACAppCheckAppCheckTokenDidChangeNotification;
 }
 
-- (nonnull NSString *)notificationAppNameKey {
-  return kGACAppCheckAppNameNotificationKey;
+- (nonnull NSString *)notificationInstanceNameKey {
+  return kGACAppCheckInstanceNameNotificationKey;
 }
 
 - (nonnull NSString *)notificationTokenKey {
@@ -320,7 +317,7 @@ - (void)postTokenUpdateNotificationWithToken:(GACAppCheckToken *)token {
                                          object:self
                                        userInfo:@{
                                          kGACAppCheckTokenNotificationKey : token.token,
-                                         kGACAppCheckAppNameNotificationKey : self.appName
+                                         kGACAppCheckInstanceNameNotificationKey : self.instanceName
                                        }];
 }
 

AppCheck/Sources/Core/GACAppCheckLogger.m

@@ -16,8 +16,6 @@
 
 #import "AppCheck/Sources/Core/GACAppCheckLogger.h"
 
-#import "FirebaseCore/Extension/FirebaseCoreInternal.h"
-
 NS_ASSUME_NONNULL_BEGIN
 
 #pragma mark - Log Message Codes

AppCheck/Sources/Core/GACAppCheckValidator.h

@@ -16,8 +16,6 @@
 
 #import <Foundation/Foundation.h>
 
-@class FIRApp;
-
 NS_ASSUME_NONNULL_BEGIN
 
 @interface GACAppCheckStoredToken : NSObject <NSSecureCoding>

AppCheck/Sources/Core/GACAppCheckValidator.m

@@ -18,7 +18,6 @@
 
 @import AppCheckInterop;
 
-@class FIRApp;
 @class GACAppCheckToken;
 @protocol GACAppCheckProvider;
 @protocol GACAppCheckSettingsProtocol;
@@ -35,7 +34,7 @@ FOUNDATION_EXPORT const NSNotificationName
 /// `userInfo` key for the `FirebaseApp.name` in `AppCheckTokenDidChangeNotification`.
 FOUNDATION_EXPORT NSString *const kGACAppCheckTokenNotificationKey NS_SWIFT_NAME(InternalAppCheckTokenNotificationKey);
 /// `userInfo` key for the `AppCheckToken` in `AppCheckTokenDidChangeNotification`.
-FOUNDATION_EXPORT NSString *const kGACAppCheckAppNameNotificationKey NS_SWIFT_NAME(InternalAppCheckAppNameNotificationKey);
+FOUNDATION_EXPORT NSString *const kGACAppCheckInstanceNameNotificationKey NS_SWIFT_NAME(InternalAppCheckInstanceNameNotificationKey);
 
 /// A class used to manage App Check tokens for a given resource.
 NS_SWIFT_NAME(InternalAppCheck)
@@ -44,12 +43,13 @@ NS_SWIFT_NAME(InternalAppCheck)
 - (instancetype)init NS_UNAVAILABLE;
 
 /// Returns an instance of `AppCheck` for an application.
-/// @param app A configured `FirebaseApp` instance.
 /// @param appCheckProvider  An `InternalAppCheckProvider` instance that provides App Check tokens.
 /// @return An instance of `AppCheck` corresponding to the provided `app`.
-- (instancetype)initWithApp:(FIRApp *)app
-           appCheckProvider:(id<GACAppCheckProvider>)appCheckProvider
-                   settings:(id<GACAppCheckSettingsProtocol>)settings;
+- (instancetype)initWithInstanceName:(NSString *)instanceName
+                    appCheckProvider:(id<GACAppCheckProvider>)appCheckProvider
+                            settings:(id<GACAppCheckSettingsProtocol>)settings
+                        resourceName:(NSString *)resourceName
+                 keychainAccessGroup:(nullable NSString *)accessGroup;
 
 /// Requests Firebase app check token. This method should *only* be used if you need to authorize
 /// requests to a non-Firebase backend. Requests to Firebase backend are authorized automatically if