Remove simpleUpload

Author: hsubox76

packages/storage/src/implementation/requests.ts

@@ -277,39 +277,6 @@ export function metadataForUpload_(
   return metadataClone;
 }
 
-/**
- * Prepare RequestInfo for non-resumable uploads as Content-Type: octet-stream.
- */
-export function simpleUpload(
-  service: StorageService,
-  location: Location,
-  mappings: Mappings,
-  blob: FbsBlob,
-  metadata?: Metadata | null
-): RequestInfo<Metadata> {
-  const urlPart = location.bucketOnlyServerUrl();
-
-  const metadata_ = metadataForUpload_(location, blob, metadata);
-  const headers: { [prop: string]: string } = {
-    // metadataForUpload_ always populates the contentType field.
-    'Content-Type': metadata_['contentType']!
-  };
-  const urlParams: UrlParams = { name: metadata_['fullPath']! };
-  const url = makeUrl(urlPart);
-  const method = 'POST';
-  const timeout = service.maxUploadRetryTime;
-  const requestInfo = new RequestInfo(
-    url,
-    method,
-    metadataHandler(service, mappings),
-    timeout
-  );
-  requestInfo.urlParams = urlParams;
-  requestInfo.headers = headers;
-  requestInfo.body = blob.uploadData();
-  requestInfo.errorHandler = sharedErrorHandler(location);
-  return requestInfo;
-}
 /**
  * Prepare RequestInfo for resumable uploads as Content-Type: multipart.
  */

packages/storage/src/reference.ts

@@ -29,7 +29,7 @@ import {
   updateMetadata as requestsUpdateMetadata,
   getDownloadUrl as requestsGetDownloadUrl,
   deleteObject as requestsDeleteObject,
-  simpleUpload
+  multipartUpload
 } from './implementation/requests';
 import { StringFormat, dataFromString } from './implementation/string';
 import { Metadata } from './metadata';
@@ -135,15 +135,15 @@ export async function uploadBytes(
 ): Promise<UploadTaskSnapshot> {
   ref._throwIfRoot('uploadBytes');
   const authToken = await ref.storage.getAuthToken();
-  const requestInfo = simpleUpload(
+  const requestInfo = multipartUpload(
     ref.storage,
     ref._location,
     getMappings(),
     new FbsBlob(data),
     metadata
   );
-  const request = ref.storage.makeRequest(requestInfo, authToken);
-  const finalMetadata = await request.getPromise();
+  const multipartRequest = ref.storage.makeRequest(requestInfo, authToken);
+  const finalMetadata = await multipartRequest.getPromise();
   return {
     metadata: finalMetadata,
     ref
@@ -193,15 +193,15 @@ export async function uploadString(
   if (metadataClone['contentType'] == null && data.contentType != null) {
     metadataClone['contentType'] = data.contentType!;
   }
-  const requestInfo = simpleUpload(
+  const requestInfo = multipartUpload(
     ref.storage,
     ref._location,
     getMappings(),
     new FbsBlob(data.data, true),
     metadataClone
   );
-  const request = ref.storage.makeRequest(requestInfo, authToken);
-  const finalMetadata = await request.getPromise();
+  const multipartRequest = ref.storage.makeRequest(requestInfo, authToken);
+  const finalMetadata = await multipartRequest.getPromise();
   return {
     metadata: finalMetadata,
     ref