Remove unnecessary Core private headers (#6439)

firebase · Sep 17, 2020 · 0a87c31 · 0a87c31
1 parent dfba699
commit 0a87c31
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 133 deletions.
diff --git a/FirebaseCore/Sources/FIRApp.m b/FirebaseCore/Sources/FIRApp.m
@@ -90,6 +90,11 @@
 NSString *const FIRAuthStateDidChangeInternalNotificationUIDKey =
     @"FIRAuthStateDidChangeInternalNotificationUIDKey";
 
+/**
+ * Error domain for exceptions and NSError construction.
+ */
+NSString *const kFirebaseCoreErrorDomain = @"com.firebase.core";
+
 /**
  * The URL to download plist files.
  */
@@ -479,20 +484,7 @@ + (NSError *)errorForMissingOptions {
     NSLocalizedRecoverySuggestionErrorKey :
         @"Check formatting and location of GoogleService-Info.plist."
   };
-  return [NSError errorWithDomain:kFirebaseCoreErrorDomain
-                             code:FIRErrorCodeInvalidPlistFile
-                         userInfo:errorDict];
-}
-
-+ (NSError *)errorForSubspecConfigurationFailureWithDomain:(NSString *)domain
-                                                 errorCode:(FIRErrorCode)code
-                                                   service:(NSString *)service
-                                                    reason:(NSString *)reason {
-  NSString *description =
-      [NSString stringWithFormat:@"Configuration failed for service %@.", service];
-  NSDictionary *errorDict =
-      @{NSLocalizedDescriptionKey : description, NSLocalizedFailureReasonErrorKey : reason};
-  return [NSError errorWithDomain:domain code:code userInfo:errorDict];
+  return [NSError errorWithDomain:kFirebaseCoreErrorDomain code:-100 userInfo:errorDict];
 }
 
 + (NSError *)errorForInvalidAppID {
@@ -502,9 +494,7 @@ + (NSError *)errorForInvalidAppID {
         @"Check formatting and location of GoogleService-Info.plist or GoogleAppID set in the "
         @"customized options."
   };
-  return [NSError errorWithDomain:kFirebaseCoreErrorDomain
-                             code:FIRErrorCodeInvalidAppID
-                         userInfo:errorDict];
+  return [NSError errorWithDomain:kFirebaseCoreErrorDomain code:-101 userInfo:errorDict];
 }
 
 + (BOOL)isDefaultAppConfigured {

diff --git a/FirebaseCore/Sources/FIRErrors.m b/FirebaseCore/Sources/FIRErrors.m
diff --git a/FirebaseCore/Sources/Private/FIRAppInternal.h b/FirebaseCore/Sources/Private/FIRAppInternal.h
@@ -16,13 +16,6 @@
 
 #import <FirebaseCore/FIRApp.h>
 
-// The has_include is a workaround so the old IID needed for the FIS tests can find FIRErrors.h
-#if __has_include("FirebaseCore/Sources/Private/FIRErrors.h")
-#import "FirebaseCore/Sources/Private/FIRErrors.h"
-#else
-#import <FirebaseCore/FIRErrors.h>
-#endif
-
 @class FIRComponentContainer;
 @protocol FIRLibrary;
 
@@ -46,6 +39,7 @@ extern NSString *const kFIRAppDeleteNotification;
 extern NSString *const kFIRAppIsDefaultAppKey;
 extern NSString *const kFIRAppNameKey;
 extern NSString *const kFIRGoogleAppIDKey;
+extern NSString *const kFirebaseCoreErrorDomain;
 
 /**
  * The format string for the User Defaults key used for storing the data collection enabled flag.
@@ -105,14 +99,6 @@ extern NSString *const FIRAuthStateDidChangeInternalNotificationUIDKey;
  */
 @property(nonatomic) FIRComponentContainer *container;
 
-/**
- * Creates an error for failing to configure a subspec service. This method is called by each
- * FIRApp notification listener.
- */
-+ (NSError *)errorForSubspecConfigurationFailureWithDomain:(NSString *)domain
-                                                 errorCode:(FIRErrorCode)code
-                                                   service:(NSString *)service
-                                                    reason:(NSString *)reason;
 /**
  * Checks if the default app is configured without trying to configure it.
  */

diff --git a/FirebaseCore/Sources/Private/FIRErrorCode.h b/FirebaseCore/Sources/Private/FIRErrorCode.h
diff --git a/FirebaseCore/Sources/Private/FIRErrors.h b/FirebaseCore/Sources/Private/FIRErrors.h
diff --git a/FirebaseCore/Tests/SwiftUnit/SwiftTestingUtilities/ExceptionCatcher.m b/FirebaseCore/Tests/SwiftUnit/SwiftTestingUtilities/ExceptionCatcher.m
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 #import "FirebaseCore/Tests/SwiftUnit/SwiftTestingUtilities/ExceptionCatcher.h"
-#import "FirebaseCore/Sources/Private/FIRErrorCode.h"
 
 @implementation ExceptionCatcher
 
@@ -30,6 +29,7 @@ + (BOOL)catchException:(ThrowingBlock)block error:(__autoreleasing NSError **)er
     [info setValue:exception.userInfo forKey:@"ExceptionUserInfo"];
 
     // Just using error code `FIRErrorCodeConfigFailed` for now
+    NSInteger FIRErrorCodeConfigFailed = -114;
     *error = [[NSError alloc] initWithDomain:exception.name
                                         code:FIRErrorCodeConfigFailed
                                     userInfo:info];

diff --git a/FirebaseCore/Tests/Unit/FIRAppTest.m b/FirebaseCore/Tests/Unit/FIRAppTest.m
@@ -371,17 +371,6 @@ - (void)testDeleteApp {
   XCTAssertNil(FIR_COMPONENT(FIRTestProtocolEagerCached, app.container));
 }
 
-- (void)testErrorForSubspecConfigurationFailure {
-  NSError *error = [FIRApp errorForSubspecConfigurationFailureWithDomain:kFirebaseCoreErrorDomain
-                                                               errorCode:-38
-                                                                 service:@"Auth"
-                                                                  reason:@"some reason"];
-  XCTAssertNotNil(error);
-  XCTAssert([error.domain isEqualToString:kFirebaseCoreErrorDomain]);
-  XCTAssert(error.code == -38);
-  XCTAssert([error.description containsString:@"Configuration failed for"]);
-}
-
 - (void)testOptionsLocking {
   FIROptions *options = [[FIROptions alloc] initWithGoogleAppID:kGoogleAppID
                                                     GCMSenderID:kGCMSenderID];

diff --git a/FirebaseDynamicLinks/Sources/FIRDynamicLinks.m b/FirebaseDynamicLinks/Sources/FIRDynamicLinks.m
@@ -185,11 +185,15 @@ - (void)configureDynamicLinks:(FIRApp *)app {
                        urlScheme:urlScheme
                     userDefaults:nil];
   } else {
-    error =
-        [FIRApp errorForSubspecConfigurationFailureWithDomain:kFirebaseDurableDeepLinkErrorDomain
-                                                    errorCode:FIRErrorCodeDurableDeepLinkFailed
-                                                      service:@"DynamicLinks"
-                                                       reason:errorDescription];
+    NSString *description =
+        [NSString stringWithFormat:@"Configuration failed for service DynamicLinks."];
+    NSDictionary *errorDict = @{
+      NSLocalizedDescriptionKey : description,
+      NSLocalizedFailureReasonErrorKey : errorDescription
+    };
+    error = [NSError errorWithDomain:kFirebaseDurableDeepLinkErrorDomain
+                                code:FIRErrorCodeDurableDeepLinkFailed
+                            userInfo:errorDict];
   }
   if (error) {
     NSString *message = nil;

diff --git a/FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.m b/FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.m
@@ -49,6 +49,7 @@ - (FIRRemoteConfig *)remoteConfigForNamespace:(NSString *)remoteConfigNamespace
   }
 
   if (errorPropertyName) {
+    NSString *const kFirebaseConfigErrorDomain = @"com.firebase.config";
     [NSException
          raise:kFirebaseConfigErrorDomain
         format:@"%@",