auth0-lock 11.30.6 → 11.31.0

package/.shiprc

@@ -3,5 +3,5 @@
         "bower.json": [],
         "README.md": []
     },
-    "postbump": "yarn dist build && git add -f build/"
+    "postbump": "yarn dist build"
 }

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## [v11.31.0](https://github.com/auth0/lock/tree/v11.31.0) (2021-10-15)
+[Full Changelog](https://github.com/auth0/lock/compare/v11.30.6...v11.31.0)
+
+**Added**
+- [SDK-2295] Add forceAutoHeight property to UI config [\#2050](https://github.com/auth0/lock/pull/2050) ([stevehobbsdev](https://github.com/stevehobbsdev))
+
+**Fixed**
+- [SDK-2823] Fix password reset when using custom connection resolver [\#2048](https://github.com/auth0/lock/pull/2048) ([stevehobbsdev](https://github.com/stevehobbsdev))
+
 ## [v11.30.6](https://github.com/auth0/lock/tree/v11.30.6) (2021-09-27)
 
 [Full Changelog](https://github.com/auth0/lock/compare/v11.30.5...v11.30.6)

package/README.md

@@ -25,7 +25,7 @@ From CDN
 
 ```html
 <!-- Latest patch release (recommended for production) -->
-<script src="https://cdn.auth0.com/js/lock/11.30.6/lock.min.js"></script>
+<script src="https://cdn.auth0.com/js/lock/11.31.0/lock.min.js"></script>
 ```
 
 From [npm](https://npmjs.org)
@@ -272,6 +272,7 @@ The appearance of the widget and the mechanics of authentication can be customiz
 - **allowShowPassword {Boolean}**: Determines whether or not add a checkbox to show the password when typing it. Defaults to `false`.
 - **allowPasswordAutocomplete {Boolean}**: Determines whether the password field will allow autocomplete; setting this to `true` is required for password manager support and to avoid many cases of adverse behavior. Defaults to `false`.
 - **preferConnectionDisplayName {Boolean}**: If true, Lock will try to use the connection display name as configured in the manage dashboard, if available.
+- **forceAutoHeight {Boolean}**: If true, Lock will use the `height: auto!important` style on the wrapping div, which may be useful in some circumstances where `height: 100vh` is undesirable (see [\#1963](https://github.com/auth0/lock/issues/1963)). Defaults to `false`.
 
 #### Theming options
 

package/lib/__tests__/connection/database/reset_password.js

@@ -4,15 +4,30 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
-var _enzyme = require('enzyme');
+var _testUtils = require('testUtils');
+
+var _immutable = require('immutable');
+
+var _immutable2 = _interopRequireDefault(_immutable);
+
+var _field = require('../../../field');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+jest.mock('connection/database/reset_password_pane', function () {
+  return (0, _testUtils.mockComponent)('reset_password_pane');
+});
+
 var getScreen = function getScreen() {
   var ResetPasswordScreen = require('connection/database/reset_password').default;
   return new ResetPasswordScreen();
 };
 
+var getComponent = function getComponent() {
+  var screen = getScreen();
+  return screen.render();
+};
+
 describe('ResetPasswordScreen', function () {
   beforeEach(function () {
     jest.resetModules();
@@ -35,9 +50,11 @@ describe('ResetPasswordScreen', function () {
     });
 
     jest.mock('i18n', function () {
-      return { str: function str(_, keys) {
+      return {
+        str: function str(_, keys) {
           return keys.join(',');
-        } };
+        }
+      };
     });
 
     jest.mock('core/index', function () {
@@ -46,7 +63,16 @@ describe('ResetPasswordScreen', function () {
           return 'id';
         },
         setGlobalError: 'setGlobalError',
-        clearGlobalError: 'clearGlobalError'
+        clearGlobalError: 'clearGlobalError',
+        connectionResolver: jest.fn().mockReturnValue(undefined),
+        ui: {
+          allowAutocomplete: function allowAutocomplete() {
+            return false;
+          }
+        },
+        submitting: function submitting() {
+          return false;
+        }
       };
     });
 
@@ -57,6 +83,7 @@ describe('ResetPasswordScreen', function () {
       };
     });
   });
+
   it('isSubmitDisabled returns true when `isEnterpriseDomain` is true', function () {
     jest.useFakeTimers();
     require('connection/enterprise').isEnterpriseDomain = function () {
@@ -67,6 +94,7 @@ describe('ResetPasswordScreen', function () {
     jest.runTimersToTime(50);
     expect(require('store/index').swap.mock.calls[0]).toMatchSnapshot();
   });
+
   it('isSubmitDisabled returns false when `isEnterpriseDomain` is false', function () {
     require('connection/enterprise').isEnterpriseDomain = function () {
       return false;
@@ -75,4 +103,54 @@ describe('ResetPasswordScreen', function () {
     expect(screen.isSubmitDisabled()).toBe(false);
     expect(require('store/index').swap.mock.calls[0]).toMatchSnapshot();
   });
+
+  describe('a custom connection resolver is being used', function () {
+    var lock = void 0;
+    var i18n = void 0;
+
+    beforeEach(function () {
+      lock = _immutable2.default.fromJS({
+        id: '__lock-id__'
+      });
+
+      i18n = {
+        html: jest.fn(),
+        str: jest.fn()
+      };
+    });
+
+    it('copies the username to the email field if an email address was entered', function () {
+      require('core/index').connectionResolver.mockReturnValue(function () {
+        return function () {
+          return true;
+        };
+      });
+      var store = require('store/index');
+      var Component = getComponent();
+
+      // Set a field on Lock to set the username field, then check it was set as the email
+      var l = (0, _field.setField)(lock, 'username', 'test@test.com');
+
+      (0, _testUtils.expectComponent)(_react2.default.createElement(Component, { i18n: i18n, model: l })).toMatchSnapshot();
+
+      expect(store.swap).toHaveBeenCalledWith('updateEntity', 'lock', 'id', expect.anything(), 'test@test.com', false);
+    });
+
+    it('sets the email field to a blank value if username is not an email address', function () {
+      require('core/index').connectionResolver.mockReturnValue(function () {
+        return function () {
+          return true;
+        };
+      });
+      var store = require('store/index');
+      var Component = getComponent();
+
+      // Set a field on Lock to set the username field, then check it was set as the email
+      var l = (0, _field.setField)(lock, 'username', 'some-username');
+
+      (0, _testUtils.expectComponent)(_react2.default.createElement(Component, { i18n: i18n, model: l })).toMatchSnapshot();
+
+      expect(store.swap).toHaveBeenCalledWith('updateEntity', 'lock', 'id', expect.anything(), '', false);
+    });
+  });
 });

package/lib/__tests__/ui/box/chrome.js

@@ -10,8 +10,6 @@ var _immutable = require('immutable');
 
 var _immutable2 = _interopRequireDefault(_immutable);
 
-var _reactTestRenderer = require('react-test-renderer');
-
 var _testUtils = require('testUtils');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -44,7 +42,10 @@ jest.mock('core/index', function () {
   return {
     handleEvent: jest.fn(function (_, event, fn) {
       mockEventRegister[event] = fn;
-    })
+    }),
+    ui: {
+      forceAutoHeight: jest.fn().mockReturnValue(false)
+    }
   };
 });
 
@@ -113,4 +114,16 @@ describe('Chrome', function () {
 
     (0, _testUtils.expectComponent)(_react2.default.createElement(Chrome, props)).toMatchSnapshot();
   });
+
+  it('adds the auto-height class when forceAutoHeight UI prop is true', function () {
+    require('core/index').ui.forceAutoHeight.mockReturnValue(true);
+
+    var props = _extends({}, defaultProps, {
+      info: 'This is an information message',
+      success: 'This is a success message',
+      error: 'There is an error'
+    });
+
+    (0, _testUtils.expectComponent)(_react2.default.createElement(Chrome, props)).toMatchSnapshot();
+  });
 });

package/lib/connection/database/reset_password.js

@@ -34,6 +34,10 @@ var l = _interopRequireWildcard(_index3);
 
 var _index4 = require('../../store/index');
 
+var _email = require('../../field/email');
+
+var _field = require('../../field');
+
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -54,6 +58,17 @@ var Component = function Component(_ref) {
     null,
     headerText
   );
+  var connectionResolver = l.connectionResolver(model);
+
+  // When using a custom connection resolver, `usernameStyle` is always 'username' (as opposed to 'email').
+  // If the user has entered an email address as the username, and a custom resolver is being used, copy the
+  // value from the 'username' field to the 'email' field so that `EmailPane` can render it.
+  if (connectionResolver) {
+    var field = (0, _field.getField)(model, 'username');
+    var value = field.get('value', '');
+
+    (0, _index4.swap)(_index4.updateEntity, 'lock', l.id(model), _email.setEmail, (0, _email.isEmail)(value, false) ? value : '', false);
+  }
 
   return _react2.default.createElement(_reset_password_pane2.default, {
     emailInputPlaceholder: i18n.str('emailInputPlaceholder'),

package/lib/core/index.js

@@ -304,7 +304,8 @@ function extractUIOptions(id, options) {
     authButtonsTheme: (typeof authButtons === 'undefined' ? 'undefined' : _typeof(authButtons)) === 'object' ? authButtons : {},
     allowShowPassword: !!options.allowShowPassword,
     allowPasswordAutocomplete: !!options.allowPasswordAutocomplete,
-    scrollGlobalMessagesIntoView: undefined === options.scrollGlobalMessagesIntoView ? true : !!options.scrollGlobalMessagesIntoView
+    scrollGlobalMessagesIntoView: undefined === options.scrollGlobalMessagesIntoView ? true : !!options.scrollGlobalMessagesIntoView,
+    forceAutoHeight: !!options.forceAutoHeight
   });
 }
 
@@ -401,6 +402,9 @@ var ui = exports.ui = {
   },
   allowPasswordAutocomplete: function allowPasswordAutocomplete(m) {
     return tget(m, 'allowPasswordAutocomplete', getUIAttribute(m, 'allowPasswordAutocomplete'));
+  },
+  forceAutoHeight: function forceAutoHeight(m) {
+    return tget(m, 'forceAutoHeight', getUIAttribute(m, 'forceAutoHeight'));
   }
 };
 

package/lib/core/web_api/helper.js

@@ -176,5 +176,5 @@ function trimAuthParams() {
 }
 
 function getVersion() {
-  return '11.30.6';
+  return '11.31.0';
 }