Skip to content

GitLab

T
tangled
Commit be3d2ee2 authored by Roman Sorokin's avatar Roman Sorokin Committed by Commit Bot
Browse files
Options

OOBE: Remove Gaia Auth extension traces 

The extension was used before on the login screen. Not used anymore

Bug: 1036348
Change-Id: I6d3c917a36168e43977a0b311ef3270546c4a667
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1978745Reviewed-by: default avatarDenis Kuznetsov [CET] <antrim@chromium.org>
Reviewed-by: default avatarBoris Sazonov <bsazonov@chromium.org>
Reviewed-by: default avatarIstiaque Ahmed <lazyboy@chromium.org>
Commit-Queue: Roman Sorokin [CET] <rsorokin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#727599}
parent 75e59b15
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 83 deletions
extensions/common/api/_behavior_features.json
View file @ be3d2ee2
......@@ -69,7 +69,6 @@
"2F47B526FA71F44816618C41EC55E5EE9543FDCC", // Braille Keyboard
"86672C8D7A04E24EFB244BF96FE518C4C4809F73", // Speech synthesis
"1CF709D51B2B96CF79D00447300BD3BFBE401D21", // Mobile activation
"D519188F86D9ACCEE0412007B227D9936EB9676B", // Gaia auth extension
"40FF1103292F40C34066E023B8BE8CAE18306EAE", // Chromeos help
"3C654B3B6682CA194E75AD044CEDE927675DDEE8", // Easy unlock
"2FCBCE08B34CCA1728A85F1EFBD9A34DD2558B2E", // ChromeVox
......
google_apis/gaia/fake_gaia.cc
View file @ be3d2ee2
......@@ -61,9 +61,6 @@ const char kTestCookieAttributes[] =
const char kDefaultGaiaId[] = "12345";
const base::FilePath::CharType kServiceLogin[] =
FILE_PATH_LITERAL("google_apis/test/service_login.html");
const base::FilePath::CharType kEmbeddedSetupChromeos[] =
FILE_PATH_LITERAL("google_apis/test/embedded_setup_chromeos.html");
......@@ -142,9 +139,6 @@ void FakeGaia::MergeSessionParams::Update(const MergeSessionParams& update) {
FakeGaia::FakeGaia() : issue_oauth_code_cookie_(false) {
base::FilePath source_root_dir;
base::PathService::Get(base::DIR_SOURCE_ROOT, &source_root_dir);
CHECK(base::ReadFileToString(
source_root_dir.Append(base::FilePath(kServiceLogin)),
&service_login_response_));
CHECK(base::ReadFileToString(
source_root_dir.Append(base::FilePath(kEmbeddedSetupChromeos)),
&embedded_setup_chromeos_response_));
......@@ -212,10 +206,6 @@ void FakeGaia::Initialize() {
REGISTER_RESPONSE_HANDLER(
gaia_urls->merge_session_url(), HandleMergeSession);
// Handles /ServiceLogin GAIA call.
REGISTER_RESPONSE_HANDLER(
gaia_urls->service_login_url(), HandleServiceLogin);
// Handles /embedded/setup/v2/chromeos GAIA call.
REGISTER_RESPONSE_HANDLER(gaia_urls->embedded_setup_chromeos_url(2),
HandleEmbeddedSetupChromeos);
......@@ -445,13 +435,6 @@ const FakeGaia::AccessTokenInfo* FakeGaia::GetAccessTokenInfo(
return nullptr;
}
void FakeGaia::HandleServiceLogin(const HttpRequest& request,
BasicHttpResponse* http_response) {
http_response->set_code(net::HTTP_OK);
http_response->set_content(service_login_response_);
http_response->set_content_type("text/html");
}
void FakeGaia::HandleEmbeddedSetupChromeos(const HttpRequest& request,
BasicHttpResponse* http_response) {
GURL request_url = GURL("http://localhost").Resolve(request.relative_url);
......
google_apis/gaia/fake_gaia.h
View file @ be3d2ee2
......@@ -270,7 +270,6 @@ class FakeGaia {
EmailToGaiaIdMap email_to_gaia_id_map_;
AccessTokenInfoMap access_token_info_map_;
RequestHandlerMap request_handlers_;
std::string service_login_response_;
std::string embedded_setup_chromeos_response_;
SamlAccountIdpMap saml_account_idp_map_;
SamlDomainRedirectUrlMap saml_domain_url_map_;
......
google_apis/test/service_login.html deleted 100644 → 0
View file @ 75e59b15
<HTML>
<HEAD>
<SCRIPT>
var gaia = gaia || {};
gaia.chromeOSLogin = {};
gaia.chromeOSLogin.parent_page_url_ =
'chrome-extension://mfffpogegjflfpflabcdkioaeobkgjik/main.html';
gaia.chromeOSLogin.attemptLogin = function(email, password, attemptToken) {
var msg = {
'method': 'attemptLogin',
'email': email,
'password': password,
'attemptToken': attemptToken
};
window.parent.postMessage(msg, gaia.chromeOSLogin.parent_page_url_);
};
gaia.chromeOSLogin.onAttemptedLogin = function(emailFormElement,
passwordFormElement,
continueUrlElement) {
var email = emailFormElement.value;
var passwd = passwordFormElement.value;
var attemptToken = new Date().getTime();
gaia.chromeOSLogin.attemptLogin(email, passwd, attemptToken);
if (continueUrlElement) {
var prevAttemptIndex = continueUrlElement.value.indexOf('?attemptToken');
if (prevAttemptIndex != -1) {
continueUrlElement.value =
continueUrlElement.value.substr(0, prevAttemptIndex);
}
continueUrlElement.value += '?attemptToken=' + attemptToken;
}
};
function submitAndGo() {
gaia.chromeOSLogin.onAttemptedLogin(document.getElementById("Email"),
document.getElementById("Passwd"),
document.getElementById("continue"));
return true;
}
function onAuthError() {
if (window.domAutomationController) {
window.domAutomationController.send('loginfail');
}
}
</SCRIPT>
</HEAD>
<BODY>
Local Auth Server:<BR>
<FORM action='/ServiceLoginAuth' method=POST onsubmit='submitAndGo()'>
<INPUT TYPE=text id="Email" name="Email">
<INPUT TYPE=text id="Passwd" name="Passwd">
<INPUT TYPE=hidden id="continue" name="continue"
value="chrome-extension://mfffpogegjflfpflabcdkioaeobkgjik/success.html">
<INPUT TYPE=Submit id="signIn">
</FORM>
</BODY>
</HTML>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment