incorporated PR feedback

Author: prakhar1989

javascript/ui/page/passwordsignup.js

@@ -116,7 +116,7 @@ firebaseui.auth.ui.page.PasswordSignUp.prototype.setupFocus_ = function() {
   if (!firebaseui.auth.ui.element.getInputValue(this.getEmailElement())) {
     this.getEmailElement().focus();
   } else if (this.requireDisplayName_ &&
-    !firebaseui.auth.ui.element.getInputValue(this.getNameElement())) {
+      !firebaseui.auth.ui.element.getInputValue(this.getNameElement())) {
     this.getNameElement().focus();
   } else {
     this.getNewPasswordElement().focus();

javascript/ui/page/passwordsignup_test.js

@@ -104,7 +104,7 @@ function testInitialFocus_email() {
 }
 
 
-function testInitialFocus_name() {
+function testInitialFocus_nameIsRequired() {
   if (goog.userAgent.IE && !goog.userAgent.isDocumentModeOrHigher(9)) {
     return;
   }
@@ -114,7 +114,7 @@ function testInitialFocus_name() {
 }
 
 
-function testDisplayNameIsNotRendered() {
+function testInitialFocus_nameIsNotRequired() {
   if (goog.userAgent.IE && !goog.userAgent.isDocumentModeOrHigher(9)) {
     return;
   }
@@ -142,7 +142,7 @@ function testInitialFocus_newPassword() {
 }
 
 
-function testFocusToNameOnEmailEnter() {
+function testFocusOnEmailEnter_nameIsRequired() {
   goog.testing.events.fireKeySequence(
       component.getEmailElement(), goog.events.KeyCodes.ENTER);
   assertEquals(
@@ -151,6 +151,29 @@ function testFocusToNameOnEmailEnter() {
 }
 
 
+function testFocusOnEmailEnter_nameIsNotRequired() {
+  if (goog.userAgent.IE && !goog.userAgent.isDocumentModeOrHigher(9)) {
+    return;
+  }
+  component.dispose();
+  component = new firebaseui.auth.ui.page.PasswordSignUp(
+      null,
+      false,
+      goog.bind(
+          firebaseui.auth.ui.element.FormTestHelper.prototype.onSubmit,
+          formTestHelper));
+  component.render(root);
+
+  // When name is not present, the focus should move to
+  // password field on pressing enter.
+  goog.testing.events.fireKeySequence(
+    component.getEmailElement(), goog.events.KeyCodes.ENTER);
+  assertEquals(
+    component.getNewPasswordElement(),
+    goog.dom.getActiveElement(document));
+}
+
+
 function testFocusToNewPasswordOnNameEnter() {
   goog.testing.events.fireKeySequence(
       component.getNameElement(), goog.events.KeyCodes.ENTER);

javascript/utils/idp.js

@@ -28,14 +28,6 @@ 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

@@ -294,13 +294,14 @@ firebaseui.auth.widget.Config.prototype.getTosUrl = function() {
  * @return {boolean} Whether the display name should be displayed.
  * Defaults to true.
  */
-firebaseui.auth.widget.Config.prototype.getRequireDisplayName = function() {
+firebaseui.auth.widget.Config.prototype.isDisplayNameRequired = function() {
   var signInOptions = this.getSignInOptions_();
 
   for (var i = 0; i < signInOptions.length; i++) {
-    if (signInOptions[i]['provider'] === firebaseui.auth.idp.EMAIL_PROVIDER_ID
-      && signInOptions[i]['requireDisplayName'] !== undefined) {
-      return /** @type {boolean} */ (signInOptions[i]['requireDisplayName']);
+    //if (signInOptions[i]['provider'] == firebase.auth.EmailAuthProvider.PROVIDER_ID
+    if (signInOptions[i]['provider'] == 'password'
+        && signInOptions[i]['requireDisplayName'] !== undefined) {
+      return /** @type {boolean} */ (!!signInOptions[i]['requireDisplayName']);
     }
   }
   return true;

javascript/widgets/config_test.js

@@ -18,8 +18,20 @@
 
 goog.provide('firebaseui.auth.widget.ConfigTest');
 
+goog.require('firebaseui.auth.AuthUI');
+goog.require('firebaseui.auth.CredentialHelper');
+goog.require('firebaseui.auth.PendingEmailCredential');
+goog.require('firebaseui.auth.acClient');
+goog.require('firebaseui.auth.idp');
+goog.require('firebaseui.auth.storage');
+goog.require('firebaseui.auth.widget.handler');
+goog.require('firebaseui.auth.widget.handler.common');
+
+
 goog.require('firebaseui.auth.util');
 goog.require('firebaseui.auth.widget.Config');
+
+
 goog.require('goog.testing');
 goog.require('goog.testing.PropertyReplacer');
 goog.require('goog.testing.jsunit');
@@ -242,27 +254,38 @@ function testGetTosUrl() {
 }
 
 
-function testRequiredDisplayNameShouldBeTrueByDefault() {
-  assertTrue(config.getRequireDisplayName());
+function testRequireDisplayName_shouldBeTrueByDefault() {
+  assertTrue(config.isDisplayNameRequired());
 }
 
 
-function testRequiredDisplayNameCanBeSet() {
+function testRequireDisplayName_canBeSet() {
   config.update('signInOptions', [
     {
       'provider': 'password',
       'requireDisplayName': true
     }
   ]);
-  assertTrue(config.getRequireDisplayName());
+  assertTrue(config.isDisplayNameRequired());
 
   config.update('signInOptions', [
     {
       'provider': 'password',
       'requireDisplayName': false
     }
   ]);
-  assertFalse(config.getRequireDisplayName());
+  assertFalse(config.isDisplayNameRequired());
+}
+
+
+function testRequireDisplayName_isTrueWithNonBooleanArgs() {
+  config.update('signInOptions', [
+    {
+      'provider': 'password',
+      'requireDisplayName': 'a string'
+    }
+  ]);
+  assertTrue(config.isDisplayNameRequired());
 }
 
 

javascript/widgets/handler/passwordsignup.js

@@ -48,7 +48,7 @@ firebaseui.auth.widget.handler.handlePasswordSignUp = function(
   // Render the UI.
   var component = new firebaseui.auth.ui.page.PasswordSignUp(
       app.getConfig().getTosUrl(),
-      app.getConfig().getRequireDisplayName(),
+      app.getConfig().isDisplayNameRequired(),
       // On submit.
       function() {
         firebaseui.auth.widget.handler.onSignUpSubmit_(app, component);
@@ -70,7 +70,7 @@ firebaseui.auth.widget.handler.handlePasswordSignUp = function(
  * @private
  */
 firebaseui.auth.widget.handler.onSignUpSubmit_ = function(app, component) {
-  var requireDisplayName = app.getConfig().getRequireDisplayName();
+  var requireDisplayName = app.getConfig().isDisplayNameRequired();
 
   // Check fields are valid.
   var email = component.checkAndGetEmail();

javascript/widgets/handler/passwordsignup_test.js

@@ -88,6 +88,34 @@ function testHandlePasswordSignUp_reset() {
   assertComponentDisposed();
 }
 
+function testHandlePasswordSignUp_withoutDisplayName() {
+  app.setConfig({
+    'signInOptions': [
+      {
+        provider: 'password',
+        requireDisplayName: false
+      }]
+  });
+  firebaseui.auth.widget.handler.handlePasswordSignUp(
+      app, container, passwordAccount.getEmail());
+  assertPasswordSignUpPage();
+  assertNull(getNameElement());
+  goog.dom.forms.setValue(getNewPasswordElement(), '123123');
+  submitForm();
+
+  // assert successful sign up without the updateProfile
+  // being called
+  testAuth.assertCreateUserWithEmailAndPassword(
+      [passwordAccount.getEmail(), '123123'], function() {
+        testAuth.setUser({
+          'email': passwordAccount.getEmail(),
+          'displayName': passwordAccount.getDisplayName()
+        });
+        return testAuth.currentUser;
+      });
+  testAuth.assertSignOut([]);
+}
+
 
 function testHandlePasswordSignUp_signInCallback() {
   // Provide a sign-in success callback.