[Storage] Improve how GetFile handles paths

Author: a-maurice

release_build_files/readme.md

@@ -613,6 +613,10 @@ workflow use only during the development of your app, not for publicly shipping
 code.
 
 ## Release Notes
+### Upcoming
+-   Changes
+    - Storage (iOS): Handle absolute paths being provided to GetFile. (#1724)
+
 ### 13.0.0
 -   Changes
     - General (Android): Update to Firebase Android BoM version 34.0.0.

storage/integration_test/src/integration_test.cc

@@ -647,7 +647,8 @@ TEST_F(FirebaseStorageTest, TestPutFileAndGetFile) {
     std::string path = PathForResource() + kGetFileTestFile;
     // Cloud Storage expects a URI, so add file:// in front of local
     // paths.
-    std::string file_path = kFileUriScheme + path;
+    // TODO: Revert, just testing to see if this will pass without.
+    std::string file_path = /*kFileUriScheme +*/ path;
 
     LogDebug("Saving to local file: %s", path.c_str());
 

storage/src/ios/storage_reference_ios.mm

@@ -142,7 +142,21 @@
   // Cache a copy of the impl and storage, in case this is destroyed before the thread runs.
   FIRStorageReference* my_impl = impl();
   StorageInternal* storage = storage_;
-  NSURL* local_file_url = [NSURL URLWithString:@(path)];
+  NSString* path_string = @(path);
+  NSURL* local_file_url = nil;
+  if ([path_string hasPrefix:@"file://"]) {
+    // If it starts with the prefix, load it assuming a URL string.
+    local_file_url = [NSURL URLWithString:path_string];
+  } else {
+    // Otherwise, assume it is a file path.
+    local_file_url = [NSURL fileURLWithPath:path_string];
+  }
+  // If we still failed to convert the path, error out.
+  if (local_file_url == nil) {
+    future_impl->Complete(handle, kErrorUnknown,
+      "Unable to convert provided path to valid URL");
+    return GetFileLastResult();
+  }
   util::DispatchAsyncSafeMainQueue(^() {
       FIRStorageDownloadTask *download_task;
       {