fix(firestore): transaction.get() should throw FirebaseException …

…on exception. (#12064)
firebase · Dec 27, 2023 · 3cfc501 · 3cfc501
1 parent 1cf38b8
commit 3cfc501
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 11 deletions.
diff --git a/packages/cloud_firestore/cloud_firestore/example/integration_test/transaction_e2e.dart b/packages/cloud_firestore/cloud_firestore/example/integration_test/transaction_e2e.dart
@@ -230,7 +230,7 @@ void runTransactionTests() {
           expect(e.code, equals('permission-denied'));
           return;
         } catch (e) {
-          fail('Transaction threw invalid exeption');
+          fail('Transaction threw invalid exception');
         }
       });
 
@@ -249,6 +249,25 @@ void runTransactionTests() {
           );
         });
 
+        testWidgets(
+            'should throw a native error, and convert to a [FirebaseException]',
+            (_) async {
+          DocumentReference<Map<String, dynamic>> documentReference =
+              firestore.doc('not-allowed/document');
+
+          try {
+            await firestore.runTransaction((Transaction transaction) async {
+              await transaction.get(documentReference);
+            });
+            fail('Transaction should not have resolved');
+          } on FirebaseException catch (e) {
+            expect(e.code, equals('permission-denied'));
+            return;
+          } catch (e) {
+            fail('Transaction threw invalid exception');
+          }
+        });
+
         // ignore: todo
         // TODO(Salakar): Test seems to fail sometimes. Will look at in a future PR.
         // testWidgets('support returning any value, e.g. a [DocumentSnapshot]', (_) async {

diff --git a/...cloud_firestore_platform_interface/lib/src/method_channel/method_channel_transaction.dart b/...cloud_firestore_platform_interface/lib/src/method_channel/method_channel_transaction.dart
@@ -6,6 +6,7 @@
 import 'dart:async';
 
 import 'package:cloud_firestore_platform_interface/cloud_firestore_platform_interface.dart';
+import 'package:cloud_firestore_platform_interface/src/method_channel/utils/exception.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:flutter/services.dart';
 
@@ -45,16 +46,19 @@ class MethodChannelTransaction extends TransactionPlatform {
   Future<DocumentSnapshotPlatform> get(String documentPath) async {
     assert(_commands.isEmpty,
         'Transactions require all reads to be executed before all writes.');
-
-    final result = await MethodChannelFirebaseFirestore.pigeonChannel
-        .transactionGet(pigeonApp, _transactionId, documentPath);
-
-    return DocumentSnapshotPlatform(
-      _firestore,
-      documentPath,
-      result.data,
-      result.metadata,
-    );
+    try {
+      final result = await MethodChannelFirebaseFirestore.pigeonChannel
+          .transactionGet(pigeonApp, _transactionId, documentPath);
+
+      return DocumentSnapshotPlatform(
+        _firestore,
+        documentPath,
+        result.data,
+        result.metadata,
+      );
+    } catch (e, stack) {
+      convertPlatformException(e, stack);
+    }
   }
 
   @override