Integrate IID to Remote Config

Whenever RC try to fetch the latest configuration from the server, it would check with InstanceIdDesktopImpl to see if instance id and token is available.  If so, the id and token will be included in REST call as part of the PackageData

PiperOrigin-RevId: 248613772

Author: chkuang-g

remote_config/src/desktop/remote_config_desktop.cc

@@ -376,7 +376,7 @@ void RemoteConfigDesktop::AsyncFetch() {
       }
 
       // Fetch fresh config from server.
-      rest->Fetch();
+      rest->Fetch(app_);
 
       {
         std::unique_lock<std::mutex> lock(mutex_);

remote_config/src/desktop/rest.cc

@@ -20,6 +20,7 @@
 #include <sstream>
 
 #include "firebase/app.h"
+#include "app/instance_id/instance_id_desktop_impl.h"
 #include "app/meta/move.h"
 #include "app/rest/request_binary.h"
 #include "app/rest/response_binary.h"
@@ -53,7 +54,8 @@ RemoteConfigREST::RemoteConfigREST(const firebase::AppOptions& app_options,
     : app_package_name_(app_options.package_name()),
       app_gmp_project_id_(app_options.app_id()),
       configs_(configs),
-      cache_expiration_in_seconds_(cache_expiration_in_seconds) {
+      cache_expiration_in_seconds_(cache_expiration_in_seconds),
+      fetch_future_sem_(0) {
   rest::util::Initialize();
   firebase::rest::InitTransportCurl();
 }
@@ -63,12 +65,57 @@ RemoteConfigREST::~RemoteConfigREST() {
   rest::util::Terminate();
 }
 
-void RemoteConfigREST::Fetch() {
+void RemoteConfigREST::Fetch(const App& app) {
+  TryGetInstanceIdAndToken(app);
   SetupRestRequest();
   firebase::rest::CreateTransport()->Perform(rest_request_, &rest_response_);
   ParseRestResponse();
 }
 
+void WaitForFuture(const Future<std::string>& future, Semaphore* future_sem,
+                   std::string* result, const char* action_name) {
+  // Block and wait until Future is complete.
+  future.OnCompletion(
+      [](const firebase::Future<std::string>& result, void* data) {
+        Semaphore* sem = static_cast<Semaphore*>(data);
+        sem->Post();
+      },
+      future_sem);
+  future_sem->Wait();
+
+  if (future.status() == firebase::kFutureStatusComplete &&
+      future.error() ==
+          firebase::instance_id::internal::InstanceIdDesktopImpl::kErrorNone) {
+    *result = *future.result();
+  } else if (future.status() != firebase::kFutureStatusComplete) {
+    // It is fine if timeout
+    LogWarning("Remote Config Fetch: %s timeout", action_name);
+  } else {
+    // It is fine if failed
+    LogWarning("Remote Config Fetch: Failed to %s. Error %d: %s", action_name,
+               future.error(), future.error_message());
+  }
+}
+
+void RemoteConfigREST::TryGetInstanceIdAndToken(const App& app) {
+  // Convert the app reference stored in RemoteConfigDesktop
+  // pointer for InstanceIdDesktopImpl.
+  App* non_const_app = const_cast<App*>(&app);
+  auto* iid_impl =
+      firebase::instance_id::internal::InstanceIdDesktopImpl::GetInstance(
+          non_const_app);
+  assert(iid_impl);
+
+  WaitForFuture(iid_impl->GetId(), &fetch_future_sem_, &app_instance_id_,
+                "Get Instance Id");
+
+  // Only get token if instance id is retrieved.
+  if (!app_instance_id_.empty()) {
+    WaitForFuture(iid_impl->GetToken(), &fetch_future_sem_,
+                  &app_instance_id_token_, "Get Instance Id Token");
+  }
+}
+
 void RemoteConfigREST::SetupRestRequest() {
   ConfigFetchRequest config_fetch_request = GetFetchRequestData();
 
@@ -113,6 +160,9 @@ void RemoteConfigREST::GetPackageData(PackageData* package_data) {
     package_data->custom_variable[kDeveloperModeKey] = "1";
   }
 
+  package_data->app_instance_id = app_instance_id_;
+  package_data->app_instance_id_token = app_instance_id_token_;
+
   package_data->requested_cache_expiration_seconds =
       static_cast<int32_t>(cache_expiration_in_seconds_);
 

remote_config/src/desktop/rest.h

@@ -18,6 +18,7 @@
 #include <cstdint>
 
 #include "firebase/app.h"
+#include "app/src/semaphore.h"
 #ifndef REST_STUB_IMPL  // These pull in unnecessary deps for the stub
 #include "app/rest/request_binary_gzip.h"
 #include "app/rest/response_binary.h"
@@ -73,10 +74,12 @@ class RemoteConfigREST {
 
   ~RemoteConfigREST();
 
-  // 1. Setup REST request;
-  // 2. Make REST request;
-  // 3. Parse REST response.
-  void Fetch();
+  // 1. Attempt to Fetch Instance Id and token.  App is required to get an
+  //    instance of InstanceIdDesktopImpl.
+  // 2. Setup REST request;
+  // 3. Make REST request;
+  // 4. Parse REST response.
+  void Fetch(const App& app);
 
   // After Fetch() will return updated fetched holder. Otherwise will return not
   // updated fetched holder.
@@ -87,6 +90,10 @@ class RemoteConfigREST {
   const RemoteConfigMetadata& metadata() const { return configs_.metadata; }
 
  private:
+  // Attempt to get Instance Id and token from app synchronously.  This will
+  // block the current thread and wait until the futures are complete.
+  void TryGetInstanceIdAndToken(const App& app);
+
   // Setup all values to make REST request. Call `SetupProtoRequest` to setup
   // post fields.
   void SetupRestRequest();
@@ -123,6 +130,13 @@ class RemoteConfigREST {
   // cache expiration
   uint64_t cache_expiration_in_seconds_;
 
+  // Instance Id data
+  std::string app_instance_id_;
+  std::string app_instance_id_token_;
+
+  // The semaphore to block the thread and wait for.
+  Semaphore fetch_future_sem_;
+
 #ifndef REST_STUB_IMPL
   // HTTP request/response
   firebase::rest::RequestBinaryGzip rest_request_;

remote_config/src/desktop/rest_nanopb_encode.cc

@@ -113,7 +113,9 @@ pb_callback_t EncodePackageDataCB(const PackageData& source) {
 
     npb_package.namespace_digest = EncodeNamedValuesCB(source.namespace_digest);
     npb_package.custom_variable = EncodeNamedValuesCB(source.custom_variable);
-
+    npb_package.app_instance_id = EncodeStringCB(source.app_instance_id);
+    npb_package.app_instance_id_token =
+        EncodeStringCB(source.app_instance_id_token);
     npb_package.sdk_version = source.sdk_version;
     npb_package.has_sdk_version = (source.sdk_version != 0);
     npb_package.requested_cache_expiration_seconds =

remote_config/src/desktop/rest_nanopb_encode.h

@@ -39,6 +39,14 @@ struct PackageData {
   // custom variables as defined by the client app.
   NamedValues custom_variable;
 
+  // optional
+  // The instance id of the app.
+  std::string app_instance_id;
+
+  // optional
+  // The instance id token of the app.
+  std::string app_instance_id_token;
+
   // version of the firebase remote config sdk. constructed by a major version,
   // a minor version, and a patch version, using the formula:
   // (major * 10000) + (minor * 100) + patch

remote_config/src_protos/config.proto

@@ -24,6 +24,8 @@ message PackageData {
   optional string gmp_project_id = 6;
   repeated NamedValue namespace_digest = 8;
   repeated NamedValue custom_variable = 9;
+  optional string app_instance_id = 12;
+  optional string app_instance_id_token = 14;
   optional int32 sdk_version = 16;
   optional int32 requested_cache_expiration_seconds = 18;
   optional int32 fetched_config_age_seconds = 19;