Chromad: Add GetUserStatus call into AuthPolicyClient

chromeos/dbus/auth_policy_client.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 #include "chromeos/dbus/auth_policy_client.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/weak_ptr.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "dbus/bus.h"
@@ skipping 15 matching lines @@
   int32_t int_error;
   if (!reader->PopInt32(&int_error)) {
     DLOG(ERROR) << "AuthPolicyClient: Failed to get an error from the response";
     return authpolicy::ERROR_DBUS_FAILURE;
   }
   if (int_error < 0 || int_error >= authpolicy::ERROR_COUNT)
     return authpolicy::ERROR_UNKNOWN;
   return static_cast<authpolicy::ErrorType>(int_error);
 }
 
+authpolicy::ErrorType GetErrorAndProto(
+    dbus::Response* response,
+    google::protobuf::MessageLite* protobuf) {
+  if (!response) {
+    DLOG(ERROR) << "Auth: Failed to  call to authpolicy";
+    return authpolicy::ERROR_DBUS_FAILURE;
+  }
+  dbus::MessageReader reader(response);
+  const authpolicy::ErrorType error(GetErrorFromReader(&reader));
+
+  if (error != authpolicy::ERROR_NONE)
+    return error;
+
+  if (!reader.PopArrayOfBytesAsProto(protobuf)) {
+    DLOG(ERROR) << "Failed to parse protobuf.";
+    return authpolicy::ERROR_DBUS_FAILURE;
+  }
+  return authpolicy::ERROR_NONE;
+}
+
 class AuthPolicyClientImpl : public AuthPolicyClient {
  public:
   AuthPolicyClientImpl() : weak_ptr_factory_(this) {}
 
   ~AuthPolicyClientImpl() override {}
 
   // AuthPolicyClient override.
   void JoinAdDomain(const std::string& machine_name,
                     const std::string& user_principal_name,
                     int password_fd,
@@ skipping 19 matching lines @@
     dbus::MessageWriter writer(&method_call);
     writer.AppendString(user_principal_name);
     writer.AppendString(object_guid);
     writer.AppendFileDescriptor(password_fd);
     proxy_->CallMethod(
         &method_call, kSlowDbusTimeoutMilliseconds,
         base::Bind(&AuthPolicyClientImpl::HandleAuthCallback,
                    weak_ptr_factory_.GetWeakPtr(), base::Passed(&callback)));
   }
 
+  void GetUserStatus(const std::string& object_guid,
+                     GetUserStatusCallback callback) override {
+    dbus::MethodCall method_call(authpolicy::kAuthPolicyInterface,
+                                 authpolicy::kAuthPolicyGetUserStatus);
+    dbus::MessageWriter writer(&method_call);
+    writer.AppendString(object_guid);
+    proxy_->CallMethod(
+        &method_call, kSlowDbusTimeoutMilliseconds,
+        base::Bind(&AuthPolicyClientImpl::HandleGetUserStatusCallback,
+                   weak_ptr_factory_.GetWeakPtr(), base::Passed(&callback)));
+  }
+
   void RefreshDevicePolicy(RefreshPolicyCallback callback) override {
     dbus::MethodCall method_call(authpolicy::kAuthPolicyInterface,
                                  authpolicy::kAuthPolicyRefreshDevicePolicy);
     proxy_->CallMethod(
         &method_call, kSlowDbusTimeoutMilliseconds,
         base::Bind(&AuthPolicyClientImpl::HandleRefreshPolicyCallback,
                    weak_ptr_factory_.GetWeakPtr(), base::Passed(&callback)));
   }
 
   void RefreshUserPolicy(const AccountId& account_id,
@@ skipping 35 matching lines @@
       DLOG(ERROR) << "Join: Couldn't call to authpolicy";
       std::move(callback).Run(authpolicy::ERROR_DBUS_FAILURE);
       return;
     }
 
     dbus::MessageReader reader(response);
     std::move(callback).Run(GetErrorFromReader(&reader));
   }
 
   void HandleAuthCallback(AuthCallback callback, dbus::Response* response) {
-    authpolicy::ActiveDirectoryAccountData account_data;
-    if (!response) {
-      DLOG(ERROR) << "Auth: Failed to  call to authpolicy";
-      std::move(callback).Run(authpolicy::ERROR_DBUS_FAILURE, account_data);
-      return;
-    }
-    dbus::MessageReader reader(response);
-    const authpolicy::ErrorType error(GetErrorFromReader(&reader));
-    if (!reader.PopArrayOfBytesAsProto(&account_data)) {
-      DLOG(ERROR) << "Failed to parse protobuf.";
-      std::move(callback).Run(authpolicy::ErrorType::ERROR_DBUS_FAILURE,
-                              account_data);
-      return;
-    }
-    std::move(callback).Run(error, account_data);
+    authpolicy::ActiveDirectoryAccountInfo account_info;
+    authpolicy::ErrorType error(GetErrorAndProto(response, &account_info));
+    std::move(callback).Run(error, account_info);
+  }
+
+  void HandleGetUserStatusCallback(GetUserStatusCallback callback,
+                                   dbus::Response* response) {
+    authpolicy::ActiveDirectoryUserStatus user_status;
+    authpolicy::ErrorType error(GetErrorAndProto(response, &user_status));
+    std::move(callback).Run(error, user_status);
   }
 
   dbus::Bus* bus_ = nullptr;
   dbus::ObjectProxy* proxy_ = nullptr;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<AuthPolicyClientImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AuthPolicyClientImpl);
 };
 
 }  // namespace
 
 AuthPolicyClient::AuthPolicyClient() {}
 
 AuthPolicyClient::~AuthPolicyClient() {}
 
 // static
 AuthPolicyClient* AuthPolicyClient::Create() {
   return new AuthPolicyClientImpl();
 }
 
 }  // namespace chromeos