Prefix list results with correct bucket (#2905)

Author: schmidt-sebastian

packages/storage/src/implementation/list.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2019 Google Inc.
+ * Copyright 2019 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@ import { Location } from './location';
 import * as json from './json';
 import * as type from './type';
 import { ListResult } from '../list';
-import * as errors from './error';
 
 /**
  * Represents the simplified object metadata returned by List API.
@@ -52,17 +51,14 @@ const ITEMS_KEY = 'items';
 
 function fromBackendResponse(
   authWrapper: AuthWrapper,
+  bucket: string,
   resource: ListResultResponse
 ): ListResult {
   const listResult: ListResult = {
     prefixes: [],
     items: [],
     nextPageToken: resource['nextPageToken']
   };
-  const bucket = authWrapper.bucket();
-  if (bucket === null) {
-    throw errors.noDefaultBucket();
-  }
   if (resource[PREFIXES_KEY]) {
     for (const path of resource[PREFIXES_KEY]) {
       const pathWithoutTrailingSlash = path.replace(/\/$/, '');
@@ -86,14 +82,15 @@ function fromBackendResponse(
 
 export function fromResponseString(
   authWrapper: AuthWrapper,
+  bucket: string,
   resourceString: string
 ): ListResult | null {
   const obj = json.jsonObjectOrNull(resourceString);
   if (obj === null) {
     return null;
   }
   const resource = (obj as unknown) as ListResultResponse;
-  return fromBackendResponse(authWrapper, resource);
+  return fromBackendResponse(authWrapper, bucket, resource);
 }
 
 export function listOptionsValidator(p: unknown): void {

packages/storage/src/implementation/requests.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -67,10 +67,15 @@ export function metadataHandler(
 }
 
 export function listHandler(
-  authWrapper: AuthWrapper
+  authWrapper: AuthWrapper,
+  bucket: string
 ): (p1: XhrIo, p2: string) => ListResult {
   function handler(xhr: XhrIo, text: string): ListResult {
-    const listResult = ListResultUtils.fromResponseString(authWrapper, text);
+    const listResult = ListResultUtils.fromResponseString(
+      authWrapper,
+      bucket,
+      text
+    );
     handlerCheck(listResult !== null);
     return listResult as ListResult;
   }
@@ -190,7 +195,7 @@ export function list(
   const requestInfo = new RequestInfo(
     url,
     method,
-    listHandler(authWrapper),
+    listHandler(authWrapper, location.bucket),
     timeout
   );
   requestInfo.urlParams = urlParams;

packages/storage/test/requests.test.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,9 +41,11 @@ import { FirebaseApp } from '@firebase/app-types';
 
 describe('Firebase Storage > Requests', () => {
   const normalBucket = 'b';
+  const differentBucket = 'c';
   const locationRoot = new Location(normalBucket, '');
   const locationNormal = new Location(normalBucket, 'o');
   const locationNormalUrl = '/b/' + normalBucket + '/o/o';
+  const locationDifferentBucket = new Location(differentBucket, '');
   const locationNormalNoObjUrl = '/b/' + normalBucket + '/o';
   const locationEscapes = new Location('b/', 'o?');
   const locationEscapesUrl = '/b/b%2F/o/o%3F';
@@ -269,11 +271,11 @@ describe('Firebase Storage > Requests', () => {
       items: [
         {
           name: 'a/a',
-          bucket: 'fredzqm-staging'
+          bucket: normalBucket
         },
         {
           name: 'a/b',
-          bucket: 'fredzqm-staging'
+          bucket: normalBucket
         }
       ],
       nextPageToken: pageToken
@@ -286,6 +288,23 @@ describe('Firebase Storage > Requests', () => {
     assert.equal(listResult.nextPageToken, pageToken);
   });
 
+  it('list handler with custom bucket', () => {
+    const requestInfo = requests.list(authWrapper, locationDifferentBucket);
+    const pageToken = 'YS9mLw==';
+    const listResponse = {
+      items: [
+        {
+          name: 'a/a',
+          bucket: differentBucket
+        }
+      ],
+      nextPageToken: pageToken
+    };
+    const listResponseString = JSON.stringify(listResponse);
+    const listResult = requestInfo.handler(fakeXhrIo({}), listResponseString);
+    assert.equal(listResult.items[0].bucket, differentBucket);
+  });
+
   it('getDownloadUrl request info', () => {
     const maps: Array<[Location, string]> = [
       [locationNormal, locationNormalUrl],