moved requireDisplayName config to signInOptions

Author: prakhar1989

demo/public/app.js

@@ -44,12 +44,14 @@ var uiConfig = {
     },
     firebase.auth.TwitterAuthProvider.PROVIDER_ID,
     firebase.auth.GithubAuthProvider.PROVIDER_ID,
-    firebase.auth.EmailAuthProvider.PROVIDER_ID
+    {
+      provider: firebase.auth.EmailAuthProvider.PROVIDER_ID,
+      // Whether the display name should be displayed in Sign Up page.
+      requireDisplayName: true
+    }
   ],
   // Terms of service url.
-  'tosUrl': 'https://www.google.com',
-  // Whether the display name should be displayed in Sign Up page.
-  'requireDisplayName': false
+  'tosUrl': 'https://www.google.com'
 };
 
 // Initialize the FirebaseUI Widget using Firebase.

javascript/utils/idp.js

@@ -28,6 +28,14 @@ firebaseui.auth.idp.isSupportedProvider = function(providerId) {
 };
 
 
+/**
+ * The provider ID constant for the email auth provider
+ *
+ * @const {string}
+ */
+firebaseui.auth.idp.EMAIL_PROVIDER_ID = 'password';
+
+
 /**
  * Supported IdP auth provider.
  * @package {Object<string, firebase.auth.AuthProvider>}

javascript/widgets/config.js

@@ -68,11 +68,6 @@ firebaseui.auth.widget.Config = function() {
   this.config_.define('siteName');
   this.config_.define('tosUrl');
   this.config_.define('widgetUrl');
-  /**
-   * Determines whether the user is asked for entering display name
-   * while going through the email/password signup flow.
-   */
-  this.config_.define('requireDisplayName', true);
 };
 
 
@@ -295,9 +290,21 @@ firebaseui.auth.widget.Config.prototype.getTosUrl = function() {
 };
 
 
-/** @return {boolean} Whether the display name should be displayed. */
+/**
+ * @return {boolean} Whether the display name should be displayed.
+ * Defaults to true.
+ */
 firebaseui.auth.widget.Config.prototype.getRequireDisplayName = function() {
-  return /** @type {boolean} */ (this.config_.get('requireDisplayName'));
+  var signInOptions = this.getSignInOptions_();
+  var requireDisplayName = true;
+
+  for (var i = 0; i < signInOptions.length; i++) {
+    if (signInOptions[i]['provider'] === firebaseui.auth.idp.EMAIL_PROVIDER_ID
+      && signInOptions[i]['requireDisplayName'] !== undefined) {
+      requireDisplayName = signInOptions[i]['requireDisplayName'];
+    }
+  }
+  return /** @type {boolean} */ (requireDisplayName);
 };
 
 

javascript/widgets/config_test.js

@@ -242,9 +242,25 @@ function testGetTosUrl() {
 }
 
 
-function testShouldDisplayName() {
+function testRequiredDisplayNameShouldBeTrueByDefault() {
   assertTrue(config.getRequireDisplayName());
-  config.update('requireDisplayName', false);
+}
+
+function testRequiredDisplayNameCanBeSet() {
+  config.update('signInOptions', [
+    {
+      'provider': 'password',
+      'requireDisplayName': true
+    }
+  ]);
+  assertTrue(config.getRequireDisplayName());
+
+  config.update('signInOptions', [
+    {
+      'provider': 'password',
+      'requireDisplayName': false
+    }
+  ]);
   assertFalse(config.getRequireDisplayName());
 }