Add error handling to inline signin flow

chrome/browser/ui/webui/inline_login_ui.cc

 // Copyright 2013 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.
 
 #include "chrome/browser/ui/webui/inline_login_ui.h"
 
 #include "base/atomic_sequence_num.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/profile_oauth2_token_service.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_global_error.h"
 #include "chrome/browser/signin/signin_manager_cookie_helper.h"
 #include "chrome/browser/signin/signin_names_io_thread.h"
 #include "chrome/browser/signin/signin_oauth_helper.h"
 #include "chrome/browser/signin/signin_promo.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/browser_finder.h"
+#include "chrome/browser/ui/sync/one_click_signin_helper.h"
 #include "chrome/browser/ui/sync/one_click_signin_sync_starter.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "google_apis/gaia/gaia_switches.h"
@@ skipping 162 matching lines @@
     string16 password;
     if (!args->GetDictionary(0, &dict) || !dict ||
         !dict->GetString("email", &email)) {
       NOTREACHED();
       return;
     }
     dict->GetString("password", &password);
     dict->GetBoolean("chooseWhatToSync", &choose_what_to_sync_);
 
     content::WebContents* web_contents = web_ui()->GetWebContents();
+    std::string error_msg;
+    OneClickSigninHelper::CanOffer(
+        web_contents, OneClickSigninHelper::CAN_OFFER_FOR_ALL,
+        UTF16ToASCII(email), &error_msg);
+    if (!error_msg.empty()) {
+      RedirectToNtpOrAppsPage(
+          web_contents, signin::GetSourceForPromoURL(web_contents->GetURL()));
+      Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
+      OneClickSigninHelper::ShowSigninErrorBubble(browser, error_msg);
+      return;
+    }
+
     content::StoragePartition* partition =
         content::BrowserContext::GetStoragePartitionForSite(
             web_contents->GetBrowserContext(),
             GURL("chrome-guest://mfffpogegjflfpflabcdkioaeobkgjik/?" +
                  partition_id_));
 
     scoped_refptr<SigninManagerCookieHelper> cookie_helper(
         new SigninManagerCookieHelper(partition->GetURLRequestContext()));
     cookie_helper->StartFetchingCookiesOnUIThread(
         GURL(GaiaUrls::GetInstance()->client_login_to_oauth2_url()),
@@ skipping 61 matching lines @@
     bool auto_close = signin::IsAutoCloseEnabledInURL(current_url);
     signin::Source source = signin::GetSourceForPromoURL(current_url);
     if (auto_close) {
       base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(
             &InlineLoginUIHandler::CloseTab, weak_factory_.GetWeakPtr()));
     } else if (source != signin::SOURCE_UNKNOWN &&
         source != signin::SOURCE_SETTINGS &&
         source != signin::SOURCE_WEBSTORE_INSTALL) {
-      // Redirect to NTP/Apps page and display a confirmation bubble.
       // TODO(guohui): should redirect to the given continue url for webstore
       // install flows.
-      GURL url(source == signin::SOURCE_APPS_PAGE_LINK ?
-               chrome::kChromeUIAppsURL : chrome::kChromeUINewTabURL);
-      content::OpenURLParams params(url,
-                                    content::Referrer(),
-                                    CURRENT_TAB,
-                                    content::PAGE_TRANSITION_AUTO_TOPLEVEL,
-                                    false);
-      contents->OpenURL(params);
+      RedirectToNtpOrAppsPage(contents, source);
     }
   }
 
+  void RedirectToNtpOrAppsPage(content::WebContents* contents,
+                               signin::Source source) {
+    VLOG(1) << "RedirectToNtpOrAppsPage";
+    GURL url(source == signin::SOURCE_APPS_PAGE_LINK ?
+             chrome::kChromeUIAppsURL : chrome::kChromeUINewTabURL);
+    content::OpenURLParams params(url,
+                                  content::Referrer(),
+                                  CURRENT_TAB,
+                                  content::PAGE_TRANSITION_AUTO_TOPLEVEL,
+                                  false);
+    contents->OpenURL(params);
+  }

[Roger Tawa OOO till Jul 10th, 2013/12/02 21:04:51]

Should reuse function from OneClickSigninHelper, like you did for
ShowSigninErrorBubble().

+
   void CloseTab() {
     content::WebContents* tab = web_ui()->GetWebContents();
     Browser* browser = chrome::FindBrowserWithWebContents(tab);
     if (browser) {
       TabStripModel* tab_strip_model = browser->tab_strip_model();
       if (tab_strip_model) {
         int index = tab_strip_model->GetIndexOfWebContents(tab);
         if (index != TabStripModel::kNoTab) {
           tab_strip_model->ExecuteContextMenuCommand(
               index, TabStripModel::CommandCloseTab);
@@ skipping 25 matching lines @@
   content::WebUIDataSource::Add(profile, CreateWebUIDataSource());
 
   web_ui->AddMessageHandler(new InlineLoginUIHandler(profile));
   // Required for intercepting extension function calls when the page is loaded
   // in a bubble (not a full tab, thus tab helpers are not registered
   // automatically).
   extensions::TabHelper::CreateForWebContents(web_ui->GetWebContents());
 }
 
 InlineLoginUI::~InlineLoginUI() {}