Reload state when panel is opened

It's important that we make the call each time the panel opens to request credentials
brave · Apr 1, 2022 · e78ea82 · e78ea82
1 parent d8c000a
commit e78ea82
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 5 deletions.
diff --git a/browser/ui/webui/brave_vpn/vpn_panel_handler.cc b/browser/ui/webui/brave_vpn/vpn_panel_handler.cc
@@ -7,18 +7,26 @@
 
 #include <utility>
 
+#include "brave/browser/brave_vpn/brave_vpn_service_factory.h"
+#include "brave/components/brave_vpn/brave_vpn_service.h"
+
 VPNPanelHandler::VPNPanelHandler(
     mojo::PendingReceiver<brave_vpn::mojom::PanelHandler> receiver,
-    ui::MojoBubbleWebUIController* webui_controller)
+    ui::MojoBubbleWebUIController* webui_controller,
+    Profile* profile)
     : receiver_(this, std::move(receiver)),
-      webui_controller_(webui_controller) {}
+      webui_controller_(webui_controller),
+      profile_(profile) {}
 
 VPNPanelHandler::~VPNPanelHandler() = default;
 
 void VPNPanelHandler::ShowUI() {
   auto embedder = webui_controller_->embedder();
+  BraveVpnService* vpn_service_desktop =
+      BraveVpnServiceFactory::GetForProfile(profile_);
   if (embedder) {
     embedder->ShowUI();
+    vpn_service_desktop->OnPanelVisible();
   }
 }
 

diff --git a/browser/ui/webui/brave_vpn/vpn_panel_handler.h b/browser/ui/webui/brave_vpn/vpn_panel_handler.h
@@ -10,6 +10,7 @@
 #include <vector>
 
 #include "brave/components/brave_vpn/brave_vpn.mojom.h"
+#include "chrome/browser/profiles/profile.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/receiver.h"
 #include "ui/webui/mojo_bubble_web_ui_controller.h"
@@ -25,7 +26,8 @@ class VPNPanelHandler : public brave_vpn::mojom::PanelHandler {
 
   VPNPanelHandler(
       mojo::PendingReceiver<brave_vpn::mojom::PanelHandler> receiver,
-      ui::MojoBubbleWebUIController* webui_controller);
+      ui::MojoBubbleWebUIController* webui_controller,
+      Profile* profile);
 
   VPNPanelHandler(const VPNPanelHandler&) = delete;
   VPNPanelHandler& operator=(const VPNPanelHandler&) = delete;
@@ -38,6 +40,7 @@ class VPNPanelHandler : public brave_vpn::mojom::PanelHandler {
  private:
   mojo::Receiver<brave_vpn::mojom::PanelHandler> receiver_;
   ui::MojoBubbleWebUIController* const webui_controller_;
+  Profile* profile_;
 };
 
 #endif  // BRAVE_BROWSER_UI_WEBUI_BRAVE_VPN_VPN_PANEL_HANDLER_H_
diff --git a/browser/ui/webui/brave_vpn/vpn_panel_ui.cc b/browser/ui/webui/brave_vpn/vpn_panel_ui.cc
@@ -64,8 +64,8 @@ void VPNPanelUI::CreatePanelHandler(
   auto* profile = Profile::FromWebUI(web_ui());
   DCHECK(profile);
 
-  panel_handler_ =
-      std::make_unique<VPNPanelHandler>(std::move(panel_receiver), this);
+  panel_handler_ = std::make_unique<VPNPanelHandler>(std::move(panel_receiver),
+                                                     this, profile);
 
   BraveVpnService* vpn_service_desktop =
       BraveVpnServiceFactory::GetForProfile(profile);

diff --git a/components/brave_vpn/brave_vpn_service.cc b/components/brave_vpn/brave_vpn_service.cc
@@ -442,6 +442,11 @@ void BraveVpnService::BindInterface(
   receivers_.Add(this, std::move(receiver));
 }
 
+void BraveVpnService::OnPanelVisible() {
+  // TODO(bsclifton): clean this up
+  LoadPurchasedState();
+}
+
 void BraveVpnService::GetConnectionState(
     GetConnectionStateCallback callback) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);

diff --git a/components/brave_vpn/brave_vpn_service.h b/components/brave_vpn/brave_vpn_service.h
@@ -90,6 +90,7 @@ class BraveVpnService :
 
   void BindInterface(
       mojo::PendingReceiver<brave_vpn::mojom::ServiceHandler> receiver);
+  void OnPanelVisible();
 
   // mojom::vpn::ServiceHandler
   void GetConnectionState(GetConnectionStateCallback callback) override;