add notification to certificate manager to generate new private certi…

…ficates when the image changes. PiperOrigin-RevId: 709170088
google · Dec 24, 2024 · 5c173f8 · 5c173f8
1 parent c9fbf6b
commit 5c173f8
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 3 deletions.
diff --git a/internal/platform/implementation/account_manager.h b/internal/platform/implementation/account_manager.h
@@ -43,6 +43,8 @@ class AccountManager {
     // |credential_error| is true if the logout is due to critical auth error.
     virtual void OnLogoutSucceeded(absl::string_view account_id,
                                    bool credential_error) = 0;
+    // Only needed by certificate manager.
+    virtual void OnIconChanged() {};
   };
 
   virtual ~AccountManager() = default;
@@ -83,7 +85,8 @@ class AccountManager {
 
   virtual void SaveAccountPrefs(absl::string_view user_id,
                                 absl::string_view client_id,
-                                absl::string_view client_secret) = 0;
+                                absl::string_view client_secret,
+                                absl::string_view picture_url) = 0;
 };
 
 }  // namespace nearby

diff --git a/internal/test/fake_account_manager.cc b/internal/test/fake_account_manager.cc
@@ -96,4 +96,10 @@ void FakeAccountManager::NotifyLogout(absl::string_view account_id,
   }
 }
 
+void FakeAccountManager::NotifyIconChanged() {
+  for (const auto& observer : observers_.GetObservers()) {
+    observer->OnIconChanged();
+  }
+}
+
 }  // namespace nearby
diff --git a/internal/test/fake_account_manager.h b/internal/test/fake_account_manager.h
@@ -52,7 +52,8 @@ class FakeAccountManager : public AccountManager {
   void RemoveObserver(Observer* observer) override;
 
   void SaveAccountPrefs(absl::string_view user_id, absl::string_view client_id,
-                        absl::string_view client_secret) override {}
+                        absl::string_view client_secret,
+                        absl::string_view picture_url) override {}
 
   // Methods to set API response.
   void SetAccount(std::optional<Account> account);
@@ -67,6 +68,7 @@ class FakeAccountManager : public AccountManager {
 
   void NotifyLogin(absl::string_view account_id);
   void NotifyLogout(absl::string_view account_id, bool credential_error);
+  void NotifyIconChanged();
 
  private:
   // Login will fail when account_ is empty.

diff --git a/internal/test/mock_account_manager.h b/internal/test/mock_account_manager.h
@@ -49,7 +49,7 @@ class MockAccountManager : public AccountManager {
   MOCK_METHOD(void, RemoveObserver, (Observer * observer), (override));
   MOCK_METHOD(void, SaveAccountPrefs,
               (absl::string_view user_id, absl::string_view client_id,
-               absl::string_view client_secret),
+               absl::string_view client_secret, absl::string_view picture_url),
               (override));
 };
 

diff --git a/internal/test/mock_account_observer.h b/internal/test/mock_account_observer.h
@@ -31,6 +31,7 @@ class MockAccountObserver : public AccountManager::Observer {
   MOCK_METHOD(void, OnLogoutSucceeded,
               (absl::string_view account_id, bool credential_error),
               (override));
+  MOCK_METHOD(void, OnIconChanged, (), (override));
 };
 
 }  // namespace nearby

diff --git a/sharing/certificates/nearby_share_certificate_manager_impl.cc b/sharing/certificates/nearby_share_certificate_manager_impl.cc
@@ -281,11 +281,13 @@ NearbyShareCertificateManagerImpl::NearbyShareCertificateManagerImpl(
       executor_(context->CreateSequencedTaskRunner()) {
   local_device_data_manager_->AddObserver(this);
   contact_manager_->AddObserver(this);
+  account_manager_.AddObserver(this);
 }
 
 NearbyShareCertificateManagerImpl::~NearbyShareCertificateManagerImpl() {
   local_device_data_manager_->RemoveObserver(this);
   contact_manager_->RemoveObserver(this);
+  account_manager_.RemoveObserver(this);
 }
 
 void NearbyShareCertificateManagerImpl::CertificateDownloadContext::
@@ -637,6 +639,15 @@ void NearbyShareCertificateManagerImpl::OnLocalDeviceDataChanged(
   });
 }
 
+void NearbyShareCertificateManagerImpl::OnIconChanged() {
+  executor_->PostTask([this]() {
+    LOG(INFO) << __func__ << ": handle icon changed.";
+    // Recreate all private certificates to ensure up-to-date metadata.
+    certificate_storage_->ClearPrivateCertificates();
+    private_certificate_expiration_scheduler_->MakeImmediateRequest();
+  });
+}
+
 void NearbyShareCertificateManagerImpl::SetVendorId(int32_t vendor_id) {
   LOG(INFO) << "Setting certificate vendor ID to " << vendor_id;
   vendor_id_ = vendor_id;

diff --git a/sharing/certificates/nearby_share_certificate_manager_impl.h b/sharing/certificates/nearby_share_certificate_manager_impl.h
@@ -61,6 +61,7 @@ class NearbyShareScheduler;
 class NearbyShareCertificateManagerImpl
     : public NearbyShareCertificateManager,
       public NearbyShareContactManager::Observer,
+      public ::nearby::AccountManager::Observer,
       public NearbyShareLocalDeviceDataManager::Observer {
  public:
   class Factory {
@@ -174,6 +175,12 @@ class NearbyShareCertificateManagerImpl
                                 bool did_full_name_change,
                                 bool did_icon_change) override;
 
+  //   // AccountManager::Observer:
+  void OnLoginSucceeded(absl::string_view account_id) override {};
+  void OnLogoutSucceeded(absl::string_view account_id,
+                         bool credential_error) override {};
+  void OnIconChanged() override;
+
   // Dump certs information.
   std::string Dump() const override;
 

diff --git a/sharing/certificates/nearby_share_certificate_manager_impl_test.cc b/sharing/certificates/nearby_share_certificate_manager_impl_test.cc
@@ -918,6 +918,16 @@ TEST_F(NearbyShareCertificateManagerImplTest,
   }
 }
 
+TEST_F(NearbyShareCertificateManagerImplTest,
+       RefreshPrivateCertificates_OnIconChanged) {
+  cert_manager_->Start();
+  fake_account_manager_.NotifyIconChanged();
+  Sync();
+  EXPECT_TRUE(cert_store_->GetPrivateCertificates()->empty());
+  EXPECT_EQ(1,
+            private_cert_exp_scheduler_->num_immediate_requests());
+}
+
 TEST_F(NearbyShareCertificateManagerImplTest,
        RefreshPrivateCertificates_OnVendorIdChanged) {
   cert_store_->ReplacePrivateCertificates({});