Chromium Code Reviews| Index: chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js |
| diff --git a/chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js b/chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js |
| index 09475949c27c75d1ebe2b82a260b1a1717d8533f..01b5a55f89232cf9c7931d17f4c689b1d9c9e3d5 100644 |
| --- a/chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js |
| +++ b/chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js |
| @@ -16,7 +16,6 @@ login.createScreen('OAuthEnrollmentScreen', 'oauth-enrollment', function() { |
| 'showStep', |
| 'showError', |
| 'showWorking', |
| - 'setAuthenticatedUserEmail', |
| 'doReload', |
| ], |
| @@ -206,24 +205,6 @@ login.createScreen('OAuthEnrollmentScreen', 'oauth-enrollment', function() { |
| this.showStep(STEP_WORKING); |
| }, |
| - /** |
| - * Invoked when the authenticated user's e-mail address has been retrieved. |
| - * This completes SAML authentication. |
| - * @param {number} attemptToken An opaque token used to correlate this |
| - * method invocation with the corresponding request to retrieve the |
| - * user's e-mail address. |
| - * @param {string} email The authenticated user's e-mail address. |
| - */ |
| - setAuthenticatedUserEmail: function(attemptToken, email) { |
| - if (this.attemptToken_ != attemptToken) |
| - return; |
| - |
| - if (!email) |
| - this.showError(loadTimeData.getString('fatalEnrollmentError'), false); |
|
bartfab (slow)
2014/10/21 14:47:47
This error message should be hooked up as this.gai
Roger Tawa OOO till Jul 10th
2014/10/21 19:15:31
Done. Testing enrollment flow and all looks good.
|
| - else |
| - chrome.send('oauthEnrollCompleteLogin', [email]); |
| - }, |
| - |
| doReload: function() { |
| $('oauth-enroll-signin-frame').contentWindow.location.href = |
| this.signInUrl_; |
| @@ -293,16 +274,6 @@ login.createScreen('OAuthEnrollmentScreen', 'oauth-enrollment', function() { |
| chrome.send('oauthEnrollCompleteLogin', [msg.email]); |
| } |
| - if (msg.method == 'retrieveAuthenticatedUserEmail') { |
| - // A user has successfully authenticated via SAML. However, the user's |
| - // identity is not known. Instead of reporting success immediately, |
| - // retrieve the user's e-mail address first. |
| - this.attemptToken_ = msg.attemptToken; |
| - this.showWorking(null); |
| - chrome.send('oauthEnrollRetrieveAuthenticatedUserEmail', |
| - [msg.attemptToken]); |
| - } |
| - |
| if (msg.method == 'authPageLoaded' && this.currentStep_ == STEP_SIGNIN) { |
| if (msg.isSAML) { |
| $('oauth-saml-notice-message').textContent = loadTimeData.getStringF( |