ash: Let UserAuthenticationServiceProvider start auth dialog

This enables UserAuthenticationServiceProvider to call
AuthDialogController to start the dialog. Currently the dialog
only has a dev view which will only show when a command line
switch is enabled.

TEST=Used u2fd to call UserAuthenticationServiceProvider while
     having --show-auth-dialog-dev-overlap. Observed that the debug
     view shows up.

Bug: b:156258540
Change-Id: Ibe4437c628fb5aed91b63e7905518112ce97a4b5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2298544
Commit-Queue: Yicheng Li <yichengli@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#797929}

ash/dbus/user_authentication_service_provider.cc

@@ -4,6 +4,7 @@
 
 #include "ash/dbus/user_authentication_service_provider.h"
 
+#include "ash/public/cpp/in_session_auth_dialog_controller.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "dbus/bus.h"
@@ -41,8 +42,23 @@ void UserAuthenticationServiceProvider::OnExported(
 void UserAuthenticationServiceProvider::ShowAuthDialog(
     dbus::MethodCall* method_call,
     dbus::ExportedObject::ResponseSender response_sender) {
-  // TODO(yichengli): Call AuthDialogController to start authentication flow.
-  std::move(response_sender).Run(dbus::Response::FromMethodCall(method_call));
+  auto* auth_dialog_controller = InSessionAuthDialogController::Get();
+  auth_dialog_controller->ShowAuthenticationDialog(base::BindOnce(
+      &UserAuthenticationServiceProvider::OnAuthFlowComplete,
+      weak_ptr_factory_.GetWeakPtr(), method_call, std::move(response_sender)));
+}
+
+void UserAuthenticationServiceProvider::OnAuthFlowComplete(
+    dbus::MethodCall* method_call,
+    dbus::ExportedObject::ResponseSender response_sender,
+    bool success) {
+  DCHECK(method_call && !response_sender.is_null());
+
+  std::unique_ptr<dbus::Response> response =
+      dbus::Response::FromMethodCall(method_call);
+  dbus::MessageWriter writer(response.get());
+  writer.AppendBool(success);
+  std::move(response_sender).Run(std::move(response));
 }
 
 }  // namespace ash

ash/dbus/user_authentication_service_provider.h

@@ -41,6 +41,11 @@ class UserAuthenticationServiceProvider
   void ShowAuthDialog(dbus::MethodCall* method_call,
                       dbus::ExportedObject::ResponseSender response_sender);
 
+  // Called when the user authentication flow completes.
+  void OnAuthFlowComplete(dbus::MethodCall* method_call,
+                          dbus::ExportedObject::ResponseSender response_sender,
+                          bool success);
+
   // Keep this last so that all weak pointers will be invalidated at the
   // beginning of destruction.
   base::WeakPtrFactory<UserAuthenticationServiceProvider> weak_ptr_factory_{

ash/in_session_auth/auth_dialog_debug_view.cc

@@ -234,8 +234,8 @@ void AuthDialogDebugView::AddActionButtonsView() {
 void AuthDialogDebugView::ButtonPressed(views::Button* sender,
                                         const ui::Event& event) {
   if (sender == cancel_button_) {
-    // DestroyAuthenticationDialog deletes |this|.
-    InSessionAuthDialogController::Get()->DestroyAuthenticationDialog();
+    // Cancel() deletes |this|.
+    InSessionAuthDialogController::Get()->Cancel();
   }
 
   // TODO(b/156258540): Enable more options button when we have both fingerprint

ash/in_session_auth/in_session_auth_dialog_controller_impl.cc

@@ -25,8 +25,13 @@ void InSessionAuthDialogControllerImpl::SetClient(
   client_ = client;
 }
 
-void InSessionAuthDialogControllerImpl::ShowAuthenticationDialog() {
+void InSessionAuthDialogControllerImpl::ShowAuthenticationDialog(
+    FinishCallback finish_callback) {
   DCHECK(client_);
+  // Concurrent requests are not supported.
+  DCHECK(!dialog_);
+
+  finish_callback_ = std::move(finish_callback);
 
   AccountId account_id =
       Shell::Get()->session_controller()->GetActiveAccountId();
@@ -73,9 +78,16 @@ void InSessionAuthDialogControllerImpl::OnAuthenticateComplete(
     OnAuthenticateCallback callback,
     bool success) {
   std::move(callback).Run(success);
-  // TODO(b/156258540): send status to UserAuthenticationServiceProvider for
-  // dbus response.
+  // TODO(b/156258540): Manage retry instead of closing directly.
+  DestroyAuthenticationDialog();
+  if (finish_callback_)
+    std::move(finish_callback_).Run(success);
+}
+
+void InSessionAuthDialogControllerImpl::Cancel() {
   DestroyAuthenticationDialog();
+  if (finish_callback_)
+    std::move(finish_callback_).Run(false);
 }
 
 }  // namespace ash

ash/in_session_auth/in_session_auth_dialog_controller_impl.h

@@ -9,7 +9,7 @@
 
 #include "ash/in_session_auth/in_session_auth_dialog.h"
 #include "ash/public/cpp/in_session_auth_dialog_controller.h"
-#include "base/callback_forward.h"
+#include "base/callback.h"
 #include "base/memory/weak_ptr.h"
 #include "base/optional.h"
 
@@ -22,12 +22,6 @@ class InSessionAuthDialogClient;
 // InSessionAuthDialogControllerImpl persists as long as UI is running.
 class InSessionAuthDialogControllerImpl : public InSessionAuthDialogController {
  public:
-  // Callback for authentication checks. |success| is nullopt if an
-  // authentication check did not run, otherwise it is true/false if auth
-  // succeeded/failed.
-  using OnAuthenticateCallback =
-      base::OnceCallback<void(base::Optional<bool> success)>;
-
   InSessionAuthDialogControllerImpl();
   InSessionAuthDialogControllerImpl(const InSessionAuthDialogControllerImpl&) =
       delete;
@@ -37,11 +31,12 @@ class InSessionAuthDialogControllerImpl : public InSessionAuthDialogController {
 
   // InSessionAuthDialogController overrides
   void SetClient(InSessionAuthDialogClient* client) override;
-  void ShowAuthenticationDialog() override;
+  void ShowAuthenticationDialog(FinishCallback finish_callback) override;
   void DestroyAuthenticationDialog() override;
   void AuthenticateUserWithPasswordOrPin(
       const std::string& password,
       OnAuthenticateCallback callback) override;
+  void Cancel() override;
 
  private:
   bool IsFingerprintAvailable(const AccountId& account_id);
@@ -52,6 +47,10 @@ class InSessionAuthDialogControllerImpl : public InSessionAuthDialogController {
 
   InSessionAuthDialogClient* client_ = nullptr;
 
+  // Callback to provide result of the entire authentication flow to
+  // UserAuthenticationServiceProvider.
+  FinishCallback finish_callback_;
+
   std::unique_ptr<InSessionAuthDialog> dialog_;
 
   base::WeakPtrFactory<InSessionAuthDialogControllerImpl> weak_factory_{this};

ash/public/cpp/in_session_auth_dialog_controller.h

@@ -19,6 +19,8 @@ class ASH_PUBLIC_EXPORT InSessionAuthDialogController {
   // succeeded/failed.
   using OnAuthenticateCallback =
       base::OnceCallback<void(base::Optional<bool> success)>;
+  // Callback for overall authentication flow result.
+  using FinishCallback = base::OnceCallback<void(bool success)>;
 
   // Return the singleton instance.
   static InSessionAuthDialogController* Get();
@@ -27,7 +29,7 @@ class ASH_PUBLIC_EXPORT InSessionAuthDialogController {
   virtual void SetClient(InSessionAuthDialogClient* client) = 0;
 
   // Displays the authentication dialog.
-  virtual void ShowAuthenticationDialog() = 0;
+  virtual void ShowAuthenticationDialog(FinishCallback finish_callback) = 0;
 
   // Destroys the authentication dialog.
   virtual void DestroyAuthenticationDialog() = 0;
@@ -39,6 +41,9 @@ class ASH_PUBLIC_EXPORT InSessionAuthDialogController {
       const std::string& password,
       OnAuthenticateCallback callback) = 0;
 
+  // Cancels all operations and destroys the dialog.
+  virtual void Cancel() = 0;
+
  protected:
   InSessionAuthDialogController();
   virtual ~InSessionAuthDialogController();

chrome/browser/ui/ash/in_session_auth_dialog_client_unittest.cc

@@ -35,19 +35,17 @@ const AccountId kAccountId = AccountId::FromUserEmail("testemail@example.com");
 class FakeInSessionAuthDialogController
     : public ash::InSessionAuthDialogController {
  public:
-  using OnAuthenticateCallback =
-      base::OnceCallback<void(base::Optional<bool> success)>;
-
   FakeInSessionAuthDialogController() = default;
   ~FakeInSessionAuthDialogController() override = default;
 
   // ash::InSessionAuthDialogController:
   void SetClient(ash::InSessionAuthDialogClient* client) override {}
-  void ShowAuthenticationDialog() override {}
+  void ShowAuthenticationDialog(FinishCallback callback) override {}
   void DestroyAuthenticationDialog() override {}
   void AuthenticateUserWithPasswordOrPin(
       const std::string& password,
       OnAuthenticateCallback callback) override {}
+  void Cancel() override {}
 };
 
 class InSessionAuthDialogClientTest : public testing::Test {