auth0-lock 11.30.5 → 11.32.0

package/lib/connection/database/actions.js

@@ -12,7 +12,6 @@ exports.cancelResetPassword = cancelResetPassword;
 exports.cancelMFALogin = cancelMFALogin;
 exports.toggleTermsAcceptance = toggleTermsAcceptance;
 exports.showLoginMFAActivity = showLoginMFAActivity;
-exports.swapCaptcha = swapCaptcha;
 
 var _immutable = require('immutable');
 
@@ -40,6 +39,8 @@ var _i18n = require('../../i18n');
 
 var i18n = _interopRequireWildcard(_i18n);
 
+var _captcha = require('../captcha');
+
 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 }; }
@@ -50,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,
@@ -57,13 +59,14 @@ function logIn(id) {
   };
 
   var fields = [usernameField, 'password'];
+  var isCaptchaValid = (0, _captcha.setCaptchaParams)(m, params, fields);
 
-  var isCaptchaValid = setCaptchaParams(m, params, fields);
   if (!isCaptchaValid) {
-    return showMissingCaptcha(m, id);
+    return (0, _captcha.showMissingCaptcha)(m, id);
   }
 
   var mfaCode = c.getFieldValue(m, 'mfa_code');
+
   if (needsMFA) {
     params['mfa_code'] = mfaCode;
     fields.push('mfa_code');
@@ -76,7 +79,7 @@ function logIn(id) {
 
     if (error) {
       var wasInvalid = error && error.code === 'invalid_captcha';
-      return swapCaptcha(id, wasInvalid, next);
+      return (0, _captcha.swapCaptcha)(id, wasInvalid, next);
     }
 
     next();
@@ -113,9 +116,9 @@ function signUp(id) {
       autoLogin: (0, _index4.shouldAutoLogin)(m)
     };
 
-    var isCaptchaValid = setCaptchaParams(m, params, fields);
+    var isCaptchaValid = (0, _captcha.setCaptchaParams)(m, params, fields);
     if (!isCaptchaValid) {
-      return showMissingCaptcha(m, id);
+      return (0, _captcha.showMissingCaptcha)(m, id);
     }
 
     if ((0, _index4.databaseConnectionRequiresUsername)(m)) {
@@ -155,7 +158,7 @@ function signUp(id) {
 
       var wasInvalidCaptcha = error && error.code === 'invalid_captcha';
 
-      swapCaptcha(id, wasInvalidCaptcha, function () {
+      (0, _captcha.swapCaptcha)(id, wasInvalidCaptcha, function () {
         setTimeout(function () {
           return signUpError(id, error);
         }, 250);
@@ -255,7 +258,7 @@ function signUpError(id, error) {
 
   if (errorKey === 'invalid_captcha') {
     errorMessage = i18n.html(m, ['error', 'login', errorKey]);
-    return swapCaptcha(id, true, function () {
+    return (0, _captcha.swapCaptcha)(id, true, function () {
       (0, _index.swap)(_index.updateEntity, 'lock', id, l.setSubmitting, false, errorMessage);
     });
   }
@@ -360,64 +363,3 @@ function showLoginMFAActivity(id) {
 
   (0, _index.swap)(_index.updateEntity, 'lock', id, _index4.setScreen, 'mfaLogin', fields);
 }
-
-/**
- * Get a new challenge and display the new captcha image.
- *
- * @param {number} id The id of the Lock instance.
- * @param {boolean} wasInvalid A boolean indicating if the previous captcha was invalid.
- * @param {Function} [next] A callback.
- */
-function swapCaptcha(id, wasInvalid, next) {
-  return _web_api2.default.getChallenge(id, function (err, newCaptcha) {
-    if (!err && newCaptcha) {
-      (0, _index.swap)(_index.updateEntity, 'lock', id, l.setCaptcha, newCaptcha, wasInvalid);
-    }
-    if (next) {
-      next();
-    }
-  });
-}
-
-/**
- * Display the error message of missing captcha in the header of lock.
- *
- * @param {Object} m model
- * @param {Number} id
- */
-function showMissingCaptcha(m, id) {
-  var captchaConfig = l.captcha(m);
-  var captchaError = captchaConfig.get('provider') === 'recaptcha_v2' ? 'invalid_recaptcha' : 'invalid_captcha';
-  var errorMessage = i18n.html(m, ['error', 'login', captchaError]);
-  (0, _index.swap)(_index.updateEntity, 'lock', id, function (m) {
-    m = l.setSubmitting(m, false, errorMessage);
-    return c.showInvalidField(m, 'captcha');
-  });
-  return m;
-}
-
-/**
- * Set the captcha value in the fields object before sending the request.
- *
- * @param {Object} m model
- * @param {Object} params
- * @param {Object} fields
- *
- * @returns {Boolean} returns true if is required and missing the response from the user
- */
-function setCaptchaParams(m, params, fields) {
-  var captchaConfig = l.captcha(m);
-  var isCaptchaRequired = captchaConfig && l.captcha(m).get('required');
-  if (!isCaptchaRequired) {
-    return true;
-  }
-  var captcha = c.getFieldValue(m, 'captcha');
-  //captcha required and missing
-  if (!captcha) {
-    return false;
-  }
-
-  params['captcha'] = captcha;
-  fields.push('captcha');
-  return true;
-}

package/lib/connection/database/login_pane.js

@@ -24,6 +24,8 @@ var _password_pane2 = _interopRequireDefault(_password_pane);
 
 var _actions = require('./actions');
 
+var _captcha = require('../captcha');
+
 var _index = require('./index');
 
 var _index2 = require('../../core/index');
@@ -34,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 }; }
@@ -83,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,
@@ -102,8 +111,8 @@ 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() {
-        return (0, _actions.swapCaptcha)(l.id(lock), false);
+    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;
 
     var dontRememberPassword = showForgotPasswordLink && (0, _index.hasScreen)(lock, 'forgotPassword') ? _react2.default.createElement(

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/connection/enterprise/actions.js

@@ -30,6 +30,8 @@ var _index3 = require('../../core/index');
 
 var l = _interopRequireWildcard(_index3);
 
+var _captcha = require('../captcha');
+
 var _index4 = require('../database/index');
 
 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; } }
@@ -57,6 +59,8 @@ function logIn(id) {
   var ssoConnection = (0, _enterprise.matchConnection)(m, email);
   var enterpriseConnection = (0, _enterprise.enterpriseActiveFlowConnection)(m);
   var connectionScopes = getConnectionScopesFrom(m, ssoConnection || enterpriseConnection);
+  var usernameField = (0, _index4.databaseLogInWithEmail)(m) ? 'email' : 'username';
+  var fields = [usernameField, 'password'];
 
   var params = {
     connection_scope: connectionScopes ? connectionScopes.toJS() : undefined
@@ -66,6 +70,12 @@ function logIn(id) {
     return logInSSO(id, ssoConnection, params);
   }
 
+  var isCaptchaValid = (0, _captcha.setCaptchaParams)(m, params, fields);
+
+  if (!isCaptchaValid && !ssoConnection) {
+    return (0, _captcha.showMissingCaptcha)(m, id);
+  }
+
   logInActiveFlow(id, params);
 }
 

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.5';
+  return '11.32.0';
 }