Changes post rebase

Author: renkelvin

FirebaseAuth.podspec

@@ -58,8 +58,6 @@ supports email and password accounts, as well as several 3rd party authenticatio
   s.dependency 'GoogleUtilities/Environment', '~> 7.8'
   s.dependency 'GTMSessionFetcher/Core', '>= 2.1', '< 4.0'
   s.ios.dependency 'RecaptchaInterop', '~> 18.2.0'
-  # Using environment variable because of the dependency on the unpublished
-  # HeartbeatLoggingTestUtils.
   s.test_spec 'unit' do |unit_tests|
     unit_tests.scheme = { :code_coverage => true }
     # Unit tests can't run on watchOS.
@@ -100,7 +98,6 @@ supports email and password accounts, as well as several 3rd party authenticatio
     # app_host is needed for tests with keychain
     unit_tests.requires_app_host = true
     unit_tests.dependency 'OCMock'
-    unit_tests.dependency 'HeartbeatLoggingTestUtils'
 
     # This pre-processor directive is used to selectively disable keychain
     # related code that blocks unit testing on macOS.

FirebaseAuth/Sources/Backend/RPC/MultiFactor/Enroll/FIRFinalizeMFAEnrollmentRequest.m

@@ -49,9 +49,8 @@ - (nullable instancetype)initWithIDToken:(NSString *)IDToken
                         (FIRAuthProtoFinalizeMFATOTPEnrollmentRequestInfo *)TOTPVerificationInfo
                     requestConfiguration:(FIRAuthRequestConfiguration *)requestConfiguration {
   self = [super initWithEndpoint:kFinalizeMFAEnrollmentEndPoint
-            requestConfiguration:requestConfiguration
-             useIdentityPlatform:YES
-                      useStaging:NO];
+            requestConfiguration:requestConfiguration];
+  self.useIdentityPlatform = YES;
   if (self) {
     _IDToken = IDToken;
     _displayName = displayName;

FirebaseAuth/Sources/Backend/RPC/MultiFactor/Enroll/FIRStartMFAEnrollmentRequest.m

@@ -45,9 +45,8 @@ - (nullable instancetype)initWithIDToken:(NSString *)IDToken
                           (FIRAuthProtoStartMFATOTPEnrollmentRequestInfo *)TOTPEnrollmentInfo
                     requestConfiguration:(FIRAuthRequestConfiguration *)requestConfiguration {
   self = [super initWithEndpoint:kStartMFAEnrollmentEndPoint
-            requestConfiguration:requestConfiguration
-             useIdentityPlatform:YES
-                      useStaging:NO];
+            requestConfiguration:requestConfiguration];
+  self.useIdentityPlatform = YES;
   if (self) {
     _IDToken = IDToken;
     _TOTPEnrollmentInfo = TOTPEnrollmentInfo;

Package.swift

@@ -176,6 +176,10 @@ let package = Package(
       url: "https://github.com/SlaunchaMan/GCDWebServer.git",
       revision: "935e2736044e71e5341663c3cc9a335ba6867a2b"
     ),
+    .package(
+      url: "https://github.com/GoogleCloudPlatform/recaptcha-enterprise-mobile-sdk.git",
+      "18.2.0" ..< "18.2.1"
+    ),
   ],
   targets: [
     .target(
@@ -420,6 +424,7 @@ let package = Package(
         .product(name: "GULAppDelegateSwizzler", package: "GoogleUtilities"),
         .product(name: "GULEnvironment", package: "GoogleUtilities"),
         .product(name: "GTMSessionFetcherCore", package: "gtm-session-fetcher"),
+        .product(name: "RecaptchaInterop", package: "recaptcha-enterprise-mobile-sdk"),
       ],
       path: "FirebaseAuth/Sources",
       publicHeadersPath: "Public",