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

Unified Diff: chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.h

Issue 1767443002: Add enterprise enrollment support for fake users. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Check instance before derefing it Created 4 years, 8 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: chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.h
diff --git a/chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.h b/chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.h
index 18ef8c187f9a70c6d7edceba94b42eb413e152ac..f112280dd8816558c1a79170086ad6f46604038f 100644
--- a/chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.h
+++ b/chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.h
@@ -9,12 +9,8 @@
#include <string>
#include "base/callback.h"
-#include "base/compiler_specific.h"
#include "base/macros.h"
-#include "base/memory/ref_counted.h"
-#include "base/memory/weak_ptr.h"
#include "google_apis/gaia/gaia_auth_consumer.h"
-#include "google_apis/gaia/oauth2_access_token_consumer.h"
class GaiaAuthFetcher;
class OAuth2AccessTokenFetcher;
@@ -30,96 +26,43 @@ namespace policy {
// send a (possibly empty) token to the callback, which will then let the policy
// subsystem proceed and resume Profile creation. Sending the token even when no
// Profile is pending is also OK.
-class PolicyOAuth2TokenFetcher
- : public base::SupportsWeakPtr<PolicyOAuth2TokenFetcher>,
- public GaiaAuthConsumer,
- public OAuth2AccessTokenConsumer {
+class PolicyOAuth2TokenFetcher {
public:
- typedef base::Callback<void(const std::string&,
- const GoogleServiceAuthError&)> TokenCallback;
+ // Allocates a PolicyOAuth2TokenFetcher instance.
+ static PolicyOAuth2TokenFetcher* CreateInstance();
+
+ // Makes CreateInstance() return a fake token fetcher that does not make
+ // network calls so tests can avoid a dependency on GAIA.
+ static void UseFakeTokensForTesting();
+
+ using TokenCallback =
+ base::Callback<void(const std::string&, const GoogleServiceAuthError&)>;
PolicyOAuth2TokenFetcher();
- ~PolicyOAuth2TokenFetcher() override;
+ virtual ~PolicyOAuth2TokenFetcher();
// Fetches the device management service's oauth2 token. This may be fetched
// via signin context, auth code, or oauth2 refresh token.
- void StartWithSigninContext(
+ virtual void StartWithSigninContext(
net::URLRequestContextGetter* auth_context_getter,
net::URLRequestContextGetter* system_context_getter,
- const TokenCallback& callback);
- void StartWithAuthCode(const std::string& auth_code,
- net::URLRequestContextGetter* system_context_getter,
- const TokenCallback& callback);
- void StartWithRefreshToken(
+ const TokenCallback& callback) = 0;
+ virtual void StartWithAuthCode(
+ const std::string& auth_code,
+ net::URLRequestContextGetter* system_context_getter,
+ const TokenCallback& callback) = 0;
+ virtual void StartWithRefreshToken(
const std::string& oauth2_refresh_token,
net::URLRequestContextGetter* system_context_getter,
- const TokenCallback& callback);
+ const TokenCallback& callback) = 0;
// Returns true if we have previously attempted to fetch tokens with this
// class and failed.
- bool failed() const {
- return failed_;
- }
-
- const std::string& oauth2_refresh_token() const {
- return oauth2_refresh_token_;
- }
- const std::string& oauth2_access_token() const {
- return oauth2_access_token_;
- }
+ virtual bool Failed() const = 0;
+ virtual const std::string& OAuth2RefreshToken() const = 0;
+ virtual const std::string& OAuth2AccessToken() const = 0;
private:
- // GaiaAuthConsumer overrides.
- void OnClientOAuthSuccess(
- const GaiaAuthConsumer::ClientOAuthResult& oauth_tokens) override;
- void OnClientOAuthFailure(const GoogleServiceAuthError& error) override;
-
- // OAuth2AccessTokenConsumer overrides.
- void OnGetTokenSuccess(const std::string& access_token,
- const base::Time& expiration_time) override;
- void OnGetTokenFailure(const GoogleServiceAuthError& error) override;
-
- // Starts fetching OAuth2 refresh token.
- void StartFetchingRefreshToken();
-
- // Starts fetching OAuth2 access token for the device management service.
- void StartFetchingAccessToken();
-
- // Decides how to proceed on GAIA |error|. If the error looks temporary,
- // retries |task| until max retry count is reached.
- // If retry count runs out, or error condition is unrecoverable, it calls
- // Delegate::OnOAuth2TokenFetchFailed().
- void RetryOnError(const GoogleServiceAuthError& error,
- const base::Closure& task);
-
- // Passes |token| and |error| to the |callback_|.
- void ForwardPolicyToken(const std::string& token,
- const GoogleServiceAuthError& error);
-
- // Auth code which is used to retreive a refresh token.
- std::string auth_code_;
-
- scoped_refptr<net::URLRequestContextGetter> auth_context_getter_;
- scoped_refptr<net::URLRequestContextGetter> system_context_getter_;
- std::unique_ptr<GaiaAuthFetcher> refresh_token_fetcher_;
- std::unique_ptr<OAuth2AccessTokenFetcher> access_token_fetcher_;
-
- // OAuth2 refresh token. Could come either from the outside or through
- // refresh token fetching flow within this class.
- std::string oauth2_refresh_token_;
-
- // OAuth2 access token.
- std::string oauth2_access_token_;
-
- // The retry counter. Increment this only when failure happened.
- int retry_count_ = 0;
-
- // True if we have already failed to fetch the policy.
- bool failed_ = false;
-
- // The callback to invoke when done.
- TokenCallback callback_;
-
DISALLOW_COPY_AND_ASSIGN(PolicyOAuth2TokenFetcher);
};
« no previous file with comments | « chrome/browser/chromeos/login/saml/saml_browsertest.cc ('k') | chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698