incorporated PR comments

Author: prakhar1989

javascript/ui/page/passwordsignup_test.js

@@ -126,7 +126,7 @@ function testDisplayNameIsNotRendered() {
           firebaseui.auth.ui.element.FormTestHelper.prototype.onSubmit,
           formTestHelper));
   component.render(root);
-  assertEquals(component.getNameElement(), null);
+  assertNull(component.getNameElement());
 }
 
 

javascript/widgets/config.js

@@ -296,15 +296,14 @@ firebaseui.auth.widget.Config.prototype.getTosUrl = function() {
  */
 firebaseui.auth.widget.Config.prototype.getRequireDisplayName = function() {
   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} */ (signInOptions[i]['requireDisplayName']);
     }
   }
-  return /** @type {boolean} */ (requireDisplayName);
+  return true;
 };
 
 

javascript/widgets/config_test.js

@@ -246,6 +246,7 @@ function testRequiredDisplayNameShouldBeTrueByDefault() {
   assertTrue(config.getRequireDisplayName());
 }
 
+
 function testRequiredDisplayNameCanBeSet() {
   config.update('signInOptions', [
     {

javascript/widgets/handler/passwordsignup.js

@@ -105,14 +105,19 @@ firebaseui.auth.widget.handler.onSignUpSubmit_ = function(app, component) {
           ),
       [email, password],
       function(user) {
-        // Sign up successful. We can now set the name.
-        return app.registerPending(user.updateProfile({'displayName': name})
-            .then(function() {
-              // Pass password credential to complete the sign-in to original
-              // auth instance.
-              firebaseui.auth.widget.handler.common.setLoggedIn(
-                  app, component, emailPassCred);
-            }));
+        if (requireDisplayName) {
+          // Sign up successful. We can now set the name.
+          return app.registerPending(user.updateProfile({'displayName': name})
+              .then(function() {
+                // Pass password credential to complete the sign-in to original
+                // auth instance.
+                firebaseui.auth.widget.handler.common.setLoggedIn(
+                    app, component, emailPassCred);
+              }));
+        } else {
+          return firebaseui.auth.widget.handler.common.setLoggedIn(
+            app, component, emailPassCred);
+        }
       },
       function(error) {
         // Ignore error if cancelled by the client.

soy/pages_test.js

@@ -103,6 +103,21 @@ function testPasswordSignUp() {
       firebaseui.auth.soy2.page.passwordSignUp,
       {
         'email': '[email protected]',
+        'requireDisplayName': true,
+        'allowCancel': true
+      },
+      IJ_DATA_);
+}
+
+
+function testPasswordSignUpWithoutDisplayName() {
+  var root = goog.dom.getElement('password-sign-up-no-name');
+  goog.soy.renderElement(
+      root,
+      firebaseui.auth.soy2.page.passwordSignUp,
+      {
+        'email': '[email protected]',
+        'requireDisplayName': false,
         'allowCancel': true
       },
       IJ_DATA_);

soy/pages_test_dom.html

@@ -41,9 +41,12 @@
 
   <!-- passwordSignUp -->
   <tr>
-    <td rowspan="2">passwordSignUp</td>
+    <td rowspan="3">passwordSignUp</td>
     <td><div id="password-sign-up"></div></td>
   </tr>
+  <tr>
+    <td><div id="password-sign-up-no-name"></div></td>
+  </tr>
   <tr>
     <td><div id="password-sign-up-tos"></div></td>
   </tr>