Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(84)

Unified Diff: remoting/webapp/base/js/auth_init.js

Issue 789733010: [Chromoting] Remove initIdentityEmail. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | remoting/webapp/crd/js/crd_main.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/webapp/base/js/auth_init.js
diff --git a/remoting/webapp/base/js/auth_init.js b/remoting/webapp/base/js/auth_init.js
index 4e849b5cacc4a4194c06ff5c64121f940a46f93b..2602efc8112998bda10b4c8b85bc85fb9e822707 100644
--- a/remoting/webapp/base/js/auth_init.js
+++ b/remoting/webapp/base/js/auth_init.js
@@ -7,7 +7,14 @@
/** @suppress {duplicate} */
var remoting = remoting || {};
-remoting.initIdentity = function() {
+/**
+ * Get the user's email address and full name.
+ *
+ * @param {function(string,string):void} onUserInfoAvailable Callback invoked
+ * when the user's email address and full name are available.
+ * @return {void} Nothing.
+ */
+remoting.initIdentity = function(onUserInfoAvailable) {
/**
* Show the authorization consent UI and register a one-shot event handler to
@@ -37,6 +44,15 @@ remoting.initIdentity = function() {
button.addEventListener('click', consentGranted, false);
}
+ /** @param {remoting.Error} error */
+ function onGetIdentityInfoError(error) {
+ // No need to show the error message for NOT_AUTHENTICATED
+ // because we will show "auth-dialog".
+ if (error != remoting.Error.NOT_AUTHENTICATED) {
+ remoting.showErrorMessage(error);
+ }
+ }
+
if (base.isAppsV2()) {
remoting.identity = new remoting.Identity(promptForConsent);
} else {
@@ -47,35 +63,7 @@ remoting.initIdentity = function() {
}
remoting.identity = remoting.oauth2;
}
-}
-
-/** @param {remoting.Error} error */
-remoting.onGetIdentityInfoError = function(error) {
- // No need to show the error message for NOT_AUTHENTICATED
- // because we will show "auth-dialog".
- if (error != remoting.Error.NOT_AUTHENTICATED) {
- remoting.showErrorMessage(error);
- }
-}
-/**
- * @param {function(string):void} onEmailAvailable Callback invoked when the
- * email address is available.
- * @return {void} Nothing.
- */
-remoting.initIdentityEmail = function(onEmailAvailable) {
- remoting.identity.getEmail(onEmailAvailable,
- remoting.onGetIdentityInfoError);
-}
-
-/**
- * Get the user's email address and full name.
- *
- * @param {function(string,string):void} onUserInfoAvailable Callback invoked
- * when the user's email address and full name are available.
- * @return {void} Nothing.
- */
-remoting.initIdentityUserInfo = function(onUserInfoAvailable) {
remoting.identity.getUserInfo(onUserInfoAvailable,
- remoting.onGetIdentityInfoError);
+ onGetIdentityInfoError);
}
« no previous file with comments | « no previous file | remoting/webapp/crd/js/crd_main.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698