From 1ce5e4ca06e557d6e65f3d02a767c7d286fb621c Mon Sep 17 00:00:00 2001
From: Mark Duckworth <1124037+MarkDuckworth@users.noreply.github.com>
Date: Tue, 19 Dec 2023 18:11:03 -0700
Subject: [PATCH] More build errors and cleanup.

---
 .../firestore/src/remote/rest_connection.ts   |  4 ++--
 .../test/unit/remote/rest_connection.test.ts  | 21 ++++++++++++++-----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/packages/firestore/src/remote/rest_connection.ts b/packages/firestore/src/remote/rest_connection.ts
index 0fd73aae638..470cb332ce2 100644
--- a/packages/firestore/src/remote/rest_connection.ts
+++ b/packages/firestore/src/remote/rest_connection.ts
@@ -89,7 +89,7 @@ export abstract class RestConnection implements Connection {
     appCheckToken: Token | null
   ): Promise<Resp> {
     const streamId = generateUniqueDebugId();
-    const url = this.makeUrl(rpcName, path.map(encodeURIComponent).join('/'));
+    const url = this.makeUrl(rpcName, path.toUriEncodedString());
     logDebug(LOG_TAG, `Sending RPC '${rpcName}' ${streamId}:`, url, req);
 
     const headers: StringMap = {
@@ -120,7 +120,7 @@ export abstract class RestConnection implements Connection {
 
   invokeStreamingRPC<Req, Resp>(
     rpcName: string,
-    path: string[],
+    path: ResourcePath,
     request: Req,
     authToken: Token | null,
     appCheckToken: Token | null,
diff --git a/packages/firestore/test/unit/remote/rest_connection.test.ts b/packages/firestore/test/unit/remote/rest_connection.test.ts
index 703bc6915c5..d45a75ce67b 100644
--- a/packages/firestore/test/unit/remote/rest_connection.test.ts
+++ b/packages/firestore/test/unit/remote/rest_connection.test.ts
@@ -21,6 +21,7 @@ import { AppCheckToken, OAuthToken, Token } from '../../../src/api/credentials';
 import { User } from '../../../src/auth/user';
 import { DatabaseId, DatabaseInfo } from '../../../src/core/database_info';
 import { SDK_VERSION } from '../../../src/core/version';
+import { ResourcePath } from '../../../src/model/path';
 import { Stream } from '../../../src/remote/connection';
 import { RestConnection } from '../../../src/remote/rest_connection';
 import { Code, FirestoreError } from '../../../src/util/error';
@@ -73,7 +74,9 @@ describe('RestConnection', () => {
   it('url uses from path', async () => {
     await connection.invokeRPC(
       'Commit',
-      'projects/testproject/databases/(default)/documents'.split('/'),
+      new ResourcePath(
+        'projects/testproject/databases/(default)/documents'.split('/')
+      ),
       {},
       null,
       null
@@ -86,7 +89,9 @@ describe('RestConnection', () => {
   it('merges headers', async () => {
     await connection.invokeRPC(
       'RunQuery',
-      'projects/testproject/databases/(default)/documents/foo'.split('/'),
+      new ResourcePath(
+        'projects/testproject/databases/(default)/documents/foo'.split('/')
+      ),
       {},
       new OAuthToken('owner', User.UNAUTHENTICATED),
       new AppCheckToken('some-app-check-token')
@@ -105,7 +110,9 @@ describe('RestConnection', () => {
   it('empty app check token is not added to headers', async () => {
     await connection.invokeRPC(
       'RunQuery',
-      'projects/testproject/databases/(default)/documents/foo'.split('/'),
+      new ResourcePath(
+        'projects/testproject/databases/(default)/documents/foo'.split('/')
+      ),
       {},
       null,
       new AppCheckToken('')
@@ -124,7 +131,9 @@ describe('RestConnection', () => {
     connection.nextResponse = Promise.resolve({ response: true });
     const response = await connection.invokeRPC(
       'RunQuery',
-      'projects/testproject/databases/(default)/documents/coll'.split('/'),
+      new ResourcePath(
+        'projects/testproject/databases/(default)/documents/coll'.split('/')
+      ),
       {},
       null,
       null
@@ -138,7 +147,9 @@ describe('RestConnection', () => {
     return expect(
       connection.invokeRPC(
         'RunQuery',
-        'projects/testproject/databases/(default)/documents/coll'.split('/'),
+        new ResourcePath(
+          'projects/testproject/databases/(default)/documents/coll'.split('/')
+        ),
         {},
         null,
         null