OAuth2LoginVerifier::~OAuth2LoginVerifier() {
}
+void OAuth2LoginVerifier::VerifyUserCookies(Profile* profile) {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+ if (DelayNetworkCall(base::Bind(&OAuth2LoginVerifier::VerifyUserCookies,
+ AsWeakPtr(),
+ profile))) {
+ return;
+ }
+
+ StartAuthCookiesVerification();
+}
+
void OAuth2LoginVerifier::VerifyProfileTokens(Profile* profile) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- // Delay the verification if the network is not connected or on a captive
- // portal.
- const NetworkState* default_network =
- NetworkHandler::Get()->network_state_handler()->DefaultNetwork();
- NetworkPortalDetector* detector = NetworkPortalDetector::Get();
- if (!default_network ||
- default_network->connection_state() == shill::kStatePortal ||
- (detector && detector->GetCaptivePortalState(default_network).status !=
- NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE)) {
- // If network is offline, defer the token fetching until online.
- LOG(WARNING) << "Network is offline. Deferring OAuth2 access token fetch.";
- BrowserThread::PostDelayedTask(
- BrowserThread::UI,
- FROM_HERE,
- base::Bind(
- &OAuth2LoginVerifier::VerifyProfileTokens, AsWeakPtr(), profile),
- base::TimeDelta::FromMilliseconds(kRequestRestartDelay));
+ if (DelayNetworkCall(base::Bind(&OAuth2LoginVerifier::VerifyProfileTokens,
+ AsWeakPtr(),
+ profile))) {
return;
}
BrowserThread::UI,
FROM_HERE,
base::Bind(
- &OAuth2LoginVerifier::StartPostRestoreVerification, AsWeakPtr()),
+ &OAuth2LoginVerifier::StartAuthCookiesVerification, AsWeakPtr()),
base::TimeDelta::FromMilliseconds(kPostResoreVerificationDelay));
}
-void OAuth2LoginVerifier::StartPostRestoreVerification() {
+void OAuth2LoginVerifier::StartAuthCookiesVerification() {
gaia_fetcher_.reset(
new GaiaAuthFetcher(this,
std::string(GaiaConstants::kChromeOSSource),
RetryOnError(
"ListAccounts",
error,
- base::Bind(&OAuth2LoginVerifier::StartPostRestoreVerification,
+ base::Bind(&OAuth2LoginVerifier::StartAuthCookiesVerification,
AsWeakPtr()),
base::Bind(&Delegate::OnListAccountsFailure,
base::Unretained(delegate_)));
error_handler.Run(IsConnectionOrServiceError(error));
}
+bool OAuth2LoginVerifier::DelayNetworkCall(const base::Closure& callback) {
+ // Delay the verification if the network is not connected or on a captive
+ // portal.
+ const NetworkState* default_network =
+ NetworkHandler::Get()->network_state_handler()->DefaultNetwork();
+ NetworkPortalDetector* detector = NetworkPortalDetector::Get();
+ if (!default_network ||
+ default_network->connection_state() == shill::kStatePortal ||
+ (detector && detector->GetCaptivePortalState(default_network).status !=
+ NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE)) {
+ // If network is offline, defer the token fetching until online.
+ LOG(WARNING) << "Network is offline. Deferring call.";
+ BrowserThread::PostDelayedTask(
+ BrowserThread::UI,
+ FROM_HERE,
+ callback,
+ base::TimeDelta::FromMilliseconds(kRequestRestartDelay));
+ return true;
+ }
+
+ return false;
+}
+
} // namespace chromeos