add validation to getAggregateFromServerDirect

Author: milaGGL

packages/firestore/src/lite-api/aggregate.ts

@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+import { CompositeFilterOpEnum } from '../protos/firestore_proto_api';
 import { invokeRunAggregationQueryRpc } from '../remote/datastore';
 import { hardAssert } from '../util/assert';
 import { cast } from '../util/input_validation';
@@ -82,19 +83,24 @@ export function getAggregateFromServerDirect(
 
   return invokeRunAggregationQueryRpc(datastore, aggregateQuery).then(
     result => {
-      const aggregationFields = new Map<string, any>();
+      hardAssert(
+        result[0] !== undefined,
+        'Aggregation fields are missing from result.'
+      );
 
-      for (const [key, value] of Object.entries(result[0])) {
-        aggregationFields.set(key, userDataWriter.convertValue(value));
-      }
-      const countField = aggregationFields.get('count_alias');
+      const countField = (result[0] as any).count_alias;
+      hardAssert(
+        countField !== undefined,
+        'Count field is missing from result.'
+      );
 
+      const countAggregateResult = userDataWriter.convertValue(countField);
       hardAssert(
-        countField !== undefined && typeof countField === 'number',
-        'Count aggeragte field is invalid. countField:' + countField
+        typeof countAggregateResult === 'number',
+        'Count aggeragte field is not a number: ' + countAggregateResult
       );
       return Promise.resolve(
-        new AggregateQuerySnapshot(aggregateQuery, countField!)
+        new AggregateQuerySnapshot(aggregateQuery, countAggregateResult)
       );
     }
   );

packages/firestore/src/remote/datastore.ts

@@ -255,7 +255,7 @@ export async function invokeRunAggregationQueryRpc(
   return (
     response
       // Omit RunAggregationQueryResponse that only contain readTimes.
-      .filter(proto => !!proto.result && !!proto.result.aggregateFields)
+      .filter(proto => !!proto.result)
       .map(proto => proto.result!.aggregateFields!)
   );
 }