Skip to content

GitLab

T
tangled
Commit 240ba84a authored by Antonio Gomes's avatar Antonio Gomes Committed by Commit Bot
Browse files
Options

[s13n] Convert permission_request_creator_apiary.cc to IdentityManager 

Similarly to [1], this CL replaces the Use of OAuth2TokenService,
OAuth2TokenService::Consumer and SigninManager APIs with the
corresponding IdentityManager counterparts.

The unittests could not be only minimally adapted, and converted on a
follow up pass, given that CL needed to replace the uses of
FakeProfileOAuth2TokenService with IdentityTestEnvironment upfront.

[1] https://crrev.com/c/1348670

BUG=907526

Change-Id: I59c2a49d20341ddadff15a28c7ad81e3056161e6
Reviewed-on: https://chromium-review.googlesource.com/c/1348671
Commit-Queue: Antonio Gomes <tonikitoo@igalia.com>
Reviewed-by: default avatarMarc Treib <treib@chromium.org>
Reviewed-by: default avatarColin Blundell <blundell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#610581}
parent 912050e1
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 81 deletions
chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary.cc
View file @ 240ba84a
......@@ -13,15 +13,11 @@
#include "base/strings/stringprintf.h"
#include "base/values.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
#include "chrome/browser/signin/signin_manager_factory.h"
#include "chrome/browser/signin/identity_manager_factory.h"
#include "chrome/browser/supervised_user/child_accounts/kids_management_api.h"
#include "chrome/browser/supervised_user/supervised_user_constants.h"
#include "chrome/common/chrome_switches.h"
#include "components/data_use_measurement/core/data_use_user_data.h"
#include "components/signin/core/browser/profile_oauth2_token_service.h"
#include "components/signin/core/browser/signin_manager.h"
#include "components/signin/core/browser/signin_manager_base.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/storage_partition.h"
#include "google_apis/gaia/google_service_auth_error.h"
......@@ -29,6 +25,9 @@
#include "net/base/net_errors.h"
#include "net/http/http_status_code.h"
#include "net/traffic_annotation/network_traffic_annotation.h"
#include "services/identity/public/cpp/access_token_fetcher.h"
#include "services/identity/public/cpp/access_token_info.h"
#include "services/identity/public/cpp/identity_manager.h"
#include "services/network/public/cpp/resource_request.h"
#include "services/network/public/cpp/shared_url_loader_factory.h"
#include "services/network/public/cpp/simple_url_loader.h"
......@@ -64,7 +63,7 @@ struct PermissionRequestCreatorApiary::Request {
std::string request_type;
std::string object_ref;
SuccessCallback callback;
std::unique_ptr<OAuth2TokenService::Request> access_token_request;
std::unique_ptr<identity::AccessTokenFetcher> access_token_fetcher;
std::string access_token;
bool access_token_expired;
std::unique_ptr<network::SimpleURLLoader> simple_url_loader;
......@@ -82,11 +81,10 @@ PermissionRequestCreatorApiary::Request::Request(
PermissionRequestCreatorApiary::Request::~Request() {}
PermissionRequestCreatorApiary::PermissionRequestCreatorApiary(
OAuth2TokenService* oauth2_token_service,
identity::IdentityManager* identity_manager,
const std::string& account_id,
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory)
: OAuth2TokenService::Consumer("permissions_creator"),
oauth2_token_service_(oauth2_token_service),
: identity_manager_(identity_manager),
account_id_(account_id),
url_loader_factory_(std::move(url_loader_factory)),
retry_on_network_change_(true) {}
......@@ -96,11 +94,9 @@ PermissionRequestCreatorApiary::~PermissionRequestCreatorApiary() {}
// static
std::unique_ptr<PermissionRequestCreator>
PermissionRequestCreatorApiary::CreateWithProfile(Profile* profile) {
ProfileOAuth2TokenService* token_service =
ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
SigninManagerBase* signin = SigninManagerFactory::GetForProfile(profile);
auto* identity_manager = IdentityManagerFactory::GetForProfile(profile);
return base::WrapUnique(new PermissionRequestCreatorApiary(
token_service, signin->GetAuthenticatedAccountId(),
identity_manager, identity_manager->GetPrimaryAccountId(),
content::BrowserContext::GetDefaultStoragePartition(profile)
->GetURLLoaderFactoryForBrowserProcess()));
}
......@@ -161,23 +157,41 @@ void PermissionRequestCreatorApiary::CreateRequest(
}
void PermissionRequestCreatorApiary::StartFetching(Request* request) {
OAuth2TokenService::ScopeSet scopes;
identity::ScopeSet scopes;
scopes.insert(GetApiScope());
request->access_token_request = oauth2_token_service_->StartRequest(
account_id_, scopes, this);
// It is safe to use Unretained(this) here given that the callback
// will not be invoked if this object is deleted. Likewise, |request|
// only comes from |requests_|, which are owned by this object too.
request->access_token_fetcher =
identity_manager_->CreateAccessTokenFetcherForAccount(
account_id_, "permissions_creator", scopes,
base::BindOnce(
&PermissionRequestCreatorApiary::OnAccessTokenFetchComplete,
base::Unretained(this), request),
identity::AccessTokenFetcher::Mode::kImmediate);
}
void PermissionRequestCreatorApiary::OnGetTokenSuccess(
const OAuth2TokenService::Request* request,
const OAuth2AccessTokenConsumer::TokenResponse& token_response) {
void PermissionRequestCreatorApiary::OnAccessTokenFetchComplete(
Request* request,
GoogleServiceAuthError error,
identity::AccessTokenInfo token_info) {
auto it = requests_.begin();
while (it != requests_.end()) {
if (request == (*it)->access_token_request.get())
if (request->access_token_fetcher.get() ==
(*it)->access_token_fetcher.get()) {
break;
}
++it;
}
DCHECK(it != requests_.end());
(*it)->access_token = token_response.access_token;
if (error.state() != GoogleServiceAuthError::NONE) {
LOG(WARNING) << "Token error: " << error.ToString();
DispatchResult(it, false);
return;
}
(*it)->access_token = token_info.token;
net::NetworkTrafficAnnotationTag traffic_annotation =
net::DefineNetworkTrafficAnnotation("permission_request_creator", R"(
......@@ -221,7 +235,7 @@ void PermissionRequestCreatorApiary::OnGetTokenSuccess(
resource_request->headers.SetHeader(
net::HttpRequestHeaders::kAuthorization,
base::StringPrintf(supervised_users::kAuthorizationHeaderFormat,
token_response.access_token.c_str()));
token_info.token.c_str()));
(*it)->simple_url_loader = network::SimpleURLLoader::Create(
std::move(resource_request), traffic_annotation);
(*it)->simple_url_loader->AttachStringForUpload(body, "application/json");
......@@ -239,20 +253,6 @@ void PermissionRequestCreatorApiary::OnGetTokenSuccess(
base::Unretained(this), std::move(it)));
}
void PermissionRequestCreatorApiary::OnGetTokenFailure(
const OAuth2TokenService::Request* request,
const GoogleServiceAuthError& error) {
auto it = requests_.begin();
while (it != requests_.end()) {
if (request == (*it)->access_token_request.get())
break;
++it;
}
DCHECK(it != requests_.end());
LOG(WARNING) << "Token error: " << error.ToString();
DispatchResult(it, false);
}
void PermissionRequestCreatorApiary::OnSimpleLoaderComplete(
RequestList::iterator it,
std::unique_ptr<std::string> response_body) {
......@@ -269,10 +269,10 @@ void PermissionRequestCreatorApiary::OnSimpleLoaderComplete(
if (response_code == net::HTTP_UNAUTHORIZED &&
!request->access_token_expired) {
request->access_token_expired = true;
OAuth2TokenService::ScopeSet scopes;
identity::ScopeSet scopes;
scopes.insert(GetApiScope());
oauth2_token_service_->InvalidateAccessToken(account_id_, scopes,
request->access_token);
identity_manager_->RemoveAccessTokenFromCache(account_id_, scopes,
request->access_token);
StartFetching(request);
return;
}
......
chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary.h
View file @ 240ba84a
......@@ -12,20 +12,24 @@
#include "base/macros.h"
#include "base/memory/scoped_refptr.h"
#include "chrome/browser/supervised_user/permission_request_creator.h"
#include "google_apis/gaia/oauth2_token_service.h"
#include "google_apis/gaia/google_service_auth_error.h"
class GURL;
class Profile;
namespace identity {
class IdentityManager;
struct AccessTokenInfo;
} // namespace identity
namespace network {
class SharedURLLoaderFactory;
}
class PermissionRequestCreatorApiary : public PermissionRequestCreator,
public OAuth2TokenService::Consumer {
class PermissionRequestCreatorApiary : public PermissionRequestCreator {
public:
PermissionRequestCreatorApiary(
OAuth2TokenService* oauth2_token_service,
identity::IdentityManager* identity_manager,
const std::string& account_id,
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory);
~PermissionRequestCreatorApiary() override;
......@@ -48,12 +52,9 @@ class PermissionRequestCreatorApiary : public PermissionRequestCreator,
struct Request;
using RequestList = std::list<std::unique_ptr<Request>>;
// OAuth2TokenService::Consumer implementation:
void OnGetTokenSuccess(
const OAuth2TokenService::Request* request,
const OAuth2AccessTokenConsumer::TokenResponse& token_response) override;
void OnGetTokenFailure(const OAuth2TokenService::Request* request,
const GoogleServiceAuthError& error) override;
void OnAccessTokenFetchComplete(Request* request,
GoogleServiceAuthError error,
identity::AccessTokenInfo token_info);
void OnSimpleLoaderComplete(RequestList::iterator it,
std::unique_ptr<std::string> response_body);
......@@ -71,7 +72,7 @@ class PermissionRequestCreatorApiary : public PermissionRequestCreator,
void DispatchResult(RequestList::iterator it, bool success);
OAuth2TokenService* oauth2_token_service_;
identity::IdentityManager* identity_manager_;
std::string account_id_;
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory_;
bool retry_on_network_change_;
......
chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary_unittest.cc
View file @ 240ba84a
......@@ -11,10 +11,9 @@
#include "base/message_loop/message_loop.h"
#include "base/threading/thread_task_runner_handle.h"
#include "base/values.h"
#include "components/prefs/testing_pref_service.h"
#include "components/signin/core/browser/fake_profile_oauth2_token_service.h"
#include "net/base/net_errors.h"
#include "net/http/http_util.h"
#include "services/identity/public/cpp/identity_test_environment.h"
#include "services/network/public/cpp/shared_url_loader_factory.h"
#include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"
#include "services/network/test/test_url_loader_factory.h"
......@@ -23,7 +22,7 @@
namespace {
const char kAccountId[] = "account@gmail.com";
const char kEmail[] = "account@gmail.com";
std::string BuildResponse() {
base::DictionaryValue dict;
......@@ -40,29 +39,27 @@ std::string BuildResponse() {
class PermissionRequestCreatorApiaryTest : public testing::Test {
public:
PermissionRequestCreatorApiaryTest()
: token_service_(&pref_service_),
test_shared_loader_factory_(
: test_shared_loader_factory_(
base::MakeRefCounted<network::WeakWrapperSharedURLLoaderFactory>(
&test_url_loader_factory_)),
permission_creator_(&token_service_,
kAccountId,
test_shared_loader_factory_) {
permission_creator_.retry_on_network_change_ = false;
token_service_.UpdateCredentials(kAccountId, "refresh_token");
&test_url_loader_factory_)) {
AccountInfo account_info = identity_test_env_.MakeAccountAvailable(kEmail);
account_id_ = account_info.account_id;
permission_creator_ = std::make_unique<PermissionRequestCreatorApiary>(
identity_test_env_.identity_manager(), account_id_,
test_shared_loader_factory_);
permission_creator_->retry_on_network_change_ = false;
}
protected:
void IssueAccessTokens() {
token_service_.IssueAllTokensForAccount(
kAccountId,
"access_token",
identity_test_env_.WaitForAccessTokenRequestIfNecessaryAndRespondWithToken(
account_id_, "access_token",
base::Time::Now() + base::TimeDelta::FromHours(1));
}
void IssueAccessTokenErrors() {
token_service_.IssueErrorForAllPendingRequestsForAccount(
kAccountId,
GoogleServiceAuthError::FromServiceError("Error!"));
identity_test_env_.WaitForAccessTokenRequestIfNecessaryAndRespondWithError(
account_id_, GoogleServiceAuthError::FromServiceError("Error!"));
}
void SetupResponse(net::Error error, const std::string& response) {
......@@ -72,12 +69,12 @@ class PermissionRequestCreatorApiaryTest : public testing::Test {
net::HttpUtil::AssembleRawHeaders(headers.c_str(), headers.size()));
network::URLLoaderCompletionStatus status(error);
status.decoded_body_length = response.size();
test_url_loader_factory_.AddResponse(permission_creator_.GetApiUrl(), head,
test_url_loader_factory_.AddResponse(permission_creator_->GetApiUrl(), head,
response, status);
}
void CreateRequest(const GURL& url) {
permission_creator_.CreateURLAccessRequest(
permission_creator_->CreateURLAccessRequest(
url,
base::BindOnce(&PermissionRequestCreatorApiaryTest::OnRequestCreated,
base::Unretained(this)));
......@@ -88,20 +85,17 @@ class PermissionRequestCreatorApiaryTest : public testing::Test {
MOCK_METHOD1(OnRequestCreated, void(bool success));
base::MessageLoop message_loop_;
TestingPrefServiceSimple pref_service_;
FakeProfileOAuth2TokenService token_service_;
std::string account_id_;
identity::IdentityTestEnvironment identity_test_env_;
network::TestURLLoaderFactory test_url_loader_factory_;
scoped_refptr<network::SharedURLLoaderFactory> test_shared_loader_factory_;
PermissionRequestCreatorApiary permission_creator_;
std::unique_ptr<PermissionRequestCreatorApiary> permission_creator_;
};
TEST_F(PermissionRequestCreatorApiaryTest, Success) {
CreateRequest(GURL("http://randomurl.com"));
CreateRequest(GURL("http://anotherurl.com"));
// We should have gotten a request for an access token.
EXPECT_GT(token_service_.GetPendingRequests().size(), 0U);
IssueAccessTokens();
EXPECT_CALL(*this, OnRequestCreated(true)).Times(2);
......@@ -113,9 +107,6 @@ TEST_F(PermissionRequestCreatorApiaryTest, Success) {
TEST_F(PermissionRequestCreatorApiaryTest, AccessTokenError) {
CreateRequest(GURL("http://randomurl.com"));
// We should have gotten a request for an access token.
EXPECT_EQ(1U, token_service_.GetPendingRequests().size());
// Our callback should get called immediately on an error.
EXPECT_CALL(*this, OnRequestCreated(false));
IssueAccessTokenErrors();
......@@ -125,9 +116,6 @@ TEST_F(PermissionRequestCreatorApiaryTest, NetworkError) {
const GURL& url = GURL("http://randomurl.com");
CreateRequest(url);
// We should have gotten a request for an access token.
EXPECT_EQ(1U, token_service_.GetPendingRequests().size());
IssueAccessTokens();
// Our callback should get called on an error.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment