Make all Storage APIs available via Swift

Author: paulb777

CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_frameworks/Podfile

@@ -27,6 +27,7 @@ target 'CocoapodsIntegrationTest' do
  pod 'FirebaseMessagingInterop', :path => '../'
  pod 'FirebasePerformance', :path => '../'
  pod 'FirebaseStorage', :path => '../'
+ pod 'FirebaseStorageObjC', :path => '../'
 end
 
 # Using the new speed-enhancing features available with CocoaPods 1.7+

FirebaseAppCheckInterop.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name = 'FirebaseAppCheckInterop'
- s.version = '8.12.0'
+ s.version = '8.13.0'
  s.summary = 'Interfaces that allow other Firebase SDKs to use AppCheck functionality.'
 
  s.description = <<-DESC

FirebaseAuthInterop.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name = 'FirebaseAuthInterop'
- s.version = '8.12.0'
+ s.version = '8.13.0'
  s.summary = 'Interfaces that allow other Firebase SDKs to use Auth functionality.'
 
  s.description = <<-DESC

FirebaseCore/Sources/FIRApp.m

@@ -836,7 +836,10 @@ + (void)registerSwiftComponents {
  SEL componentsToRegisterSEL = @selector(componentsToRegister);
  // Dictionary of class names that conform to `FIRLibrary` and their user agents. These should only
  // be SDKs that are written in Swift but still visible to ObjC.
- NSDictionary<NSString *, NSString *> *swiftLibs = @{@"FIRFunctionsComponent" : @"fire-fun"};
+ NSDictionary<NSString *, NSString *> *swiftLibs = @{
+ @"FIRFunctionsComponent" : @"fire-fun",
+ @"FIRStorageComponent" : @"fire-str",
+ };
  for (NSString *className in swiftLibs.allKeys) {
  Class klass = NSClassFromString(className);
  if (klass && [klass respondsToSelector:componentsToRegisterSEL]) {

FirebaseCoreInternal.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name = 'FirebaseCoreInternal'
- s.version = '8.12.0'
+ s.version = '8.13.0'
  s.summary = 'APIs only for Firebase internal usage'
 
  s.description = <<-DESC

FirebaseMessagingInterop.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name = 'FirebaseMessagingInterop'
- s.version = '8.12.0'
+ s.version = '8.13.0'
  s.summary = 'Interfaces that allow other Firebase SDKs to use Messaging functionality.'
 
  s.description = <<-DESC

FirebaseStorage.podspec

@@ -36,7 +36,30 @@ Firebase Storage provides robust, secure file uploads and downloads from Firebas
  'FirebaseStorageSwift/Sources/*.swift',
  ]
 
- s.dependency 'FirebaseStorageObjC', '~> 8.10'
+ s.dependency 'FirebaseStorageObjC', '~> 8.13'
+ s.dependency 'FirebaseAppCheckInterop', '~> 8.13'
+ s.dependency 'FirebaseAuthInterop', '~> 8.13'
+ s.dependency 'FirebaseCoreInternal', '~> 8.13'
+
+ s.test_spec 'objcIntegration' do |objc_tests|
+ objc_tests.scheme = { :code_coverage => true }
+ objc_tests.platforms = {
+ :ios => ios_deployment_target,
+ :osx => osx_deployment_target,
+ :tvos => tvos_deployment_target
+ }
+ objc_tests.source_files = [
+ 'FirebaseStorage/Tests/Integration/*.[mh]',
+ 'FirebaseStorageSwift/Tests/ObjCIntegration/*.m',
+ ]
+ objc_tests.requires_app_host = true
+ objc_tests.resources = 'FirebaseStorage/Tests/Integration/Resources/1mb.dat',
+ 'FirebaseStorage/Tests/Integration/Resources/GoogleService-Info.plist'
+ objc_tests.dependency 'FirebaseAuth', '~> 8.0'
+ objc_tests.pod_target_xcconfig = {
+ 'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"'
+ }
+ end
 
  s.test_spec 'integration' do |int_tests|
  int_tests.scheme = { :code_coverage => true }
@@ -50,6 +73,6 @@ Firebase Storage provides robust, secure file uploads and downloads from Firebas
  int_tests.resources = 'FirebaseStorage/Tests/Integration/Resources/1mb.dat',
  'FirebaseStorage/Tests/Integration/Resources/GoogleService-Info.plist',
  'FirebaseStorage/Tests/Integration/Resources/HomeImprovement.numbers'
- int_tests.dependency 'FirebaseAuth', '~> 8.0'
+ int_tests.dependency 'FirebaseAuth', '~> 8.13'
  end
 end

FirebaseStorage/Sources/FIRStorage.m

@@ -15,7 +15,6 @@
 #import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorage.h"
 #import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageReference.h"
 
-#import "FirebaseStorage/Sources/FIRStorageComponent.h"
 #import "FirebaseStorage/Sources/FIRStorageConstants_Private.h"
 #import "FirebaseStorage/Sources/FIRStoragePath.h"
 #import "FirebaseStorage/Sources/FIRStorageReference_Private.h"
@@ -39,7 +38,7 @@
  NSMutableDictionary<NSString * /* bucket */, GTMSessionFetcherService *> *> *_fetcherServiceMap;
 static GTMSessionFetcherRetryBlock _retryWhenOffline;
 
-@interface FIRStorage () {
+@interface FIRIMPLStorage () {
  /// Stored Auth reference, if it exists. This needs to be stored for `copyWithZone:`.
  id<FIRAuthInterop> _Nullable _auth;
  id<FIRAppCheckInterop> _Nullable _appCheck;
@@ -50,7 +49,7 @@ @interface FIRStorage () {
 }
 @end
 
-@implementation FIRStorage
+@implementation FIRIMPLStorage
 
 + (void)initialize {
  static dispatch_once_t onceToken;
@@ -102,16 +101,12 @@ + (void)setGTMSessionFetcherLoggingEnabled:(BOOL)isLoggingEnabled {
  [GTMSessionFetcher setLoggingEnabled:isLoggingEnabled];
 }
 
-+ (instancetype)storage {
- return [self storageForApp:[FIRApp defaultApp]];
-}
-
-+ (instancetype)storageForApp:(FIRApp *)app {
++ (NSString *)bucketForApp:(FIRApp *)app {
  if (app.options.storageBucket) {
  NSString *url = [app.options.storageBucket isEqualToString:@""]
  ? @""
  : [@"gs://" stringByAppendingString:app.options.storageBucket];
- return [self storageForApp:app URL:url];
+ return [self bucketForApp:app URL:url];
  } else {
  NSString *const kAppNotConfiguredMessage =
  @"No default Storage bucket found. Did you configure Firebase Storage properly?";
@@ -120,11 +115,7 @@ + (instancetype)storageForApp:(FIRApp *)app {
  }
 }
 
-+ (instancetype)storageWithURL:(NSString *)url {
- return [self storageForApp:[FIRApp defaultApp] URL:url];
-}
-
-+ (instancetype)storageForApp:(FIRApp *)app URL:(NSString *)url {
++ (NSString *)bucketForApp:(FIRApp *)app URL:(NSString *)url {
  NSString *bucket;
  if ([url isEqualToString:@""]) {
  bucket = @"";
@@ -145,11 +136,7 @@ + (instancetype)storageForApp:(FIRApp *)app URL:(NSString *)url {
 
  bucket = path.bucket;
  }
-
- // Retrieve the instance provider from the app's container to inject dependencies as needed.
- id<FIRStorageMultiBucketProvider> provider =
- FIR_COMPONENT(FIRStorageMultiBucketProvider, app.container);
- return [provider storageForBucket:bucket];
+ return bucket;
 }
 
 - (instancetype)initWithApp:(FIRApp *)app
@@ -190,10 +177,10 @@ - (instancetype)init {
 #pragma mark - NSObject overrides
 
 - (instancetype)copyWithZone:(NSZone *)zone {
- FIRStorage *storage = [[[self class] allocWithZone:zone] initWithApp:_app
- bucket:_storageBucket
- auth:_auth
- appCheck:_appCheck];
+ FIRIMPLStorage *storage = [[[self class] allocWithZone:zone] initWithApp:_app
+  bucket:_storageBucket
+  auth:_auth
+  appCheck:_appCheck];
  storage.callbackQueue = self.callbackQueue;
  return storage;
 }
@@ -204,15 +191,15 @@ - (BOOL)isEqual:(id)object {
  return YES;
  }
 
- if (![object isKindOfClass:[FIRStorage class]]) {
+ if (![object isKindOfClass:[FIRIMPLStorage class]]) {
  return NO;
  }
 
- BOOL isEqualObject = [self isEqualToFIRStorage:(FIRStorage *)object];
+ BOOL isEqualObject = [self isEqualToFIRStorage:(FIRIMPLStorage *)object];
  return isEqualObject;
 }
 
-- (BOOL)isEqualToFIRStorage:(FIRStorage *)storage {
+- (BOOL)isEqualToFIRStorage:(FIRIMPLStorage *)storage {
  BOOL isEqual =
  [_app isEqual:storage.app] && [_storageBucket isEqualToString:storage.storageBucket];
  return isEqual;
@@ -273,21 +260,22 @@ - (NSTimeInterval)maxOperationRetryTime {
 
 #pragma mark - Public methods
 
-- (FIRStorageReference *)reference {
+- (FIRIMPLStorageReference *)reference {
  [self ensureConfigured];
 
  FIRStoragePath *path = [[FIRStoragePath alloc] initWithBucket:_storageBucket object:nil];
- return [[FIRStorageReference alloc] initWithStorage:self path:path];
+ return [[FIRIMPLStorageReference alloc] initWithStorage:self path:path];
 }
 
-- (FIRStorageReference *)referenceForURL:(NSString *)string {
+- (FIRIMPLStorageReference *)referenceForURL:(NSString *)string {
  [self ensureConfigured];
 
  FIRStoragePath *path = [FIRStoragePath pathFromString:string];
 
  // If no default bucket exists (empty string), accept anything.
  if ([_storageBucket isEqual:@""]) {
- FIRStorageReference *reference = [[FIRStorageReference alloc] initWithStorage:self path:path];
+ FIRIMPLStorageReference *reference = [[FIRIMPLStorageReference alloc] initWithStorage:self
+ path:path];
  return reference;
  }
 
@@ -299,12 +287,13 @@ - (FIRStorageReference *)referenceForURL:(NSString *)string {
  format:kInvalidBucketFormat, path.bucket, _storageBucket];
  }
 
- FIRStorageReference *reference = [[FIRStorageReference alloc] initWithStorage:self path:path];
+ FIRIMPLStorageReference *reference = [[FIRIMPLStorageReference alloc] initWithStorage:self
+ path:path];
  return reference;
 }
 
-- (FIRStorageReference *)referenceWithPath:(NSString *)string {
- FIRStorageReference *reference = [[self reference] child:string];
+- (FIRIMPLStorageReference *)referenceWithPath:(NSString *)string {
+ FIRIMPLStorageReference *reference = [[self reference] child:string];
  return reference;
 }
 
@@ -347,22 +336,22 @@ + (void)enableBackgroundTasks:(BOOL)isEnabled {
  [NSException raise:NSGenericException format:@"enableBackgroundTasks not implemented"];
 }
 
-- (NSArray<FIRStorageUploadTask *> *)uploadTasks {
+- (NSArray<FIRIMPLStorageUploadTask *> *)uploadTasks {
  [NSException raise:NSGenericException format:@"getUploadTasks not implemented"];
  return nil;
 }
 
-- (NSArray<FIRStorageDownloadTask *> *)downloadTasks {
+- (NSArray<FIRIMPLStorageDownloadTask *> *)downloadTasks {
  [NSException raise:NSGenericException format:@"getDownloadTasks not implemented"];
  return nil;
 }
 
 - (void)ensureConfigured {
  if (!_fetcherServiceForApp) {
- _fetcherServiceForApp = [FIRStorage fetcherServiceForApp:_app
- bucket:_storageBucket
- auth:_auth
- appCheck:_appCheck];
+ _fetcherServiceForApp = [FIRIMPLStorage fetcherServiceForApp:_app
+  bucket:_storageBucket
+  auth:_auth
+  appCheck:_appCheck];
  if (_usesEmulator) {
  _fetcherServiceForApp.allowLocalhostRequest = YES;
  _fetcherServiceForApp.allowedInsecureSchemes = @[ @"http" ];