sync with master (#11132)

* [Infra] Avoid subshells in test script (#11094)

* [Auth] Remove unreachable code (#11091)

* [Auth] Remove unreachable code

* Rename '-[FIRAuthStoredUserManager getStoredUserAccessGroupWithError:]'

* Favor 'NULL' over 'nil' for a **

* Rename '-[FIRAuthStoredUserManager setStoredUserAccessGroup:error:]'

* [Tooling] Add FIR_CLANG_FORMAT_PATH env var to style.sh (#11097)

Added an environment variable to specify the path to the version of clang-format used by the style.sh script.

* Carthage json updates for 10.8.0 (#11103)

* Update versions for Release 10.9.0 (#11112)

* [RemoteConfig] Expose NSUnderlyingError to client (#11102)

* [Release Tooling] Separate out dynamic content from zip README.md (#11113)

* Updated README Badges (#11117)

* [Release] Enable macCatalyst support for Firestore targets (#11121)

* [Release] Update Package.swift for 10.8.1 release

* Update changelog entry for 10.8.1 Package.swift

* New Cache Config API (#11057)

* Fix bundle query resume bug (#11018)

* Fix bundle query resume bug

* fix

* Update for proposed g3 ocmock changes (#11116)

---------

Co-authored-by: Nick Cooke <36927374+ncooke3@users.noreply.github.com>
Co-authored-by: Andrew Heard <andrewheard@google.com>
Co-authored-by: Paul Beusterien <paulbeusterien@google.com>
Co-authored-by: Guglielmo Faglioni <guglielmo@gorillatech.io>
Co-authored-by: Max Cobb <5754073+maxxfrazer@users.noreply.github.com>
Co-authored-by: wu-hui <53845758+wu-hui@users.noreply.github.com>

Author: 7 people

FirebaseMessaging/Tests/UnitTests/FIRMessagingRemoteNotificationsProxyTest.m

@@ -300,7 +300,7 @@ - (void)testListeningForDelegateChangesOnInvalidUserNotificationCenter {
 
     [(id<UNUserNotificationCenterDelegate>)invalidNotificationCenter.delegate
          userNotificationCenter:self.mockUserNotificationCenter
-        willPresentNotification:OCMClassMock([UNNotification class])
+        willPresentNotification:[UNNotification alloc]
           withCompletionHandler:^(UNNotificationPresentationOptions options){
           }];
   }
@@ -315,7 +315,7 @@ - (void)testSwizzlingInvalidUserNotificationCenterDelegate {
     OCMReject([self.mockMessaging appDidReceiveMessage:[OCMArg any]]);
 
     [invalidDelegate userNotificationCenter:self.mockUserNotificationCenter
-                    willPresentNotification:OCMClassMock([UNNotification class])
+                    willPresentNotification:[UNNotification alloc]
                       withCompletionHandler:^(UNNotificationPresentationOptions options){
                       }];
   }

Firestore/core/src/bundle/bundle_serializer.cc

@@ -53,6 +53,7 @@ using core::FieldFilter;
 using core::Filter;
 using core::LimitType;
 using core::OrderBy;
+using core::Query;
 using core::Target;
 using model::DeepClone;
 using model::Document;
@@ -376,10 +377,19 @@ BundledQuery BundleSerializer::DecodeBundledQuery(
   int32_t limit = DecodeLimit(reader, structured_query);
   LimitType limit_type = DecodeLimitType(reader, query);
 
-  return BundledQuery(Target(std::move(parent), std::move(collection_group),
-                             std::move(filters), std::move(order_bys), limit,
-                             std::move(start_at), std::move(end_at)),
-                      limit_type);
+  if (!reader.ok()) {
+    return {};
+  }
+
+  return BundledQuery(
+      Query(std::move(parent), std::move(collection_group), std::move(filters),
+            std::move(order_bys), limit,
+            // Not using `limit_type` because bundled queries are what the
+            // backend sees, and there is no limit_to_last for the backend.
+            // Limit type is applied when the query is read back instead.
+            LimitType::None, std::move(start_at), std::move(end_at))
+          .ToTarget(),
+      limit_type);
 }
 
 ResourcePath BundleSerializer::DecodeName(JsonReader& reader,

Firestore/core/src/core/target.h

@@ -192,7 +192,6 @@ class Target {
   }
   friend class Query;
   friend class remote::Serializer;
-  friend class bundle::BundleSerializer;
   friend class local::LevelDbIndexManager;
 
   /** Returns the field filters that target the given field path. */

Firestore/core/test/unit/bundle/bundle_serializer_test.cc

@@ -1161,6 +1161,38 @@ TEST_F(BundleSerializerTest, DecodeInvalidBundledDocumentMetadataFails) {
   }
 }
 
+TEST_F(BundleSerializerTest, DecodeTargetWithoutImplicitOrderByOnName) {
+  std::string json(
+      R"({"name":"myNamedQuery",
+"bundledQuery":{"parent":"projects/p/databases/default/documents",
+"structuredQuery":{"from":[{"collectionId":"foo"}],
+"limit":{"value":10}},"limitType":"FIRST"},
+"readTime":{"seconds":"1679674432","nanos":579934000}})");
+  JsonReader reader;
+  auto named_query = bundle_serializer.DecodeNamedQuery(reader, Parse(json));
+  EXPECT_OK(reader.status());
+  EXPECT_EQ(testutil::Query("foo").WithLimitToFirst(10).ToTarget(),
+            named_query.bundled_query().target());
+  EXPECT_EQ(core::LimitType::First, named_query.bundled_query().limit_type());
+}
+
+TEST_F(BundleSerializerTest,
+       DecodeLimitToLastTargetWithoutImplicitOrderByOnName) {
+  std::string json(
+      R"({"name":"myNamedQuery",
+"bundledQuery":{"parent":"projects/p/databases/default/documents",
+"structuredQuery":{"from":[{"collectionId":"foo"}],
+"limit":{"value":10}},"limitType":"LAST"},
+"readTime":{"seconds":"1679674432","nanos":579934000}})");
+  JsonReader reader;
+  auto named_query = bundle_serializer.DecodeNamedQuery(reader, Parse(json));
+  EXPECT_OK(reader.status());
+  // Note `WithLimitToFirst(10)` is expected.
+  EXPECT_EQ(testutil::Query("foo").WithLimitToFirst(10).ToTarget(),
+            named_query.bundled_query().target());
+  EXPECT_EQ(core::LimitType::Last, named_query.bundled_query().limit_type());
+}
+
 }  //  namespace
 }  //  namespace bundle
 }  //  namespace firestore