Use OAuth2 refresh token to download GAIA info

chrome/browser/profiles/profile_downloader.cc

Index: chrome/browser/profiles/profile_downloader.cc
diff --git a/chrome/browser/profiles/profile_downloader.cc b/chrome/browser/profiles/profile_downloader.cc
index da6eccb92c2e55f1dee4994df7b482e33d1c512e..4154239fb9e6492e8f61874310a4034537f7d116 100644
--- a/chrome/browser/profiles/profile_downloader.cc
+++ b/chrome/browser/profiles/profile_downloader.cc
@@ -18,6 +18,8 @@
 #include "chrome/browser/profiles/profile_downloader_delegate.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/net/gaia/gaia_constants.h"
+#include "chrome/common/net/gaia/gaia_urls.h"
+#include "chrome/common/net/gaia/oauth2_access_token_fetcher.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
@@ -32,12 +34,22 @@ using content::BrowserThread;
 
 namespace {
 
-// Template for optional authorization header.
-const char kAuthorizationHeader[] = "Authorization: GoogleLogin auth=%s";
+// Template for optional authorization header when using client login access

[Ivan Korotkov, 2011/11/30 11:17:31]

the ClientLogin

[sail, 2011/11/30 11:34:10]

Done.

+// token.
+const char kClientAccessAuthorizationHeader[] =
+    "Authorization: GoogleLogin auth=%s";
+
+// Template for optional authorization header when using an OAuth access token.
+const char kOAuthAccessAuthorizationHeader[] =
+    "Authorization: Bearer %s";
 
 // URL requesting Picasa API for user info.
 const char kUserEntryURL[] =
     "http://picasaweb.google.com/data/entry/api/user/default?alt=json";
+
+// OAuth scope for the Picasa API.
+const char kPicasaScope[] = "http://picasaweb.google.com/data/";
+
 // Path in JSON dictionary to user's photo thumbnail URL.
 const char kPhotoThumbnailURLPath[] = "entry.gphoto$thumbnail.$t";
 
@@ -187,7 +199,20 @@ void ProfileDownloader::Start() {
     delegate_->OnDownloadComplete(this, false);
     return;
   }
-  if (service->HasTokenForService(GaiaConstants::kPicasaService)) {
+
+  if (delegate_->GetShouldUseOAuthRefreshToken() &&
+      service->HasOAuthLoginToken()) {
+    std::vector<std::string> scopes;
+    scopes.push_back(kPicasaScope);
+    oauth2_access_token_fetcher_.reset(new OAuth2AccessTokenFetcher(
+        this, delegate_->GetBrowserProfile()->GetRequestContext()));
+    oauth2_access_token_fetcher_->Start(
+        GaiaUrls::GetInstance()->oauth2_chrome_client_id(),
+        GaiaUrls::GetInstance()->oauth2_chrome_client_secret(),
+        service->GetOAuth2LoginRefreshToken(),
+        scopes);
+  } else if (!delegate_->GetShouldUseOAuthRefreshToken() &&
+      service->HasTokenForService(GaiaConstants::kPicasaService)) {
     auth_token_ =
         service->GetTokenForService(GaiaConstants::kPicasaService);
     StartFetchingImage();
@@ -217,11 +242,16 @@ void ProfileDownloader::StartFetchingImage() {
       delegate_->GetBrowserProfile()->GetRequestContext());
   if (!auth_token_.empty()) {
     user_entry_fetcher_->SetExtraRequestHeaders(
-        base::StringPrintf(kAuthorizationHeader, auth_token_.c_str()));
+        base::StringPrintf(GetAuthorizationHeader(), auth_token_.c_str()));
   }
   user_entry_fetcher_->Start();
 }
 
+const char* ProfileDownloader::GetAuthorizationHeader() const {
+  return delegate_->GetShouldUseOAuthRefreshToken() ?
+      kOAuthAccessAuthorizationHeader : kClientAccessAuthorizationHeader;
+}
+
 ProfileDownloader::~ProfileDownloader() {}
 
 void ProfileDownloader::OnURLFetchComplete(const content::URLFetcher* source) {
@@ -253,7 +283,7 @@ void ProfileDownloader::OnURLFetchComplete(const content::URLFetcher* source) {
         delegate_->GetBrowserProfile()->GetRequestContext());
     if (!auth_token_.empty()) {
       profile_image_fetcher_->SetExtraRequestHeaders(
-          base::StringPrintf(kAuthorizationHeader, auth_token_.c_str()));
+          base::StringPrintf(GetAuthorizationHeader(), auth_token_.c_str()));
     }
     profile_image_fetcher_->Start();
   } else if (source == profile_image_fetcher_.get()) {
@@ -290,16 +320,30 @@ void ProfileDownloader::Observe(
 
   TokenService::TokenAvailableDetails* token_details =
       content::Details<TokenService::TokenAvailableDetails>(details).ptr();
+  std::string service = delegate_->GetShouldUseOAuthRefreshToken() ?
+      GaiaConstants::kGaiaOAuth2LoginRefreshToken :
+      GaiaConstants::kPicasaService;
+
   if (type == chrome::NOTIFICATION_TOKEN_AVAILABLE) {
-    if (token_details->service() == GaiaConstants::kPicasaService) {
+    if (token_details->service() == service) {
       registrar_.RemoveAll();
       auth_token_ = token_details->token();
       StartFetchingImage();
     }
   } else {
-    if (token_details->service() == GaiaConstants::kPicasaService) {
+    if (token_details->service() == service) {
       LOG(WARNING) << "ProfileDownloader: token request failed";
       delegate_->OnDownloadComplete(this, false);
     }
   }
 }
+
+void ProfileDownloader::OnGetTokenSuccess(const std::string& access_token) {

[Ivan Korotkov, 2011/11/30 11:17:31]

I'm kinda puzzled, when does this get called? When using OAuth refresh token
method, right? Do we get a notification with Observe() for it?
Also, shouldn't we remove the notification subscription here?

[sail, 2011/11/30 11:34:10]

This is a callback for the oauth2_access_token_fetcher. This class is the
delegate for the fetcher so there's nothing to unset. I added comments to
explain this.

+  auth_token_ = access_token;
+  StartFetchingImage();
+}
+
+void ProfileDownloader::OnGetTokenFailure(const GoogleServiceAuthError& error) {
+  LOG(WARNING) << "ProfileDownloader: token request using refresh token failed";
+  delegate_->OnDownloadComplete(this, false);
+}