cros: Port SAML support to webview sign-in.

chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.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/chromeos/login/gaia_screen_handler.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
@@ skipping 23 matching lines @@
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/login/auth/user_context.h"
 #include "chromeos/settings/cros_settings_names.h"
 #include "components/login/localized_values_builder.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "google_apis/gaia/gaia_switches.h"
 #include "google_apis/gaia/gaia_urls.h"
+#include "grit/browser_resources.h"
 #include "ui/base/ime/chromeos/input_method_manager.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::BrowserThread;
 
 namespace chromeos {
 
 namespace {
 
 const char kJsScreenPath[] = "login.GaiaSigninScreen";
 const char kAuthIframeParentName[] = "signin-frame";
 const char kAuthIframeParentOrigin[] =
     "chrome-extension://mfffpogegjflfpflabcdkioaeobkgjik/";
 
-// TODO(rsorokin): Get rid of this url before the beta release. Issue tracking
+// TODO(rsorokin): Get rid of this before the beta release. Issue tracking
 // that http://crbug/462204.
-const char kStagingGaiaUrl[] = "https://accounts.sandbox.google.com/";
+const char kGaiaSandboxUrlSwitch[] = "gaia-sandbox-url";

[Dmitry Polukhin, 2015/03/13 11:56:20]

We agreed to use accounts.sandbox.google.com temporary to see changes sooner. On
Chrome OS there is no easy way to change flags on login screen. I would keep it
as is until SAML support is ready for dogfood. Alternative solution could be
command hotkey working in canary and dev to change default server.

[Dmitry Polukhin, 2015/03/17 17:51:43]

As discussed it is not a problem. We will switch to prod.

 // TODO(rsorokin): Move this to the proper file.
 const char kMinuteMaidPath[] = "ChromeOsEmbeddedSetup";
 
 void UpdateAuthParams(base::DictionaryValue* params,
                       bool has_users,
                       bool is_enrolling_consumer_management) {
   CrosSettings* cros_settings = CrosSettings::Get();
   bool allow_new_user = true;
   cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user);
   bool allow_guest = true;
@@ skipping 170 matching lines @@
     params.SetString("chromeType", GetChromeDeviceTypeString());
     params.SetString("clientId",
                      GaiaUrls::GetInstance()->oauth2_chrome_client_id());
     if (!command_line->HasSwitch(switches::kGaiaEndpointChromeOS)) {
       command_line->AppendSwitchASCII(switches::kGaiaEndpointChromeOS,
                                       kMinuteMaidPath);
     }
   }
 
   if (!command_line->HasSwitch(::switches::kGaiaUrl) &&
+      command_line->HasSwitch(kGaiaSandboxUrlSwitch) &&
       StartupUtils::IsWebviewSigninEnabled()) {
     // We can't use switch --gaia-url in this case cause we need get
     // auth_code from staging gaia and make all the other auths against prod
     // gaia so user could use all the google services.
+    // Default to production Gaia for MM unless --gaia-url or --gaia-sandbox-url
+    // is specified.
     // TODO(dpolukhin): crbug.com/462204
-    const GURL gaia_url = GURL(kStagingGaiaUrl);
+    const GURL gaia_url =
+        GURL(command_line->GetSwitchValueASCII(kGaiaSandboxUrlSwitch));
     params.SetString("gaiaUrl", gaia_url.spec());
   } else {
     const GURL gaia_url =
         command_line->HasSwitch(::switches::kGaiaUrl)
             ? GURL(command_line->GetSwitchValueASCII(::switches::kGaiaUrl))
             : GaiaUrls::GetInstance()->gaia_url();
     params.SetString("gaiaUrl", gaia_url.spec());
   }
 
   if (command_line->HasSwitch(switches::kGaiaEndpointChromeOS)) {
@@ skipping 88 matching lines @@
   builder->Add("fatalErrorMessageVerificationFailed",
                IDS_LOGIN_FATAL_ERROR_PASSWORD_VERIFICATION);
   builder->Add("fatalErrorMessageInsecureURL",
                IDS_LOGIN_FATAL_ERROR_TEXT_INSECURE_URL);
   builder->Add("fatalErrorInstructions", IDS_LOGIN_FATAL_ERROR_INSTRUCTIONS);
   builder->Add("fatalErrorDismissButton", IDS_OK);
 }
 
 void GaiaScreenHandler::GetAdditionalParameters(base::DictionaryValue* dict) {
   dict->SetBoolean("isWebviewSignin", StartupUtils::IsWebviewSigninEnabled());
+  dict->SetString(
+      "samlInjectedJS",
+      l10n_util::GetStringUTF8(IDR_GAIA_AUTH_WEBVIEW_SAML_INJECTED_JS));
 }
 
 void GaiaScreenHandler::Initialize() {
 }
 
 void GaiaScreenHandler::RegisterMessages() {
   AddCallback("frameLoadingCompleted",
               &GaiaScreenHandler::HandleFrameLoadingCompleted);
   AddCallback("completeLogin", &GaiaScreenHandler::HandleCompleteLogin);
   AddCallback("completeAuthentication",
@@ skipping 462 matching lines @@
 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() {
   DCHECK(signin_screen_handler_);
   return signin_screen_handler_->delegate_;
 }
 
 void GaiaScreenHandler::SetSigninScreenHandler(SigninScreenHandler* handler) {
   signin_screen_handler_ = handler;
 }
 
 }  // namespace chromeos