Fixed issue where metadata wasn't properly initialized (#10356)

Author: maneesht

FirebaseStorage/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 10.0.1
+- [fixed] Fixed an issue where metadata passed to `putFile` was not properly initialized.
+
 # 10.0.0
 - [changed] FirebaseStorage is now completely implemented in Swift. Swift-specific API improvements
   are planned for subsequent releases. (#9963)

FirebaseStorage/Sources/StorageReference.swift

@@ -212,15 +212,10 @@ import Foundation
   open func putFile(from fileURL: URL,
                     metadata: StorageMetadata? = nil,
                     completion: ((_: StorageMetadata?, _: Error?) -> Void)?) -> StorageUploadTask {
-    var putMetadata: StorageMetadata
-    if metadata == nil {
-      putMetadata = StorageMetadata()
-      if let path = path.object {
-        putMetadata.path = path
-        putMetadata.name = (path as NSString).lastPathComponent as String
-      }
-    } else {
-      putMetadata = metadata!
+    let putMetadata: StorageMetadata = metadata ?? StorageMetadata()
+    if let path = path.object {
+      putMetadata.path = path
+      putMetadata.name = (path as NSString).lastPathComponent as String
     }
     let fetcherService = storage.fetcherServiceForApp
     let task = StorageUploadTask(reference: self,

FirebaseStorage/Tests/ObjCIntegration/FIRStorageIntegrationTests.m

@@ -344,6 +344,48 @@ - (void)testPutFile {
   [self waitForExpectations];
 }
 
+- (void)testPutFileWithMetadata {
+  XCTestExpectation *expectation = [self expectationWithDescription:@"testPutFileWithMetaData"];
+
+  FIRStorageReference *ref =
+      [self.storage referenceWithPath:@"ios/public/testUnauthenticatedSimplePutFile"];
+
+  NSData *data = [@"Hello World" dataUsingEncoding:NSUTF8StringEncoding];
+  NSURL *tmpDirURL = [NSURL fileURLWithPath:NSTemporaryDirectory()];
+  NSURL *fileURL =
+      [[tmpDirURL URLByAppendingPathComponent:@"hello"] URLByAppendingPathExtension:@"txt"];
+  [data writeToURL:fileURL atomically:YES];
+
+  FIRStorageMetadata *putMetadata = [[FIRStorageMetadata alloc] init];
+  putMetadata.contentType = @"text/plain";
+
+  FIRStorageUploadTask *task = [ref putFile:fileURL
+                                   metadata:putMetadata
+                                 completion:^(FIRStorageMetadata *metadata, NSError *error) {
+                                   XCTAssertNotNil(metadata, "Metadata should not be nil");
+                                   XCTAssertNil(error, "Error should be nil");
+                                 }];
+
+  __block long uploadedBytes = -1;
+
+  [task observeStatus:FIRStorageTaskStatusSuccess
+              handler:^(FIRStorageTaskSnapshot *snapshot) {
+                XCTAssertEqualObjects([snapshot description], @"<State: Success>");
+                [expectation fulfill];
+              }];
+
+  [task observeStatus:FIRStorageTaskStatusProgress
+              handler:^(FIRStorageTaskSnapshot *_Nonnull snapshot) {
+                XCTAssertTrue([[snapshot description] containsString:@"State: Progress"] ||
+                              [[snapshot description] containsString:@"State: Resume"]);
+                NSProgress *progress = snapshot.progress;
+                XCTAssertGreaterThanOrEqual(progress.completedUnitCount, uploadedBytes);
+                uploadedBytes = (long)progress.completedUnitCount;
+              }];
+
+  [self waitForExpectations];
+}
+
 - (void)testPutFileWithSpecialCharacters {
   XCTestExpectation *expectation =
       [self expectationWithDescription:@"testPutFileWithSpecialCharacters"];