auth0-lock 11.31.1 → 11.32.0

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## [v11.32.0](https://github.com/auth0/lock/tree/v11.32.0) (2022-01-07)
+[Full Changelog](https://github.com/auth0/lock/compare/v11.31.1...v11.32.0)
+
+**Fixed**
+- [SDK-2970] Remove captcha for enterprise SSO connections [\#2071](https://github.com/auth0/lock/pull/2071) ([stevehobbsdev](https://github.com/stevehobbsdev))
+- Add ID attributes to password field + submit button [\#2072](https://github.com/auth0/lock/pull/2072) ([stevehobbsdev](https://github.com/stevehobbsdev))
+
 ## [v11.31.1](https://github.com/auth0/lock/tree/v11.31.1) (2021-11-02)
 
 [Full Changelog](https://github.com/auth0/lock/compare/v11.31.0...v11.31.1)

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.31.1/lock.min.js"></script>
+<script src="https://cdn.auth0.com/js/lock/11.32.0/lock.min.js"></script>
 ```
 
 From [npm](https://npmjs.org)

package/karma.conf.js

@@ -1,4 +1,4 @@
-module.exports = function(config) {
+module.exports = function (config) {
   process.env.CHROME_BIN = require('puppeteer').executablePath();
 
   config.set({
@@ -52,9 +52,9 @@ module.exports = function(config) {
 
     browserNoActivityTimeout: 60000,
 
-    browserDisconnectTimeout: 20000,
+    browserDisconnectTimeout: 30000,
 
-    browserDisconnectTolerance: 3,
+    browserDisconnectTolerance: 10,
 
     // level of logging
     logLevel: config.LOG_INFO,
@@ -118,12 +118,6 @@ module.exports = function(config) {
       }
     },
 
-    browsers: [
-      'bs_chrome_windows',
-      'bs_firefox_windows',
-      'bs_safari',
-      'bs_ie11_windows',
-      'bs_edge_windows'
-    ]
+    browsers: ['bs_chrome_windows']
   });
 };

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

@@ -0,0 +1,93 @@
+'use strict';
+
+var _react = require('react');
+
+var _react2 = _interopRequireDefault(_react);
+
+var _immutable = require('immutable');
+
+var _immutable2 = _interopRequireDefault(_immutable);
+
+var _testUtils = require('testUtils');
+
+var _login_pane = require('../../../connection/database/login_pane');
+
+var _login_pane2 = _interopRequireDefault(_login_pane);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
+
+var lock = _immutable2.default.fromJS({ id: '__lock-id__' });
+
+jest.mock('core/index');
+
+jest.mock('engine/classic');
+jest.mock('connection/enterprise');
+
+describe('LoginPane', function () {
+  var defaultProps = {
+    emailInputPlaceholder: '',
+    forgotPasswordAction: '',
+    i18n: {},
+    passwordInputPlaceholder: '',
+    showForgotPasswordLink: true,
+    showPassword: true,
+    usernameInputPlaceholder: '',
+    lock: lock
+  };
+
+  beforeEach(function () {
+    jest.resetAllMocks();
+  });
+
+  it('renders correctly', _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+    return regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            (0, _testUtils.expectShallowComponent)(_react2.default.createElement(_login_pane2.default, defaultProps)).toMatchSnapshot();
+
+          case 1:
+          case 'end':
+            return _context.stop();
+        }
+      }
+    }, _callee, undefined);
+  })));
+
+  it('renders a captcha', function () {
+    require('core/index').captcha.mockReturnValue({
+      get: function get() {
+        return true;
+      }
+    });
+
+    (0, _testUtils.expectShallowComponent)(_react2.default.createElement(_login_pane2.default, defaultProps)).toMatchSnapshot();
+  });
+
+  it('hides the captcha for SSO connections', function () {
+    require('core/index').captcha.mockReturnValue({
+      get: function get() {
+        return true;
+      }
+    });
+
+    require('engine/classic').isSSOEnabled.mockReturnValue(true);
+
+    (0, _testUtils.expectShallowComponent)(_react2.default.createElement(_login_pane2.default, defaultProps)).toMatchSnapshot();
+  });
+
+  it('shows the captcha for SSO (ADFS) connections', function () {
+    require('core/index').captcha.mockReturnValue({
+      get: function get() {
+        return true;
+      }
+    });
+
+    require('engine/classic').isSSOEnabled.mockReturnValue(true);
+    require('connection/enterprise').isHRDDomain.mockReturnValue(true);
+
+    (0, _testUtils.expectShallowComponent)(_react2.default.createElement(_login_pane2.default, defaultProps)).toMatchSnapshot();
+  });
+});

package/lib/__tests__/connection/enterprise/actions.js

@@ -20,7 +20,8 @@ jest.mock('connection/database/index', function () {
   return {
     databaseLogInWithEmail: jest.fn(function () {
       return true;
-    })
+    }),
+    databaseUsernameValue: jest.fn()
   };
 });
 
@@ -39,7 +40,8 @@ jest.mock('connection/enterprise', function () {
   return {
     matchConnection: jest.fn(),
     enterpriseActiveFlowConnection: jest.fn(),
-    isHRDActive: jest.fn()
+    isHRDActive: jest.fn(),
+    isEnterpriseDomain: jest.fn()
   };
 });
 
@@ -88,10 +90,12 @@ describe('Login with connection scopes', function () {
       });
     });
 
-    it('should throw an error if the captcha was not completed', function () {
+    it('should not throw an error if the captcha was not completed', function () {
       lock = l.setup('__lock__', 'client', 'domain', {});
       lock = (0, _index2.setField)(lock, 'email', 'test@test.com');
 
+      // This will be specified in the response from the /challenge endpoint if the
+      // dashboard settings have Captcha as 'required', regardless of connection being used.
       lock = l.setCaptcha(lock, {
         required: true,
         provider: 'recaptcha_v2'
@@ -104,7 +108,7 @@ describe('Login with connection scopes', function () {
       var coreActions = require('core/actions');
 
       (0, _actions.logIn)('__lock__');
-      expect(coreActions.logIn).not.toHaveBeenCalled();
+      expect(coreActions.logIn).toHaveBeenCalled();
     });
   });
 

package/lib/__tests__/engine/classic/login.js

@@ -4,8 +4,6 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
-var _enzyme = require('enzyme');
-
 var _testUtils = require('testUtils');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/__tests__/engine/classic/sign_up_pane.js

@@ -6,10 +6,10 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
-var _enzyme = require('enzyme');
-
 var _testUtils = require('testUtils');
 
+var _testUtils2 = require('../../testUtils');
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 jest.mock('field/email/email_pane', function () {
@@ -25,6 +25,24 @@ jest.mock('field/custom_input', function () {
   return (0, _testUtils.mockComponent)('custom_input');
 });
 
+jest.mock('core/index', function () {
+  return {
+    captcha: jest.fn()
+  };
+});
+
+jest.mock('engine/classic', function () {
+  return {
+    isSSOEnabled: jest.fn()
+  };
+});
+
+jest.mock('connection/enterprise', function () {
+  return {
+    isHRDDomain: jest.fn()
+  };
+});
+
 var getComponent = function getComponent() {
   return require('engine/classic/sign_up_pane').default;
 };
@@ -46,6 +64,9 @@ describe('SignUpPane', function () {
         },
         signUpFieldsStrictValidation: function signUpFieldsStrictValidation() {
           return true;
+        },
+        databaseUsernameValue: function databaseUsernameValue() {
+          return null;
         }
       };
     });
@@ -85,6 +106,50 @@ describe('SignUpPane', function () {
 
     (0, _testUtils.expectComponent)(_react2.default.createElement(Component, _extends({}, defaultProps, { instructions: 'instructions' }))).toMatchSnapshot();
   });
+
+  it('shows the Captcha pane', function () {
+    require('core/index').captcha.mockReturnValue({
+      get: function get() {
+        return true;
+      }
+    });
+
+    require('engine/classic').isSSOEnabled.mockReturnValue(false);
+
+    var Component = getComponent();
+
+    (0, _testUtils2.expectShallowComponent)(_react2.default.createElement(Component, defaultProps)).toMatchSnapshot();
+  });
+
+  it('hides the Captcha pane for SSO connections', function () {
+    require('core/index').captcha.mockReturnValue({
+      get: function get() {
+        return true;
+      }
+    });
+
+    require('engine/classic').isSSOEnabled.mockReturnValue(true);
+
+    var Component = getComponent();
+
+    (0, _testUtils2.expectShallowComponent)(_react2.default.createElement(Component, defaultProps)).toMatchSnapshot();
+  });
+
+  it('shows the Captcha pane for SSO (ADFS) connections', function () {
+    require('core/index').captcha.mockReturnValue({
+      get: function get() {
+        return true;
+      }
+    });
+
+    require('engine/classic').isSSOEnabled.mockReturnValue(true);
+    require('connection/enterprise').isHRDDomain.mockReturnValue(true);
+
+    var Component = getComponent();
+
+    (0, _testUtils2.expectShallowComponent)(_react2.default.createElement(Component, defaultProps)).toMatchSnapshot();
+  });
+
   describe('onlyEmail is false', function () {
     it('shows PasswordPane', function () {
       var Component = getComponent();

package/lib/__tests__/testUtils.js

@@ -1,7 +1,7 @@
 'use strict';
 
 exports.__esModule = true;
-exports.expectMockToMatch = exports.setURL = exports.extractPropsFromWrapper = exports.mockComponent = exports.expectComponent = undefined;
+exports.expectMockToMatch = exports.setURL = exports.extractPropsFromWrapper = exports.mockComponent = exports.renderShallowComponent = exports.expectShallowComponent = exports.expectComponent = undefined;
 
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
@@ -13,6 +13,10 @@ var _reactTestRenderer = require('react-test-renderer');
 
 var _reactTestRenderer2 = _interopRequireDefault(_reactTestRenderer);
 
+var _shallow = require('react-test-renderer/shallow');
+
+var _shallow2 = _interopRequireDefault(_shallow);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; } // eslint-disable-line
@@ -23,6 +27,18 @@ var expectComponent = exports.expectComponent = function expectComponent(childre
   return expect(component);
 };
 
+var expectShallowComponent = exports.expectShallowComponent = function expectShallowComponent(children) {
+  var component = renderShallowComponent(children);
+  return expect(component);
+};
+
+var renderShallowComponent = exports.renderShallowComponent = function renderShallowComponent(children) {
+  var renderer = new _shallow2.default();
+
+  renderer.render(children);
+  return renderer.getRenderOutput();
+};
+
 var addDataToProps = function addDataToProps(props) {
   var returnedProps = {};
   Object.keys(props).forEach(function (k) {

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

@@ -45,7 +45,10 @@ jest.mock('core/index', function () {
     }),
     ui: {
       forceAutoHeight: jest.fn().mockReturnValue(false)
-    }
+    },
+    id: jest.fn(function () {
+      return 'lock';
+    })
   };
 });
 

package/lib/__tests__/ui/input/password_input.js

@@ -29,7 +29,10 @@ jest.mock('core/index', function () {
       allowPasswordAutocomplete: function allowPasswordAutocomplete() {
         return false;
       }
-    }
+    },
+    id: jest.fn(function () {
+      return 'lock';
+    })
   };
 });
 

package/lib/connection/database/actions.js

@@ -51,6 +51,7 @@ function logIn(id) {
   var m = (0, _index.read)(_index.getEntity, 'lock', id);
   var usernameField = (0, _index4.databaseLogInWithEmail)(m) ? 'email' : 'username';
   var username = c.getFieldValue(m, usernameField);
+
   var params = {
     connection: (0, _index4.databaseConnectionName)(m),
     username: username,
@@ -58,13 +59,14 @@ function logIn(id) {
   };
 
   var fields = [usernameField, 'password'];
-
   var isCaptchaValid = (0, _captcha.setCaptchaParams)(m, params, fields);
+
   if (!isCaptchaValid) {
     return (0, _captcha.showMissingCaptcha)(m, id);
   }
 
   var mfaCode = c.getFieldValue(m, 'mfa_code');
+
   if (needsMFA) {
     params['mfa_code'] = mfaCode;
     fields.push('mfa_code');

package/lib/connection/database/login_pane.js

@@ -36,6 +36,12 @@ var _captcha_pane = require('../../field/captcha/captcha_pane');
 
 var _captcha_pane2 = _interopRequireDefault(_captcha_pane);
 
+var _classic = require('../../engine/classic');
+
+var _enterprise = require('../enterprise');
+
+var _database = require('../database');
+
 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 }; }
@@ -85,6 +91,7 @@ var LoginPane = function (_React$Component) {
       headerText
     );
     var resolver = l.connectionResolver(lock);
+    var sso = (0, _classic.isSSOEnabled)(lock);
 
     // Should never validate format on login because of custom db connection and import mode.
     // If a custom resolver is in use, always use UsernamePane without validating format,
@@ -104,7 +111,7 @@ var LoginPane = function (_React$Component) {
       strictValidation: false
     });
 
-    var captchaPane = l.captcha(lock) && l.captcha(lock).get('required') ? _react2.default.createElement(_captcha_pane2.default, { i18n: i18n, lock: lock, onReload: function onReload() {
+    var captchaPane = l.captcha(lock) && l.captcha(lock).get('required') && ((0, _enterprise.isHRDDomain)(lock, (0, _database.databaseUsernameValue)(lock)) || !sso) ? _react2.default.createElement(_captcha_pane2.default, { i18n: i18n, lock: lock, onReload: function onReload() {
         return (0, _captcha.swapCaptcha)(l.id(lock), false);
       } }) : null;
 

package/lib/connection/enterprise/actions.js

@@ -66,16 +66,16 @@ function logIn(id) {
     connection_scope: connectionScopes ? connectionScopes.toJS() : undefined
   };
 
+  if (ssoConnection && !(0, _enterprise.isHRDActive)(m)) {
+    return logInSSO(id, ssoConnection, params);
+  }
+
   var isCaptchaValid = (0, _captcha.setCaptchaParams)(m, params, fields);
 
-  if (!isCaptchaValid) {
+  if (!isCaptchaValid && !ssoConnection) {
     return (0, _captcha.showMissingCaptcha)(m, id);
   }
 
-  if (ssoConnection && !(0, _enterprise.isHRDActive)(m)) {
-    return logInSSO(id, ssoConnection, params);
-  }
-
   logInActiveFlow(id, params);
 }
 

package/lib/core/web_api/helper.js

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

package/lib/engine/classic/sign_up_pane.js

@@ -34,6 +34,10 @@ var l = _interopRequireWildcard(_index2);
 
 var _captcha = require('../../connection/captcha');
 
+var _enterprise = require('../../connection/enterprise');
+
+var _classic = require('../classic');
+
 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 }; }
@@ -71,6 +75,7 @@ var SignUpPane = function (_React$Component) {
       null,
       headerText
     );
+    var sso = (0, _classic.isSSOEnabled)(model);
 
     var usernamePane = !onlyEmail && (0, _index.databaseConnectionRequiresUsername)(model) && !(0, _index.signUpHideUsernameField)(model) ? _react2.default.createElement(_username_pane2.default, {
       i18n: i18n,
@@ -96,7 +101,7 @@ var SignUpPane = function (_React$Component) {
       });
     });
 
-    var captchaPane = l.captcha(model) && l.captcha(model).get('required') ? _react2.default.createElement(_captcha_pane2.default, { i18n: i18n, lock: model, onReload: function onReload() {
+    var captchaPane = l.captcha(model) && l.captcha(model).get('required') && ((0, _enterprise.isHRDDomain)(model, (0, _index.databaseUsernameValue)(model)) || !sso) ? _react2.default.createElement(_captcha_pane2.default, { i18n: i18n, lock: model, onReload: function onReload() {
         return (0, _captcha.swapCaptcha)(l.id(model), false);
       } }) : null;
 

package/lib/field/captcha/captcha_pane.js

@@ -53,14 +53,10 @@ var CaptchaPane = function (_React$Component) {
         lock = _props.lock,
         onReload = _props.onReload;
 
-
     var lockId = l.id(lock);
-
     var captcha = l.captcha(lock);
-
     var value = (0, _index3.getFieldValue)(lock, 'captcha');
     var isValid = !(0, _index3.isFieldVisiblyInvalid)(lock, 'captcha');
-
     var provider = captcha.get('provider');
 
     if ((0, _recaptcha.isRecaptcha)(provider)) {

package/lib/i18n.js

@@ -125,7 +125,7 @@ function assertLanguage(m, language, base) {
 function syncLang(m, language, _cb) {
   (0, _cdn_utils.load)({
     method: 'registerLanguageDictionary',
-    url: l.languageBaseUrl(m) + '/js/lock/' + '11.31.1' + '/' + language + '.js',
+    url: l.languageBaseUrl(m) + '/js/lock/' + '11.32.0' + '/' + language + '.js',
     check: function check(str) {
       return str && str === language;
     },

package/lib/lock.js

@@ -42,7 +42,7 @@ var Auth0Lock = function (_Core) {
 
 
 exports.default = Auth0Lock;
-Auth0Lock.version = '11.31.1';
+Auth0Lock.version = '11.32.0';
 
 // TODO: should we have different telemetry for classic/passwordless?
 // TODO: should we set telemetry info before each request?

package/lib/passwordless.js

@@ -41,4 +41,4 @@ var Auth0LockPasswordless = function (_Core) {
 exports.default = Auth0LockPasswordless;
 
 
-Auth0LockPasswordless.version = '11.31.1';
+Auth0LockPasswordless.version = '11.32.0';

package/lib/ui/box/chrome.js

@@ -176,7 +176,10 @@ var SubmitButton = function (_React$Component) {
         color = _props2.color,
         disabled = _props2.disabled,
         label = _props2.label,
-        display = _props2.display;
+        display = _props2.display,
+        contentProps = _props2.contentProps;
+    var model = contentProps.model;
+
 
     var content = label ? _react2.default.createElement(
       'span',
@@ -188,6 +191,7 @@ var SubmitButton = function (_React$Component) {
     return _react2.default.createElement(
       'button',
       {
+        id: l.id(model) + '-submit',
         className: 'auth0-lock-submit',
         disabled: disabled,
         style: { backgroundColor: color, display: display },

package/lib/ui/input/password_input.js

@@ -116,6 +116,7 @@ var PasswordInput = function (_React$Component) {
       _react2.default.createElement('input', _extends({
         ref: 'input',
         type: showPassword ? 'text' : 'password',
+        id: l.id(lock) + '-password',
         name: 'password',
         className: 'auth0-lock-input',
         autoComplete: allowPasswordAutocomplete ? 'on' : 'off',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "auth0-lock",
-  "version": "11.31.1",
+  "version": "11.32.0",
   "description": "Auth0 Lock",
   "author": "Auth0 <support@auth0.com> (http://auth0.com)",
   "license": "MIT",
@@ -105,17 +105,17 @@
     "webpack-dev-server": "^2.3.0"
   },
   "dependencies": {
-    "auth0-js": "^9.16.4",
+    "auth0-js": "^9.18.0",
     "auth0-password-policies": "^1.0.2",
     "blueimp-md5": "^2.19.0",
     "classnames": "^2.3.1",
-    "dompurify": "^2.2.8",
+    "dompurify": "^2.3.4",
     "immutable": "^3.7.3",
     "jsonp": "^0.2.1",
-    "node-fetch": "^2.6.1",
+    "node-fetch": "^2.6.6",
     "password-sheriff": "^1.1.1",
     "prop-types": "^15.6.0",
-    "qs": "^6.7.0",
+    "qs": "^6.10.2",
     "react": "^15.6.2",
     "react-dom": "^15.6.2",
     "react-transition-group": "^2.2.1",