Merge branch 'mrschmidt/fieldvalue' of https://github.com/firebase/firebase-cpp-sdk into mrschmidt/fieldvalue

Author: var-const

.github/workflows/integration_tests.yml

@@ -14,7 +14,7 @@ on:
         required: true
       apis:
         description: 'CSV of apis to build and test'
-        default: 'admob,analytics,auth,database,dynamic_links,firestore,functions,installations,messaging,remote_config,storage'
+        default: 'firestore'
         required: true
       operating_systems:
         description: 'CSV of VMs to run on'

auth/src/android/common_android.cc

@@ -115,7 +115,11 @@ static const ErrorCodeMapping kFirebaseAuthCodes[] = {
     {"ERROR_UNSUPPORTED_FIRST_FACTOR", kAuthErrorUnsupportedFirstFactor},
     {"ERROR_EMAIL_CHANGE_NEEDS_VERIFICATION",
      kAuthErrorEmailChangeNeedsVerification},
-    {"ERROR_USER_CANCELLED", kAuthErrorMissingOrInvalidNonce},
+    {"ERROR_MISSING_OR_INVALID_NONCE", kAuthErrorMissingOrInvalidNonce},
+    {"ERROR_USER_CANCELLED", kAuthErrorUserCancelled},
+    {"ERROR_UNSUPPORTED_PASSTHROUGH_OPERATION",
+     kAuthErrorUnsupportedPassthroughOperation},
+    {"ERROR_TOKEN_REFRESH_UNAVAILABLE", kAuthErrorTokenRefreshUnavailable},
     {nullptr},
 };
 

auth/src/include/firebase/auth/types.h

@@ -419,6 +419,14 @@ enum AuthError {
   /// IDP sign-in.
   kAuthErrorUserCancelled,
 
+  /// Indicates that a request was made to an unsupported backend endpoint in
+  /// passthrough mode.
+  kAuthErrorUnsupportedPassthroughOperation,
+
+  /// Indicates that a token refresh was requested, but neither a refresh token
+  /// nor a custom token provider is available.
+  kAuthErrorTokenRefreshUnavailable,
+
 #endif  // INTERNAL_EXEPERIMENTAL
 };
 

firestore/generate_android_test.py

@@ -1,6 +1,19 @@
 #!/usr/grte/v4/bin/python2.7
 
 # Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 """Generate JUnit4 tests from gtest files.
 
 This script reads a template and fills in test-specific information such as .so

firestore/integration_test/src/integration_test.cc

@@ -1,16 +1,18 @@
-// Copyright 2019 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 /*
    IMPORTANT: This file is used by both the regular and the internal Firestore

firestore/integration_test_emulator.sh

@@ -1,6 +1,18 @@
 #!/bin/bash
 
 # Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 source googletest.sh || exit 1
 

firestore/integration_test_internal/abseil-cpp.cmake

@@ -1,4 +1,4 @@
-# Copyright 2019 Google
+# Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj

@@ -726,6 +726,7 @@
 					"\"$(SRCROOT)/external/googletest/src/googletest\"",
 					"\"$(SRCROOT)/external/googletest/src/googlemock\"",
 					"\"$(SRCROOT)/Pods/FirebaseFirestore\"",
+					"\"$(SRCROOT)/Pods/FirebaseFirestore/Firestore/Protos/nanopb\"",
 					"\"$(SRCROOT)/../..\"",
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
@@ -768,6 +769,7 @@
 					"\"$(SRCROOT)/external/googletest/src/googletest\"",
 					"\"$(SRCROOT)/external/googletest/src/googlemock\"",
 					"\"$(SRCROOT)/Pods/FirebaseFirestore\"",
+					"\"$(SRCROOT)/Pods/FirebaseFirestore/Firestore/Protos/nanopb\"",
 					"\"$(SRCROOT)/../..\"",
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
@@ -829,6 +831,7 @@
 					"\"$(SRCROOT)/external/googletest/src/googletest\"",
 					"\"$(SRCROOT)/external/googletest/src/googlemock\"",
 					"\"$(SRCROOT)/Pods/FirebaseFirestore\"",
+					"\"$(SRCROOT)/Pods/FirebaseFirestore/Firestore/Protos/nanopb\"",
 					"\"$(SRCROOT)/../..\"",
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
@@ -894,6 +897,7 @@
 					"\"$(SRCROOT)/external/googletest/src/googletest\"",
 					"\"$(SRCROOT)/external/googletest/src/googlemock\"",
 					"\"$(SRCROOT)/Pods/FirebaseFirestore\"",
+					"\"$(SRCROOT)/Pods/FirebaseFirestore/Firestore/Protos/nanopb\"",
 					"\"$(SRCROOT)/../..\"",
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/Info.plist";

firestore/integration_test_internal/src/android/cancellation_token_source.cc

@@ -1,4 +1,18 @@
-// Copyright 2021 Google LLC
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 #include "android/cancellation_token_source.h"
 

firestore/integration_test_internal/src/android/cancellation_token_source.h

@@ -1,4 +1,18 @@
-// Copyright 2021 Google LLC
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 #ifndef FIREBASE_FIRESTORE_INTEGRATION_TEST_INTERNAL_SRC_ANDROID_CANCELLATION_TOKEN_SOURCE_H_
 #define FIREBASE_FIRESTORE_INTEGRATION_TEST_INTERNAL_SRC_ANDROID_CANCELLATION_TOKEN_SOURCE_H_