Parse extra parameters on x-chrome-manage-accounts header

BUG=375416

Review URL: https://codereview.chromium.org/345533005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278599 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/extensions/api/principals_private/principals_private_api.cc

@@ -36,7 +36,7 @@ bool PrincipalsPrivateShowAvatarBubbleFunction::RunSyncSafe() {
   if (browser) {
     browser->window()->ShowAvatarBubbleFromAvatarButton(
         BrowserWindow::AVATAR_BUBBLE_MODE_ACCOUNT_MANAGEMENT,
-        signin::GAIA_SERVICE_TYPE_NONE);
+        signin::ManageAccountsParams());
   }
   return true;
 }

chrome/browser/signin/signin_global_error.cc

@@ -101,7 +101,7 @@ void SigninGlobalError::ExecuteMenuItem(Browser* browser) {
   if (switches::IsNewAvatarMenu()) {
     browser->window()->ShowAvatarBubbleFromAvatarButton(
         BrowserWindow::AVATAR_BUBBLE_MODE_REAUTH,
-        signin::GAIA_SERVICE_TYPE_NONE);
+        signin::ManageAccountsParams());
   } else {
     chrome::ShowSingletonTab(
         browser,

chrome/browser/signin/signin_header_helper.cc

@@ -38,6 +38,12 @@ const char kGaiaIdAttrName[] = "id";
 const char kProfileModeAttrName[] = "mode";
 const char kEnableAccountConsistencyAttrName[] = "enable_account_consistency";
 
+const char kServiceTypeAttrName[] = "action";
+const char kEmailAttrName[] = "email";
+const char kIsSamlAttrName[] = "is_saml";
+const char kContinueUrlAttrName[] = "continue_url";
+const char kIsSameTabAttrName[] = "is_same_tab";
+
 // Determines the service type that has been passed from GAIA in the header.
 signin::GAIAServiceType GetGAIAServiceTypeFromHeader(
     const std::string& header_value) {
@@ -69,7 +75,7 @@ MirrorResponseHeaderDictionary ParseMirrorResponseHeader(
     std::string field(*i);
     std::vector<std::string> tokens;
     if (Tokenize(field, "=", &tokens) != 2) {
-      DLOG(WARNING) << "Unexpected GAIA header filed '" << field << "'.";
+      DLOG(WARNING) << "Unexpected GAIA header field '" << field << "'.";
       continue;
     }
     dictionary[tokens[0]] = tokens[1];
@@ -77,6 +83,34 @@ MirrorResponseHeaderDictionary ParseMirrorResponseHeader(
   return dictionary;
 }
 
+// Returns the parameters contained in the X-Chrome-Manage-Accounts response
+// header.
+signin::ManageAccountsParams BuildManageAccountsParams(
+    const std::string& header_value) {
+  signin::ManageAccountsParams params;
+  MirrorResponseHeaderDictionary header_dictionary =
+      ParseMirrorResponseHeader(header_value);
+  MirrorResponseHeaderDictionary::const_iterator it = header_dictionary.begin();
+  for (; it != header_dictionary.end(); ++it) {
+    const std::string key_name(it->first);
+    if (key_name == kServiceTypeAttrName) {
+      params.service_type =
+          GetGAIAServiceTypeFromHeader(header_dictionary[kServiceTypeAttrName]);
+    } else if (key_name == kEmailAttrName) {
+      params.email = header_dictionary[kEmailAttrName];
+    } else if (key_name == kIsSamlAttrName) {
+      params.is_saml = header_dictionary[kIsSamlAttrName] == "true";
+    } else if (key_name == kContinueUrlAttrName) {
+      params.continue_url = header_dictionary[kContinueUrlAttrName];
+    } else if (key_name == kIsSameTabAttrName) {
+      params.is_same_tab = header_dictionary[kIsSameTabAttrName] == "true";
+    } else {
+      DLOG(WARNING) << "Unexpected GAIA header attribute '" << key_name << "'.";
+    }
+  }
+  return params;
+}
+
 #if !defined(OS_IOS)
 // Processes the mirror response header on the UI thread. Currently depending
 // on the value of |header_value|, it either shows the profile avatar menu, or
@@ -112,7 +146,7 @@ void ProcessMirrorHeaderUIThread(
         bubble_mode = BrowserWindow::AVATAR_BUBBLE_MODE_ACCOUNT_MANAGEMENT;
     }
     browser->window()->ShowAvatarBubbleFromAvatarButton(
-        bubble_mode, service_type);
+        bubble_mode, manage_accounts_params);
   }
 #else  // defined(OS_ANDROID)
   if (service_type == signin::GAIA_SERVICE_TYPE_INCOGNITO) {
@@ -141,6 +175,15 @@ bool IsDriveOrigin(const GURL& url) {
 
 namespace signin {
 
+ManageAccountsParams::ManageAccountsParams() :
+    service_type(GAIA_SERVICE_TYPE_NONE),
+    email(""),
+    is_saml(false),
+    continue_url(""),
+    is_same_tab(false),
+    child_id(0),
+    route_id(0) {}
+
 bool AppendMirrorRequestHeaderIfPossible(
     net::URLRequest* request,
     const GURL& redirect_url,
@@ -198,31 +241,6 @@ bool AppendMirrorRequestHeaderIfPossible(
   return true;
 }
 
-ManageAccountsParams GetManageAccountsParams(net::URLRequest* request,
-                                             ProfileIOData* io_data) {
-  ManageAccountsParams params;
-  params.service_type = GAIA_SERVICE_TYPE_NONE;
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-  if (!gaia::IsGaiaSignonRealm(request->url().GetOrigin()))
-    return params;
-
-  std::string header_value;
-  if (!request->response_headers()->GetNormalizedHeader(
-          kChromeManageAccountsHeader, &header_value)) {
-    return params;
-  }
-
-  DCHECK(switches::IsNewProfileManagement() && !io_data->IsOffTheRecord());
-
-  MirrorResponseHeaderDictionary header_dictionary =
-      ParseMirrorResponseHeader(header_value);
-  if (header_dictionary.count("action")) {
-    params.service_type =
-        GetGAIAServiceTypeFromHeader(header_dictionary["action"]);
-  }
-  return params;
-}
-
 void ProcessMirrorResponseHeaderIfExists(
     net::URLRequest* request,
     ProfileIOData* io_data,
@@ -232,10 +250,22 @@ void ProcessMirrorResponseHeaderIfExists(
   NOTREACHED();
 #else
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-  ManageAccountsParams params = GetManageAccountsParams(request, io_data);
+  if (!gaia::IsGaiaSignonRealm(request->url().GetOrigin()))
+    return;
+
+  std::string header_value;
+  if (!request->response_headers()->GetNormalizedHeader(
+          kChromeManageAccountsHeader, &header_value)) {
+    return;
+  }
+
+  DCHECK(switches::IsNewProfileManagement() && !io_data->IsOffTheRecord());
+  ManageAccountsParams params(BuildManageAccountsParams(header_value));
   if (params.service_type == GAIA_SERVICE_TYPE_NONE)
     return;
 
+  params.child_id = child_id;
+  params.route_id = route_id;
   content::BrowserThread::PostTask(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(ProcessMirrorHeaderUIThread, child_id, route_id, params));

chrome/browser/signin/signin_header_helper.h

@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_SIGNIN_SIGNIN_HEADER_HELPER_H_
 #define CHROME_BROWSER_SIGNIN_SIGNIN_HEADER_HELPER_H_
 
+#include <string>
+
 namespace net {
 class URLRequest;
 }
@@ -41,7 +43,23 @@ enum GAIAServiceType {
 
 // Struct describing the paramters received in the manage account header.
 struct ManageAccountsParams {
+  // The requested service type such as "ADDSESSION".
   GAIAServiceType service_type;
+  // The prefilled email.
+  std::string email;
+  // Whether |email| is a saml account.
+  bool is_saml;
+  // The continue URL after the requested service is completed successfully.
+  // Defaults to the current URL if empty.
+  std::string continue_url;
+  // Whether the continue URL should be loaded in the same tab.
+  bool is_same_tab;
+  // The child id associated with the web content of the request.
+  int child_id;
+  // The route id associated with the web content of the request.
+  int route_id;
+
+  ManageAccountsParams();
 };
 
 // Adds X-Chrome-Connected header to all Gaia requests from a connected profile,
@@ -55,14 +73,6 @@ bool AppendMirrorRequestHeaderIfPossible(
     int child_id,
     int route_id);
 
-// Returns the parameters contained in the X-Chrome-Manage-Accounts response
-// header.
-// If the request does not have a response header or if the header contains
-// garbage, then |service_type| is set to |GAIA_SERVICE_TYPE_NONE|.
-// Must be called on IO thread.
-ManageAccountsParams GetManageAccountsParams(net::URLRequest* request,
-                                             ProfileIOData* io_data);
-
 // Looks for the X-Chrome-Manage-Accounts response header, and if found,
 // tries to show the avatar bubble in the browser identified by the
 // child/route id. Must be called on IO thread.

chrome/browser/ui/browser_commands.cc

@@ -1047,7 +1047,7 @@ void ShowAppMenu(Browser* browser) {
 void ShowAvatarMenu(Browser* browser) {
   browser->window()->ShowAvatarBubbleFromAvatarButton(
       BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT,
-      signin::GAIA_SERVICE_TYPE_NONE);
+      signin::ManageAccountsParams());
 }
 
 void OpenUpdateChromeDialog(Browser* browser) {

chrome/browser/ui/browser_window.h

@@ -372,9 +372,8 @@ class BrowserWindow : public ui::BaseWindow {
     AVATAR_BUBBLE_MODE_SIGNIN,
     AVATAR_BUBBLE_MODE_REAUTH,
   };
-  virtual void ShowAvatarBubbleFromAvatarButton(
-      AvatarBubbleMode mode,
-      signin::GAIAServiceType service_type) = 0;
+  virtual void ShowAvatarBubbleFromAvatarButton(AvatarBubbleMode mode,
+      const signin::ManageAccountsParams& manage_accounts_params) = 0;
 
   // Show bubble for password generation positioned relative to |rect|. The
   // subclasses implementing this interface do not own the |password_generator|

chrome/browser/ui/cocoa/browser_window_cocoa.h

@@ -150,7 +150,7 @@ class BrowserWindowCocoa :
   virtual void ShowAvatarBubble(content::WebContents* web_contents,
                                 const gfx::Rect& rect) OVERRIDE;
   virtual void ShowAvatarBubbleFromAvatarButton(AvatarBubbleMode mode,
-      signin::GAIAServiceType service_type) OVERRIDE;
+      const signin::ManageAccountsParams& manage_accounts_params) OVERRIDE;
   virtual void ShowPasswordGenerationBubble(
       const gfx::Rect& rect,
       const autofill::PasswordForm& form,

chrome/browser/ui/cocoa/browser_window_cocoa.mm

@@ -706,14 +706,15 @@ void BrowserWindowCocoa::ShowAvatarBubble(WebContents* web_contents,
 }
 
 void BrowserWindowCocoa::ShowAvatarBubbleFromAvatarButton(
-    AvatarBubbleMode mode, signin::GAIAServiceType service_type) {
+    AvatarBubbleMode mode,
+    const signin::ManageAccountsParams& manage_accounts_params) {
   AvatarBaseController* controller = [controller_ avatarButtonController];
   NSView* anchor = [controller buttonView];
   if ([anchor isHiddenOrHasHiddenAncestor])
     anchor = [[controller_ toolbarController] wrenchButton];
   [controller showAvatarBubble:anchor
                       withMode:mode
-               withServiceType:service_type];
+               withServiceType:manage_accounts_params.service_type];
 }
 
 void BrowserWindowCocoa::ShowPasswordGenerationBubble(

chrome/browser/ui/views/frame/browser_view.cc

@@ -2378,10 +2378,10 @@ void BrowserView::ShowAvatarBubble(WebContents* web_contents,
 
 void BrowserView::ShowAvatarBubbleFromAvatarButton(
     AvatarBubbleMode mode,
-    signin::GAIAServiceType service_type) {
+    const signin::ManageAccountsParams& manage_accounts_params) {
   views::BubbleBorder::Arrow arrow = views::BubbleBorder::TOP_RIGHT;
   views::BubbleBorder::BubbleAlignment alignment =
-    views::BubbleBorder::ALIGN_ARROW_TO_MID_ANCHOR;
+      views::BubbleBorder::ALIGN_ARROW_TO_MID_ANCHOR;
   views::View* anchor_view = frame_->GetAvatarMenuButton();
   if (!anchor_view)
     anchor_view = toolbar_->app_menu();
@@ -2411,8 +2411,8 @@ void BrowserView::ShowAvatarBubbleFromAvatarButton(
         view_mode = profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
         break;
     }
-    ProfileChooserView::ShowBubble(view_mode, service_type, anchor_view, arrow,
-                                   alignment, browser());
+    ProfileChooserView::ShowBubble(view_mode, manage_accounts_params,
+        anchor_view, arrow, alignment, browser());
   } else {
     gfx::Point origin;
     views::View::ConvertPointToScreen(anchor_view, &origin);

chrome/browser/ui/views/frame/browser_view.h

@@ -363,7 +363,7 @@ class BrowserView : public BrowserWindow,
   virtual void ShowAvatarBubble(content::WebContents* web_contents,
                                 const gfx::Rect& rect) OVERRIDE;
   virtual void ShowAvatarBubbleFromAvatarButton(AvatarBubbleMode mode,
-      signin::GAIAServiceType service_type) OVERRIDE;
+      const signin::ManageAccountsParams& manage_accounts_params) OVERRIDE;
   virtual void ShowPasswordGenerationBubble(
       const gfx::Rect& rect,
       const autofill::PasswordForm& form,

chrome/browser/ui/views/frame/glass_browser_frame_view.cc

@@ -289,7 +289,7 @@ void GlassBrowserFrameView::ButtonPressed(views::Button* sender,
   if (sender == new_avatar_button()) {
     browser_view()->ShowAvatarBubbleFromAvatarButton(
         BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT,
-        signin::GAIA_SERVICE_TYPE_NONE);
+        signin::ManageAccountsParams());
   }
 }
 

chrome/browser/ui/views/frame/opaque_browser_frame_view.cc

@@ -351,7 +351,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Button* sender,
   } else if (sender == new_avatar_button()) {
     browser_view()->ShowAvatarBubbleFromAvatarButton(
         BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT,
-        signin::GAIA_SERVICE_TYPE_NONE);
+        signin::ManageAccountsParams());
   }
 }
 

chrome/browser/ui/views/profiles/avatar_label.cc

@@ -108,7 +108,7 @@ bool AvatarLabel::OnMousePressed(const ui::MouseEvent& event) {
 
   browser_view_->ShowAvatarBubbleFromAvatarButton(
       BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT,
-      signin::GAIA_SERVICE_TYPE_NONE);
+      signin::ManageAccountsParams());
   return true;
 }
 

chrome/browser/ui/views/profiles/profile_chooser_view.cc

@@ -445,7 +445,7 @@ bool ProfileChooserView::close_on_deactivate_for_testing_ = true;
 // static
 void ProfileChooserView::ShowBubble(
     profiles::BubbleViewMode view_mode,
-    signin::GAIAServiceType service_type,
+    const signin::ManageAccountsParams& manage_accounts_params,
     views::View* anchor_view,
     views::BubbleBorder::Arrow arrow,
     views::BubbleBorder::BubbleAlignment border_alignment,
@@ -454,7 +454,7 @@ void ProfileChooserView::ShowBubble(
     return;
 
   profile_bubble_ = new ProfileChooserView(anchor_view, arrow, browser,
-                                           view_mode, service_type);
+      view_mode, manage_accounts_params.service_type);
   views::BubbleDelegateView::CreateBubble(profile_bubble_);
   profile_bubble_->set_close_on_deactivate(close_on_deactivate_for_testing_);
   profile_bubble_->SetAlignment(border_alignment);

chrome/browser/ui/views/profiles/profile_chooser_view.h

@@ -51,12 +51,13 @@ class ProfileChooserView : public views::BubbleDelegateView,
   // call this function when the button is clicked and if the bubble isn't
   // showing it will appear while if it is showing, nothing will happen here and
   // the existing bubble will auto-close due to focus loss.
-  static void ShowBubble(profiles::BubbleViewMode view_mode,
-                         signin::GAIAServiceType service_type,
-                         views::View* anchor_view,
-                         views::BubbleBorder::Arrow arrow,
-                         views::BubbleBorder::BubbleAlignment border_alignment,
-                         Browser* browser);
+  static void ShowBubble(
+      profiles::BubbleViewMode view_mode,
+      const signin::ManageAccountsParams& manage_accounts_params,
+      views::View* anchor_view,
+      views::BubbleBorder::Arrow arrow,
+      views::BubbleBorder::BubbleAlignment border_alignment,
+      Browser* browser);
   static bool IsShowing();
   static void Hide();
 

chrome/browser/ui/webui/signin/inline_login_handler_impl.cc

@@ -385,7 +385,7 @@ void InlineLoginHandlerImpl::CloseTab(bool show_account_management) {
     if (show_account_management) {
       browser->window()->ShowAvatarBubbleFromAvatarButton(
             BrowserWindow::AVATAR_BUBBLE_MODE_ACCOUNT_MANAGEMENT,
-            signin::GAIA_SERVICE_TYPE_NONE);
+            signin::ManageAccountsParams());
     }
   }
 }

chrome/browser/ui/webui/sync_setup_handler.cc

@@ -529,7 +529,7 @@ void SyncSetupHandler::DisplayGaiaLoginInNewTabOrWindow() {
     if (switches::IsNewProfileManagement()) {
       browser->window()->ShowAvatarBubbleFromAvatarButton(
           BrowserWindow::AVATAR_BUBBLE_MODE_REAUTH,
-          signin::GAIA_SERVICE_TYPE_NONE);
+          signin::ManageAccountsParams());
     } else {
       url = signin::GetReauthURL(browser->profile(),
                                  error_controller->error_account_id());
@@ -538,7 +538,7 @@ void SyncSetupHandler::DisplayGaiaLoginInNewTabOrWindow() {
     if (switches::IsNewProfileManagement()) {
       browser->window()->ShowAvatarBubbleFromAvatarButton(
           BrowserWindow::AVATAR_BUBBLE_MODE_SIGNIN,
-          signin::GAIA_SERVICE_TYPE_NONE);
+          signin::ManageAccountsParams());
     } else {
       url = signin::GetPromoURL(signin::SOURCE_SETTINGS, true);
     }

chrome/test/base/test_browser_window.h

@@ -146,7 +146,7 @@ class TestBrowserWindow : public BrowserWindow {
   virtual void ShowAvatarBubble(content::WebContents* web_contents,
                                 const gfx::Rect& rect) OVERRIDE {}
   virtual void ShowAvatarBubbleFromAvatarButton(AvatarBubbleMode mode,
-      signin::GAIAServiceType service_type) OVERRIDE {}
+      const signin::ManageAccountsParams& manage_accounts_params) OVERRIDE {}
   virtual void ShowPasswordGenerationBubble(
       const gfx::Rect& rect,
       const autofill::PasswordForm& form,