Fixed checks

Author: maneesht

packages/firebase_data_connect/firebase_data_connect/lib/src/common/common_library.dart

@@ -17,7 +17,6 @@ library firebase_data_connect_common;
 import 'dart:convert';
 
 import 'package:firebase_app_check/firebase_app_check.dart';
-import 'package:firebase_auth/firebase_auth.dart';
 
 part 'dataconnect_error.dart';
 part 'dataconnect_options.dart';

packages/firebase_data_connect/firebase_data_connect/lib/src/core/ref.dart

@@ -42,22 +42,29 @@ abstract class OperationRef<Data, Variables> {
   DataConnectTransport _transport;
   Deserializer<Data> deserializer;
   Serializer<Variables> serializer;
+  String? _lastToken;
 
   FirebaseDataConnect dataConnect;
 
   Future<OperationResult<Data, Variables>> execute() {
-    return this._executeWithRetry(true);
+    return this._executeWithRetry();
   }
 
-  Future<OperationResult<Data, Variables>> _executeOperation(bool forceRefresh);
+  Future<OperationResult<Data, Variables>> _executeOperation(String? token);
 
-  Future<OperationResult<Data, Variables>> _executeWithRetry(bool retry) async {
+  Future<OperationResult<Data, Variables>> _executeWithRetry() async {
+    String? newToken =
+        await this.dataConnect.auth?.currentUser?.getIdToken(false);
+    bool shouldRetry = newToken != null && _lastToken != newToken;
+    _lastToken = newToken;
     try {
-      OperationResult<Data, Variables> r = await this._executeOperation(!retry);
+      OperationResult<Data, Variables> r =
+          await this._executeOperation(newToken);
       return r;
     } on DataConnectError catch (e) {
-      if (retry && e.code == DataConnectErrorCode.unauthorized.toString()) {
-        return this._executeWithRetry(false);
+      if (shouldRetry &&
+          e.code == DataConnectErrorCode.unauthorized.toString()) {
+        return this._executeWithRetry();
       } else {
         throw e;
       }
@@ -132,10 +139,7 @@ class QueryRef<Data, Variables> extends OperationRef<Data, Variables> {
 
   QueryManager _queryManager;
 
-  Future<QueryResult<Data, Variables>> _executeOperation(
-      bool forceRefresh) async {
-    String? token =
-        await this.dataConnect.auth?.currentUser?.getIdToken(forceRefresh);
+  Future<QueryResult<Data, Variables>> _executeOperation(String? token) async {
     try {
       Data data = await _transport.invokeQuery<Data, Variables>(
           operationName, deserializer, serializer, variables, token);
@@ -157,7 +161,7 @@ class QueryRef<Data, Variables> extends OperationRef<Data, Variables> {
         .cast<QueryResult<Data, Variables>>();
     if (_queryManager.containsQuery(operationName, variables, varsSerialized)) {
       try {
-        this._executeWithRetry(true);
+        this._executeWithRetry();
       } catch (_) {
         // Call to `execute` should properly pass the error to the Stream.
         log("Error thrown by execute. The error will propagate via onError.");
@@ -179,9 +183,7 @@ class MutationRef<Data, Variables> extends OperationRef<Data, Variables> {
             variables);
   @override
   Future<OperationResult<Data, Variables>> _executeOperation(
-      bool forceRefresh) async {
-    String? token =
-        await this.dataConnect.auth?.currentUser?.getIdToken(forceRefresh);
+      String? token) async {
     Data data = await _transport.invokeMutation<Data, Variables>(
         operationName, deserializer, serializer, variables, token);
     return OperationResult(dataConnect, data, this);

packages/firebase_data_connect/firebase_data_connect/lib/src/network/rest_library.dart

@@ -18,7 +18,6 @@ import 'dart:convert';
 import 'dart:developer';
 
 import 'package:firebase_app_check/firebase_app_check.dart';
-import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/foundation.dart';
 import 'package:http/http.dart' as http;
 

packages/firebase_data_connect/firebase_data_connect/lib/src/network/rest_transport.dart

@@ -64,12 +64,13 @@ class RestTransport implements DataConnectTransport {
 
   /// Invokes the current operation, whether its a query or mutation.
   Future<Data> invokeOperation<Data, Variables>(
-      String queryName,
-      Deserializer<Data> deserializer,
-      Serializer<Variables>? serializer,
-      Variables? vars,
-      String? authToken,
-      String endpoint) async {
+    String queryName,
+    String endpoint,
+    Deserializer<Data> deserializer,
+    Serializer<Variables>? serializer,
+    Variables? vars,
+    String? authToken,
+  ) async {
     String project = options.projectId;
     String location = options.location;
     String service = options.serviceId;
@@ -146,7 +147,7 @@ class RestTransport implements DataConnectTransport {
       Variables? vars,
       String? token) async {
     return invokeOperation(
-        queryName, deserializer, serializer, vars, token, 'executeQuery');
+        queryName, 'executeQuery', deserializer, serializer, vars, token);
   }
 
   /// Invokes mutation REST endpoint.
@@ -158,7 +159,7 @@ class RestTransport implements DataConnectTransport {
       Variables? vars,
       String? token) async {
     return invokeOperation(
-        queryName, deserializer, serializer, vars, token, 'executeMutation');
+        queryName, 'executeMutation', deserializer, serializer, vars, token);
   }
 }
 

packages/firebase_data_connect/firebase_data_connect/test/src/core/ref_test.dart

@@ -32,7 +32,20 @@ class MockDataConnectTransport extends Mock implements DataConnectTransport {}
 
 class MockFirebaseDataConnect extends Mock implements FirebaseDataConnect {}
 
-class MockFirebaseAuth extends Mock implements FirebaseAuth {}
+class DCMockUser extends Mock implements User {
+  int count = 0;
+  List<String?> tokens = ['invalid-token', 'valid-token'];
+  @override
+  Future<String?> getIdToken([bool forceRefresh = false]) {
+    // First return an invalid token, then return a valid token
+    return Future.value(tokens[count++]);
+  }
+}
+
+class MockFirebaseAuth extends Mock implements FirebaseAuth {
+  @override
+  User? get currentUser => DCMockUser();
+}
 
 class MockQueryManager extends Mock implements QueryManager {}
 
@@ -111,7 +124,9 @@ void main() {
     late Deserializer<String> deserializer;
 
     setUp(() {
+      print('setting up');
       mockDataConnect = MockFirebaseDataConnect();
+      when(mockDataConnect.auth).thenReturn(MockFirebaseAuth());
       mockHttpClient = MockClient();
       transport = RestTransport(
         TransportOptions('testhost', 443, true),
@@ -127,15 +142,14 @@ void main() {
       );
       transport.setHttp(mockHttpClient);
       mockDataConnect.transport = transport;
-      mockDataConnect.auth = MockFirebaseAuth();
     });
     test(
         'query should forceRefresh on ID token if the first request is unauthorized',
         () async {
       final mockResponse = http.Response('{"error": "Unauthorized"}', 401);
       final mockResponseSuccess = http.Response('{"success": true}', 200);
-      int count = 0;
       final deserializer = (String data) => 'Deserialized Data';
+      int count = 0;
       QueryRef ref = QueryRef(mockDataConnect, 'operation', transport,
           deserializer, QueryManager(mockDataConnect), emptySerializer, null);
 

packages/firebase_data_connect/firebase_data_connect/test/src/network/rest_transport_test.dart

@@ -96,11 +96,11 @@ void main() {
 
       final result = await transport.invokeOperation(
         'testQuery',
+        'executeQuery',
         deserializer,
         null,
         null,
         null,
-        'executeQuery',
       );
 
       expect(result, 'Deserialized Data');
@@ -117,7 +117,7 @@ void main() {
 
       expect(
         () => transport.invokeOperation(
-            'testQuery', deserializer, null, null, null, 'executeQuery'),
+            'testQuery', 'executeQuery', deserializer, null, null, null),
         throwsA(isA<DataConnectError>()),
       );
     });
@@ -133,7 +133,7 @@ void main() {
 
       expect(
         () => transport.invokeOperation(
-            'testQuery', deserializer, null, null, null, 'executeQuery'),
+            'testQuery', 'executeQuery', deserializer, null, null, null),
         throwsA(isA<DataConnectError>()),
       );
     });
@@ -195,8 +195,8 @@ void main() {
 
       final deserializer = (String data) => 'Deserialized Data';
 
-      await transport.invokeOperation('testQuery', deserializer, null, null,
-          'authToken123', 'executeQuery');
+      await transport.invokeOperation('testQuery', 'executeQuery', deserializer,
+          null, null, 'authToken123');
 
       verify(mockHttpClient.post(
         any,
@@ -222,7 +222,7 @@ void main() {
       final deserializer = (String data) => 'Deserialized Data';
 
       await transport.invokeOperation(
-          'testQuery', deserializer, null, null, null, 'executeQuery');
+          'testQuery', 'executeQuery', deserializer, null, null, null);
 
       verify(mockHttpClient.post(
         any,
@@ -257,7 +257,7 @@ void main() {
 
       expect(
         () => transport.invokeOperation(
-            'testQuery', deserializer, null, null, null, 'executeQuery'),
+            'testQuery', 'executeQuery', deserializer, null, null, null),
         throwsA(isA<DataConnectError>()),
       );
     });