Address bug where the one-click sign-in bar would never show again once

chrome/browser/ui/sync/one_click_signin_helper.cc

 // Copyright (c) 2012 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/sync/one_click_signin_helper.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/metrics/histogram.h"
 #include "base/string_split.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
@@ skipping 39 matching lines @@
   virtual bool Cancel() OVERRIDE;
   virtual string16 GetLinkText() const OVERRIDE;
   virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE;
 
   virtual InfoBarAutomationType GetInfoBarAutomationType() const OVERRIDE;
 
   // Set the profile preference to turn off one-click sign in so that it won't
   // show again in this profile.
   void DisableOneClickSignIn();
 
+  // Add a specific email to the list of emails rejected for one-click
+  // sign-in, for this profile.
+  void AddEmailToOneClickRejectedList(const std::string& email);
+
   // Record the specified action in the histogram for one-click sign in.
   void RecordHistogramAction(int action);
 
   // Information about the account that has just logged in.
   std::string session_index_;
   std::string email_;
   std::string password_;
 
   // Whether any UI controls in the infobar were pressed or not.
   bool button_pressed_;
@@ skipping 55 matching lines @@
   // The starter deletes itself once its done.
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
   new OneClickSigninSyncStarter(profile, session_index, email, password,
                                 start_mode);
 }
 
 }  // namespace
 
 bool OneClickLoginInfoBarDelegate::Accept() {
+  // User has accepted one-click sign-in for this account. Never ask again for
+  // this profile.
   DisableOneClickSignIn();
   content::WebContents* web_contents = owner()->web_contents();
   RecordHistogramAction(one_click_signin::HISTOGRAM_ACCEPTED);
   browser::FindBrowserWithWebContents(web_contents)->window()->
       ShowOneClickSigninBubble(base::Bind(&StartSync, web_contents,
                                           session_index_, email_, password_));
   button_pressed_ = true;
   return true;
 }
 
 bool OneClickLoginInfoBarDelegate::Cancel() {
-  DisableOneClickSignIn();
+  AddEmailToOneClickRejectedList(email_);
   RecordHistogramAction(one_click_signin::HISTOGRAM_REJECTED);
   button_pressed_ = true;
   return true;
 }
 
 string16 OneClickLoginInfoBarDelegate::GetLinkText() const {
   return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
 }
 
 bool OneClickLoginInfoBarDelegate::LinkClicked(
@@ skipping 12 matching lines @@
   return ONE_CLICK_LOGIN_INFOBAR;
 }
 
 void OneClickLoginInfoBarDelegate::DisableOneClickSignIn() {
   PrefService* pref_service =
       TabContents::FromWebContents(owner()->web_contents())->
           profile()->GetPrefs();
   pref_service->SetBoolean(prefs::kReverseAutologinEnabled, false);
 }
 
+void OneClickLoginInfoBarDelegate::AddEmailToOneClickRejectedList(
+    const std::string& email) {
+  PrefService* pref_service =
+      TabContents::FromWebContents(owner()->web_contents())->
+          profile()->GetPrefs();
+  ListPrefUpdate updater(pref_service,
+                         prefs::kReverseAutologinRejectedEmailList);
+  updater->AppendIfNotPresent(base::Value::CreateStringValue(email));
+}
+
 void OneClickLoginInfoBarDelegate::RecordHistogramAction(int action) {
   UMA_HISTOGRAM_ENUMERATION("AutoLogin.Reverse", action,
                             one_click_signin::HISTOGRAM_MAX);
 }
 
 // static
 bool OneClickSigninHelper::CanOffer(content::WebContents* web_contents,
+                                    const std::string& email,
                                     bool check_connected) {
   if (!web_contents)
     return false;
 
   if (web_contents->GetBrowserContext()->IsOffTheRecord())
     return false;
 
   if (!ProfileSyncService::IsSyncEnabled())
     return false;
 
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
   if (!profile)
     return false;
 
   if (!profile->GetPrefs()->GetBoolean(prefs::kReverseAutologinEnabled))
     return false;
 
   if (!SigninManager::AreSigninCookiesAllowed(profile))
     return false;
 
   if (check_connected) {
     SigninManager* manager =
         SigninManagerFactory::GetForProfile(profile);
     if (!manager)
       return false;
 
     if (!manager->GetAuthenticatedUsername().empty())
       return false;
+
+    // Make sure this username is not prohibited by policy.
+    if (!manager->IsAllowedUsername(email))
+      return false;
+
+    // If email was already rejected by this profile for one-click sign-in.
+    if (!email.empty()) {
+      const ListValue* rejected_emails = profile->GetPrefs()->GetList(
+          prefs::kReverseAutologinRejectedEmailList);
+      if (!rejected_emails->empty()) {
+        const Value* email_value = Value::CreateStringValue(email);
+        ListValue::const_iterator iter = rejected_emails->Find(
+                *email_value);
+        if (iter != rejected_emails->end())
+          return false;
+      }
+    }
   }
 
   return true;
 }
 
 // static
 void OneClickSigninHelper::ShowInfoBarIfPossible(net::URLRequest* request,
                                                  int child_id,
                                                  int route_id) {
   // See if the response contains the Google-Accounts-SignIn header.
@@ skipping 37 matching lines @@
 // static
 void OneClickSigninHelper::ShowInfoBarUIThread(
     const std::string& session_index,
     const std::string& email,
     int child_id,
     int route_id) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   content::WebContents* web_contents = tab_util::GetWebContentsByID(child_id,
                                                                     route_id);
-  if (!web_contents || !CanOffer(web_contents, true))
+  if (!web_contents || !CanOffer(web_contents, email, true))
     return;
 
   // If some profile, not just the current one, is already connected to this
   // account, don't show the infobar.
   if (g_browser_process) {
     ProfileManager* manager = g_browser_process->profile_manager();
     if (manager) {
       string16 email16 = UTF8ToUTF16(email);
       ProfileInfoCache& cache = manager->GetProfileInfoCache();
 
       for (size_t i = 0; i < cache.GetNumberOfProfiles(); ++i) {
         if (email16 == cache.GetUserNameOfProfileAtIndex(i))
           return;
       }
     }
   }

[Roger Tawa OOO till Jul 10th, 2012/06/27 21:17:08]

how about this if block?  Can it be moved to CanOffer() too?

[mathp, 2012/06/29 13:44:00]

Done.

 
-  // Make sure this username is not prohibited by policy.
-  Profile* profile =
-      Profile::FromBrowserContext(web_contents->GetBrowserContext());
-  SigninManager* signin = SigninManagerFactory::GetForProfile(profile);
-  if (!signin->IsAllowedUsername(email))
-    return;
-
   TabContents* tab_contents = TabContents::FromWebContents(web_contents);
   if (!tab_contents)
     return;
 
   // Save the email in the one-click signin manager.  The manager may
   // not exist if the contents is incognito or if the profile is already
   // connected to a Google account.
   OneClickSigninHelper* helper = tab_contents->one_click_signin_helper();
   if (helper)
     helper->SaveSessionIndexAndEmail(session_index, email);
@@ skipping 26 matching lines @@
   session_index_ = session_index;
   email_ = email;
 }
 
 void OneClickSigninHelper::SavePassword(const std::string& password) {
   // TODO(rogerta): in the case of a 2-factor or captcha or some other type of
   // challenge, its possible for the user to never complete the signin.
   // Should have a way to detect this and clear the password member.
   password_ = password;
 }