@okta/okta-auth-js 5.9.1 → 5.10.0

package/esm/index.js

@@ -24,17 +24,17 @@ import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 import crossFetch from 'cross-fetch';
 import idx from '@okta/okta-idx-js';
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
-import _get from '@babel/runtime/helpers/get';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
+import _get from '@babel/runtime/helpers/get';
 
-function _createSuper$n(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$n(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _createSuper$r(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$r(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-function _isNativeReflectConstruct$n() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct$r() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 var CustomError = /*#__PURE__*/function (_Error) {
   _inherits(CustomError, _Error);
 
-  var _super = _createSuper$n(CustomError);
+  var _super = _createSuper$r(CustomError);
 
   function CustomError(message) {
     var _this;
@@ -49,14 +49,14 @@ var CustomError = /*#__PURE__*/function (_Error) {
   return CustomError;
 }( /*#__PURE__*/_wrapNativeSuper(Error));
 
-function _createSuper$m(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$m(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _createSuper$q(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$q(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-function _isNativeReflectConstruct$m() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct$q() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 var AuthApiError = /*#__PURE__*/function (_CustomError) {
   _inherits(AuthApiError, _CustomError);
 
-  var _super = _createSuper$m(AuthApiError);
+  var _super = _createSuper$q(AuthApiError);
 
   function AuthApiError(err, xhr) {
     var _this;
@@ -82,14 +82,14 @@ var AuthApiError = /*#__PURE__*/function (_CustomError) {
   return AuthApiError;
 }(CustomError);
 
-function _createSuper$l(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$l(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _createSuper$p(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$p(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-function _isNativeReflectConstruct$l() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct$p() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 var AuthPollStopError = /*#__PURE__*/function (_CustomError) {
   _inherits(AuthPollStopError, _CustomError);
 
-  var _super = _createSuper$l(AuthPollStopError);
+  var _super = _createSuper$p(AuthPollStopError);
 
   function AuthPollStopError() {
     _classCallCheck(this, AuthPollStopError);
@@ -101,14 +101,14 @@ var AuthPollStopError = /*#__PURE__*/function (_CustomError) {
   return AuthPollStopError;
 }(CustomError);
 
-function _createSuper$k(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$k(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _createSuper$o(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$o(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-function _isNativeReflectConstruct$k() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct$o() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 var AuthSdkError = /*#__PURE__*/function (_CustomError) {
   _inherits(AuthSdkError, _CustomError);
 
-  var _super = _createSuper$k(AuthSdkError);
+  var _super = _createSuper$o(AuthSdkError);
 
   function AuthSdkError(msg, xhr) {
     var _this;
@@ -133,14 +133,14 @@ var AuthSdkError = /*#__PURE__*/function (_CustomError) {
   return AuthSdkError;
 }(CustomError);
 
-function _createSuper$j(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$j(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _createSuper$n(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$n(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-function _isNativeReflectConstruct$j() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct$n() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 var OAuthError = /*#__PURE__*/function (_CustomError) {
   _inherits(OAuthError, _CustomError);
 
-  var _super = _createSuper$j(OAuthError);
+  var _super = _createSuper$n(OAuthError);
 
   function OAuthError(errorCode, summary) {
     var _this;
@@ -1789,9 +1789,10 @@ var AuthenticatorKey;
 (function (AuthenticatorKey) {
   AuthenticatorKey["OKTA_PASSWORD"] = "okta_password";
   AuthenticatorKey["OKTA_EMAIL"] = "okta_email";
-  AuthenticatorKey["OKTA_VERIFIER"] = "okta_verifier";
   AuthenticatorKey["PHONE_NUMBER"] = "phone_number";
   AuthenticatorKey["GOOGLE_AUTHENTICATOR"] = "google_otp";
+  AuthenticatorKey["SECURITY_QUESTION"] = "security_question";
+  AuthenticatorKey["OKTA_VERIFY"] = "okta_verify";
 })(AuthenticatorKey || (AuthenticatorKey = {}));
 
 var IdxFeature;
@@ -3124,6 +3125,7 @@ var TokenService = /*#__PURE__*/function () {
 var DEFAULT_OPTIONS = {
   autoRenew: true,
   autoRemove: true,
+  clearPendingRemoveTokens: true,
   storage: undefined,
   expireEarlySeconds: 30,
   storageKey: TOKEN_STORAGE_NAME,
@@ -3192,6 +3194,10 @@ var TokenManager = /*#__PURE__*/function () {
         this.stop();
       }
 
+      if (this.options.clearPendingRemoveTokens) {
+        this.clearPendingRemoveTokens();
+      }
+
       this.service = new TokenService(this, this.getOptions());
       this.service.start();
     }
@@ -3584,11 +3590,11 @@ var TokenManager = /*#__PURE__*/function () {
       }).catch(function (err) {
         if (isRefreshTokenError(err) || err.name === 'OAuthError' || err.name === 'AuthSdkError') {
           _this4.remove(key);
+        }
 
-          err.tokenKey = key;
+        err.tokenKey = key;
 
-          _this4.emitError(err);
-        }
+        _this4.emitError(err);
 
         throw err;
       }).finally(function () {
@@ -3602,6 +3608,18 @@ var TokenManager = /*#__PURE__*/function () {
       this.clearExpireEventTimeoutAll();
       this.storage.clearStorage();
     }
+  }, {
+    key: "clearPendingRemoveTokens",
+    value: function clearPendingRemoveTokens() {
+      var _this5 = this;
+
+      var tokens = this.getTokensSync();
+      Object.keys(tokens).forEach(function (key) {
+        if (tokens[key].pendingRemove) {
+          _this5.remove(key);
+        }
+      });
+    }
   }, {
     key: "getTokensFromStorageValue",
     value: function getTokensFromStorageValue(value) {
@@ -3626,6 +3644,15 @@ var TokenManager = /*#__PURE__*/function () {
       tokenStorage[key] = token;
       this.storage.setStorage(tokenStorage);
     }
+  }, {
+    key: "addPendingRemoveFlags",
+    value: function addPendingRemoveFlags() {
+      var tokens = this.getTokensSync();
+      Object.keys(tokens).forEach(function (key) {
+        tokens[key].pendingRemove = true;
+      });
+      this.setTokens(tokens);
+    }
   }]);
 
   return TokenManager;
@@ -4567,11 +4594,11 @@ var TransactionManager = /*#__PURE__*/function () {
   return TransactionManager;
 }();
 
-function _createForOfIteratorHelper$3(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$3(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _createForOfIteratorHelper$4(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$4(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
-function _unsupportedIterableToArray$3(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$3(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$3(o, minLen); }
+function _unsupportedIterableToArray$4(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$4(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$4(o, minLen); }
 
-function _arrayLikeToArray$3(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$4(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 readData(response) {
   if (response.headers.get('Content-Type') && response.headers.get('Content-Type').toLowerCase().indexOf('application/json') >= 0) {
@@ -4590,7 +4617,7 @@ function formatResult(status, data, response) {
   var isObject = _typeof(data) === 'object';
   var headers = {};
 
-  var _iterator = _createForOfIteratorHelper$3(response.headers.entries()),
+  var _iterator = _createForOfIteratorHelper$4(response.headers.entries()),
       _step;
 
   try {
@@ -5039,6 +5066,7 @@ function _interact() {
         clientId,
         redirectUri,
         scopes,
+        activationToken,
         baseUrl,
         _args = arguments;
 
@@ -5068,6 +5096,7 @@ function _interact() {
             _authClient$options = authClient.options, clientId = _authClient$options.clientId, redirectUri = _authClient$options.redirectUri;
             state = state || meta.state;
             scopes = options.scopes || authClient.options.scopes || meta.scopes;
+            activationToken = options.activationToken;
             baseUrl = getOAuthBaseUrl(authClient);
             return _context.abrupt("return", idx.interact({
               clientId: clientId,
@@ -5076,7 +5105,8 @@ function _interact() {
               state: state,
               redirectUri: redirectUri,
               codeChallenge: codeChallenge,
-              codeChallengeMethod: codeChallengeMethod
+              codeChallengeMethod: codeChallengeMethod,
+              activationToken: activationToken
             }).then(function (interactionHandle) {
               var newMeta = Object.assign(Object.assign({}, meta), {
                 interactionHandle: interactionHandle,
@@ -5087,7 +5117,7 @@ function _interact() {
               return getResponse(newMeta);
             }));
 
-          case 13:
+          case 14:
           case "end":
             return _context.stop();
         }
@@ -5162,496 +5192,162 @@ function _introspect() {
   return _introspect.apply(this, arguments);
 }
 
-function _createForOfIteratorHelper$2(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$2(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-
-function _unsupportedIterableToArray$2(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$2(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$2(o, minLen); }
-
-function _arrayLikeToArray$2(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 getRemediator(idxRemediations, values, options) {
-  var remediators = options.remediators,
-      flowMonitor = options.flowMonitor;
-  var remediator;
-  var remediatorCandidates = [];
-
-  var _iterator = _createForOfIteratorHelper$2(idxRemediations),
-      _step;
-
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var remediation = _step.value;
-      var isRemeditionInFlow = Object.keys(remediators).includes(remediation.name);
-
-      if (!isRemeditionInFlow) {
-        continue;
-      }
-
-      var T = remediators[remediation.name];
-      remediator = new T(remediation, values);
-
-      if (flowMonitor.isRemediatorCandidate(remediator, idxRemediations, values)) {
-        if (remediator.canRemediate()) {
-          return remediator;
-        }
-
-        remediatorCandidates.push(remediator);
-      }
+function getAllValues(idxRemediation) {
+  return idxRemediation.value.map(function (r) {
+    return r.name;
+  });
+}
+function getRequiredValues(idxRemediation) {
+  return idxRemediation.value.reduce(function (required, cur) {
+    if (cur.required) {
+      required.push(cur.name);
     }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
-  }
 
-  return remediatorCandidates[0];
+    return required;
+  }, []);
 }
-
-function isTerminalResponse(idxResponse) {
-  var neededToProceed = idxResponse.neededToProceed,
-      interactionCode = idxResponse.interactionCode;
-  return !neededToProceed.length && !interactionCode;
+function titleCase(str) {
+  return str.charAt(0).toUpperCase() + str.substring(1);
 }
-
-function canSkipFn(idxResponse) {
-  return idxResponse.neededToProceed.some(function (_ref) {
+function getAuthenticatorFromRemediation(remediation) {
+  return remediation.value.find(function (_ref) {
     var name = _ref.name;
-    return name === 'skip';
-  });
-}
-
-function canResendFn(idxResponse) {
-  return Object.keys(idxResponse.actions).some(function (actionName) {
-    return actionName.includes('resend');
+    return name === 'authenticator';
   });
 }
 
-function getIdxMessages(idxResponse, remediators) {
-  var _a;
+function _createForOfIteratorHelper$3(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$3(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
-  var messages = [];
+function _unsupportedIterableToArray$3(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$3(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$3(o, minLen); }
 
-  if (!remediators) {
-    return messages;
-  }
+function _arrayLikeToArray$3(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 Remediator = /*#__PURE__*/function () {
+  function Remediator(remediation) {
+    var values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
 
-  var rawIdxState = idxResponse.rawIdxState,
-      neededToProceed = idxResponse.neededToProceed;
-  var globalMessages = (_a = rawIdxState.messages) === null || _a === void 0 ? void 0 : _a.value.map(function (message) {
-    return message;
-  });
+    _classCallCheck(this, Remediator);
 
-  if (globalMessages) {
-    messages = [].concat(_toConsumableArray(messages), _toConsumableArray(globalMessages));
+    this.values = Object.assign({}, values);
+    this.formatAuthenticators();
+    this.remediation = remediation;
   }
 
-  var _iterator2 = _createForOfIteratorHelper$2(neededToProceed),
-      _step2;
+  _createClass(Remediator, [{
+    key: "formatAuthenticators",
+    value: function formatAuthenticators() {
+      var _this = this;
 
-  try {
-    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-      var remediation = _step2.value;
-      var T = remediators[remediation.name];
+      this.values.authenticators = this.values.authenticators || [];
 
-      if (!T) {
-        continue;
-      }
+      if (this.values.authenticator) {
+        var hasAuthenticatorInList = this.values.authenticators.some(function (authenticator) {
+          if (typeof authenticator === 'string') {
+            return authenticator === _this.values.authenticator;
+          }
 
-      var remediator = new T(remediation);
-      var fieldMessages = remediator.getMessages();
+          return authenticator.key === _this.values.authenticator;
+        });
 
-      if (fieldMessages) {
-        messages = [].concat(_toConsumableArray(messages), _toConsumableArray(fieldMessages));
+        if (!hasAuthenticatorInList) {
+          this.values.authenticators.push({
+            key: this.values.authenticator
+          });
+        }
       }
-    }
-  } catch (err) {
-    _iterator2.e(err);
-  } finally {
-    _iterator2.f();
-  }
 
-  return messages;
-}
+      this.values.authenticators = this.values.authenticators.map(function (authenticator) {
+        return typeof authenticator === 'string' ? {
+          key: authenticator
+        } : authenticator;
+      });
+      this.values.authenticatorsData = this.values.authenticators.reduce(function (acc, authenticator) {
+        if (_typeof(authenticator) === 'object' && Object.keys(authenticator).length > 1) {
+          acc.push(authenticator);
+        }
 
-function getNextStep(remediator, idxResponse) {
-  var nextStep = remediator.getNextStep();
-  var canSkip = canSkipFn(idxResponse);
-  var canResend = canResendFn(idxResponse);
-  return Object.assign(Object.assign(Object.assign({}, nextStep), canSkip && {
-    canSkip: canSkip
-  }), canResend && {
-    canResend: canResend
-  });
-}
+        return acc;
+      }, this.values.authenticatorsData || []);
+    }
+  }, {
+    key: "getName",
+    value: function getName() {
+      return this.remediation.name;
+    }
+  }, {
+    key: "canRemediate",
+    value: function canRemediate() {
+      var _this2 = this;
 
-function handleIdxError(e, remediators, remediator) {
-  var idxState = isIdxResponse(e) ? e : null;
+      if (!this.map) {
+        return false;
+      }
 
-  if (!idxState) {
-    throw e;
-  }
+      var required = getRequiredValues(this.remediation);
+      var needed = required.find(function (key) {
+        return !_this2.hasData(key);
+      });
 
-  var terminal = isTerminalResponse(idxState);
-  var messages = getIdxMessages(idxState, remediators);
+      if (needed) {
+        return false;
+      }
 
-  if (terminal) {
-    return {
-      terminal: terminal,
-      messages: messages
-    };
-  } else {
-    var nextStep = remediator && getNextStep(remediator, idxState);
-    return Object.assign({
-      messages: messages
-    }, nextStep && {
-      nextStep: nextStep
-    });
-  }
-}
+      return true;
+    }
+  }, {
+    key: "getData",
+    value: function getData(key) {
+      var _this3 = this;
 
-function getActionFromValues(values, idxResponse) {
-  return Object.keys(idxResponse.actions).find(function (action) {
-    return !!values.resend && action.includes('-resend');
-  });
-}
+      if (!key) {
+        var allValues = getAllValues(this.remediation);
+        var res = allValues.reduce(function (data, key) {
+          data[key] = _this3.getData(key);
+          return data;
+        }, {});
+        return res;
+      }
 
-function removeActionFromValues(values) {
-  values.resend = undefined;
-  return values;
-}
+      if (typeof this["map".concat(titleCase(key))] === 'function') {
+        return this["map".concat(titleCase(key))](this.remediation.value.find(function (_ref) {
+          var name = _ref.name;
+          return name === key;
+        }));
+      }
 
-function remediate(_x, _x2, _x3) {
-  return _remediate.apply(this, arguments);
-}
+      if (!this.map) {
+        return this.values[key];
+      }
 
-function _remediate() {
-  _remediate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(idxResponse, values, options) {
-    var _idxResponse, neededToProceed, interactionCode, remediators, flowMonitor, terminal, messages, actionFromValues, actions, _iterator3, _step3, action, valuesWithoutExecutedAction, remediator, nextStep, name, data, _terminal, _messages, _nextStep;
+      var entry = this.map[key];
 
-    return _regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _idxResponse = idxResponse, neededToProceed = _idxResponse.neededToProceed, interactionCode = _idxResponse.interactionCode;
-            remediators = options.remediators, flowMonitor = options.flowMonitor;
+      if (!entry) {
+        return this.values[key];
+      }
 
-            if (!interactionCode) {
-              _context.next = 4;
-              break;
-            }
+      for (var i = 0; i < entry.length; i++) {
+        var val = this.values[entry[i]];
 
-            return _context.abrupt("return", {
-              idxResponse: idxResponse
-            });
+        if (val) {
+          return val;
+        }
+      }
+    }
+  }, {
+    key: "hasData",
+    value: function hasData(key) {
+      var data = this.getData(key);
 
-          case 4:
-            terminal = isTerminalResponse(idxResponse);
-            messages = getIdxMessages(idxResponse, remediators);
-
-            if (!terminal) {
-              _context.next = 8;
-              break;
-            }
-
-            return _context.abrupt("return", {
-              terminal: terminal,
-              messages: messages
-            });
-
-          case 8:
-            actionFromValues = getActionFromValues(values, idxResponse);
-            actions = [].concat(_toConsumableArray(options.actions || []), _toConsumableArray(actionFromValues && [actionFromValues] || []));
-
-            if (!actions) {
-              _context.next = 40;
-              break;
-            }
-
-            _iterator3 = _createForOfIteratorHelper$2(actions);
-            _context.prev = 12;
-
-            _iterator3.s();
-
-          case 14:
-            if ((_step3 = _iterator3.n()).done) {
-              _context.next = 32;
-              break;
-            }
-
-            action = _step3.value;
-            valuesWithoutExecutedAction = removeActionFromValues(values);
-
-            if (!(typeof idxResponse.actions[action] === 'function')) {
-              _context.next = 30;
-              break;
-            }
-
-            _context.prev = 18;
-            _context.next = 21;
-            return idxResponse.actions[action]();
-
-          case 21:
-            idxResponse = _context.sent;
-            _context.next = 27;
-            break;
-
-          case 24:
-            _context.prev = 24;
-            _context.t0 = _context["catch"](18);
-            return _context.abrupt("return", handleIdxError(_context.t0, remediators));
-
-          case 27:
-            if (!(action === 'cancel')) {
-              _context.next = 29;
-              break;
-            }
-
-            return _context.abrupt("return", {
-              canceled: true
-            });
-
-          case 29:
-            return _context.abrupt("return", remediate(idxResponse, valuesWithoutExecutedAction, options));
-
-          case 30:
-            _context.next = 14;
-            break;
-
-          case 32:
-            _context.next = 37;
-            break;
-
-          case 34:
-            _context.prev = 34;
-            _context.t1 = _context["catch"](12);
-
-            _iterator3.e(_context.t1);
-
-          case 37:
-            _context.prev = 37;
-
-            _iterator3.f();
-
-            return _context.finish(37);
-
-          case 40:
-            remediator = getRemediator(neededToProceed, values, options);
-
-            if (remediator) {
-              _context.next = 43;
-              break;
-            }
-
-            throw new AuthSdkError("\n      No remediation can match current flow, check policy settings in your org.\n      Remediations: [".concat(neededToProceed.reduce(function (acc, curr) {
-              return acc ? acc + ' ,' + curr.name : curr.name;
-            }, ''), "]\n    "));
-
-          case 43:
-            if (!flowMonitor.loopDetected(remediator)) {
-              _context.next = 45;
-              break;
-            }
-
-            throw new AuthSdkError("\n      Remediation run into loop, break!!! remediation: ".concat(remediator.getName(), "\n    "));
-
-          case 45:
-            if (remediator.canRemediate()) {
-              _context.next = 48;
-              break;
-            }
-
-            nextStep = getNextStep(remediator, idxResponse);
-            return _context.abrupt("return", {
-              idxResponse: idxResponse,
-              nextStep: nextStep
-            });
-
-          case 48:
-            name = remediator.getName();
-            data = remediator.getData();
-            _context.prev = 50;
-            _context.next = 53;
-            return idxResponse.proceed(name, data);
-
-          case 53:
-            idxResponse = _context.sent;
-            _context.next = 56;
-            return flowMonitor.trackRemediations(name);
-
-          case 56:
-            if (!idxResponse.interactionCode) {
-              _context.next = 58;
-              break;
-            }
-
-            return _context.abrupt("return", {
-              idxResponse: idxResponse
-            });
-
-          case 58:
-            _terminal = isTerminalResponse(idxResponse);
-            _messages = getIdxMessages(idxResponse, remediators);
-
-            if (!_terminal) {
-              _context.next = 62;
-              break;
-            }
-
-            return _context.abrupt("return", {
-              terminal: _terminal,
-              messages: _messages
-            });
-
-          case 62:
-            if (!_messages.length) {
-              _context.next = 65;
-              break;
-            }
-
-            _nextStep = getNextStep(remediator, idxResponse);
-            return _context.abrupt("return", {
-              nextStep: _nextStep,
-              messages: _messages
-            });
-
-          case 65:
-            values = remediator.getValuesAfterProceed();
-            return _context.abrupt("return", remediate(idxResponse, values, options));
-
-          case 69:
-            _context.prev = 69;
-            _context.t2 = _context["catch"](50);
-            return _context.abrupt("return", handleIdxError(_context.t2, remediators, remediator));
-
-          case 72:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee, null, [[12, 34, 37, 40], [18, 24], [50, 69]]);
-  }));
-  return _remediate.apply(this, arguments);
-}
-
-function getAllValues(idxRemediation) {
-  return idxRemediation.value.map(function (r) {
-    return r.name;
-  });
-}
-function getRequiredValues(idxRemediation) {
-  return idxRemediation.value.reduce(function (required, cur) {
-    if (cur.required) {
-      required.push(cur.name);
-    }
-
-    return required;
-  }, []);
-}
-function titleCase(str) {
-  return str.charAt(0).toUpperCase() + str.substring(1);
-}
-function getAuthenticatorFromRemediation(remediation) {
-  return remediation.value.find(function (_ref) {
-    var name = _ref.name;
-    return name === 'authenticator';
-  });
-}
-
-var Remediator = /*#__PURE__*/function () {
-  function Remediator(remediation) {
-    var values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
-    _classCallCheck(this, Remediator);
-
-    var _a;
-
-    values.authenticators = ((_a = values.authenticators) === null || _a === void 0 ? void 0 : _a.map(function (authenticator) {
-      return typeof authenticator === 'string' ? {
-        key: authenticator
-      } : authenticator;
-    })) || [];
-    this.values = values;
-    this.remediation = remediation;
-  }
-
-  _createClass(Remediator, [{
-    key: "getName",
-    value: function getName() {
-      return this.remediation.name;
-    }
-  }, {
-    key: "canRemediate",
-    value: function canRemediate() {
-      var _this = this;
-
-      if (!this.map) {
-        return false;
-      }
-
-      var required = getRequiredValues(this.remediation);
-      var needed = required.find(function (key) {
-        return !_this.hasData(key);
-      });
-
-      if (needed) {
-        return false;
-      }
-
-      return true;
-    }
-  }, {
-    key: "getData",
-    value: function getData(key) {
-      var _this2 = this;
-
-      if (!key) {
-        var allValues = getAllValues(this.remediation);
-        var res = allValues.reduce(function (data, key) {
-          data[key] = _this2.getData(key);
-          return data;
-        }, {});
-        return res;
-      }
-
-      if (typeof this["map".concat(titleCase(key))] === 'function') {
-        return this["map".concat(titleCase(key))](this.remediation.value.find(function (_ref) {
-          var name = _ref.name;
-          return name === key;
-        }));
-      }
-
-      if (!this.map) {
-        return this.values[key];
-      }
-
-      var entry = this.map[key];
-
-      if (!entry) {
-        return this.values[key];
-      }
-
-      for (var i = 0; i < entry.length; i++) {
-        var val = this.values[entry[i]];
-
-        if (val) {
-          return val;
-        }
-      }
-    }
-  }, {
-    key: "hasData",
-    value: function hasData(key) {
-      var data = this.getData(key);
-
-      if (_typeof(data) === 'object') {
-        return !!Object.keys(data).find(function (key) {
-          return !!data[key];
-        });
-      }
+      if (_typeof(data) === 'object') {
+        return !!Object.keys(data).find(function (key) {
+          return !!data[key];
+        });
+      }
 
       return !!data;
     }
   }, {
     key: "getNextStep",
-    value: function getNextStep() {
+    value: function getNextStep(_context) {
       var name = this.getName();
       var inputs = this.getInputs();
       var authenticator = this.getAuthenticator();
@@ -5668,14 +5364,14 @@ var Remediator = /*#__PURE__*/function () {
   }, {
     key: "getInputs",
     value: function getInputs() {
-      var _this3 = this;
+      var _this4 = this;
 
       if (!this.map) {
         return [];
       }
 
       return Object.keys(this.map).reduce(function (inputs, key) {
-        var inputFromRemediation = _this3.remediation.value.find(function (item) {
+        var inputFromRemediation = _this4.remediation.value.find(function (item) {
           return item.name === key;
         });
 
@@ -5684,11 +5380,11 @@ var Remediator = /*#__PURE__*/function () {
         }
 
         var input;
-        var aliases = _this3.map[key];
+        var aliases = _this4.map[key];
         var type = inputFromRemediation.type;
 
-        if (typeof _this3["getInput".concat(titleCase(key))] === 'function') {
-          input = _this3["getInput".concat(titleCase(key))](inputFromRemediation);
+        if (typeof _this4["getInput".concat(titleCase(key))] === 'function') {
+          input = _this4["getInput".concat(titleCase(key))](inputFromRemediation);
         } else if (type !== 'object') {
           var name;
 
@@ -5696,7 +5392,7 @@ var Remediator = /*#__PURE__*/function () {
             name = aliases[0];
           } else {
             name = aliases.find(function (name) {
-              return Object.keys(_this3.values).includes(name);
+              return Object.keys(_this4.values).includes(name);
             });
           }
 
@@ -5708,7 +5404,7 @@ var Remediator = /*#__PURE__*/function () {
         }
 
         if (!input) {
-          throw new AuthSdkError("Missing custom getInput".concat(titleCase(key), " method in Remediator: ").concat(_this3.getName()));
+          throw new AuthSdkError("Missing custom getInput".concat(titleCase(key), " method in Remediator: ").concat(_this4.getName()));
         }
 
         if (Array.isArray(input)) {
@@ -5723,119 +5419,344 @@ var Remediator = /*#__PURE__*/function () {
       }, []);
     }
   }, {
-    key: "getMessages",
-    value: function getMessages() {
-      var _a, _b;
+    key: "getValuesAfterProceed",
+    value: function getValuesAfterProceed() {
+      var inputs = this.getInputs();
 
-      if (!this.remediation.value) {
-        return;
-      }
+      var _iterator = _createForOfIteratorHelper$3(inputs),
+          _step;
 
-      return (_b = (_a = this.remediation.value[0]) === null || _a === void 0 ? void 0 : _a.form) === null || _b === void 0 ? void 0 : _b.value.reduce(function (messages, field) {
-        if (field.messages) {
-          messages = [].concat(_toConsumableArray(messages), _toConsumableArray(field.messages.value));
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var input = _step.value;
+          delete this.values[input.name];
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+
+      return this.values;
+    }
+  }, {
+    key: "getAuthenticator",
+    value: function getAuthenticator() {
+      var _a;
+
+      return (_a = this.remediation.relatesTo) === null || _a === void 0 ? void 0 : _a.value;
+    }
+  }], [{
+    key: "getMessages",
+    value: function getMessages(remediation) {
+      var _a, _b;
+
+      if (!remediation.value) {
+        return;
+      }
+
+      return (_b = (_a = remediation.value[0]) === null || _a === void 0 ? void 0 : _a.form) === null || _b === void 0 ? void 0 : _b.value.reduce(function (messages, field) {
+        if (field.messages) {
+          messages = [].concat(_toConsumableArray(messages), _toConsumableArray(field.messages.value));
         }
 
         return messages;
       }, []);
     }
+  }]);
+
+  return Remediator;
+}();
+
+var Authenticator = function Authenticator(authenticator) {
+  _classCallCheck(this, Authenticator);
+
+  this.meta = authenticator;
+};
+
+function _createSuper$m(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$m(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
+function _isNativeReflectConstruct$m() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+var VerificationCodeAuthenticator = /*#__PURE__*/function (_Authenticator) {
+  _inherits(VerificationCodeAuthenticator, _Authenticator);
+
+  var _super = _createSuper$m(VerificationCodeAuthenticator);
+
+  function VerificationCodeAuthenticator() {
+    _classCallCheck(this, VerificationCodeAuthenticator);
+
+    return _super.apply(this, arguments);
+  }
+
+  _createClass(VerificationCodeAuthenticator, [{
+    key: "canVerify",
+    value: function canVerify(values) {
+      return !!values.verificationCode;
+    }
   }, {
-    key: "getValuesAfterProceed",
-    value: function getValuesAfterProceed() {
-      var _a, _b;
+    key: "mapCredentials",
+    value: function mapCredentials(values) {
+      return {
+        passcode: values.verificationCode
+      };
+    }
+  }, {
+    key: "getInputs",
+    value: function getInputs(idxRemediationValue) {
+      var _a;
 
-      var authenticatorKey = (_a = this.getAuthenticator()) === null || _a === void 0 ? void 0 : _a.key;
-      var authenticators = (_b = this.values.authenticators) === null || _b === void 0 ? void 0 : _b.filter(function (authenticator) {
-        return authenticator.key !== authenticatorKey;
-      });
-      return Object.assign(Object.assign({}, this.values), {
-        authenticators: authenticators
+      return Object.assign(Object.assign({}, (_a = idxRemediationValue.form) === null || _a === void 0 ? void 0 : _a.value[0]), {
+        name: 'verificationCode',
+        type: 'string',
+        required: idxRemediationValue.required
       });
     }
+  }]);
+
+  return VerificationCodeAuthenticator;
+}(Authenticator);
+
+function _createSuper$l(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$l(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
+function _isNativeReflectConstruct$l() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+var OktaVerifyTotp = /*#__PURE__*/function (_VerificationCodeAuth) {
+  _inherits(OktaVerifyTotp, _VerificationCodeAuth);
+
+  var _super = _createSuper$l(OktaVerifyTotp);
+
+  function OktaVerifyTotp() {
+    _classCallCheck(this, OktaVerifyTotp);
+
+    return _super.apply(this, arguments);
+  }
+
+  _createClass(OktaVerifyTotp, [{
+    key: "mapCredentials",
+    value: function mapCredentials(values) {
+      return {
+        totp: values.verificationCode
+      };
+    }
+  }]);
+
+  return OktaVerifyTotp;
+}(VerificationCodeAuthenticator);
+
+function _createSuper$k(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$k(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
+function _isNativeReflectConstruct$k() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+var OktaPassword = /*#__PURE__*/function (_Authenticator) {
+  _inherits(OktaPassword, _Authenticator);
+
+  var _super = _createSuper$k(OktaPassword);
+
+  function OktaPassword() {
+    _classCallCheck(this, OktaPassword);
+
+    return _super.apply(this, arguments);
+  }
+
+  _createClass(OktaPassword, [{
+    key: "canVerify",
+    value: function canVerify(values) {
+      return !!values.password;
+    }
   }, {
-    key: "getAuthenticator",
-    value: function getAuthenticator() {
+    key: "mapCredentials",
+    value: function mapCredentials(values) {
+      return {
+        passcode: values.password
+      };
+    }
+  }, {
+    key: "getInputs",
+    value: function getInputs(idxRemediationValue) {
       var _a;
 
-      return (_a = this.remediation.relatesTo) === null || _a === void 0 ? void 0 : _a.value;
+      return Object.assign(Object.assign({}, (_a = idxRemediationValue.form) === null || _a === void 0 ? void 0 : _a.value[0]), {
+        name: 'password',
+        type: 'string',
+        required: idxRemediationValue.required
+      });
     }
   }]);
 
-  return Remediator;
-}();
+  return OktaPassword;
+}(Authenticator);
+
+function _createSuper$j(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$j(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
+function _isNativeReflectConstruct$j() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+var SecurityQuestionEnrollment = /*#__PURE__*/function (_Authenticator) {
+  _inherits(SecurityQuestionEnrollment, _Authenticator);
+
+  var _super = _createSuper$j(SecurityQuestionEnrollment);
+
+  function SecurityQuestionEnrollment() {
+    _classCallCheck(this, SecurityQuestionEnrollment);
+
+    return _super.apply(this, arguments);
+  }
+
+  _createClass(SecurityQuestionEnrollment, [{
+    key: "canVerify",
+    value: function canVerify(values) {
+      var questionKey = values.questionKey,
+          question = values.question,
+          answer = values.answer;
+      return questionKey && answer || question && answer;
+    }
+  }, {
+    key: "mapCredentials",
+    value: function mapCredentials(values) {
+      var questionKey = values.questionKey,
+          question = values.question,
+          answer = values.answer;
+      return {
+        questionKey: question ? 'custom' : questionKey,
+        question: question,
+        answer: answer
+      };
+    }
+  }, {
+    key: "getInputs",
+    value: function getInputs() {
+      return [{
+        name: 'questionKey',
+        type: 'string',
+        require: true
+      }, {
+        name: 'question',
+        type: 'string',
+        label: 'Create a security question'
+      }, {
+        name: 'answer',
+        type: 'string',
+        label: 'Answer',
+        required: true
+      }];
+    }
+  }]);
+
+  return SecurityQuestionEnrollment;
+}(Authenticator);
 
 function _createSuper$i(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$i(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
 function _isNativeReflectConstruct$i() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+var SecurityQuestionVerification = /*#__PURE__*/function (_Authenticator) {
+  _inherits(SecurityQuestionVerification, _Authenticator);
+
+  var _super = _createSuper$i(SecurityQuestionVerification);
+
+  function SecurityQuestionVerification() {
+    _classCallCheck(this, SecurityQuestionVerification);
+
+    return _super.apply(this, arguments);
+  }
+
+  _createClass(SecurityQuestionVerification, [{
+    key: "canVerify",
+    value: function canVerify(values) {
+      return values.answer;
+    }
+  }, {
+    key: "mapCredentials",
+    value: function mapCredentials(values) {
+      return {
+        questionKey: this.meta.contextualData.enrolledQuestion.questionKey,
+        answer: values.answer
+      };
+    }
+  }, {
+    key: "getInputs",
+    value: function getInputs() {
+      return [{
+        name: 'answer',
+        type: 'string',
+        label: 'Answer',
+        required: true
+      }];
+    }
+  }]);
+
+  return SecurityQuestionVerification;
+}(Authenticator);
+
+function getAuthenticator(remediation) {
+  var _remediation$relatesT = remediation.relatesTo;
+  _remediation$relatesT = _remediation$relatesT === void 0 ? {} : _remediation$relatesT;
+  var value = _remediation$relatesT.value;
+
+  switch (value.key) {
+    case AuthenticatorKey.OKTA_PASSWORD:
+      return new OktaPassword(value);
+
+    case AuthenticatorKey.SECURITY_QUESTION:
+      if (value.contextualData.enrolledQuestion) {
+        return new SecurityQuestionVerification(value);
+      } else {
+        return new SecurityQuestionEnrollment(value);
+      }
+
+    case AuthenticatorKey.OKTA_VERIFY:
+      return new OktaVerifyTotp(value);
+
+    default:
+      return new VerificationCodeAuthenticator(value);
+  }
+}
+
+function _createSuper$h(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$h(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
+function _isNativeReflectConstruct$h() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 var VerifyAuthenticator = /*#__PURE__*/function (_Remediator) {
   _inherits(VerifyAuthenticator, _Remediator);
 
-  var _super = _createSuper$i(VerifyAuthenticator);
+  var _super = _createSuper$h(VerifyAuthenticator);
 
-  function VerifyAuthenticator() {
+  function VerifyAuthenticator(remediation) {
     var _this;
 
+    var values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
     _classCallCheck(this, VerifyAuthenticator);
 
-    _this = _super.apply(this, arguments);
+    _this = _super.call(this, remediation, values);
     _this.map = {
       'credentials': []
     };
+    _this.authenticator = getAuthenticator(remediation);
     return _this;
   }
 
   _createClass(VerifyAuthenticator, [{
     key: "canRemediate",
     value: function canRemediate() {
-      return !!(this.values.password || this.values.verificationCode);
+      return this.authenticator.canVerify(this.values);
     }
   }, {
     key: "mapCredentials",
     value: function mapCredentials() {
-      return {
-        passcode: this.values.verificationCode || this.values.password
-      };
+      return this.authenticator.mapCredentials(this.values);
     }
   }, {
     key: "getInputCredentials",
     value: function getInputCredentials(input) {
-      var _a;
-
-      var challengeType = this.getAuthenticator().type;
-      var name = challengeType === 'password' ? 'password' : 'verificationCode';
-      return Object.assign(Object.assign({}, (_a = input.form) === null || _a === void 0 ? void 0 : _a.value[0]), {
-        name: name,
-        type: 'string',
-        required: input.required
-      });
-    }
-  }, {
-    key: "getValuesAfterProceed",
-    value: function getValuesAfterProceed() {
-      var values = _get(_getPrototypeOf(VerifyAuthenticator.prototype), "getValuesAfterProceed", this).call(this);
-
-      var authenticator = this.getAuthenticator();
-
-      if (authenticator.type === 'password') {
-        delete values.password;
-      } else {
-        delete values.verificationCode;
-      }
-
-      return values;
+      return this.authenticator.getInputs(input);
     }
   }]);
 
   return VerifyAuthenticator;
 }(Remediator);
 
-function _createSuper$h(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$h(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _createSuper$g(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$g(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-function _isNativeReflectConstruct$h() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct$g() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 var EnrollAuthenticator = /*#__PURE__*/function (_VerifyAuthenticator) {
   _inherits(EnrollAuthenticator, _VerifyAuthenticator);
 
-  var _super = _createSuper$h(EnrollAuthenticator);
+  var _super = _createSuper$g(EnrollAuthenticator);
 
   function EnrollAuthenticator() {
     _classCallCheck(this, EnrollAuthenticator);
@@ -5847,13 +5768,69 @@ var EnrollAuthenticator = /*#__PURE__*/function (_VerifyAuthenticator) {
 }(VerifyAuthenticator);
 EnrollAuthenticator.remediationName = 'enroll-authenticator';
 
-function _createSuper$g(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$g(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _createSuper$f(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$f(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-function _isNativeReflectConstruct$g() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct$f() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+var EnrollPoll = /*#__PURE__*/function (_Remediator) {
+  _inherits(EnrollPoll, _Remediator);
+
+  var _super = _createSuper$f(EnrollPoll);
+
+  function EnrollPoll() {
+    _classCallCheck(this, EnrollPoll);
+
+    return _super.apply(this, arguments);
+  }
+
+  _createClass(EnrollPoll, [{
+    key: "canRemediate",
+    value: function canRemediate() {
+      return Boolean(this.values.startPolling);
+    }
+  }, {
+    key: "getNextStep",
+    value: function getNextStep(context) {
+      var name = this.getName();
+      var authenticator = this.getAuthenticator();
+
+      if (!authenticator && (context === null || context === void 0 ? void 0 : context.currentAuthenticator)) {
+        authenticator = context.currentAuthenticator.value;
+      }
+
+      return {
+        name: name,
+        authenticator: authenticator,
+        poll: {
+          required: true,
+          refresh: this.remediation.refresh
+        }
+      };
+    }
+  }, {
+    key: "getValuesAfterProceed",
+    value: function getValuesAfterProceed() {
+      var _this = this;
+
+      var trimmedValues = Object.keys(this.values).filter(function (valueKey) {
+        return valueKey !== 'startPolling';
+      });
+      return trimmedValues.reduce(function (values, valueKey) {
+        return Object.assign(Object.assign({}, values), _defineProperty({}, valueKey, _this.values[valueKey]));
+      }, {});
+    }
+  }]);
+
+  return EnrollPoll;
+}(Remediator);
+EnrollPoll.remediationName = 'enroll-poll';
+
+function _createSuper$e(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$e(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
+function _isNativeReflectConstruct$e() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 var ChallengeAuthenticator = /*#__PURE__*/function (_VerifyAuthenticator) {
   _inherits(ChallengeAuthenticator, _VerifyAuthenticator);
 
-  var _super = _createSuper$g(ChallengeAuthenticator);
+  var _super = _createSuper$e(ChallengeAuthenticator);
 
   function ChallengeAuthenticator() {
     _classCallCheck(this, ChallengeAuthenticator);
@@ -5865,13 +5842,31 @@ var ChallengeAuthenticator = /*#__PURE__*/function (_VerifyAuthenticator) {
 }(VerifyAuthenticator);
 ChallengeAuthenticator.remediationName = 'challenge-authenticator';
 
-function _createSuper$f(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$f(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _createSuper$d(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$d(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-function _isNativeReflectConstruct$f() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct$d() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+var ChallengePoll = /*#__PURE__*/function (_EnrollPoll) {
+  _inherits(ChallengePoll, _EnrollPoll);
+
+  var _super = _createSuper$d(ChallengePoll);
+
+  function ChallengePoll() {
+    _classCallCheck(this, ChallengePoll);
+
+    return _super.apply(this, arguments);
+  }
+
+  return ChallengePoll;
+}(EnrollPoll);
+ChallengePoll.remediationName = 'challenge-poll';
+
+function _createSuper$c(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$c(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
+function _isNativeReflectConstruct$c() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 var ResetAuthenticator = /*#__PURE__*/function (_VerifyAuthenticator) {
   _inherits(ResetAuthenticator, _VerifyAuthenticator);
 
-  var _super = _createSuper$f(ResetAuthenticator);
+  var _super = _createSuper$c(ResetAuthenticator);
 
   function ResetAuthenticator() {
     _classCallCheck(this, ResetAuthenticator);
@@ -5883,13 +5878,13 @@ var ResetAuthenticator = /*#__PURE__*/function (_VerifyAuthenticator) {
 }(VerifyAuthenticator);
 ResetAuthenticator.remediationName = 'reset-authenticator';
 
-function _createSuper$e(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$e(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _createSuper$b(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$b(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-function _isNativeReflectConstruct$e() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct$b() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 var EnrollProfile = /*#__PURE__*/function (_Remediator) {
   _inherits(EnrollProfile, _Remediator);
 
-  var _super = _createSuper$e(EnrollProfile);
+  var _super = _createSuper$b(EnrollProfile);
 
   function EnrollProfile() {
     var _this;
@@ -5955,40 +5950,25 @@ var EnrollProfile = /*#__PURE__*/function (_Remediator) {
 }(Remediator);
 EnrollProfile.remediationName = 'enroll-profile';
 
-function _createSuper$d(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$d(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _createSuper$a(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$a(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-function _isNativeReflectConstruct$d() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct$a() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 var Identify = /*#__PURE__*/function (_Remediator) {
   _inherits(Identify, _Remediator);
 
-  var _super = _createSuper$d(Identify);
+  var _super = _createSuper$a(Identify);
 
-  function Identify(remediation, values) {
+  function Identify() {
     var _this;
 
     _classCallCheck(this, Identify);
 
-    _this = _super.call(this, remediation, values);
+    _this = _super.apply(this, arguments);
     _this.map = {
       'identifier': ['username'],
       'credentials': [],
       'rememberMe': ['rememberMe']
     };
-    var _this$values = _this.values,
-        password = _this$values.password,
-        authenticators = _this$values.authenticators;
-
-    if (password && !authenticators.some(function (authenticator) {
-      return authenticator.type === 'password';
-    })) {
-      _this.values = Object.assign(Object.assign({}, _this.values), {
-        authenticators: [{
-          type: 'password',
-          key: AuthenticatorKey.OKTA_PASSWORD
-        }].concat(_toConsumableArray(authenticators))
-      });
-    }
-
     return _this;
   }
 
@@ -6015,38 +5995,19 @@ var Identify = /*#__PURE__*/function (_Remediator) {
         required: input.required
       });
     }
-  }, {
-    key: "getValuesAfterProceed",
-    value: function getValuesAfterProceed() {
-      var _a;
-
-      if (this.remediation.value.some(function (_ref) {
-        var name = _ref.name;
-        return name === 'credentials';
-      })) {
-        var authenticators = (_a = this.values.authenticators) === null || _a === void 0 ? void 0 : _a.filter(function (authenticator) {
-          return authenticator.key !== AuthenticatorKey.OKTA_PASSWORD;
-        });
-        return Object.assign(Object.assign({}, this.values), {
-          authenticators: authenticators
-        });
-      }
-
-      return _get(_getPrototypeOf(Identify.prototype), "getValuesAfterProceed", this).call(this);
-    }
   }]);
 
   return Identify;
 }(Remediator);
 Identify.remediationName = 'identify';
 
-function _createSuper$c(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$c(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _createSuper$9(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$9(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-function _isNativeReflectConstruct$c() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct$9() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 var ReEnrollAuthenticator = /*#__PURE__*/function (_Remediator) {
   _inherits(ReEnrollAuthenticator, _Remediator);
 
-  var _super = _createSuper$c(ReEnrollAuthenticator);
+  var _super = _createSuper$9(ReEnrollAuthenticator);
 
   function ReEnrollAuthenticator() {
     var _this;
@@ -6082,13 +6043,13 @@ var ReEnrollAuthenticator = /*#__PURE__*/function (_Remediator) {
 }(Remediator);
 ReEnrollAuthenticator.remediationName = 'reenroll-authenticator';
 
-function _createSuper$b(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$b(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _createSuper$8(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$8(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-function _isNativeReflectConstruct$b() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct$8() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 var RedirectIdp = /*#__PURE__*/function (_Remediator) {
   _inherits(RedirectIdp, _Remediator);
 
-  var _super = _createSuper$b(RedirectIdp);
+  var _super = _createSuper$8(RedirectIdp);
 
   function RedirectIdp() {
     _classCallCheck(this, RedirectIdp);
@@ -6122,20 +6083,20 @@ var RedirectIdp = /*#__PURE__*/function (_Remediator) {
 }(Remediator);
 RedirectIdp.remediationName = 'redirect-idp';
 
-function _createSuper$a(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$a(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _createSuper$7(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$7(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-function _isNativeReflectConstruct$a() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct$7() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
-function _createForOfIteratorHelper$1(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$1(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _createForOfIteratorHelper$2(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$2(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
-function _unsupportedIterableToArray$1(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$1(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$1(o, minLen); }
+function _unsupportedIterableToArray$2(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$2(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$2(o, minLen); }
 
-function _arrayLikeToArray$1(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$2(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 findMatchedOption(authenticators, options) {
   var option;
 
-  var _iterator = _createForOfIteratorHelper$1(authenticators),
+  var _iterator = _createForOfIteratorHelper$2(authenticators),
       _step;
 
   try {
@@ -6168,32 +6129,17 @@ function findMatchedOption(authenticators, options) {
 var SelectAuthenticator = /*#__PURE__*/function (_Remediator) {
   _inherits(SelectAuthenticator, _Remediator);
 
-  var _super = _createSuper$a(SelectAuthenticator);
+  var _super = _createSuper$7(SelectAuthenticator);
 
-  function SelectAuthenticator(remediation) {
+  function SelectAuthenticator() {
     var _this;
 
-    var values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
     _classCallCheck(this, SelectAuthenticator);
 
-    _this = _super.call(this, remediation, values);
+    _this = _super.apply(this, arguments);
     _this.map = {
       authenticator: []
     };
-    var _this$values = _this.values,
-        selectedAuthenticator = _this$values.authenticator,
-        authenticators = _this$values.authenticators;
-    var hasSelectedAuthenticatorInList = authenticators === null || authenticators === void 0 ? void 0 : authenticators.some(function (authenticator) {
-      return authenticator.key === selectedAuthenticator;
-    });
-
-    if (selectedAuthenticator && !hasSelectedAuthenticatorInList) {
-      _this.values.authenticators = [].concat(_toConsumableArray(authenticators || []), [{
-        key: selectedAuthenticator
-      }]);
-    }
-
     return _this;
   }
 
@@ -6240,6 +6186,7 @@ var SelectAuthenticator = /*#__PURE__*/function (_Remediator) {
       var authenticators = this.values.authenticators;
       var options = remediationValue.options;
       var selectedOption = findMatchedOption(authenticators, options);
+      this.selectedAuthenticator = selectedOption.relatesTo;
       return {
         id: selectedOption === null || selectedOption === void 0 ? void 0 : selectedOption.value.form.value.find(function (_ref2) {
           var name = _ref2.name;
@@ -6255,36 +6202,67 @@ var SelectAuthenticator = /*#__PURE__*/function (_Remediator) {
         key: 'string'
       };
     }
+  }, {
+    key: "getValuesAfterProceed",
+    value: function getValuesAfterProceed() {
+      var _this2 = this;
+
+      this.values = _get(_getPrototypeOf(SelectAuthenticator.prototype), "getValuesAfterProceed", this).call(this);
+      var authenticators = this.values.authenticators.filter(function (authenticator) {
+        return authenticator.key !== _this2.selectedAuthenticator.key;
+      });
+      return Object.assign(Object.assign({}, this.values), {
+        authenticators: authenticators
+      });
+    }
   }]);
 
   return SelectAuthenticator;
 }(Remediator);
 
-function _createSuper$9(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$9(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _createSuper$6(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$6(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-function _isNativeReflectConstruct$9() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct$6() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 var SelectAuthenticatorAuthenticate = /*#__PURE__*/function (_SelectAuthenticator) {
   _inherits(SelectAuthenticatorAuthenticate, _SelectAuthenticator);
 
-  var _super = _createSuper$9(SelectAuthenticatorAuthenticate);
+  var _super = _createSuper$6(SelectAuthenticatorAuthenticate);
+
+  function SelectAuthenticatorAuthenticate(remediation) {
+    var _this;
+
+    var values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
 
-  function SelectAuthenticatorAuthenticate() {
     _classCallCheck(this, SelectAuthenticatorAuthenticate);
 
-    return _super.apply(this, arguments);
+    var _a;
+
+    _this = _super.call(this, remediation, values);
+    var hasPasswordInOptions = (_a = getAuthenticatorFromRemediation(remediation).options) === null || _a === void 0 ? void 0 : _a.some(function (_ref) {
+      var relatesTo = _ref.relatesTo;
+      return relatesTo.key === AuthenticatorKey.OKTA_PASSWORD;
+    });
+
+    if (hasPasswordInOptions && (_this.values.flow === 'recoverPassword' || _this.values.password)) {
+      _this.values.authenticators = [].concat(_toConsumableArray(_this.values.authenticators), [{
+        key: AuthenticatorKey.OKTA_PASSWORD
+      }]);
+    }
+
+    return _this;
   }
 
   return SelectAuthenticatorAuthenticate;
 }(SelectAuthenticator);
 SelectAuthenticatorAuthenticate.remediationName = 'select-authenticator-authenticate';
 
-function _createSuper$8(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$8(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _createSuper$5(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$5(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-function _isNativeReflectConstruct$8() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct$5() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 var SelectAuthenticatorEnroll = /*#__PURE__*/function (_SelectAuthenticator) {
   _inherits(SelectAuthenticatorEnroll, _SelectAuthenticator);
 
-  var _super = _createSuper$8(SelectAuthenticatorEnroll);
+  var _super = _createSuper$5(SelectAuthenticatorEnroll);
 
   function SelectAuthenticatorEnroll() {
     _classCallCheck(this, SelectAuthenticatorEnroll);
@@ -6296,13 +6274,13 @@ var SelectAuthenticatorEnroll = /*#__PURE__*/function (_SelectAuthenticator) {
 }(SelectAuthenticator);
 SelectAuthenticatorEnroll.remediationName = 'select-authenticator-enroll';
 
-function _createSuper$7(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$7(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _createSuper$4(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$4(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-function _isNativeReflectConstruct$7() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct$4() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 var SelectEnrollProfile = /*#__PURE__*/function (_Remediator) {
   _inherits(SelectEnrollProfile, _Remediator);
 
-  var _super = _createSuper$7(SelectEnrollProfile);
+  var _super = _createSuper$4(SelectEnrollProfile);
 
   function SelectEnrollProfile() {
     _classCallCheck(this, SelectEnrollProfile);
@@ -6321,13 +6299,13 @@ var SelectEnrollProfile = /*#__PURE__*/function (_Remediator) {
 }(Remediator);
 SelectEnrollProfile.remediationName = 'select-enroll-profile';
 
-function _createSuper$6(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$6(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _createSuper$3(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$3(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-function _isNativeReflectConstruct$6() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct$3() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 var AuthenticatorData = /*#__PURE__*/function (_Remediator) {
   _inherits(AuthenticatorData, _Remediator);
 
-  var _super = _createSuper$6(AuthenticatorData);
+  var _super = _createSuper$3(AuthenticatorData);
 
   function AuthenticatorData(remediation) {
     var _this;
@@ -6336,36 +6314,60 @@ var AuthenticatorData = /*#__PURE__*/function (_Remediator) {
 
     _classCallCheck(this, AuthenticatorData);
 
-    var _a;
-
     _this = _super.call(this, remediation, values);
     _this.map = {
       'authenticator': []
     };
-    var authenticators = _this.values.authenticators;
+    _this.authenticator = _this.getAuthenticator();
 
-    var authenticatorKey = _this.getAuthenticator().key;
+    _this.formatAuthenticatorData();
 
-    var authenticator = (_a = authenticators) === null || _a === void 0 ? void 0 : _a.find(function (authenticator) {
-      return authenticator.key === authenticatorKey;
-    });
+    return _this;
+  }
 
-    if (authenticator) {
-      _this.values.authenticators = authenticators.map(function (authenticator) {
-        if (authenticatorKey === authenticator.type) {
-          return _this.mapAuthenticatorFromValues(authenticator);
+  _createClass(AuthenticatorData, [{
+    key: "formatAuthenticatorData",
+    value: function formatAuthenticatorData() {
+      var _this2 = this;
+
+      var authenticatorData = this.getAuthenticatorData();
+
+      if (authenticatorData) {
+        this.values.authenticatorsData = this.values.authenticatorsData.map(function (data) {
+          if (data.key === _this2.authenticator.key) {
+            return _this2.mapAuthenticatorDataFromValues(data);
+          }
+
+          return data;
+        });
+      } else {
+        var data = this.mapAuthenticatorDataFromValues();
+
+        if (data) {
+          this.values.authenticatorsData.push(data);
         }
+      }
+    }
+  }, {
+    key: "getAuthenticatorData",
+    value: function getAuthenticatorData() {
+      var _this3 = this;
 
-        return authenticator;
+      return this.values.authenticatorsData.find(function (_ref) {
+        var key = _ref.key;
+        return key === _this3.authenticator.key;
       });
-    } else {
-      _this.values.authenticators = [].concat(_toConsumableArray(authenticators), [_this.mapAuthenticatorFromValues()]);
     }
+  }, {
+    key: "canRemediate",
+    value: function canRemediate() {
+      var _this4 = this;
 
-    return _this;
-  }
-
-  _createClass(AuthenticatorData, [{
+      return this.values.authenticatorsData.some(function (data) {
+        return data.key === _this4.authenticator.key;
+      });
+    }
+  }, {
     key: "getNextStep",
     value: function getNextStep() {
       var common = _get(_getPrototypeOf(AuthenticatorData.prototype), "getNextStep", this).call(this);
@@ -6376,34 +6378,21 @@ var AuthenticatorData = /*#__PURE__*/function (_Remediator) {
       });
     }
   }, {
-    key: "getAuthenticatorFromValues",
-    value: function getAuthenticatorFromValues() {
-      if (!this.values.authenticators) {
-        return null;
-      }
-
-      var authenticatorKey = this.getAuthenticator().key;
-      var authenticator = this.values.authenticators.find(function (authenticator) {
-        return authenticator.key === authenticatorKey;
-      });
-      return authenticator;
-    }
-  }, {
-    key: "mapAuthenticatorFromValues",
-    value: function mapAuthenticatorFromValues(authenticator) {
-      var key = this.getAuthenticator().key;
+    key: "mapAuthenticatorDataFromValues",
+    value: function mapAuthenticatorDataFromValues(authenticatorData) {
       var methodType = this.values.methodType;
-      return Object.assign(Object.assign({
-        key: key
-      }, authenticator && authenticator), methodType && {
+      var data = Object.assign(Object.assign({
+        key: this.authenticator.key
+      }, authenticatorData && authenticatorData), methodType && {
         methodType: methodType
       });
+      return data.methodType ? data : null;
     }
   }, {
     key: "getAuthenticatorFromRemediation",
     value: function getAuthenticatorFromRemediation() {
-      var authenticator = this.remediation.value.find(function (_ref) {
-        var name = _ref.name;
+      var authenticator = this.remediation.value.find(function (_ref2) {
+        var name = _ref2.name;
         return name === 'authenticator';
       });
       return authenticator;
@@ -6414,23 +6403,36 @@ var AuthenticatorData = /*#__PURE__*/function (_Remediator) {
       var _a;
 
       var authenticator = this.getAuthenticatorFromRemediation();
-      return (_a = authenticator.form.value.find(function (_ref2) {
-        var name = _ref2.name;
+      return (_a = authenticator.form.value.find(function (_ref3) {
+        var name = _ref3.name;
         return name === 'methodType';
       })) === null || _a === void 0 ? void 0 : _a.options;
     }
+  }, {
+    key: "getValuesAfterProceed",
+    value: function getValuesAfterProceed() {
+      var _this5 = this;
+
+      this.values = _get(_getPrototypeOf(AuthenticatorData.prototype), "getValuesAfterProceed", this).call(this);
+      var authenticatorsData = this.values.authenticatorsData.filter(function (data) {
+        return data.key !== _this5.authenticator.key;
+      });
+      return Object.assign(Object.assign({}, this.values), {
+        authenticatorsData: authenticatorsData
+      });
+    }
   }]);
 
   return AuthenticatorData;
 }(Remediator);
 
-function _createSuper$5(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$5(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _createSuper$2(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$2(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-function _isNativeReflectConstruct$5() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct$2() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 var AuthenticatorVerificationData = /*#__PURE__*/function (_AuthenticatorData) {
   _inherits(AuthenticatorVerificationData, _AuthenticatorData);
 
-  var _super = _createSuper$5(AuthenticatorVerificationData);
+  var _super = _createSuper$2(AuthenticatorVerificationData);
 
   function AuthenticatorVerificationData() {
     _classCallCheck(this, AuthenticatorVerificationData);
@@ -6439,26 +6441,22 @@ var AuthenticatorVerificationData = /*#__PURE__*/function (_AuthenticatorData) {
   }
 
   _createClass(AuthenticatorVerificationData, [{
-    key: "canRemediate",
-    value: function canRemediate() {
-      var authenticator = this.getAuthenticatorFromValues();
-      return !!(authenticator && authenticator.methodType);
-    }
-  }, {
     key: "mapAuthenticator",
     value: function mapAuthenticator() {
+      var _a;
+
+      var authenticatorData = this.getAuthenticatorData();
       var authenticatorFromRemediation = this.getAuthenticatorFromRemediation();
-      var authenticatorFromValues = this.getAuthenticatorFromValues();
       return {
         id: authenticatorFromRemediation.form.value.find(function (_ref) {
           var name = _ref.name;
           return name === 'id';
         }).value,
-        enrollmentId: authenticatorFromRemediation.form.value.find(function (_ref2) {
+        enrollmentId: (_a = authenticatorFromRemediation.form.value.find(function (_ref2) {
           var name = _ref2.name;
           return name === 'enrollmentId';
-        }).value,
-        methodType: authenticatorFromValues.methodType
+        })) === null || _a === void 0 ? void 0 : _a.value,
+        methodType: authenticatorData.methodType
       };
     }
   }, {
@@ -6470,128 +6468,450 @@ var AuthenticatorVerificationData = /*#__PURE__*/function (_AuthenticatorData) {
         return name === 'methodType';
       });
 
-      if (methodType && methodType.options) {
-        return {
-          name: 'methodType',
-          type: 'string',
-          required: true
-        };
-      }
+      if (methodType && methodType.options) {
+        return {
+          name: 'methodType',
+          type: 'string',
+          required: true
+        };
+      }
+
+      var inputs = _toConsumableArray(authenticator.form.value);
+
+      return inputs;
+    }
+  }]);
+
+  return AuthenticatorVerificationData;
+}(AuthenticatorData);
+AuthenticatorVerificationData.remediationName = 'authenticator-verification-data';
+
+function _createSuper$1(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$1(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
+function _isNativeReflectConstruct$1() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+var AuthenticatorEnrollmentData = /*#__PURE__*/function (_AuthenticatorData) {
+  _inherits(AuthenticatorEnrollmentData, _AuthenticatorData);
+
+  var _super = _createSuper$1(AuthenticatorEnrollmentData);
+
+  function AuthenticatorEnrollmentData() {
+    _classCallCheck(this, AuthenticatorEnrollmentData);
+
+    return _super.apply(this, arguments);
+  }
+
+  _createClass(AuthenticatorEnrollmentData, [{
+    key: "mapAuthenticator",
+    value: function mapAuthenticator() {
+      var authenticatorData = this.getAuthenticatorData();
+      var authenticatorFromRemediation = getAuthenticatorFromRemediation(this.remediation);
+      return {
+        id: authenticatorFromRemediation.form.value.find(function (_ref) {
+          var name = _ref.name;
+          return name === 'id';
+        }).value,
+        methodType: authenticatorData.methodType,
+        phoneNumber: authenticatorData.phoneNumber
+      };
+    }
+  }, {
+    key: "getInputAuthenticator",
+    value: function getInputAuthenticator() {
+      return [{
+        name: 'methodType',
+        type: 'string',
+        required: true
+      }, {
+        name: 'phoneNumber',
+        type: 'string',
+        required: true,
+        label: 'Phone Number'
+      }];
+    }
+  }, {
+    key: "mapAuthenticatorDataFromValues",
+    value: function mapAuthenticatorDataFromValues(data) {
+      data = _get(_getPrototypeOf(AuthenticatorEnrollmentData.prototype), "mapAuthenticatorDataFromValues", this).call(this, data);
+      var phoneNumber = this.values.phoneNumber;
+      data = Object.assign(Object.assign({}, data && data), phoneNumber && {
+        phoneNumber: phoneNumber
+      });
+      return data.phoneNumber && data.methodType ? data : null;
+    }
+  }]);
+
+  return AuthenticatorEnrollmentData;
+}(AuthenticatorData);
+AuthenticatorEnrollmentData.remediationName = 'authenticator-enrollment-data';
+
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+var Skip = /*#__PURE__*/function (_Remediator) {
+  _inherits(Skip, _Remediator);
+
+  var _super = _createSuper(Skip);
+
+  function Skip() {
+    var _this;
+
+    _classCallCheck(this, Skip);
+
+    _this = _super.apply(this, arguments);
+    _this.map = {
+      skip: ['skip']
+    };
+    return _this;
+  }
+
+  _createClass(Skip, [{
+    key: "canRemediate",
+    value: function canRemediate() {
+      return !!this.values.skip;
+    }
+  }]);
+
+  return Skip;
+}(Remediator);
+Skip.remediationName = 'skip';
+
+var remediators = /*#__PURE__*/Object.freeze({
+  __proto__: null,
+  Remediator: Remediator,
+  EnrollAuthenticator: EnrollAuthenticator,
+  EnrollPoll: EnrollPoll,
+  ChallengeAuthenticator: ChallengeAuthenticator,
+  ChallengePoll: ChallengePoll,
+  ResetAuthenticator: ResetAuthenticator,
+  EnrollProfile: EnrollProfile,
+  Identify: Identify,
+  ReEnrollAuthenticator: ReEnrollAuthenticator,
+  RedirectIdp: RedirectIdp,
+  SelectAuthenticatorAuthenticate: SelectAuthenticatorAuthenticate,
+  SelectAuthenticatorEnroll: SelectAuthenticatorEnroll,
+  SelectEnrollProfile: SelectEnrollProfile,
+  AuthenticatorVerificationData: AuthenticatorVerificationData,
+  AuthenticatorEnrollmentData: AuthenticatorEnrollmentData,
+  Skip: Skip
+});
+
+function _createForOfIteratorHelper$1(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$1(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
+function _unsupportedIterableToArray$1(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$1(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$1(o, minLen); }
+
+function _arrayLikeToArray$1(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 getRemediator(idxRemediations, values, options) {
+  var remediators = options.remediators;
+  var remediator;
+  var remediatorCandidates = [];
+
+  var _iterator = _createForOfIteratorHelper$1(idxRemediations),
+      _step;
+
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var remediation = _step.value;
+      var isRemeditionInFlow = Object.keys(remediators).includes(remediation.name);
+
+      if (!isRemeditionInFlow) {
+        continue;
+      }
+
+      var T = remediators[remediation.name];
+      remediator = new T(remediation, values);
+
+      if (remediator.canRemediate()) {
+        return remediator;
+      }
+
+      remediatorCandidates.push(remediator);
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+
+  return remediatorCandidates[0];
+}
+
+function isTerminalResponse(idxResponse) {
+  var neededToProceed = idxResponse.neededToProceed,
+      interactionCode = idxResponse.interactionCode;
+  return !neededToProceed.length && !interactionCode;
+}
+
+function canSkipFn(idxResponse) {
+  return idxResponse.neededToProceed.some(function (_ref) {
+    var name = _ref.name;
+    return name === 'skip';
+  });
+}
+
+function canResendFn(idxResponse) {
+  return Object.keys(idxResponse.actions).some(function (actionName) {
+    return actionName.includes('resend');
+  });
+}
+
+function getIdxMessages(idxResponse) {
+  var _a;
+
+  var messages = [];
+  var rawIdxState = idxResponse.rawIdxState,
+      neededToProceed = idxResponse.neededToProceed;
+  var globalMessages = (_a = rawIdxState.messages) === null || _a === void 0 ? void 0 : _a.value.map(function (message) {
+    return message;
+  });
+
+  if (globalMessages) {
+    messages = [].concat(_toConsumableArray(messages), _toConsumableArray(globalMessages));
+  }
+
+  var _iterator2 = _createForOfIteratorHelper$1(neededToProceed),
+      _step2;
+
+  try {
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      var remediation = _step2.value;
+      var fieldMessages = Remediator.getMessages(remediation);
+
+      if (fieldMessages) {
+        messages = [].concat(_toConsumableArray(messages), _toConsumableArray(fieldMessages));
+      }
+    }
+  } catch (err) {
+    _iterator2.e(err);
+  } finally {
+    _iterator2.f();
+  }
+
+  return messages;
+}
+
+function getNextStep(remediator, idxResponse) {
+  var nextStep = remediator.getNextStep(idxResponse.context);
+  var canSkip = canSkipFn(idxResponse);
+  var canResend = canResendFn(idxResponse);
+  return Object.assign(Object.assign(Object.assign({}, nextStep), canSkip && {
+    canSkip: canSkip
+  }), canResend && {
+    canResend: canResend
+  });
+}
+
+function handleIdxError(e, remediator) {
+  var idxState = isIdxResponse(e) ? e : null;
+
+  if (!idxState) {
+    throw e;
+  }
+
+  var terminal = isTerminalResponse(idxState);
+  var messages = getIdxMessages(idxState);
+
+  if (terminal) {
+    return {
+      terminal: terminal,
+      messages: messages
+    };
+  } else {
+    var nextStep = remediator && getNextStep(remediator, idxState);
+    return Object.assign({
+      messages: messages
+    }, nextStep && {
+      nextStep: nextStep
+    });
+  }
+}
+
+function getActionFromValues(values, idxResponse) {
+  return Object.keys(idxResponse.actions).find(function (action) {
+    return !!values.resend && action.includes('-resend');
+  });
+}
+
+function removeActionFromValues(values) {
+  values.resend = undefined;
+  return values;
+}
+
+function remediate(_x, _x2, _x3) {
+  return _remediate.apply(this, arguments);
+}
+
+function _remediate() {
+  _remediate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(idxResponse, values, options) {
+    var _idxResponse, neededToProceed, interactionCode, remediators, terminal, messages, remediator, nextStep, actionFromValues, actions, _iterator3, _step3, action, valuesWithoutExecutedAction, _nextStep, name, data;
+
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _idxResponse = idxResponse, neededToProceed = _idxResponse.neededToProceed, interactionCode = _idxResponse.interactionCode;
+            remediators = options.remediators;
+
+            if (!interactionCode) {
+              _context.next = 4;
+              break;
+            }
+
+            return _context.abrupt("return", {
+              idxResponse: idxResponse
+            });
+
+          case 4:
+            terminal = isTerminalResponse(idxResponse);
+            messages = getIdxMessages(idxResponse);
+
+            if (!terminal) {
+              _context.next = 8;
+              break;
+            }
+
+            return _context.abrupt("return", {
+              terminal: terminal,
+              messages: messages
+            });
+
+          case 8:
+            remediator = getRemediator(neededToProceed, values, options);
+
+            if (remediator) {
+              _context.next = 11;
+              break;
+            }
+
+            throw new AuthSdkError("\n      No remediation can match current flow, check policy settings in your org.\n      Remediations: [".concat(neededToProceed.reduce(function (acc, curr) {
+              return acc ? acc + ' ,' + curr.name : curr.name;
+            }, ''), "]\n    "));
+
+          case 11:
+            if (!messages.length) {
+              _context.next = 14;
+              break;
+            }
+
+            nextStep = getNextStep(remediator, idxResponse);
+            return _context.abrupt("return", {
+              nextStep: nextStep,
+              messages: messages
+            });
+
+          case 14:
+            actionFromValues = getActionFromValues(values, idxResponse);
+            actions = [].concat(_toConsumableArray(options.actions || []), _toConsumableArray(actionFromValues && [actionFromValues] || []));
+
+            if (!actions) {
+              _context.next = 46;
+              break;
+            }
+
+            _iterator3 = _createForOfIteratorHelper$1(actions);
+            _context.prev = 18;
 
-      var inputs = _toConsumableArray(authenticator.form.value);
+            _iterator3.s();
 
-      return inputs;
-    }
-  }]);
+          case 20:
+            if ((_step3 = _iterator3.n()).done) {
+              _context.next = 38;
+              break;
+            }
 
-  return AuthenticatorVerificationData;
-}(AuthenticatorData);
-AuthenticatorVerificationData.remediationName = 'authenticator-verification-data';
+            action = _step3.value;
+            valuesWithoutExecutedAction = removeActionFromValues(values);
 
-function _createSuper$4(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$4(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+            if (!(typeof idxResponse.actions[action] === 'function')) {
+              _context.next = 36;
+              break;
+            }
 
-function _isNativeReflectConstruct$4() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-var AuthenticatorEnrollmentData = /*#__PURE__*/function (_AuthenticatorData) {
-  _inherits(AuthenticatorEnrollmentData, _AuthenticatorData);
+            _context.prev = 24;
+            _context.next = 27;
+            return idxResponse.actions[action]();
 
-  var _super = _createSuper$4(AuthenticatorEnrollmentData);
+          case 27:
+            idxResponse = _context.sent;
+            _context.next = 33;
+            break;
 
-  function AuthenticatorEnrollmentData() {
-    _classCallCheck(this, AuthenticatorEnrollmentData);
+          case 30:
+            _context.prev = 30;
+            _context.t0 = _context["catch"](24);
+            return _context.abrupt("return", handleIdxError(_context.t0, remediators));
 
-    return _super.apply(this, arguments);
-  }
+          case 33:
+            if (!(action === 'cancel')) {
+              _context.next = 35;
+              break;
+            }
 
-  _createClass(AuthenticatorEnrollmentData, [{
-    key: "canRemediate",
-    value: function canRemediate() {
-      var authenticator = this.getAuthenticatorFromValues();
-      return !!(authenticator && authenticator.methodType && authenticator.phoneNumber);
-    }
-  }, {
-    key: "mapAuthenticator",
-    value: function mapAuthenticator() {
-      var authenticatorFromValues = this.getAuthenticatorFromValues();
-      var authenticatorFromRemediation = getAuthenticatorFromRemediation(this.remediation);
-      return {
-        id: authenticatorFromRemediation.form.value.find(function (_ref) {
-          var name = _ref.name;
-          return name === 'id';
-        }).value,
-        methodType: authenticatorFromValues.methodType,
-        phoneNumber: authenticatorFromValues.phoneNumber
-      };
-    }
-  }, {
-    key: "getInputAuthenticator",
-    value: function getInputAuthenticator() {
-      return [{
-        name: 'methodType',
-        type: 'string',
-        required: true
-      }, {
-        name: 'phoneNumber',
-        type: 'string',
-        required: true
-      }];
-    }
-  }, {
-    key: "mapAuthenticatorFromValues",
-    value: function mapAuthenticatorFromValues(authenticator) {
-      authenticator = _get(_getPrototypeOf(AuthenticatorEnrollmentData.prototype), "mapAuthenticatorFromValues", this).call(this, authenticator);
-      var phoneNumber = this.values.phoneNumber;
-      return Object.assign(Object.assign({}, authenticator), phoneNumber && {
-        phoneNumber: phoneNumber
-      });
-    }
-  }]);
+            return _context.abrupt("return", {
+              canceled: true
+            });
 
-  return AuthenticatorEnrollmentData;
-}(AuthenticatorData);
-AuthenticatorEnrollmentData.remediationName = 'authenticator-enrollment-data';
+          case 35:
+            return _context.abrupt("return", remediate(idxResponse, valuesWithoutExecutedAction, options));
 
-function _createSuper$3(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$3(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+          case 36:
+            _context.next = 20;
+            break;
 
-function _isNativeReflectConstruct$3() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-var Skip = /*#__PURE__*/function (_Remediator) {
-  _inherits(Skip, _Remediator);
+          case 38:
+            _context.next = 43;
+            break;
 
-  var _super = _createSuper$3(Skip);
+          case 40:
+            _context.prev = 40;
+            _context.t1 = _context["catch"](18);
 
-  function Skip() {
-    _classCallCheck(this, Skip);
+            _iterator3.e(_context.t1);
 
-    return _super.apply(this, arguments);
-  }
+          case 43:
+            _context.prev = 43;
 
-  _createClass(Skip, [{
-    key: "canRemediate",
-    value: function canRemediate() {
-      return !!this.values.skip;
-    }
-  }]);
+            _iterator3.f();
 
-  return Skip;
-}(Remediator);
-Skip.remediationName = 'skip';
+            return _context.finish(43);
 
-var remediators = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  Remediator: Remediator,
-  EnrollAuthenticator: EnrollAuthenticator,
-  ChallengeAuthenticator: ChallengeAuthenticator,
-  ResetAuthenticator: ResetAuthenticator,
-  EnrollProfile: EnrollProfile,
-  Identify: Identify,
-  ReEnrollAuthenticator: ReEnrollAuthenticator,
-  RedirectIdp: RedirectIdp,
-  SelectAuthenticatorAuthenticate: SelectAuthenticatorAuthenticate,
-  SelectAuthenticatorEnroll: SelectAuthenticatorEnroll,
-  SelectEnrollProfile: SelectEnrollProfile,
-  AuthenticatorVerificationData: AuthenticatorVerificationData,
-  AuthenticatorEnrollmentData: AuthenticatorEnrollmentData,
-  Skip: Skip
-});
+          case 46:
+            if (remediator.canRemediate()) {
+              _context.next = 49;
+              break;
+            }
+
+            _nextStep = getNextStep(remediator, idxResponse);
+            return _context.abrupt("return", {
+              idxResponse: idxResponse,
+              nextStep: _nextStep
+            });
+
+          case 49:
+            name = remediator.getName();
+            data = remediator.getData();
+            _context.prev = 51;
+            _context.next = 54;
+            return idxResponse.proceed(name, data);
+
+          case 54:
+            idxResponse = _context.sent;
+            values = remediator.getValuesAfterProceed();
+            return _context.abrupt("return", remediate(idxResponse, values, options));
+
+          case 59:
+            _context.prev = 59;
+            _context.t2 = _context["catch"](51);
+            return _context.abrupt("return", handleIdxError(_context.t2, remediator));
+
+          case 62:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee, null, [[18, 40, 43, 46], [24, 30], [51, 59]]);
+  }));
+  return _remediate.apply(this, arguments);
+}
 
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
@@ -6747,7 +7067,7 @@ function _run() {
             meta = metaFromResp;
             enabledFeatures = getEnabledFeatures(idxResponse);
             availableSteps = getAvailableSteps(idxResponse.neededToProceed);
-            _context.next = 53;
+            _context.next = 49;
             break;
 
           case 24:
@@ -6783,29 +7103,17 @@ function _run() {
 
             status = IdxStatus.CANCELED;
             shouldClearTransaction = true;
-            _context.next = 53;
+            _context.next = 49;
             break;
 
           case 42:
             if (!(idxResponseFromResp === null || idxResponseFromResp === void 0 ? void 0 : idxResponseFromResp.interactionCode)) {
-              _context.next = 53;
-              break;
-            }
-
-            _context.next = 45;
-            return options.flowMonitor.isFinished();
-
-          case 45:
-            if (_context.sent) {
-              _context.next = 47;
+              _context.next = 49;
               break;
             }
 
-            throw new AuthSdkError('Current flow is not supported, check policy settings in your org.');
-
-          case 47:
             _metaFromResp = metaFromResp, clientId = _metaFromResp.clientId, codeVerifier = _metaFromResp.codeVerifier, ignoreSignature = _metaFromResp.ignoreSignature, redirectUri = _metaFromResp.redirectUri, urls = _metaFromResp.urls, scopes = _metaFromResp.scopes;
-            _context.next = 50;
+            _context.next = 46;
             return authClient.token.exchangeCodeForTokens({
               interactionCode: idxResponseFromResp.interactionCode,
               clientId: clientId,
@@ -6815,23 +7123,23 @@ function _run() {
               scopes: scopes
             }, urls);
 
-          case 50:
+          case 46:
             tokens = _context.sent;
             status = IdxStatus.SUCCESS;
             shouldClearTransaction = true;
 
-          case 53:
-            _context.next = 60;
+          case 49:
+            _context.next = 56;
             break;
 
-          case 55:
-            _context.prev = 55;
+          case 51:
+            _context.prev = 51;
             _context.t0 = _context["catch"](3);
             error = _context.t0;
             status = IdxStatus.FAILURE;
             shouldClearTransaction = true;
 
-          case 60:
+          case 56:
             if (shouldClearTransaction) {
               authClient.transactionManager.clear();
             }
@@ -6847,160 +7155,37 @@ function _run() {
               availableSteps: availableSteps
             }), tokens && {
               tokens: tokens.tokens
-            }), nextStep && {
-              nextStep: nextStep
-            }), messages && {
-              messages: messages
-            }), error && {
-              error: error
-            }));
-
-          case 62:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee, null, [[3, 55]]);
-  }));
-  return _run.apply(this, arguments);
-}
-
-var AuthenticationFlow = {
-  'identify': Identify,
-  'select-authenticator-authenticate': SelectAuthenticatorAuthenticate,
-  'select-authenticator-enroll': SelectAuthenticatorEnroll,
-  'authenticator-enrollment-data': AuthenticatorEnrollmentData,
-  'authenticator-verification-data': AuthenticatorVerificationData,
-  'enroll-authenticator': EnrollAuthenticator,
-  'challenge-authenticator': ChallengeAuthenticator,
-  'reenroll-authenticator': ReEnrollAuthenticator,
-  'redirect-idp': RedirectIdp
-};
-
-var FlowMonitor = /*#__PURE__*/function () {
-  function FlowMonitor(authClient) {
-    _classCallCheck(this, FlowMonitor);
-
-    this.authClient = authClient;
-  }
-
-  _createClass(FlowMonitor, [{
-    key: "loopDetected",
-    value: function loopDetected(remediator) {
-      if (!this.previousRemediator) {
-        this.previousRemediator = remediator;
-        return false;
-      }
-
-      if (this.previousRemediator.getName() === remediator.getName()) {
-        return true;
-      }
-
-      this.previousRemediator = remediator;
-      return false;
-    }
-  }, {
-    key: "isRemediatorCandidate",
-    value: function isRemediatorCandidate(remediator, remediations, values) {
-      var remediatorName = remediator.getName();
-
-      if (!values.skip && remediatorName === 'skip') {
-        return false;
-      }
-
-      if (values.skip && remediatorName !== 'skip') {
-        return false;
-      }
-
-      return true;
-    }
-  }, {
-    key: "trackRemediations",
-    value: function () {
-      var _trackRemediations = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(name) {
-        var meta, remediations;
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _context.next = 2;
-                return getTransactionMeta(this.authClient);
-
-              case 2:
-                meta = _context.sent;
-                remediations = meta.remediations || [];
-                meta = Object.assign(Object.assign({}, meta), {
-                  remediations: [].concat(_toConsumableArray(remediations), [name])
-                });
-                saveTransactionMeta(this.authClient, meta);
-
-              case 6:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
-
-      function trackRemediations(_x) {
-        return _trackRemediations.apply(this, arguments);
-      }
-
-      return trackRemediations;
-    }()
-  }, {
-    key: "isFinished",
-    value: function isFinished() {
-      return Promise.resolve(true);
-    }
-  }]);
-
-  return FlowMonitor;
-}();
-
-function _createSuper$2(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$2(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
-function _isNativeReflectConstruct$2() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-var AuthenticationFlowMonitor = /*#__PURE__*/function (_FlowMonitor) {
-  _inherits(AuthenticationFlowMonitor, _FlowMonitor);
-
-  var _super = _createSuper$2(AuthenticationFlowMonitor);
-
-  function AuthenticationFlowMonitor() {
-    _classCallCheck(this, AuthenticationFlowMonitor);
-
-    return _super.apply(this, arguments);
-  }
-
-  _createClass(AuthenticationFlowMonitor, [{
-    key: "isRemediatorCandidate",
-    value: function isRemediatorCandidate(remediator, remediations, values) {
-      var _a;
-
-      var prevRemediatorName = (_a = this.previousRemediator) === null || _a === void 0 ? void 0 : _a.getName();
-      var remediatorName = remediator.getName();
-
-      if (remediatorName === 'select-authenticator-authenticate' && ['select-authenticator-authenticate'].includes(prevRemediatorName)) {
-        return false;
-      }
-
-      if (remediatorName === 'select-authenticator-authenticate' && remediations.some(function (_ref) {
-        var name = _ref.name;
-        return name === 'challenge-authenticator';
-      })) {
-        return false;
-      }
+            }), nextStep && {
+              nextStep: nextStep
+            }), messages && {
+              messages: messages
+            }), error && {
+              error: error
+            }));
 
-      if (remediatorName === 'select-authenticator-enroll' && ['select-authenticator-enroll', 'authenticator-enrollment-data'].includes(prevRemediatorName)) {
-        return false;
+          case 58:
+          case "end":
+            return _context.stop();
+        }
       }
+    }, _callee, null, [[3, 51]]);
+  }));
+  return _run.apply(this, arguments);
+}
 
-      return _get(_getPrototypeOf(AuthenticationFlowMonitor.prototype), "isRemediatorCandidate", this).call(this, remediator, remediations, values);
-    }
-  }]);
-
-  return AuthenticationFlowMonitor;
-}(FlowMonitor);
+var AuthenticationFlow = {
+  'identify': Identify,
+  'select-authenticator-authenticate': SelectAuthenticatorAuthenticate,
+  'select-authenticator-enroll': SelectAuthenticatorEnroll,
+  'authenticator-enrollment-data': AuthenticatorEnrollmentData,
+  'authenticator-verification-data': AuthenticatorVerificationData,
+  'enroll-authenticator': EnrollAuthenticator,
+  'challenge-authenticator': ChallengeAuthenticator,
+  'challenge-poll': ChallengePoll,
+  'reenroll-authenticator': ReEnrollAuthenticator,
+  'enroll-poll': EnrollPoll,
+  'redirect-idp': RedirectIdp
+};
 
 var PasswordRecoveryFlow = {
   'identify': Identify,
@@ -7012,162 +7197,41 @@ var PasswordRecoveryFlow = {
   'reenroll-authenticator': ReEnrollAuthenticator
 };
 
-function _createSuper$1(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$1(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
-function _isNativeReflectConstruct$1() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-var PasswordRecoveryFlowMonitor = /*#__PURE__*/function (_FlowMonitor) {
-  _inherits(PasswordRecoveryFlowMonitor, _FlowMonitor);
-
-  var _super = _createSuper$1(PasswordRecoveryFlowMonitor);
-
-  function PasswordRecoveryFlowMonitor() {
-    _classCallCheck(this, PasswordRecoveryFlowMonitor);
-
-    return _super.apply(this, arguments);
-  }
-
-  _createClass(PasswordRecoveryFlowMonitor, [{
-    key: "isRemediatorCandidate",
-    value: function isRemediatorCandidate(remediator, remediations, values) {
-      var _a;
-
-      var prevRemediatorName = (_a = this.previousRemediator) === null || _a === void 0 ? void 0 : _a.getName();
-      var remediatorName = remediator.getName();
-
-      if (remediatorName === 'select-authenticator-authenticate' && ['select-authenticator-authenticate', 'reenroll-authenticator'].includes(prevRemediatorName)) {
-        return false;
-      }
-
-      if (remediatorName === 'select-authenticator-authenticate' && remediations.some(function (_ref) {
-        var name = _ref.name;
-        return name === 'challenge-authenticator';
-      })) {
-        return false;
-      }
-
-      return _get(_getPrototypeOf(PasswordRecoveryFlowMonitor.prototype), "isRemediatorCandidate", this).call(this, remediator, remediations, values);
-    }
-  }, {
-    key: "isFinished",
-    value: function () {
-      var _isFinished = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        var _yield$getTransaction, remediations;
-
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _context.next = 2;
-                return getTransactionMeta(this.authClient);
-
-              case 2:
-                _yield$getTransaction = _context.sent;
-                remediations = _yield$getTransaction.remediations;
-
-                if (remediations.includes('reset-authenticator')) {
-                  _context.next = 6;
-                  break;
-                }
-
-                return _context.abrupt("return", false);
-
-              case 6:
-                _context.next = 8;
-                return _get(_getPrototypeOf(PasswordRecoveryFlowMonitor.prototype), "isFinished", this).call(this);
-
-              case 8:
-                return _context.abrupt("return", _context.sent);
-
-              case 9:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
-
-      function isFinished() {
-        return _isFinished.apply(this, arguments);
-      }
-
-      return isFinished;
-    }()
-  }]);
-
-  return PasswordRecoveryFlowMonitor;
-}(FlowMonitor);
-
 var RegistrationFlow = {
   'select-enroll-profile': SelectEnrollProfile,
   'enroll-profile': EnrollProfile,
   'authenticator-enrollment-data': AuthenticatorEnrollmentData,
   'select-authenticator-enroll': SelectAuthenticatorEnroll,
+  'enroll-poll': EnrollPoll,
   'enroll-authenticator': EnrollAuthenticator,
   'skip': Skip
 };
 
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-var RegistrationFlowMonitor = /*#__PURE__*/function (_FlowMonitor) {
-  _inherits(RegistrationFlowMonitor, _FlowMonitor);
-
-  var _super = _createSuper(RegistrationFlowMonitor);
-
-  function RegistrationFlowMonitor() {
-    _classCallCheck(this, RegistrationFlowMonitor);
-
-    return _super.apply(this, arguments);
-  }
-
-  _createClass(RegistrationFlowMonitor, [{
-    key: "isRemediatorCandidate",
-    value: function isRemediatorCandidate(remediator, remediations, values) {
-      var _a;
-
-      var prevRemediatorName = (_a = this.previousRemediator) === null || _a === void 0 ? void 0 : _a.getName();
-      var remediatorName = remediator.getName();
-
-      if (remediatorName === 'select-authenticator-enroll' && ['select-authenticator-enroll', 'authenticator-enrollment-data'].includes(prevRemediatorName)) {
-        return false;
-      }
-
-      return _get(_getPrototypeOf(RegistrationFlowMonitor.prototype), "isRemediatorCandidate", this).call(this, remediator, remediations, values);
-    }
-  }]);
-
-  return RegistrationFlowMonitor;
-}(FlowMonitor);
-
 function getFlowSpecification(oktaAuth) {
   var flow = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'proceed';
-  var remediators, flowMonitor, actions;
+  var remediators, actions;
 
   switch (flow) {
     case 'register':
     case 'signup':
     case 'enrollProfile':
       remediators = RegistrationFlow;
-      flowMonitor = new RegistrationFlowMonitor(oktaAuth);
       break;
 
     case 'recoverPassword':
     case 'resetPassword':
       remediators = PasswordRecoveryFlow;
-      flowMonitor = new PasswordRecoveryFlowMonitor(oktaAuth);
       actions = ['currentAuthenticator-recover', 'currentAuthenticatorEnrollment-recover'];
       break;
 
     default:
       remediators = AuthenticationFlow;
-      flowMonitor = new AuthenticationFlowMonitor(oktaAuth);
       break;
   }
 
   return {
     flow: flow,
     remediators: remediators,
-    flowMonitor: flowMonitor,
     actions: actions
   };
 }
@@ -7202,15 +7266,18 @@ function cancel(_x, _x2) {
 
 function _cancel() {
   _cancel = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(authClient, options) {
+    var meta, flowSpec;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            return _context.abrupt("return", run(authClient, Object.assign(Object.assign({}, options), {
+            meta = authClient.transactionManager.load();
+            flowSpec = getFlowSpecification(authClient, meta.flow);
+            return _context.abrupt("return", run(authClient, Object.assign(Object.assign(Object.assign({}, options), flowSpec), {
               actions: ['cancel']
             })));
 
-          case 1:
+          case 3:
           case "end":
             return _context.stop();
         }
@@ -7267,6 +7334,89 @@ function _proceed() {
   return _proceed.apply(this, arguments);
 }
 
+function poll(_x) {
+  return _poll.apply(this, arguments);
+}
+
+function _poll() {
+  _poll = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(authClient) {
+    var options,
+        _a,
+        transaction,
+        meta,
+        availablePollingRemeditaions,
+        _args2 = arguments;
+
+    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            options = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : {};
+            _context2.next = 3;
+            return proceed(authClient, {
+              startPolling: true
+            });
+
+          case 3:
+            transaction = _context2.sent;
+            meta = getSavedTransactionMeta(authClient);
+            availablePollingRemeditaions = (_a = meta === null || meta === void 0 ? void 0 : meta.remediations) === null || _a === void 0 ? void 0 : _a.find(function (remediation) {
+              return remediation.includes('poll');
+            });
+
+            if (!(availablePollingRemeditaions === null || availablePollingRemeditaions === void 0 ? void 0 : availablePollingRemeditaions.length)) {
+              warn('No polling remediations available at the current IDX flow stage');
+            }
+
+            if (!Number.isInteger(options.refresh)) {
+              _context2.next = 9;
+              break;
+            }
+
+            return _context2.abrupt("return", new Promise(function (resolve, reject) {
+              setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+                var _a, _b, refresh;
+
+                return _regeneratorRuntime.wrap(function _callee$(_context) {
+                  while (1) {
+                    switch (_context.prev = _context.next) {
+                      case 0:
+                        try {
+                          refresh = (_b = (_a = transaction.nextStep) === null || _a === void 0 ? void 0 : _a.poll) === null || _b === void 0 ? void 0 : _b.refresh;
+
+                          if (refresh) {
+                            resolve(poll(authClient, {
+                              refresh: refresh
+                            }));
+                          } else {
+                            resolve(transaction);
+                          }
+                        } catch (err) {
+                          reject(err);
+                        }
+
+                      case 1:
+                      case "end":
+                        return _context.stop();
+                    }
+                  }
+                }, _callee);
+              })), options.refresh);
+            }));
+
+          case 9:
+            return _context2.abrupt("return", transaction);
+
+          case 10:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  }));
+  return _poll.apply(this, arguments);
+}
+
 function startTransaction(_x) {
   return _startTransaction.apply(this, arguments);
 }
@@ -7293,34 +7443,44 @@ function _startTransaction() {
   return _startTransaction.apply(this, arguments);
 }
 
-function register(_x, _x2) {
+function register(_x) {
   return _register.apply(this, arguments);
 }
 
 function _register() {
-  _register = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(authClient, options) {
-    var _yield$startTransacti, enabledFeatures, error, flowSpec;
+  _register = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(authClient) {
+    var options,
+        _yield$startTransacti,
+        enabledFeatures,
+        availableSteps,
+        error,
+        _error,
+        flowSpec,
+        _args = arguments;
 
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
+            options = _args.length > 1 && _args[1] !== undefined ? _args[1] : {};
+
             if (transactionMetaExist(authClient)) {
-              _context.next = 8;
+              _context.next = 13;
               break;
             }
 
-            _context.next = 3;
+            _context.next = 4;
             return startTransaction(authClient, Object.assign({
               flow: 'register'
             }, options));
 
-          case 3:
+          case 4:
             _yield$startTransacti = _context.sent;
             enabledFeatures = _yield$startTransacti.enabledFeatures;
+            availableSteps = _yield$startTransacti.availableSteps;
 
-            if (!(enabledFeatures && !enabledFeatures.includes(IdxFeature.REGISTRATION))) {
-              _context.next = 8;
+            if (!(!options.activationToken && enabledFeatures && !enabledFeatures.includes(IdxFeature.REGISTRATION))) {
+              _context.next = 10;
               break;
             }
 
@@ -7330,11 +7490,26 @@ function _register() {
               error: error
             });
 
-          case 8:
+          case 10:
+            if (!(options.activationToken && (availableSteps === null || availableSteps === void 0 ? void 0 : availableSteps.some(function (_ref) {
+              var name = _ref.name;
+              return name === 'identify';
+            })))) {
+              _context.next = 13;
+              break;
+            }
+
+            _error = new AuthSdkError('activationToken is not supported based on your current org configuration.');
+            return _context.abrupt("return", {
+              status: IdxStatus.FAILURE,
+              error: _error
+            });
+
+          case 13:
             flowSpec = getFlowSpecification(authClient, 'register');
             return _context.abrupt("return", run(authClient, Object.assign(Object.assign({}, options), flowSpec)));
 
-          case 10:
+          case 15:
           case "end":
             return _context.stop();
         }
@@ -7459,7 +7634,7 @@ var OktaUserAgent = /*#__PURE__*/function () {
   function OktaUserAgent() {
     _classCallCheck(this, OktaUserAgent);
 
-    this.environments = ["okta-auth-js/".concat("5.9.1")];
+    this.environments = ["okta-auth-js/".concat("5.10.0")];
   }
 
   _createClass(OktaUserAgent, [{
@@ -7478,7 +7653,7 @@ var OktaUserAgent = /*#__PURE__*/function () {
   }, {
     key: "getVersion",
     value: function getVersion() {
-      return "5.9.1";
+      return "5.10.0";
     }
   }, {
     key: "maybeAddNodeEnvironment",
@@ -7537,9 +7712,9 @@ var OktaAuth = /*#__PURE__*/function () {
       this.options = Object.assign(this.options, {
         redirectUri: toAbsoluteUrl(args.redirectUri, window.location.origin)
       });
-      this.userAgent = getUserAgent(args, "okta-auth-js/".concat("5.9.1"));
+      this.userAgent = getUserAgent(args, "okta-auth-js/".concat("5.10.0"));
     } else {
-      this.userAgent = getUserAgent(args, "okta-auth-js-server/".concat("5.9.1"));
+      this.userAgent = getUserAgent(args, "okta-auth-js-server/".concat("5.10.0"));
     }
 
     if (!args.maxClockSkew && args.maxClockSkew !== 0) {
@@ -7603,6 +7778,7 @@ var OktaAuth = /*#__PURE__*/function () {
       introspect: introspect.bind(null, this),
       authenticate: authenticate.bind(null, this),
       register: register.bind(null, this),
+      poll: poll.bind(null, this),
       proceed: proceed.bind(null, this),
       cancel: cancel.bind(null, this),
       recoverPassword: recoverPassword.bind(null, this),
@@ -7797,8 +7973,22 @@ var OktaAuth = /*#__PURE__*/function () {
   }, {
     key: "closeSession",
     value: function closeSession() {
-      this.tokenManager.clear();
-      return this.session.close().catch(function (e) {
+      var _this3 = this;
+
+      return this.session.close().then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
+        return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+          while (1) {
+            switch (_context4.prev = _context4.next) {
+              case 0:
+                _this3.tokenManager.clear();
+
+              case 1:
+              case "end":
+                return _context4.stop();
+            }
+          }
+        }, _callee4);
+      }))).catch(function (e) {
         if (e.name === 'AuthApiError' && e.errorCode === 'E0000007') {
           return null;
         }
@@ -7809,42 +7999,42 @@ var OktaAuth = /*#__PURE__*/function () {
   }, {
     key: "revokeAccessToken",
     value: function () {
-      var _revokeAccessToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(accessToken) {
+      var _revokeAccessToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(accessToken) {
         var accessTokenKey;
-        return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+        return _regeneratorRuntime.wrap(function _callee5$(_context5) {
           while (1) {
-            switch (_context4.prev = _context4.next) {
+            switch (_context5.prev = _context5.next) {
               case 0:
                 if (accessToken) {
-                  _context4.next = 6;
+                  _context5.next = 6;
                   break;
                 }
 
-                _context4.next = 3;
+                _context5.next = 3;
                 return this.tokenManager.getTokens();
 
               case 3:
-                accessToken = _context4.sent.accessToken;
+                accessToken = _context5.sent.accessToken;
                 accessTokenKey = this.tokenManager.getStorageKeyByType('accessToken');
                 this.tokenManager.remove(accessTokenKey);
 
               case 6:
                 if (accessToken) {
-                  _context4.next = 8;
+                  _context5.next = 8;
                   break;
                 }
 
-                return _context4.abrupt("return", Promise.resolve(null));
+                return _context5.abrupt("return", Promise.resolve(null));
 
               case 8:
-                return _context4.abrupt("return", this.token.revoke(accessToken));
+                return _context5.abrupt("return", this.token.revoke(accessToken));
 
               case 9:
               case "end":
-                return _context4.stop();
+                return _context5.stop();
             }
           }
-        }, _callee4, this);
+        }, _callee5, this);
       }));
 
       function revokeAccessToken(_x3) {
@@ -7856,42 +8046,42 @@ var OktaAuth = /*#__PURE__*/function () {
   }, {
     key: "revokeRefreshToken",
     value: function () {
-      var _revokeRefreshToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(refreshToken) {
+      var _revokeRefreshToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(refreshToken) {
         var refreshTokenKey;
-        return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+        return _regeneratorRuntime.wrap(function _callee6$(_context6) {
           while (1) {
-            switch (_context5.prev = _context5.next) {
+            switch (_context6.prev = _context6.next) {
               case 0:
                 if (refreshToken) {
-                  _context5.next = 6;
+                  _context6.next = 6;
                   break;
                 }
 
-                _context5.next = 3;
+                _context6.next = 3;
                 return this.tokenManager.getTokens();
 
               case 3:
-                refreshToken = _context5.sent.refreshToken;
+                refreshToken = _context6.sent.refreshToken;
                 refreshTokenKey = this.tokenManager.getStorageKeyByType('refreshToken');
                 this.tokenManager.remove(refreshTokenKey);
 
               case 6:
                 if (refreshToken) {
-                  _context5.next = 8;
+                  _context6.next = 8;
                   break;
                 }
 
-                return _context5.abrupt("return", Promise.resolve(null));
+                return _context6.abrupt("return", Promise.resolve(null));
 
               case 8:
-                return _context5.abrupt("return", this.token.revoke(refreshToken));
+                return _context6.abrupt("return", this.token.revoke(refreshToken));
 
               case 9:
               case "end":
-                return _context5.stop();
+                return _context6.stop();
             }
           }
-        }, _callee5, this);
+        }, _callee6, this);
       }));
 
       function revokeRefreshToken(_x4) {
@@ -7937,11 +8127,11 @@ var OktaAuth = /*#__PURE__*/function () {
   }, {
     key: "signOut",
     value: function () {
-      var _signOut = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(options) {
+      var _signOut = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(options) {
         var defaultUri, currentUri, postLogoutRedirectUri, accessToken, refreshToken, revokeAccessToken, revokeRefreshToken, logoutUri;
-        return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+        return _regeneratorRuntime.wrap(function _callee7$(_context7) {
           while (1) {
-            switch (_context6.prev = _context6.next) {
+            switch (_context7.prev = _context7.next) {
               case 0:
                 options = Object.assign({}, options);
                 defaultUri = window.location.origin;
@@ -7964,36 +8154,34 @@ var OktaAuth = /*#__PURE__*/function () {
                   options.idToken = this.tokenManager.getTokensSync().idToken;
                 }
 
-                this.tokenManager.clear();
-
                 if (!(revokeRefreshToken && refreshToken)) {
-                  _context6.next = 15;
+                  _context7.next = 14;
                   break;
                 }
 
-                _context6.next = 15;
+                _context7.next = 14;
                 return this.revokeRefreshToken(refreshToken);
 
-              case 15:
+              case 14:
                 if (!(revokeAccessToken && accessToken)) {
-                  _context6.next = 18;
+                  _context7.next = 17;
                   break;
                 }
 
-                _context6.next = 18;
+                _context7.next = 17;
                 return this.revokeAccessToken(accessToken);
 
-              case 18:
+              case 17:
                 logoutUri = this.getSignOutRedirectUrl(Object.assign(Object.assign({}, options), {
                   postLogoutRedirectUri: postLogoutRedirectUri
                 }));
 
                 if (logoutUri) {
-                  _context6.next = 23;
+                  _context7.next = 22;
                   break;
                 }
 
-                return _context6.abrupt("return", this.closeSession().then(function () {
+                return _context7.abrupt("return", this.closeSession().then(function () {
                   if (postLogoutRedirectUri === currentUri) {
                     window.location.reload();
                   } else {
@@ -8001,15 +8189,21 @@ var OktaAuth = /*#__PURE__*/function () {
                   }
                 }));
 
-              case 23:
+              case 22:
+                if (options.clearTokensAfterRedirect) {
+                  this.tokenManager.addPendingRemoveFlags();
+                } else {
+                  this.tokenManager.clear();
+                }
+
                 window.location.assign(logoutUri);
 
               case 24:
               case "end":
-                return _context6.stop();
+                return _context7.stop();
             }
           }
-        }, _callee6, this);
+        }, _callee7, this);
       }));
 
       function signOut(_x5) {
@@ -8032,76 +8226,94 @@ var OktaAuth = /*#__PURE__*/function () {
   }, {
     key: "isAuthenticated",
     value: function () {
-      var _isAuthenticated = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
+      var _isAuthenticated = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
         var _this$tokenManager$ge, accessToken, idToken, _this$tokenManager$ge2, autoRenew, autoRemove;
 
-        return _regeneratorRuntime.wrap(function _callee7$(_context7) {
+        return _regeneratorRuntime.wrap(function _callee8$(_context8) {
           while (1) {
-            switch (_context7.prev = _context7.next) {
+            switch (_context8.prev = _context8.next) {
               case 0:
                 _this$tokenManager$ge = this.tokenManager.getTokensSync(), accessToken = _this$tokenManager$ge.accessToken, idToken = _this$tokenManager$ge.idToken;
                 _this$tokenManager$ge2 = this.tokenManager.getOptions(), autoRenew = _this$tokenManager$ge2.autoRenew, autoRemove = _this$tokenManager$ge2.autoRemove;
 
                 if (!(accessToken && this.tokenManager.hasExpired(accessToken))) {
-                  _context7.next = 11;
+                  _context8.next = 16;
                   break;
                 }
 
                 accessToken = null;
 
                 if (!autoRenew) {
-                  _context7.next = 10;
+                  _context8.next = 15;
                   break;
                 }
 
-                _context7.next = 7;
+                _context8.prev = 5;
+                _context8.next = 8;
                 return this.tokenManager.renew('accessToken');
 
-              case 7:
-                accessToken = _context7.sent;
-                _context7.next = 11;
+              case 8:
+                accessToken = _context8.sent;
+                _context8.next = 13;
                 break;
 
-              case 10:
+              case 11:
+                _context8.prev = 11;
+                _context8.t0 = _context8["catch"](5);
+
+              case 13:
+                _context8.next = 16;
+                break;
+
+              case 15:
                 if (autoRemove) {
                   this.tokenManager.remove('accessToken');
                 }
 
-              case 11:
+              case 16:
                 if (!(idToken && this.tokenManager.hasExpired(idToken))) {
-                  _context7.next = 20;
+                  _context8.next = 30;
                   break;
                 }
 
                 idToken = null;
 
                 if (!autoRenew) {
-                  _context7.next = 19;
+                  _context8.next = 29;
                   break;
                 }
 
-                _context7.next = 16;
+                _context8.prev = 19;
+                _context8.next = 22;
                 return this.tokenManager.renew('idToken');
 
-              case 16:
-                idToken = _context7.sent;
-                _context7.next = 20;
+              case 22:
+                idToken = _context8.sent;
+                _context8.next = 27;
                 break;
 
-              case 19:
+              case 25:
+                _context8.prev = 25;
+                _context8.t1 = _context8["catch"](19);
+
+              case 27:
+                _context8.next = 30;
+                break;
+
+              case 29:
                 if (autoRemove) {
                   this.tokenManager.remove('idToken');
                 }
 
-              case 20:
-                return _context7.abrupt("return", !!(accessToken && idToken));
+              case 30:
+                return _context8.abrupt("return", !!(accessToken && idToken));
 
-              case 21:
+              case 31:
               case "end":
-                return _context7.stop();
+                return _context8.stop();
             }
           }
-        }, _callee7, this);
+        }, _callee8, this, [[5, 11], [19, 25]]);
       }));
 
       function isAuthenticated() {
@@ -8113,22 +8325,22 @@ var OktaAuth = /*#__PURE__*/function () {
   }, {
     key: "getUser",
     value: function () {
-      var _getUser = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
+      var _getUser = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9() {
         var _this$tokenManager$ge3, idToken, accessToken;
 
-        return _regeneratorRuntime.wrap(function _callee8$(_context8) {
+        return _regeneratorRuntime.wrap(function _callee9$(_context9) {
           while (1) {
-            switch (_context8.prev = _context8.next) {
+            switch (_context9.prev = _context9.next) {
               case 0:
                 _this$tokenManager$ge3 = this.tokenManager.getTokensSync(), idToken = _this$tokenManager$ge3.idToken, accessToken = _this$tokenManager$ge3.accessToken;
-                return _context8.abrupt("return", this.token.getUserInfo(accessToken, idToken));
+                return _context9.abrupt("return", this.token.getUserInfo(accessToken, idToken));
 
               case 2:
               case "end":
-                return _context8.stop();
+                return _context9.stop();
             }
           }
-        }, _callee8, this);
+        }, _callee9, this);
       }));
 
       function getUser() {
@@ -8164,27 +8376,27 @@ var OktaAuth = /*#__PURE__*/function () {
   }, {
     key: "storeTokensFromRedirect",
     value: function () {
-      var _storeTokensFromRedirect = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9() {
+      var _storeTokensFromRedirect = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10() {
         var _yield$this$token$par, tokens;
 
-        return _regeneratorRuntime.wrap(function _callee9$(_context9) {
+        return _regeneratorRuntime.wrap(function _callee10$(_context10) {
           while (1) {
-            switch (_context9.prev = _context9.next) {
+            switch (_context10.prev = _context10.next) {
               case 0:
-                _context9.next = 2;
+                _context10.next = 2;
                 return this.token.parseFromUrl();
 
               case 2:
-                _yield$this$token$par = _context9.sent;
+                _yield$this$token$par = _context10.sent;
                 tokens = _yield$this$token$par.tokens;
                 this.tokenManager.setTokens(tokens);
 
               case 5:
               case "end":
-                return _context9.stop();
+                return _context10.stop();
             }
           }
-        }, _callee9, this);
+        }, _callee10, this);
       }));
 
       function storeTokensFromRedirect() {
@@ -8242,49 +8454,49 @@ var OktaAuth = /*#__PURE__*/function () {
   }, {
     key: "handleLoginRedirect",
     value: function () {
-      var _handleLoginRedirect = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(tokens, originalUri) {
+      var _handleLoginRedirect = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11(tokens, originalUri) {
         var state, oAuthResponse, restoreOriginalUri;
-        return _regeneratorRuntime.wrap(function _callee10$(_context10) {
+        return _regeneratorRuntime.wrap(function _callee11$(_context11) {
           while (1) {
-            switch (_context10.prev = _context10.next) {
+            switch (_context11.prev = _context11.next) {
               case 0:
                 state = this.options.state;
 
                 if (!tokens) {
-                  _context10.next = 6;
+                  _context11.next = 6;
                   break;
                 }
 
                 this.tokenManager.setTokens(tokens);
                 originalUri = originalUri || this.getOriginalUri(this.options.state);
-                _context10.next = 17;
+                _context11.next = 17;
                 break;
 
               case 6:
                 if (!this.isLoginRedirect()) {
-                  _context10.next = 16;
+                  _context11.next = 16;
                   break;
                 }
 
-                _context10.next = 9;
+                _context11.next = 9;
                 return parseOAuthResponseFromUrl(this, {});
 
               case 9:
-                oAuthResponse = _context10.sent;
+                oAuthResponse = _context11.sent;
                 state = oAuthResponse.state;
                 originalUri = originalUri || this.getOriginalUri(state);
-                _context10.next = 14;
+                _context11.next = 14;
                 return this.storeTokensFromRedirect();
 
               case 14:
-                _context10.next = 17;
+                _context11.next = 17;
                 break;
 
               case 16:
-                return _context10.abrupt("return");
+                return _context11.abrupt("return");
 
               case 17:
-                _context10.next = 19;
+                _context11.next = 19;
                 return this.authStateManager.updateAuthState();
 
               case 19:
@@ -8292,15 +8504,15 @@ var OktaAuth = /*#__PURE__*/function () {
                 restoreOriginalUri = this.options.restoreOriginalUri;
 
                 if (!restoreOriginalUri) {
-                  _context10.next = 26;
+                  _context11.next = 26;
                   break;
                 }
 
-                _context10.next = 24;
+                _context11.next = 24;
                 return restoreOriginalUri(this, originalUri);
 
               case 24:
-                _context10.next = 27;
+                _context11.next = 27;
                 break;
 
               case 26:
@@ -8308,10 +8520,10 @@ var OktaAuth = /*#__PURE__*/function () {
 
               case 27:
               case "end":
-                return _context10.stop();
+                return _context11.stop();
             }
           }
-        }, _callee10, this);
+        }, _callee11, this);
       }));
 
       function handleLoginRedirect(_x6, _x7) {