auth0-lock 12.0.0-beta.0 → 12.0.1

package/lib/connection/enterprise/actions.js

@@ -50,7 +50,7 @@ function logIn(id) {
   if (ssoConnection && !(0, _enterprise.isHRDActive)(m)) {
     return logInSSO(id, ssoConnection, params);
   }
-  var isCaptchaValid = (0, _captcha.setCaptchaParams)(m, params, fields);
+  var isCaptchaValid = (0, _captcha.setCaptchaParams)(m, params, false, fields);
   if (!isCaptchaValid && !ssoConnection) {
     return (0, _captcha.showMissingCaptcha)(m, id);
   }
@@ -69,7 +69,7 @@ function logInActiveFlow(id, params) {
     login_hint: username
   }), function (id, error, fields, next) {
     var wasCaptchaInvalid = error && error.code === 'invalid captcha';
-    (0, _captcha.swapCaptcha)(id, wasCaptchaInvalid, next);
+    (0, _captcha.swapCaptcha)(id, false, wasCaptchaInvalid, next);
   });
 }
 function logInSSO(id, connection, params) {

package/lib/connection/enterprise/hrd_pane.js

@@ -47,7 +47,7 @@ var HRDPane = /*#__PURE__*/function (_React$Component) {
         i18n: i18n,
         lock: model,
         onReload: function onReload() {
-          return (0, _captcha.swapCaptcha)(l.id(model), false);
+          return (0, _captcha.swapCaptcha)(l.id(model), false, false);
         }
       }) : null;
       return /*#__PURE__*/_react.default.createElement("div", null, header, /*#__PURE__*/_react.default.createElement(_username_pane.default, {

package/lib/connection/enterprise.js

@@ -38,7 +38,7 @@ function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread n
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 var _dataFns = (0, _data_utils.dataFns)(['enterprise']),
   get = _dataFns.get,
   initNS = _dataFns.initNS,

package/lib/connection/passwordless/actions.js

@@ -11,7 +11,6 @@ exports.resendEmail = resendEmail;
 exports.restart = restart;
 exports.sendSMS = sendSMS;
 exports.toggleTermsAcceptance = toggleTermsAcceptance;
-var _immutable = require("immutable");
 var _index = require("../../store/index");
 var _actions = require("../../core/actions");
 var _web_api = _interopRequireDefault(require("../../core/web_api"));
@@ -20,6 +19,7 @@ var l = _interopRequireWildcard(require("../../core/index"));
 var _index4 = require("./index");
 var _phone_number = require("../../field/phone_number");
 var i18n = _interopRequireWildcard(require("../../i18n"));
+var _captcha = require("../captcha");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -29,16 +29,24 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-function getErrorMessage(m, error) {
+function getErrorMessage(m, id, error) {
   var key = error.error;
   if (error.error === 'sms_provider_error' && (error.description || '').indexOf('(Code: 21211)') > -1) {
     key = 'bad.phone_number';
   }
+  if (error.code === 'invalid_captcha') {
+    var captchaConfig = l.passwordlessCaptcha(m);
+    key = captchaConfig.get('provider') === 'recaptcha_v2' || captchaConfig.get('provider') === 'recaptcha_enterprise' ? 'invalid_recaptcha' : 'invalid_captcha';
+  }
   return i18n.html(m, ['error', 'passwordless', key]) || i18n.html(m, ['error', 'passwordless', 'lock.fallback']);
 }
+function swapCaptchaAfterError(id, error) {
+  var wasCaptchaInvalid = error && error.code === 'invalid_captcha';
+  (0, _captcha.swapCaptcha)(id, true, wasCaptchaInvalid);
+}
 function requestPasswordlessEmail(id) {
   (0, _actions.validateAndSubmit)(id, ['email'], function (m) {
-    sendEmail(m, requestPasswordlessEmailSuccess, requestPasswordlessEmailError);
+    sendEmail(m, id, requestPasswordlessEmailSuccess, requestPasswordlessEmailError);
   });
 }
 function requestPasswordlessEmailSuccess(id) {
@@ -49,13 +57,14 @@ function requestPasswordlessEmailSuccess(id) {
 }
 function requestPasswordlessEmailError(id, error) {
   var m = (0, _index.read)(_index.getEntity, 'lock', id);
-  var errorMessage = getErrorMessage(m, error);
-  return (0, _index.swap)(_index.updateEntity, 'lock', id, l.setSubmitting, false, errorMessage);
+  var errorMessage = getErrorMessage(m, id, error);
+  (0, _index.swap)(_index.updateEntity, 'lock', id, l.setSubmitting, false, errorMessage);
+  swapCaptchaAfterError(id, error);
 }
 function resendEmail(id) {
   (0, _index.swap)(_index.updateEntity, 'lock', id, _index4.resend);
   var m = (0, _index.read)(_index.getEntity, 'lock', id);
-  sendEmail(m, resendEmailSuccess, resendEmailError);
+  sendEmail(m, id, resendEmailSuccess, resendEmailError);
 }
 function resendEmailSuccess(id) {
   (0, _index.swap)(_index.updateEntity, 'lock', id, _index4.setResendSuccess);
@@ -67,7 +76,7 @@ function getPasswordlessConnectionName(m, defaultPasswordlessConnection) {
   var connections = l.connections(m, 'passwordless', defaultPasswordlessConnection);
   return connections.size > 0 && l.useCustomPasswordlessConnection(m) ? connections.first().get('name') : defaultPasswordlessConnection;
 }
-function sendEmail(m, successFn, errorFn) {
+function sendEmail(m, id, successFn, errorFn) {
   var params = {
     connection: getPasswordlessConnectionName(m, 'email'),
     email: c.getFieldValue(m, 'email'),
@@ -76,6 +85,10 @@ function sendEmail(m, successFn, errorFn) {
   if ((0, _index4.isSendLink)(m) && !l.auth.params(m).isEmpty()) {
     params.authParams = l.auth.params(m).toJS();
   }
+  var isCaptchaValid = (0, _captcha.setCaptchaParams)(m, params, true, []);
+  if (!isCaptchaValid) {
+    return (0, _captcha.showMissingCaptcha)(m, id, true);
+  }
   _web_api.default.startPasswordless(l.id(m), params, function (error) {
     if (error) {
       setTimeout(function () {
@@ -93,6 +106,10 @@ function sendSMS(id) {
       phoneNumber: (0, _phone_number.phoneNumberWithDiallingCode)(m),
       send: (0, _index4.send)(m)
     };
+    var isCaptchaValid = (0, _captcha.setCaptchaParams)(m, params, true, []);
+    if (!isCaptchaValid) {
+      return (0, _captcha.showMissingCaptcha)(m, id, true);
+    }
     _web_api.default.startPasswordless(id, params, function (error) {
       if (error) {
         setTimeout(function () {
@@ -113,9 +130,10 @@ function sendSMSSuccess(id) {
 }
 function sendSMSError(id, error) {
   var m = (0, _index.read)(_index.getEntity, 'lock', id);
-  var errorMessage = getErrorMessage(m, error);
+  var errorMessage = getErrorMessage(m, id, error);
   l.emitAuthorizationErrorEvent(m, error);
-  return (0, _index.swap)(_index.updateEntity, 'lock', id, l.setSubmitting, false, errorMessage);
+  (0, _index.swap)(_index.updateEntity, 'lock', id, l.setSubmitting, false, errorMessage);
+  swapCaptchaAfterError(id, error);
 }
 function logIn(id) {
   var m = (0, _index.read)(_index.getEntity, 'lock', id);
@@ -135,7 +153,7 @@ function logIn(id) {
     var errorMessage;
     if (error) {
       var _m = (0, _index.read)(_index.getEntity, 'lock', id);
-      errorMessage = getErrorMessage(_m, error);
+      errorMessage = getErrorMessage(_m, id, error);
       if (error.logToConsole) {
         console.error(error.description);
       }
@@ -148,6 +166,7 @@ function logIn(id) {
 }
 function restart(id) {
   (0, _index.swap)(_index.updateEntity, 'lock', id, _index4.restartPasswordless);
+  (0, _captcha.swapCaptcha)(id, true, false);
 }
 function toggleTermsAcceptance(id) {
   (0, _index.swap)(_index.updateEntity, 'lock', id, _index4.toggleTermsAcceptance);

package/lib/connection/social/index.js

@@ -50,7 +50,7 @@ var STRATEGIES = {
   thirtysevensignals: 'Basecamp',
   twitter: 'Twitter',
   vkontakte: 'vKontakte',
-  windowslive: 'Microsoft Account',
+  windowslive: 'Microsoft',
   wordpress: 'Wordpress',
   yahoo: 'Yahoo!',
   yammer: 'Yammer',

package/lib/core/client/index.js

@@ -21,7 +21,7 @@ function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread n
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }

package/lib/core/index.js

@@ -42,6 +42,7 @@ exports.languageBaseUrl = languageBaseUrl;
 exports.loggedIn = loggedIn;
 exports.loginErrorMessage = loginErrorMessage;
 exports.overrideOptions = overrideOptions;
+exports.passwordlessCaptcha = passwordlessCaptcha;
 exports.prefill = prefill;
 exports.render = render;
 exports.rendering = rendering;
@@ -53,6 +54,7 @@ exports.setGlobalError = setGlobalError;
 exports.setGlobalInfo = setGlobalInfo;
 exports.setGlobalSuccess = setGlobalSuccess;
 exports.setLoggedIn = setLoggedIn;
+exports.setPasswordlessCaptcha = setPasswordlessCaptcha;
 exports.setResolvedConnection = setResolvedConnection;
 exports.setSubmitting = setSubmitting;
 exports.setSupressSubmitOverlay = setSupressSubmitOverlay;
@@ -488,14 +490,16 @@ function setCaptcha(m, value, wasInvalid) {
   m = captchaField.reset(m, wasInvalid);
   return set(m, 'captcha', _immutable.default.fromJS(value));
 }
+function setPasswordlessCaptcha(m, value, wasInvalid) {
+  m = captchaField.reset(m, wasInvalid);
+  return set(m, 'passwordlessCaptcha', _immutable.default.fromJS(value));
+}
 function captcha(m) {
-  //some tests send an string as model.
-  // https://github.com/auth0/lock/blob/82f56187698528699478bd429858cf91e387763c/src/__tests__/engine/classic/sign_up_pane.test.jsx#L28
-  if (_typeof(m) !== 'object') {
-    return;
-  }
   return get(m, 'captcha');
 }
+function passwordlessCaptcha(m) {
+  return get(m, 'passwordlessCaptcha');
+}
 function prefill(m) {
   return get(m, 'prefill', {});
 }
@@ -651,7 +655,7 @@ function loginErrorMessage(m, error, type) {
   }
   if (code === 'invalid_captcha') {
     var currentCaptcha = get(m, 'captcha');
-    if (currentCaptcha && currentCaptcha.get('provider') === 'recaptcha_v2') {
+    if (currentCaptcha && (currentCaptcha.get('provider') === 'recaptcha_v2' || currentCaptcha.get('provider') === 'recaptcha_enterprise')) {
       code = 'invalid_recaptcha';
     }
   }

package/lib/core/remote_data.js

@@ -78,5 +78,13 @@ function syncRemoteData(m) {
     },
     successFn: _index2.setCaptcha
   });
+  m = (0, _sync.default)(m, 'passwordlessCaptcha', {
+    syncFn: function syncFn(m, cb) {
+      _web_api.default.getPasswordlessChallenge(m.get('id'), function (err, r) {
+        cb(null, r);
+      });
+    },
+    successFn: _index2.setPasswordlessCaptcha
+  });
   return m;
 }

package/lib/core/tenant/index.js

@@ -20,7 +20,7 @@ function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread n
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }

package/lib/core/web_api/helper.js

@@ -170,5 +170,5 @@ function trimAuthParams() {
   return p;
 }
 function getVersion() {
-  return "12.0.0-beta.0";
+  return "12.0.1";
 }

package/lib/core/web_api/p2_api.js

@@ -194,6 +194,12 @@ var Auth0APIClient = /*#__PURE__*/function () {
       var _this$client$client2;
       return (_this$client$client2 = this.client.client).getChallenge.apply(_this$client$client2, arguments);
     }
+  }, {
+    key: "getPasswordlessChallenge",
+    value: function getPasswordlessChallenge() {
+      var _this$client$client$p;
+      return (_this$client$client$p = this.client.client.passwordless).getChallenge.apply(_this$client$client$p, arguments);
+    }
   }, {
     key: "getUserCountry",
     value: function getUserCountry(cb) {

package/lib/core/web_api.js

@@ -84,6 +84,11 @@ var Auth0WebAPI = /*#__PURE__*/function () {
     value: function getChallenge(lockID, callback) {
       return this.clients[lockID].getChallenge(callback);
     }
+  }, {
+    key: "getPasswordlessChallenge",
+    value: function getPasswordlessChallenge(lockID, callback) {
+      return this.clients[lockID].getPasswordlessChallenge(callback);
+    }
   }, {
     key: "getSSOData",
     value: function getSSOData(lockID) {