Merge branch 'master' into wuandy/OverlayRelease

# Conflicts:
#	firebase-firestore/src/test/java/com/google/firebase/firestore/local/LocalStoreTestCase.java

Author: wu-hui

appcheck/firebase-appcheck-debug/src/test/java/com/google/firebase/appcheck/debug/internal/DebugAppCheckProviderTest.java

@@ -102,19 +102,6 @@ public void testPublicConstructor_nullFirebaseApp_expectThrows() {
         });
   }
 
-  @Test
-  public void testPublicConstructor_nullProjectId_expectThrows() {
-    FirebaseOptions firebaseOptionsNoProjectId =
-        new FirebaseOptions.Builder().setApiKey(API_KEY).setApplicationId(APP_ID).build();
-    when(mockFirebaseApp.getOptions()).thenReturn(firebaseOptionsNoProjectId);
-
-    assertThrows(
-        IllegalArgumentException.class,
-        () -> {
-          new DebugAppCheckProvider(mockFirebaseApp, null);
-        });
-  }
-
   @Test
   public void testDetermineDebugSecret_noStoredSecret_createsNewSecret() {
     // Sanity check

appcheck/firebase-appcheck-safetynet/src/main/java/com/google/firebase/appcheck/safetynet/internal/SafetyNetAppCheckProvider.java

@@ -57,21 +57,28 @@ public class SafetyNetAppCheckProvider implements AppCheckProvider {
 
   /** @param firebaseApp the FirebaseApp to which this Factory is tied. */
   public SafetyNetAppCheckProvider(@NonNull FirebaseApp firebaseApp) {
-    this(firebaseApp, GoogleApiAvailability.getInstance(), Executors.newCachedThreadPool());
+    this(
+        firebaseApp,
+        new NetworkClient(firebaseApp),
+        GoogleApiAvailability.getInstance(),
+        Executors.newCachedThreadPool());
   }
 
   @VisibleForTesting
   SafetyNetAppCheckProvider(
       @NonNull FirebaseApp firebaseApp,
+      @NonNull NetworkClient networkClient,
       @NonNull GoogleApiAvailability googleApiAvailability,
       @NonNull ExecutorService backgroundExecutor) {
     checkNotNull(firebaseApp);
+    checkNotNull(networkClient);
     checkNotNull(googleApiAvailability);
+    checkNotNull(backgroundExecutor);
     this.context = firebaseApp.getApplicationContext();
     this.apiKey = firebaseApp.getOptions().getApiKey();
     this.backgroundExecutor = backgroundExecutor;
     this.safetyNetClientTask = initSafetyNetClient(googleApiAvailability, this.backgroundExecutor);
-    this.networkClient = new NetworkClient(firebaseApp);
+    this.networkClient = networkClient;
     this.retryManager = new RetryManager();
   }
 

appcheck/firebase-appcheck-safetynet/src/test/java/com/google/firebase/appcheck/safetynet/internal/SafetyNetAppCheckProviderTest.java

@@ -92,7 +92,8 @@ public void testPublicConstructor_nullFirebaseApp_expectThrows() {
     when(mockGoogleApiAvailability.isGooglePlayServicesAvailable(any()))
         .thenReturn(ConnectionResult.SERVICE_MISSING);
     SafetyNetAppCheckProvider provider =
-        new SafetyNetAppCheckProvider(firebaseApp, mockGoogleApiAvailability, backgroundExecutor);
+        new SafetyNetAppCheckProvider(
+            firebaseApp, mockNetworkClient, mockGoogleApiAvailability, backgroundExecutor);
     assertThat(provider.getSafetyNetClientTask().isSuccessful()).isFalse();
   }
 
@@ -101,7 +102,8 @@ public void testGetToken_googlePlayServicesIsNotAvailable_expectGetTokenTaskExce
     when(mockGoogleApiAvailability.isGooglePlayServicesAvailable(any()))
         .thenReturn(ConnectionResult.SERVICE_MISSING);
     SafetyNetAppCheckProvider provider =
-        new SafetyNetAppCheckProvider(firebaseApp, mockGoogleApiAvailability, backgroundExecutor);
+        new SafetyNetAppCheckProvider(
+            firebaseApp, mockNetworkClient, mockGoogleApiAvailability, backgroundExecutor);
     assertThat(provider.getSafetyNetClientTask().isSuccessful()).isFalse();
 
     Task<AppCheckToken> tokenTask = provider.getToken();

appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/DefaultFirebaseAppCheck.java

@@ -40,7 +40,6 @@
 public class DefaultFirebaseAppCheck extends FirebaseAppCheck {
 
   private static final long BUFFER_TIME_MILLIS = 5 * 60 * 1000; // 5 minutes in milliseconds
-  private static final String HEART_BEAT_STORAGE_TAG = "fire-app-check";
 
   private final FirebaseApp firebaseApp;
   private final Provider<UserAgentPublisher> userAgentPublisherProvider;
@@ -217,19 +216,14 @@ public Task<AppCheckToken> then(@NonNull Task<AppCheckToken> task) {
             });
   }
 
-  @Nullable
-  String getUserAgent() {
-    return userAgentPublisherProvider.get() != null
-        ? userAgentPublisherProvider.get().getUserAgent()
-        : null;
+  @NonNull
+  Provider<UserAgentPublisher> getUserAgentPublisherProvider() {
+    return userAgentPublisherProvider;
   }
 
-  @Nullable
-  String getHeartbeatCode() {
-    return heartBeatInfoProvider.get() != null
-        ? Integer.toString(
-            heartBeatInfoProvider.get().getHeartBeatCode(HEART_BEAT_STORAGE_TAG).getCode())
-        : null;
+  @NonNull
+  Provider<HeartBeatInfo> getHeartBeatInfoProvider() {
+    return heartBeatInfoProvider;
   }
 
   /** Sets the in-memory cached {@link AppCheckToken}. */

appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/NetworkClient.java

@@ -26,7 +26,12 @@
 import com.google.android.gms.common.util.Hex;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseException;
+import com.google.firebase.FirebaseOptions;
 import com.google.firebase.appcheck.FirebaseAppCheck;
+import com.google.firebase.heartbeatinfo.HeartBeatInfo;
+import com.google.firebase.heartbeatinfo.HeartBeatInfo.HeartBeat;
+import com.google.firebase.inject.Provider;
+import com.google.firebase.platforminfo.UserAgentPublisher;
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -58,12 +63,14 @@ public class NetworkClient {
   @VisibleForTesting static final String X_FIREBASE_CLIENT_LOG_TYPE = "X-Firebase-Client-Log-Type";
   @VisibleForTesting static final String X_ANDROID_PACKAGE = "X-Android-Package";
   @VisibleForTesting static final String X_ANDROID_CERT = "X-Android-Cert";
+  private static final String HEART_BEAT_STORAGE_TAG = "fire-app-check";
 
   private final Context context;
-  private final DefaultFirebaseAppCheck firebaseAppCheck;
   private final String apiKey;
   private final String appId;
   private final String projectId;
+  private final Provider<UserAgentPublisher> userAgentPublisherProvider;
+  private final Provider<HeartBeatInfo> heartBeatInfoProvider;
 
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({UNKNOWN, SAFETY_NET, DEBUG})
@@ -74,15 +81,34 @@ public class NetworkClient {
   public static final int DEBUG = 2;
 
   public NetworkClient(@NonNull FirebaseApp firebaseApp) {
-    checkNotNull(firebaseApp);
-    this.context = firebaseApp.getApplicationContext();
-    this.firebaseAppCheck = (DefaultFirebaseAppCheck) FirebaseAppCheck.getInstance(firebaseApp);
-    this.apiKey = firebaseApp.getOptions().getApiKey();
-    this.appId = firebaseApp.getOptions().getApplicationId();
-    this.projectId = firebaseApp.getOptions().getProjectId();
+    this(
+        firebaseApp.getApplicationContext(),
+        firebaseApp.getOptions(),
+        ((DefaultFirebaseAppCheck) FirebaseAppCheck.getInstance(firebaseApp))
+            .getUserAgentPublisherProvider(),
+        ((DefaultFirebaseAppCheck) FirebaseAppCheck.getInstance(firebaseApp))
+            .getHeartBeatInfoProvider());
+  }
+
+  @VisibleForTesting
+  NetworkClient(
+      @NonNull Context context,
+      @NonNull FirebaseOptions firebaseOptions,
+      @NonNull Provider<UserAgentPublisher> userAgentPublisherProvider,
+      @NonNull Provider<HeartBeatInfo> heartBeatInfoProvider) {
+    checkNotNull(context);
+    checkNotNull(firebaseOptions);
+    checkNotNull(userAgentPublisherProvider);
+    checkNotNull(heartBeatInfoProvider);
+    this.context = context;
+    this.apiKey = firebaseOptions.getApiKey();
+    this.appId = firebaseOptions.getApplicationId();
+    this.projectId = firebaseOptions.getProjectId();
     if (projectId == null) {
       throw new IllegalArgumentException("FirebaseOptions#getProjectId cannot be null.");
     }
+    this.userAgentPublisherProvider = userAgentPublisherProvider;
+    this.heartBeatInfoProvider = heartBeatInfoProvider;
   }
 
   /**
@@ -105,12 +131,17 @@ public AppCheckTokenResponse exchangeAttestationForAppCheckToken(
       urlConnection.setDoOutput(true);
       urlConnection.setFixedLengthStreamingMode(requestBytes.length);
       urlConnection.setRequestProperty(CONTENT_TYPE, APPLICATION_JSON);
-      if (firebaseAppCheck.getUserAgent() != null) {
-        urlConnection.setRequestProperty(X_FIREBASE_CLIENT, firebaseAppCheck.getUserAgent());
+      String userAgent = getUserAgent();
+      if (userAgent != null) {
+        urlConnection.setRequestProperty(X_FIREBASE_CLIENT, userAgent);
       }
-      if (firebaseAppCheck.getHeartbeatCode() != null) {
+
+      // getHeartbeatCode should not be called multiple times, as subsequent calls will return
+      // HeartBeat.NONE until the heartbeat is reset.
+      HeartBeat heartBeat = getHeartbeatCode();
+      if (heartBeat != HeartBeat.NONE) {
         urlConnection.setRequestProperty(
-            X_FIREBASE_CLIENT_LOG_TYPE, firebaseAppCheck.getHeartbeatCode());
+            X_FIREBASE_CLIENT_LOG_TYPE, Integer.toString(heartBeat.getCode()));
       }
 
       // Headers for Android API key restrictions.
@@ -152,6 +183,18 @@ public AppCheckTokenResponse exchangeAttestationForAppCheckToken(
     }
   }
 
+  private String getUserAgent() {
+    return userAgentPublisherProvider.get() != null
+        ? userAgentPublisherProvider.get().getUserAgent()
+        : null;
+  }
+
+  private HeartBeat getHeartbeatCode() {
+    return heartBeatInfoProvider.get() != null
+        ? heartBeatInfoProvider.get().getHeartBeatCode(HEART_BEAT_STORAGE_TAG)
+        : HeartBeat.NONE;
+  }
+
   /** Gets the Android package's SHA-1 fingerprint. */
   private String getFingerprintHashForPackage() {
     byte[] hash;