Merge remote-tracking branch 'origin/master' into ghm

Author: a-maurice

Android/firebase_dependencies.gradle

@@ -20,17 +20,17 @@ def firebaseDependenciesMap = [
   'admob' : ['com.google.firebase:firebase-ads:18.3.0',
              'com.google.android.gms:play-services-measurement-sdk-api:17.2.1'],
   'analytics' : ['com.google.firebase:firebase-analytics:17.2.1'],
-  'auth' : ['com.google.firebase:firebase-auth:19.1.0'],
+  'auth' : ['com.google.firebase:firebase-auth:19.2.0'],
   'database' : ['com.google.firebase:firebase-database:19.2.0'],
   'dynamic_links' : ['com.google.firebase:firebase-dynamic-links:19.0.0'],
   'functions' : ['com.google.firebase:firebase-functions:19.0.1'],
-  'instance_id' : ['com.google.firebase:firebase-iid:20.0.1'],
+  'instance_id' : ['com.google.firebase:firebase-iid:20.0.2'],
   'invites' : ['com.google.firebase:firebase-invites:17.0.0'],
   // Messaging has an additional local dependency to include.
-  'messaging' : ['com.google.firebase:firebase-messaging:20.0.1',
+  'messaging' : ['com.google.firebase:firebase-messaging:20.1.0',
                  'firebase_cpp_sdk.messaging:messaging_java'],
-  'performance' : ['com.google.firebase:firebase-perf:19.0.2'],
-  'remote_config' : ['com.google.firebase:firebase-config:19.0.3'],
+  'performance' : ['com.google.firebase:firebase-perf:19.0.4'],
+  'remote_config' : ['com.google.firebase:firebase-config:19.1.0'],
   'storage' : ['com.google.firebase:firebase-storage:19.1.0']
 ]
 

CMakeLists.txt

@@ -44,15 +44,20 @@ option(FIREBASE_CPP_BUILD_TESTS
        "Enable the Firebase C++ Build Tests." OFF)
 option(FIREBASE_FORCE_FAKE_SECURE_STORAGE
        "Disable use of platform secret store and use fake impl." OFF)
+option(FIREBASE_CPP_BUILD_PACKAGE
+       "Bundle the Firebase C++ libraries into a zip file." OFF)
 
-if(WIN32)
-  # Turn on the use of the __cplusplus compiler define that is used to detect if
-  # move operators are supported
-  add_definitions("/Zc:__cplusplus")
-endif()
+# Define this directory to be the root of the C++ SDK, which the libraries can
+# then refer to.
+set(FIREBASE_CPP_SDK_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR})
+
+project (firebase NONE)
+enable_language(C)
+enable_language(CXX)
 
 list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_CURRENT_LIST_DIR}/cmake)
 include(external_rules)
+include(cpp_pack)
 
 if(FIREBASE_CPP_BUILD_TESTS)
   enable_testing()
@@ -74,10 +79,6 @@ set(FIREBASE_GEN_FILE_DIR ${CMAKE_BINARY_DIR}/generated)
 # Directory for any shared scripts.
 set(FIREBASE_SCRIPT_DIR ${CMAKE_CURRENT_LIST_DIR})
 
-project (firebase NONE)
-enable_language(C)
-enable_language(CXX)
-
 if (FIREBASE_CPP_BUILD_TESTS AND MSVC)
   # Googletest requires MSVC to compile with the static version of the runtime
   # library, so define the appropriate runtime flag, before adding libraries.
@@ -94,7 +95,9 @@ set(FIREBASE_INSTALL_DIR ${PROJECT_BINARY_DIR}/opt)
 set(FIREBASE_DOWNLOAD_DIR ${PROJECT_BINARY_DIR}/downloads)
 
 # Run the CMake build logic that will download all the external dependencies.
+message(STATUS "Downloading external project dependencies...")
 download_external_sources()
+message(STATUS "Download complete.")
 
 # Disable the Flatbuffer build tests, install and flathash
 set(FLATBUFFERS_BUILD_TESTS OFF CACHE BOOL "")
@@ -264,10 +267,6 @@ else()
   set(FIREBASE_FLATBUFFERS_DEPENDENCIES "")
 endif()
 
-# Define this directory to be the root of the C++ SDK, which the libraries can
-# then refer to.
-set(FIREBASE_CPP_SDK_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR})
-
 include(binary_to_array)
 include(firebase_cpp_gradle)
 
@@ -311,3 +310,10 @@ endif()
 if (FIREBASE_INCLUDE_STORAGE)
   add_subdirectory(storage)
 endif()
+
+# Place the CMake and gradle build files provided to easily link against the
+# prebuilt libraries at the root of the package.
+cpp_pack_dir(
+  "${CMAKE_CURRENT_LIST_DIR}/release_build_files/"
+  .
+)

admob/CMakeLists.txt

@@ -120,3 +120,6 @@ elseif(IOS)
   # accomplish that.
   symlink_pod_headers(firebase_admob Google-Mobile-Ads-SDK GoogleMobileAds)
 endif()
+
+cpp_pack_library(firebase_admob "")
+cpp_pack_public_headers()

admob/src/android/banner_view_internal_android.cc

@@ -188,6 +188,7 @@ BoundingBox BannerViewInternalAndroid::GetBoundingBox() const {
   // x-coordinate, and y-coordinate.
   int count = static_cast<int>(env->GetArrayLength(jni_int_array));
   assert(count == 4);
+  (void)count;
 
   jint* bounding_box_elements =
       env->GetIntArrayElements(jni_int_array, nullptr);

admob/src/android/native_express_ad_view_internal_android.cc

@@ -198,6 +198,7 @@ BoundingBox NativeExpressAdViewInternalAndroid::GetBoundingBox() const {
   // x-coordinate, and y-coordinate.
   int count = static_cast<int>(env->GetArrayLength(jni_int_array));
   assert(count == 4);
+  (void)count;
 
   jint* bounding_box_elements =
       env->GetIntArrayElements(jni_int_array, nullptr);

analytics/CMakeLists.txt

@@ -133,3 +133,6 @@ if(FIREBASE_CPP_BUILD_TESTS)
   # Add the tests subdirectory
   add_subdirectory(tests)
 endif()
+
+cpp_pack_library(firebase_analytics "")
+cpp_pack_public_headers()

app/CMakeLists.txt

@@ -365,3 +365,9 @@ if(FIREBASE_CPP_BUILD_TESTS)
   # Add the tests subdirectory
   add_subdirectory(tests)
 endif()
+
+cpp_pack_library(firebase_app "")
+cpp_pack_public_headers()
+if (NOT ANDROID AND NOT IOS)
+  cpp_pack_library(flatbuffers "deps/app/external")
+endif()

app/instance_id/CMakeLists.txt

@@ -58,3 +58,5 @@ target_compile_definitions(firebase_instance_id_desktop_impl
   PRIVATE
     -DINTERNAL_EXPERIMENTAL=1
 )
+
+cpp_pack_library(firebase_instance_id_desktop_impl "deps/app")

app/rest/CMakeLists.txt

@@ -126,3 +126,9 @@ if(FIREBASE_CPP_BUILD_TESTS)
   # Add the tests subdirectory
   add_subdirectory(tests)
 endif()
+
+cpp_pack_library(firebase_rest_lib "deps/app")
+cpp_pack_library(libcurl "deps/app/external")
+cpp_pack_library(zlibstatic "deps/app/external")
+cpp_pack_library_file(${OPENSSL_SSL_LIBRARY} "deps/app/external")
+cpp_pack_library_file(${OPENSSL_CRYPTO_LIBRARY} "deps/app/external")

app/src/include/firebase/app.h

@@ -54,40 +54,6 @@ class FunctionRegistry;
 namespace internal {
 class AppInternal;
 }  // namespace internal
-namespace auth {
-class Auth;
-}  // namespace auth
-namespace crashlytics {
-namespace internal {
-class CrashlyticsInternal;
-}  // namespace internal
-}  // namespace crashlytics
-namespace database {
-namespace internal {
-class DatabaseInternal;
-}  // namespace internal
-}  // namespace database
-#ifdef INTERNAL_EXPERIMENTAL
-namespace firestore {
-class FirestoreInternal;
-}  // namespace firestore
-#endif  // INTERNAL_EXPERIMENTAL
-namespace functions {
-namespace internal {
-class FunctionsInternal;
-}  // namespace internal
-}  // namespace functions
-namespace internal {
-class InstanceId;
-}  // namespace internal
-namespace instance_id {
-class InstanceId;
-}  // namespace instance_id
-namespace storage {
-namespace internal {
-class StorageInternal;
-}  // namespace internal
-}  // namespace storage
 
 /// @brief Reports whether a Firebase module initialized successfully.
 enum InitResult {

app/src/secure/user_secure_linux_internal.cc

@@ -47,7 +47,7 @@ SecretSchema BuildSchema(const char key_namespace[]) {
 
 UserSecureLinuxInternal::UserSecureLinuxInternal(const char* domain,
                                                  const char* key_namespace)
-    : domain_(domain), key_namespace_(key_namespace) {
+    : domain_(domain), key_namespace_(key_namespace), known_error_code_(0) {
   storage_schema_ = BuildSchema(key_namespace_.c_str());
 }
 
@@ -68,14 +68,8 @@ std::string UserSecureLinuxInternal::LoadUserData(const std::string& app_name) {
       /* key1= */ kAppNameKey,
       /* value1= */ app_name.c_str(), /* key2= */ kStorageDomainKey,
       /* value2= */ domain_.c_str(), nullptr);
-  if (error) {
-    g_error_free(error);
-    LogWarning("Secret lookup failed, please make sure libsecret is "
-               "installed.");
-    return empty_str;
-  }
 
-  if (result == nullptr) {
+  if (CheckForError(&error, "lookup") || result == nullptr) {
     return empty_str;
   }
   std::string str_result(result);
@@ -97,10 +91,7 @@ void UserSecureLinuxInternal::SaveUserData(const std::string& app_name,
       /* value1= */ app_name.c_str(),
       /* key2= */ kStorageDomainKey, /* value2= */ domain_.c_str(), nullptr);
 
-  if (error) {
-    g_error_free(error);
-    LogWarning("Secret store failed, please make sure libsecret is installed.");
-  }
+  CheckForError(&error, "store");
 }
 
 void UserSecureLinuxInternal::DeleteUserData(const std::string& app_name) {
@@ -115,10 +106,7 @@ void UserSecureLinuxInternal::DeleteUserData(const std::string& app_name) {
                              /* key2= */ kStorageDomainKey,
                              /* value2= */ domain_.c_str(), nullptr);
 
-  if (error) {
-    g_error_free(error);
-    LogWarning("Secret clear failed, please make sure libsecret is installed.");
-  }
+  CheckForError(&error, "clear");
 }
 
 void UserSecureLinuxInternal::DeleteAllData() {
@@ -130,10 +118,20 @@ void UserSecureLinuxInternal::DeleteAllData() {
                              /* error= */ &error,
                              /* key2= */ kStorageDomainKey,
                              /* value2= */ domain_.c_str(), nullptr);
-  if (error) {
-    g_error_free(error);
-    LogWarning("Secret clear failed, please make sure libsecret is installed.");
+  CheckForError(&error, "clear");
+}
+
+bool UserSecureLinuxInternal::CheckForError(GError** error,
+                                            const char* function_name) {
+  if (error == nullptr || *error == nullptr) return false;
+  if ((*error)->code != known_error_code_) {
+    LogWarning("Secret %s failed. Error %d: %s", function_name, (*error)->code,
+               (*error)->message);
+    known_error_code_ = (*error)->code;
   }
+  g_error_free(*error);
+  *error = nullptr;
+  return true;
 }
 
 }  // namespace secure

app/src/secure/user_secure_linux_internal.h

@@ -45,9 +45,15 @@ class UserSecureLinuxInternal : public UserSecureInternal {
   void DeleteAllData() override;
 
  private:
+  // Check if there is an error, log it and free it if there is.
+  // Returns true iff there was an error.
+  bool CheckForError(GError** error, const char* function_name);
+
   const std::string domain_;
   const std::string key_namespace_;
   SecretSchema storage_schema_;
+  int known_error_code_;  // If nonzero, this error was already logged, so
+                          // don't be too spammy about it.
 };
 
 }  // namespace secure

auth/CMakeLists.txt

@@ -209,3 +209,6 @@ if(FIREBASE_CPP_BUILD_TESTS)
   # Add the tests subdirectory
   add_subdirectory(tests)
 endif()
+
+cpp_pack_library(firebase_auth "")
+cpp_pack_public_headers()

auth/auth_resources/build.gradle

@@ -46,7 +46,7 @@ android {
 
 dependencies {
   implementation 'com.google.firebase:firebase-analytics:17.2.1'
-  implementation 'com.google.firebase:firebase-auth:19.1.0'
+  implementation 'com.google.firebase:firebase-auth:19.2.0'
   implementation project(':app:app_resources')
 }
 

auth/samples/src/doc_samples.cc

@@ -44,6 +44,8 @@ struct MyProgramContext {
 JNIEnv* my_jni_env = nullptr;
 jobject my_activity = nullptr;
 #endif  // defined(__ANDROID__)
+const char* apple_id_token = nullptr;
+const char* raw_nonce = nullptr;
 const char* email = nullptr;
 const char* password = nullptr;
 const char* google_id_token = nullptr;
@@ -74,6 +76,14 @@ firebase::auth::Auth* AuthFromApp(firebase::App* app) {
 }
 
 void VariousCredentials(firebase::auth::Auth* auth) {
+  {
+    // [START auth_credential_apple]
+    firebase::auth::Credential credential =
+        firebase::auth::OAuthProvider::GetCredential(
+            "apple.com", apple_id_token, raw_nonce, nullptr);
+    // [END auth_credential_apple]
+    (void)credential;
+  }
   {
     // [START auth_credential_email]
     firebase::auth::Credential credential =
@@ -113,6 +123,16 @@ void VariousSignIns(firebase::auth::Auth* auth) {
     // [END auth_create_user]
     (void)result;
   }
+  {
+    // [START auth_sign_in_apple]
+    firebase::auth::Credential credential =
+        firebase::auth::OAuthProvider::GetCredential(
+            "apple.com", apple_id_token, raw_nonce, nullptr);
+    firebase::Future<firebase::auth::User*> result =
+        auth->SignInWithCredential(credential);
+    // [END auth_sign_in_apple]
+    (void)result;
+  }
   {
     // [START auth_sign_in_email]
     firebase::Future<firebase::auth::User*> result =