Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(633)

Unified Diff: components/signin/core/browser/mutable_profile_oauth2_token_service.h

Issue 1143323005: Refactor AO2TS to make it easier to componentize. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address final comments Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/signin/core/browser/mutable_profile_oauth2_token_service.h
diff --git a/components/signin/core/browser/mutable_profile_oauth2_token_service.h b/components/signin/core/browser/mutable_profile_oauth2_token_service.h
deleted file mode 100644
index 611a716dc2d827886d574f425d638fce9e13d472..0000000000000000000000000000000000000000
--- a/components/signin/core/browser/mutable_profile_oauth2_token_service.h
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright 2014 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.
-
-#ifndef COMPONENTS_SIGNIN_CORE_BROWSER_MUTABLE_PROFILE_OAUTH2_TOKEN_SERVICE_H_
-#define COMPONENTS_SIGNIN_CORE_BROWSER_MUTABLE_PROFILE_OAUTH2_TOKEN_SERVICE_H_
-
-#include "base/memory/scoped_vector.h"
-#include "base/threading/thread_checker.h"
-#include "components/signin/core/browser/profile_oauth2_token_service.h"
-#include "components/signin/core/browser/signin_error_controller.h"
-#include "components/webdata/common/web_data_service_base.h"
-#include "components/webdata/common/web_data_service_consumer.h"
-#include "net/base/backoff_entry.h"
-
-// A specialization of ProfileOAuth2TokenService that can can mutate its OAuth2
-// tokens.
-//
-// Note: This class is just a placeholder for now. Methods used to mutate
-// the tokens are currently being migrated from ProfileOAuth2TokenService.
-class MutableProfileOAuth2TokenService : public ProfileOAuth2TokenService,
- public WebDataServiceConsumer {
- public:
- // ProfileOAuth2TokenService overrides.
- void Shutdown() override;
- std::vector<std::string> GetAccounts() override;
-
- // The below three methods should be called only on the thread on which this
- // object was created.
- void LoadCredentials(const std::string& primary_account_id) override;
- void UpdateCredentials(const std::string& account_id,
- const std::string& refresh_token) override;
- void RevokeAllCredentials() override;
- bool RefreshTokenIsAvailable(const std::string& account_id) const override;
-
- // Revokes credentials related to |account_id|.
- void RevokeCredentials(const std::string& account_id);
-
- protected:
- class AccountInfo : public SigninErrorController::AuthStatusProvider {
- public:
- AccountInfo(SigninErrorController* signin_error_controller,
- const std::string& account_id,
- const std::string& refresh_token);
- ~AccountInfo() override;
-
- const std::string& refresh_token() const { return refresh_token_; }
- void set_refresh_token(const std::string& token) {
- refresh_token_ = token;
- }
-
- void SetLastAuthError(const GoogleServiceAuthError& error);
-
- // SigninErrorController::AuthStatusProvider implementation.
- std::string GetAccountId() const override;
- GoogleServiceAuthError GetAuthStatus() const override;
-
- private:
- SigninErrorController* signin_error_controller_;
- std::string account_id_;
- std::string refresh_token_;
- GoogleServiceAuthError last_auth_error_;
-
- DISALLOW_COPY_AND_ASSIGN(AccountInfo);
- };
-
- // Maps the |account_id| of accounts known to ProfileOAuth2TokenService
- // to information about the account.
- typedef std::map<std::string, linked_ptr<AccountInfo> > AccountInfoMap;
-
- friend class ProfileOAuth2TokenServiceFactory;
- friend class MutableProfileOAuth2TokenServiceTest;
-
- MutableProfileOAuth2TokenService();
- ~MutableProfileOAuth2TokenService() override;
-
- // OAuth2TokenService implementation.
- OAuth2AccessTokenFetcher* CreateAccessTokenFetcher(
- const std::string& account_id,
- net::URLRequestContextGetter* getter,
- OAuth2AccessTokenConsumer* consumer) override;
- net::URLRequestContextGetter* GetRequestContext() override;
-
- // Updates the internal cache of the result from the most-recently-completed
- // auth request (used for reporting errors to the user).
- void UpdateAuthError(const std::string& account_id,
- const GoogleServiceAuthError& error) override;
-
- virtual std::string GetRefreshToken(const std::string& account_id) const;
-
- bool HasPersistentError(const std::string& account_id);
-
- AccountInfoMap& refresh_tokens() { return refresh_tokens_; }
-
- private:
- class RevokeServerRefreshToken;
-
- FRIEND_TEST_ALL_PREFIXES(MutableProfileOAuth2TokenServiceTest,
- TokenServiceUpdateClearsCache);
- FRIEND_TEST_ALL_PREFIXES(MutableProfileOAuth2TokenServiceTest,
- PersistenceDBUpgrade);
- FRIEND_TEST_ALL_PREFIXES(MutableProfileOAuth2TokenServiceTest,
- PersistenceLoadCredentials);
- FRIEND_TEST_ALL_PREFIXES(MutableProfileOAuth2TokenServiceTest,
- CanonicalizeAccountId);
- FRIEND_TEST_ALL_PREFIXES(MutableProfileOAuth2TokenServiceTest,
- FetchPersistentError);
- FRIEND_TEST_ALL_PREFIXES(MutableProfileOAuth2TokenServiceTest,
- RetryBackoff);
- FRIEND_TEST_ALL_PREFIXES(MutableProfileOAuth2TokenServiceTest,
- CanonAndNonCanonAccountId);
-
- // WebDataServiceConsumer implementation:
- void OnWebDataServiceRequestDone(WebDataServiceBase::Handle handle,
- const WDTypedResult* result) override;
-
- // Loads credentials into in memory stucture.
- void LoadAllCredentialsIntoMemory(
- const std::map<std::string, std::string>& db_tokens);
-
- // Persists credentials for |account_id|. Enables overriding for
- // testing purposes, or other cases, when accessing the DB is not desired.
- void PersistCredentials(const std::string& account_id,
- const std::string& refresh_token);
-
- // Clears credentials persisted for |account_id|. Enables overriding for
- // testing purposes, or other cases, when accessing the DB is not desired.
- void ClearPersistedCredentials(const std::string& account_id);
-
- // Revokes the refresh token on the server.
- void RevokeCredentialsOnServer(const std::string& refresh_token);
-
- // Cancels any outstanding fetch for tokens from the web database.
- void CancelWebTokenFetch();
-
- // In memory refresh token store mapping account_id to refresh_token.
- AccountInfoMap refresh_tokens_;
-
- // Handle to the request reading tokens from database.
- WebDataServiceBase::Handle web_data_service_request_;
-
- // The primary account id of this service's profile during the loading of
- // credentials. This member is empty otherwise.
- std::string loading_primary_account_id_;
-
- ScopedVector<RevokeServerRefreshToken> server_revokes_;
-
- // Used to verify that certain methods are called only on the thread on which
- // this instance was created.
- base::ThreadChecker thread_checker_;
-
- // Used to rate-limit network token requests so as to not overload the server.
- net::BackoffEntry::Policy backoff_policy_;
- net::BackoffEntry backoff_entry_;
- GoogleServiceAuthError backoff_error_;
-
- DISALLOW_COPY_AND_ASSIGN(MutableProfileOAuth2TokenService);
-};
-
-#endif // COMPONENTS_SIGNIN_CORE_BROWSER_MUTABLE_PROFILE_OAUTH2_TOKEN_SERVICE_H_
« no previous file with comments | « components/signin/core/browser/BUILD.gn ('k') | components/signin/core/browser/mutable_profile_oauth2_token_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698