Update the open source build with the updates to IID

Because the secure logic was moved from Auth to App, libsecret is now needed as a dependency when building App via open source. Add the instance_id_desktop_impl as a target, that the desktop versions of instance id and remote config depends on.

PiperOrigin-RevId: 250909017

Author: a-maurice

app/CMakeLists.txt

@@ -109,6 +109,7 @@ set(common_SRCS
     ${google_services_resource_source}
     ${google_services_resource_header}
     src/app_common.cc
+    src/app_identifier.cc
     src/app_options.cc
     src/callback.cc
     src/cleanup_notifier.cc
@@ -122,7 +123,8 @@ set(common_SRCS
     src/time.cc
     src/secure/user_secure_manager.cc
     src/util.cc
-    src/variant.cc)
+    src/variant.cc
+    src/base64.cc)
 
 set(invites_SRCS
     src/invites/cached_receiver.cc
@@ -135,12 +137,14 @@ set(app_android_SRCS
     ${google_api_resources_source}
     ${invites_resources_source}
     src/invites/android/invites_receiver_internal_android.cc
-    src/invites/android/invites_android_helper.cc)
+    src/invites/android/invites_android_helper.cc
+    src/uuid.cc)
 set(app_ios_SRCS
     src/app_ios.mm
     src/util_ios.mm
     src/invites/ios/invites_receiver_internal_ios.mm
-    src/invites/ios/invites_ios_startup.mm)
+    src/invites/ios/invites_ios_startup.mm
+    src/uuid_ios_darwin.mm)
 set(app_desktop_SRCS
     src/app_desktop.cc
     src/invites/stub/invites_receiver_internal_stub.cc
@@ -154,15 +158,21 @@ elseif(IOS)
 else()
   if(MSVC)
     set(app_desktop_extra_SRCS
-        src/secure/user_secure_windows_internal.cc)
+        src/secure/user_secure_windows_internal.cc
+        src/locale.cc
+        src/uuid.cc)
   elseif(APPLE)
     set(app_desktop_extra_SRCS
-        src/secure/user_secure_darwin_internal.mm)
+        src/secure/user_secure_darwin_internal.mm
+        src/locale_apple.mm
+        src/uuid_ios_darwin.mm)
   else()
     # Linux requires libsecret.
     pkg_check_modules(LIBSECRET libsecret-1 REQUIRED)
     set(app_desktop_extra_SRCS
-        src/secure/user_secure_linux_internal.cc)
+        src/secure/user_secure_linux_internal.cc
+        src/locale.cc
+        src/uuid.cc)
   endif()
 
   set(app_platform_SRCS
@@ -265,6 +275,7 @@ target_include_directories(firebase_app
   PRIVATE
     ${FIREBASE_CPP_SDK_ROOT_DIR}
     ${FLATBUFFERS_SOURCE_DIR}/include
+    ${LIBSECRET_INCLUDE_DIRS}
 )
 target_compile_definitions(firebase_app
   PRIVATE
@@ -274,6 +285,7 @@ target_compile_definitions(firebase_app
 target_link_libraries(firebase_app
   PRIVATE
     flatbuffers
+    ${LIBSECRET_LIBRARIES}
 )
 # Automatically include headers that might not be declared.
 if(MSVC)
@@ -313,3 +325,4 @@ endif()
 
 # Add the rest subdirectory, so that other libraries can access it
 add_subdirectory(rest)
+add_subdirectory(instance_id)

app/instance_id/CMakeLists.txt

@@ -0,0 +1,60 @@
+# Copyright 2019 Google
+#
+# 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.
+
+# CMake file for the firebase_instance_id_desktop_impl library
+
+cmake_minimum_required (VERSION 3.1)
+set (CMAKE_CXX_STANDARD 11)
+
+project(firebase_instance_id_desktop_impl NONE)
+enable_language(C)
+enable_language(CXX)
+
+# Build the iid_data_generated.h header from the flatbuffer schema file.
+set(FLATBUFFERS_FLATC_SCHEMA_EXTRA_ARGS
+    "--no-union-value-namespacing"
+    "--gen-object-api"
+    "--cpp-ptr-type" "firebase::UniquePtr")
+build_flatbuffers("${CMAKE_CURRENT_LIST_DIR}/iid_data.fbs"
+                  ""
+                  "iid_data_generated_includes"
+                  "${FIREBASE_FLATBUFFERS_DEPENDENCIES}"
+                  "${FIREBASE_GEN_FILE_DIR}/app/instance_id"
+                  ""
+                  "")
+
+set(iid_impl_SRCS
+    instance_id_desktop_impl.cc
+    instance_id_desktop_impl.h
+    ${FIREBASE_GEN_FILE_DIR}/app/instance_id/iid_data_generated.h)
+
+add_library(firebase_instance_id_desktop_impl STATIC
+    ${iid_impl_SRCS})
+
+target_include_directories(firebase_instance_id_desktop_impl
+  PUBLIC
+    ${FIREBASE_CPP_SDK_ROOT_DIR}
+    ${FIREBASE_GEN_FILE_DIR}
+)
+target_link_libraries(firebase_instance_id_desktop_impl
+  PUBLIC
+    firebase_app
+  PRIVATE
+    flatbuffers
+    firebase_rest_lib
+)
+target_compile_definitions(firebase_instance_id_desktop_impl
+  PRIVATE
+    -DINTERNAL_EXPERIMENTAL=1
+)

app/rest/CMakeLists.txt

@@ -34,6 +34,7 @@ set(rest_SRCS
     transport_curl.cc
     transport_interface.cc
     util.cc
+    www_form_url_encoded.cc
     zlibwrapper.cc)
 
 add_library(firebase_rest_lib STATIC

auth/CMakeLists.txt

@@ -151,11 +151,9 @@ if(ANDROID OR IOS)
   set(additional_target_definitions)
 else()
   set(additional_include_DIR
-      ${FLATBUFFERS_SOURCE_DIR}/include
-      ${LIBSECRET_INCLUDE_DIRS})
+      ${FLATBUFFERS_SOURCE_DIR}/include)
   set(additional_link_LIB
-      firebase_rest_lib
-      ${LIBSECRET_LIBRARIES})
+      firebase_rest_lib)
 endif()
 
 add_library(firebase_auth STATIC

instance_id/CMakeLists.txt

@@ -41,7 +41,8 @@ set(ios_SRCS
 
 # Source files used by the desktop implementation.
 set(desktop_SRCS
-    src/stub/instance_id.cc)
+    src/desktop/instance_id.cc
+    src/desktop/instance_id_internal.cc)
 
 if(ANDROID)
   set(instance_id_platform_SRCS
@@ -54,6 +55,13 @@ else()
       "${desktop_SRCS}")
 endif()
 
+if(ANDROID OR IOS OR use_stub)
+  set(additional_link_LIB)
+else()
+  set(additional_link_LIB
+      firebase_instance_id_desktop_impl)
+endif()
+
 add_library(firebase_instance_id STATIC
     ${common_SRCS}
     ${instance_id_platform_SRCS})
@@ -62,6 +70,8 @@ add_library(firebase_instance_id STATIC
 target_link_libraries(firebase_instance_id
   PUBLIC
     firebase_app
+  PRIVATE
+    ${additional_link_LIB}
 )
 # Public headers all refer to each other relative to the src/include directory,
 # while private headers are relative to the entire C++ SDK directory.

remote_config/CMakeLists.txt

@@ -81,6 +81,7 @@ else()
       ${PROJECT_BINARY_DIR}/..)
   set(additional_link_LIB
       firebase_rest_lib
+      firebase_instance_id_desktop_impl
       flatbuffers
       protobuf-nanopb)
 endif()