@okta/okta-auth-js 6.4.1 → 6.5.0

package/esm/esm.node.mjs

@@ -62,11 +62,11 @@ import _Number$isInteger from '@babel/runtime-corejs3/core-js-stable/number/is-i
 import _URL2 from '@babel/runtime-corejs3/core-js-stable/url';
 import Emitter from 'tiny-emitter';
 
-function _createSuper$x(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$x(); 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$x() { 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 _createSuper$y(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$y(); 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$y() { 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 = function (_Error) {
   _inherits(CustomError, _Error);
-  var _super = _createSuper$x(CustomError);
+  var _super = _createSuper$y(CustomError);
   function CustomError(message) {
     var _this;
     _classCallCheck(this, CustomError);
@@ -77,11 +77,11 @@ var CustomError = function (_Error) {
   return CustomError;
 }( _wrapNativeSuper(Error));
 
-function _createSuper$w(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$w(); 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$w() { 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 _createSuper$x(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$x(); 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$x() { 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 = function (_CustomError) {
   _inherits(AuthApiError, _CustomError);
-  var _super = _createSuper$w(AuthApiError);
+  var _super = _createSuper$x(AuthApiError);
   function AuthApiError(err, xhr) {
     var _this;
     _classCallCheck(this, AuthApiError);
@@ -101,11 +101,11 @@ var AuthApiError = function (_CustomError) {
   return AuthApiError;
 }(CustomError);
 
-function _createSuper$v(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$v(); 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$v() { 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 _createSuper$w(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$w(); 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$w() { 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 = function (_CustomError) {
   _inherits(AuthPollStopError, _CustomError);
-  var _super = _createSuper$v(AuthPollStopError);
+  var _super = _createSuper$w(AuthPollStopError);
   function AuthPollStopError() {
     _classCallCheck(this, AuthPollStopError);
     var message = 'The poll was stopped by the sdk';
@@ -114,11 +114,11 @@ var AuthPollStopError = function (_CustomError) {
   return AuthPollStopError;
 }(CustomError);
 
-function _createSuper$u(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$u(); 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$u() { 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 _createSuper$v(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$v(); 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$v() { 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 = function (_CustomError) {
   _inherits(AuthSdkError, _CustomError);
-  var _super = _createSuper$u(AuthSdkError);
+  var _super = _createSuper$v(AuthSdkError);
   function AuthSdkError(msg, xhr) {
     var _this;
     _classCallCheck(this, AuthSdkError);
@@ -137,11 +137,11 @@ var AuthSdkError = function (_CustomError) {
   return AuthSdkError;
 }(CustomError);
 
-function _createSuper$t(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$t(); 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$t() { 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 _createSuper$u(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$u(); 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$u() { 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 = function (_CustomError) {
   _inherits(OAuthError, _CustomError);
-  var _super = _createSuper$t(OAuthError);
+  var _super = _createSuper$u(OAuthError);
   function OAuthError(errorCode, summary) {
     var _this;
     _classCallCheck(this, OAuthError);
@@ -4269,13 +4269,15 @@ var TransactionManager = function () {
       var transactionStorage = this.storageManager.getTransactionStorage();
       var meta = transactionStorage.getStorage();
       transactionStorage.clearStorage();
-      this.clearIdxResponse();
       if (this.enableSharedStorage && options.clearSharedStorage !== false) {
         var state = options.state || (meta === null || meta === void 0 ? void 0 : meta.state);
         if (state) {
           clearTransactionFromSharedStorage(this.storageManager, state);
         }
       }
+      if (options.clearIdxResponse !== false) {
+        this.clearIdxResponse();
+      }
       if (!this.legacyWidgetSupport) {
         return;
       }
@@ -4471,9 +4473,7 @@ var TransactionManager = function () {
     }
   }, {
     key: "saveIdxResponse",
-    value: function saveIdxResponse(_ref) {
-      var rawIdxResponse = _ref.rawIdxResponse,
-          requestDidSucceed = _ref.requestDidSucceed;
+    value: function saveIdxResponse(data) {
       if (!this.saveLastResponse) {
         return;
       }
@@ -4481,14 +4481,11 @@ var TransactionManager = function () {
       if (!storage) {
         return;
       }
-      storage.setStorage({
-        rawIdxResponse: rawIdxResponse,
-        requestDidSucceed: requestDidSucceed
-      });
+      storage.setStorage(data);
     }
   }, {
     key: "loadIdxResponse",
-    value: function loadIdxResponse() {
+    value: function loadIdxResponse(options) {
       if (!this.saveLastResponse) {
         return null;
       }
@@ -4500,6 +4497,16 @@ var TransactionManager = function () {
       if (!storedValue || !isRawIdxResponse(storedValue.rawIdxResponse)) {
         return null;
       }
+      if (options) {
+        var stateHandle = options.stateHandle,
+            interactionHandle = options.interactionHandle;
+        if (stateHandle && storedValue.stateHandle !== stateHandle) {
+          return null;
+        }
+        if (interactionHandle && storedValue.interactionHandle !== interactionHandle) {
+          return null;
+        }
+      }
       return storedValue;
     }
   }, {
@@ -4749,6 +4756,7 @@ function mergeOptions(options, args) {
 }
 function buildOptions() {
   var args = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var _a;
   assertValidConfig(args);
   args = mergeOptions(getDefaultOptions(), args);
   return removeNils({
@@ -4782,6 +4790,9 @@ function buildOptions() {
     codeChallengeMethod: args.codeChallengeMethod,
     recoveryToken: args.recoveryToken,
     activationToken: args.activationToken,
+    idx: {
+      useGenericRemediator: !!((_a = args.idx) === null || _a === void 0 ? void 0 : _a.useGenericRemediator)
+    },
     ignoreSignature: !!args.ignoreSignature,
     clientSecret: args.clientSecret
   });
@@ -4804,6 +4815,8 @@ function _createTransactionMeta() {
         activationToken,
         _Object$assign2$recov,
         recoveryToken,
+        _Object$assign2$maxAg,
+        maxAge,
         meta,
         _args = arguments;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
@@ -4816,12 +4829,13 @@ function _createTransactionMeta() {
           case 3:
             tokenParams = _context.sent;
             pkceMeta = createOAuthMeta(authClient, tokenParams);
-            _Object$assign2 = _Object$assign(_Object$assign({}, authClient.options), options), _Object$assign2$flow = _Object$assign2.flow, flow = _Object$assign2$flow === void 0 ? 'default' : _Object$assign2$flow, _Object$assign2$withC = _Object$assign2.withCredentials, withCredentials = _Object$assign2$withC === void 0 ? true : _Object$assign2$withC, _Object$assign2$activ = _Object$assign2.activationToken, activationToken = _Object$assign2$activ === void 0 ? undefined : _Object$assign2$activ, _Object$assign2$recov = _Object$assign2.recoveryToken, recoveryToken = _Object$assign2$recov === void 0 ? undefined : _Object$assign2$recov;
+            _Object$assign2 = _Object$assign(_Object$assign({}, authClient.options), options), _Object$assign2$flow = _Object$assign2.flow, flow = _Object$assign2$flow === void 0 ? 'default' : _Object$assign2$flow, _Object$assign2$withC = _Object$assign2.withCredentials, withCredentials = _Object$assign2$withC === void 0 ? true : _Object$assign2$withC, _Object$assign2$activ = _Object$assign2.activationToken, activationToken = _Object$assign2$activ === void 0 ? undefined : _Object$assign2$activ, _Object$assign2$recov = _Object$assign2.recoveryToken, recoveryToken = _Object$assign2$recov === void 0 ? undefined : _Object$assign2$recov, _Object$assign2$maxAg = _Object$assign2.maxAge, maxAge = _Object$assign2$maxAg === void 0 ? undefined : _Object$assign2$maxAg;
             meta = _Object$assign(_Object$assign({}, pkceMeta), {
               flow: flow,
               withCredentials: withCredentials,
               activationToken: activationToken,
-              recoveryToken: recoveryToken
+              recoveryToken: recoveryToken,
+              maxAge: maxAge
             });
             return _context.abrupt("return", meta);
           case 8:
@@ -4949,6 +4963,7 @@ function _interact() {
         codeChallengeMethod,
         activationToken,
         recoveryToken,
+        maxAge,
         clientSecret,
         url,
         params,
@@ -4975,31 +4990,30 @@ function _interact() {
           case 7:
             meta = _context.sent;
             baseUrl = getOAuthBaseUrl(authClient);
-            _meta = meta, clientId = _meta.clientId, redirectUri = _meta.redirectUri, state = _meta.state, scopes = _meta.scopes, withCredentials = _meta.withCredentials, codeChallenge = _meta.codeChallenge, codeChallengeMethod = _meta.codeChallengeMethod, activationToken = _meta.activationToken, recoveryToken = _meta.recoveryToken;
+            _meta = meta, clientId = _meta.clientId, redirectUri = _meta.redirectUri, state = _meta.state, scopes = _meta.scopes, withCredentials = _meta.withCredentials, codeChallenge = _meta.codeChallenge, codeChallengeMethod = _meta.codeChallengeMethod, activationToken = _meta.activationToken, recoveryToken = _meta.recoveryToken, maxAge = _meta.maxAge;
             clientSecret = options.clientSecret || authClient.options.clientSecret;
             withCredentials = withCredentials !== null && withCredentials !== void 0 ? withCredentials : true;
             url = "".concat(baseUrl, "/v1/interact");
-            params = {
+            params = _Object$assign(_Object$assign(_Object$assign(_Object$assign({
               client_id: clientId,
               scope: scopes.join(' '),
               redirect_uri: redirectUri,
               code_challenge: codeChallenge,
               code_challenge_method: codeChallengeMethod,
               state: state
-            };
-            if (activationToken) {
-              params.activation_token = activationToken;
-            }
-            if (recoveryToken) {
-              params.recovery_token = recoveryToken;
-            }
-            if (clientSecret) {
-              params.client_secret = clientSecret;
-            }
+            }, activationToken && {
+              activation_token: activationToken
+            }), recoveryToken && {
+              recovery_token: recoveryToken
+            }), clientSecret && {
+              client_secret: clientSecret
+            }), maxAge && {
+              max_age: maxAge
+            });
             headers = {
               'Content-Type': 'application/x-www-form-urlencoded'
             };
-            _context.next = 20;
+            _context.next = 17;
             return httpRequest(authClient, {
               method: 'POST',
               url: url,
@@ -5007,7 +5021,7 @@ function _interact() {
               withCredentials: withCredentials,
               args: params
             });
-          case 20:
+          case 17:
             resp = _context.sent;
             interactionHandle = resp.interaction_handle;
             newMeta = _Object$assign(_Object$assign({}, meta), {
@@ -5020,7 +5034,7 @@ function _interact() {
             });
             saveTransactionMeta(authClient, newMeta);
             return _context.abrupt("return", getResponse(newMeta));
-          case 25:
+          case 22:
           case "end":
             return _context.stop();
         }
@@ -5268,11 +5282,14 @@ var expandRelatesTo = function expandRelatesTo(idxResponse, value) {
   });
 };
 var convertRemediationAction = function convertRemediationAction(authClient, remediation, toPersist) {
-  var remediationActions = generateRemediationFunctions(authClient, [remediation], toPersist);
-  var actionFn = remediationActions[remediation.name];
-  return _Object$assign(_Object$assign({}, remediation), {
-    action: actionFn
-  });
+  if (remediation.rel) {
+    var remediationActions = generateRemediationFunctions(authClient, [remediation], toPersist);
+    var actionFn = remediationActions[remediation.name];
+    return _Object$assign(_Object$assign({}, remediation), {
+      action: actionFn
+    });
+  }
+  return remediation;
 };
 var parseIdxResponse = function parseIdxResponse(authClient, idxResponse) {
   var toPersist = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
@@ -5306,6 +5323,7 @@ function makeIdxState$1(authClient, idxResponse, toPersist, requestDidSucceed) {
     var _ref = _asyncToGenerator( _regeneratorRuntime.mark(function _callee(remediationChoice) {
       var paramsFromUser,
           remediationChoiceObject,
+          actionFn,
           _args = arguments;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
@@ -5321,8 +5339,15 @@ function makeIdxState$1(authClient, idxResponse, toPersist, requestDidSucceed) {
               }
               return _context.abrupt("return", _Promise.reject("Unknown remediation choice: [".concat(remediationChoice, "]")));
             case 4:
+              actionFn = remediationChoiceObject.action;
+              if (!(typeof actionFn !== 'function')) {
+                _context.next = 7;
+                break;
+              }
+              return _context.abrupt("return", _Promise.reject("Current remediation cannot make form submit action: [".concat(remediationChoice, "]")));
+            case 7:
               return _context.abrupt("return", remediationChoiceObject.action(paramsFromUser));
-            case 5:
+            case 8:
             case "end":
               return _context.stop();
           }
@@ -5410,7 +5435,7 @@ function _introspect() {
         switch (_context.prev = _context.next) {
           case 0:
             options = _args.length > 1 && _args[1] !== undefined ? _args[1] : {};
-            savedIdxResponse = authClient.transactionManager.loadIdxResponse();
+            savedIdxResponse = authClient.transactionManager.loadIdxResponse(options);
             if (savedIdxResponse) {
               rawIdxResponse = savedIdxResponse.rawIdxResponse;
               requestDidSucceed = savedIdxResponse.requestDidSucceed;
@@ -5653,7 +5678,7 @@ var Remediator = function () {
     }
   }, {
     key: "getNextStep",
-    value: function getNextStep(_context) {
+    value: function getNextStep(_authClient, _context) {
       var name = this.getName();
       var inputs = this.getInputs();
       var authenticator = this.getAuthenticator();
@@ -5790,11 +5815,11 @@ var Authenticator = function Authenticator(authenticator) {
   this.meta = authenticator;
 };
 
-function _createSuper$s(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$s(); 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$s() { 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 _createSuper$t(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$t(); 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$t() { 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 = function (_Authenticator) {
   _inherits(VerificationCodeAuthenticator, _Authenticator);
-  var _super = _createSuper$s(VerificationCodeAuthenticator);
+  var _super = _createSuper$t(VerificationCodeAuthenticator);
   function VerificationCodeAuthenticator() {
     _classCallCheck(this, VerificationCodeAuthenticator);
     return _super.apply(this, arguments);
@@ -5831,11 +5856,11 @@ var VerificationCodeAuthenticator = function (_Authenticator) {
   return VerificationCodeAuthenticator;
 }(Authenticator);
 
-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$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; } }
+function _createSuper$s(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$s(); 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$s() { 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 = function (_VerificationCodeAuth) {
   _inherits(OktaVerifyTotp, _VerificationCodeAuth);
-  var _super = _createSuper$r(OktaVerifyTotp);
+  var _super = _createSuper$s(OktaVerifyTotp);
   function OktaVerifyTotp() {
     _classCallCheck(this, OktaVerifyTotp);
     return _super.apply(this, arguments);
@@ -5855,11 +5880,11 @@ var OktaVerifyTotp = function (_VerificationCodeAuth) {
   return OktaVerifyTotp;
 }(VerificationCodeAuthenticator);
 
-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$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; } }
+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$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 OktaPassword = function (_Authenticator) {
   _inherits(OktaPassword, _Authenticator);
-  var _super = _createSuper$q(OktaPassword);
+  var _super = _createSuper$r(OktaPassword);
   function OktaPassword() {
     _classCallCheck(this, OktaPassword);
     return _super.apply(this, arguments);
@@ -5895,11 +5920,11 @@ var OktaPassword = function (_Authenticator) {
   return OktaPassword;
 }(Authenticator);
 
-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$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; } }
+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$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 SecurityQuestionEnrollment = function (_Authenticator) {
   _inherits(SecurityQuestionEnrollment, _Authenticator);
-  var _super = _createSuper$p(SecurityQuestionEnrollment);
+  var _super = _createSuper$q(SecurityQuestionEnrollment);
   function SecurityQuestionEnrollment() {
     _classCallCheck(this, SecurityQuestionEnrollment);
     return _super.apply(this, arguments);
@@ -5922,7 +5947,7 @@ var SecurityQuestionEnrollment = function (_Authenticator) {
       var questionKey = values.questionKey,
           question = values.question,
           answer = values.answer;
-      if (!questionKey && !question && !answer) {
+      if (!answer || !questionKey && !question) {
         return;
       }
       return {
@@ -5953,11 +5978,11 @@ var SecurityQuestionEnrollment = function (_Authenticator) {
   return SecurityQuestionEnrollment;
 }(Authenticator);
 
-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$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; } }
+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$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 SecurityQuestionVerification = function (_Authenticator) {
   _inherits(SecurityQuestionVerification, _Authenticator);
-  var _super = _createSuper$o(SecurityQuestionVerification);
+  var _super = _createSuper$p(SecurityQuestionVerification);
   function SecurityQuestionVerification() {
     _classCallCheck(this, SecurityQuestionVerification);
     return _super.apply(this, arguments);
@@ -5965,7 +5990,12 @@ var SecurityQuestionVerification = function (_Authenticator) {
   _createClass(SecurityQuestionVerification, [{
     key: "canVerify",
     value: function canVerify(values) {
-      return !!values.answer;
+      var credentials = values.credentials;
+      if (credentials && credentials.answer) {
+        return true;
+      }
+      var answer = values.answer;
+      return !!answer;
     }
   }, {
     key: "mapCredentials",
@@ -5993,11 +6023,11 @@ var SecurityQuestionVerification = function (_Authenticator) {
   return SecurityQuestionVerification;
 }(Authenticator);
 
-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$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 _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$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 WebauthnEnrollment = function (_Authenticator) {
   _inherits(WebauthnEnrollment, _Authenticator);
-  var _super = _createSuper$n(WebauthnEnrollment);
+  var _super = _createSuper$o(WebauthnEnrollment);
   function WebauthnEnrollment() {
     _classCallCheck(this, WebauthnEnrollment);
     return _super.apply(this, arguments);
@@ -6043,11 +6073,11 @@ var WebauthnEnrollment = function (_Authenticator) {
   return WebauthnEnrollment;
 }(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; } }
+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$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 WebauthnVerification = function (_Authenticator) {
   _inherits(WebauthnVerification, _Authenticator);
-  var _super = _createSuper$m(WebauthnVerification);
+  var _super = _createSuper$n(WebauthnVerification);
   function WebauthnVerification() {
     _classCallCheck(this, WebauthnVerification);
     return _super.apply(this, arguments);
@@ -6128,11 +6158,11 @@ function getAuthenticator(remediation) {
   }
 }
 
-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; } }
+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 VerifyAuthenticator = function (_Remediator) {
   _inherits(VerifyAuthenticator, _Remediator);
-  var _super = _createSuper$l(VerifyAuthenticator);
+  var _super = _createSuper$m(VerifyAuthenticator);
   function VerifyAuthenticator(remediation) {
     var _this;
     var values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -6143,9 +6173,9 @@ var VerifyAuthenticator = function (_Remediator) {
   }
   _createClass(VerifyAuthenticator, [{
     key: "getNextStep",
-    value: function getNextStep(context) {
+    value: function getNextStep(authClient, context) {
       var _a;
-      var nextStep = _get(_getPrototypeOf(VerifyAuthenticator.prototype), "getNextStep", this).call(this, context);
+      var nextStep = _get(_getPrototypeOf(VerifyAuthenticator.prototype), "getNextStep", this).call(this, authClient, context);
       var authenticatorEnrollments = (_a = context === null || context === void 0 ? void 0 : context.authenticatorEnrollments) === null || _a === void 0 ? void 0 : _a.value;
       return _Object$assign(_Object$assign({}, nextStep), {
         authenticatorEnrollments: authenticatorEnrollments
@@ -6183,11 +6213,11 @@ var VerifyAuthenticator = function (_Remediator) {
   return VerifyAuthenticator;
 }(Remediator);
 
-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; } }
+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 EnrollAuthenticator = function (_VerifyAuthenticator) {
   _inherits(EnrollAuthenticator, _VerifyAuthenticator);
-  var _super = _createSuper$k(EnrollAuthenticator);
+  var _super = _createSuper$l(EnrollAuthenticator);
   function EnrollAuthenticator() {
     _classCallCheck(this, EnrollAuthenticator);
     return _super.apply(this, arguments);
@@ -6196,11 +6226,11 @@ var EnrollAuthenticator = function (_VerifyAuthenticator) {
 }(VerifyAuthenticator);
 EnrollAuthenticator.remediationName = 'enroll-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; } }
+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 EnrollPoll = function (_Remediator) {
   _inherits(EnrollPoll, _Remediator);
-  var _super = _createSuper$j(EnrollPoll);
+  var _super = _createSuper$k(EnrollPoll);
   function EnrollPoll() {
     _classCallCheck(this, EnrollPoll);
     return _super.apply(this, arguments);
@@ -6212,8 +6242,8 @@ var EnrollPoll = function (_Remediator) {
     }
   }, {
     key: "getNextStep",
-    value: function getNextStep(context) {
-      var common = _get(_getPrototypeOf(EnrollPoll.prototype), "getNextStep", this).call(this, context);
+    value: function getNextStep(authClient, context) {
+      var common = _get(_getPrototypeOf(EnrollPoll.prototype), "getNextStep", this).call(this, authClient, context);
       var authenticator = this.getAuthenticator();
       if (!authenticator && (context === null || context === void 0 ? void 0 : context.currentAuthenticator)) {
         authenticator = context.currentAuthenticator.value;
@@ -6243,11 +6273,11 @@ var EnrollPoll = function (_Remediator) {
 }(Remediator);
 EnrollPoll.remediationName = 'enroll-poll';
 
-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; } }
+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 SelectEnrollmentChannel = function (_Remediator) {
   _inherits(SelectEnrollmentChannel, _Remediator);
-  var _super = _createSuper$i(SelectEnrollmentChannel);
+  var _super = _createSuper$j(SelectEnrollmentChannel);
   function SelectEnrollmentChannel() {
     _classCallCheck(this, SelectEnrollmentChannel);
     return _super.apply(this, arguments);
@@ -6259,8 +6289,8 @@ var SelectEnrollmentChannel = function (_Remediator) {
     }
   }, {
     key: "getNextStep",
-    value: function getNextStep(context) {
-      var common = _get(_getPrototypeOf(SelectEnrollmentChannel.prototype), "getNextStep", this).call(this);
+    value: function getNextStep(authClient, context) {
+      var common = _get(_getPrototypeOf(SelectEnrollmentChannel.prototype), "getNextStep", this).call(this, authClient, context);
       var options = this.getChannels();
       var authenticator = context.currentAuthenticator.value;
       return _Object$assign(_Object$assign(_Object$assign({}, common), options && {
@@ -6310,11 +6340,11 @@ var SelectEnrollmentChannel = function (_Remediator) {
 }(Remediator);
 SelectEnrollmentChannel.remediationName = 'select-enrollment-channel';
 
-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; } }
+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 EnrollmentChannelData = function (_Remediator) {
   _inherits(EnrollmentChannelData, _Remediator);
-  var _super = _createSuper$h(EnrollmentChannelData);
+  var _super = _createSuper$i(EnrollmentChannelData);
   function EnrollmentChannelData() {
     _classCallCheck(this, EnrollmentChannelData);
     return _super.apply(this, arguments);
@@ -6346,8 +6376,8 @@ var EnrollmentChannelData = function (_Remediator) {
     }
   }, {
     key: "getNextStep",
-    value: function getNextStep(context) {
-      var common = _get(_getPrototypeOf(EnrollmentChannelData.prototype), "getNextStep", this).call(this);
+    value: function getNextStep(authClient, context) {
+      var common = _get(_getPrototypeOf(EnrollmentChannelData.prototype), "getNextStep", this).call(this, authClient, context);
       var authenticator = context.currentAuthenticator.value;
       return _Object$assign(_Object$assign({}, common), {
         authenticator: authenticator
@@ -6380,11 +6410,11 @@ var EnrollmentChannelData = function (_Remediator) {
 }(Remediator);
 EnrollmentChannelData.remediationName = 'enrollment-channel-data';
 
-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$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 _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 ChallengeAuthenticator = function (_VerifyAuthenticator) {
   _inherits(ChallengeAuthenticator, _VerifyAuthenticator);
-  var _super = _createSuper$g(ChallengeAuthenticator);
+  var _super = _createSuper$h(ChallengeAuthenticator);
   function ChallengeAuthenticator() {
     _classCallCheck(this, ChallengeAuthenticator);
     return _super.apply(this, arguments);
@@ -6393,11 +6423,11 @@ var ChallengeAuthenticator = 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 _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 _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$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 ChallengePoll = function (_EnrollPoll) {
   _inherits(ChallengePoll, _EnrollPoll);
-  var _super = _createSuper$f(ChallengePoll);
+  var _super = _createSuper$g(ChallengePoll);
   function ChallengePoll() {
     _classCallCheck(this, ChallengePoll);
     return _super.apply(this, arguments);
@@ -6412,11 +6442,11 @@ var ChallengePoll = function (_EnrollPoll) {
 }(EnrollPoll);
 ChallengePoll.remediationName = 'challenge-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; } }
+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$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 ResetAuthenticator = function (_VerifyAuthenticator) {
   _inherits(ResetAuthenticator, _VerifyAuthenticator);
-  var _super = _createSuper$e(ResetAuthenticator);
+  var _super = _createSuper$f(ResetAuthenticator);
   function ResetAuthenticator() {
     _classCallCheck(this, ResetAuthenticator);
     return _super.apply(this, arguments);
@@ -6425,11 +6455,11 @@ var ResetAuthenticator = function (_VerifyAuthenticator) {
 }(VerifyAuthenticator);
 ResetAuthenticator.remediationName = 'reset-authenticator';
 
-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$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 _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 EnrollProfile = function (_Remediator) {
   _inherits(EnrollProfile, _Remediator);
-  var _super = _createSuper$d(EnrollProfile);
+  var _super = _createSuper$e(EnrollProfile);
   function EnrollProfile() {
     _classCallCheck(this, EnrollProfile);
     return _super.apply(this, arguments);
@@ -6491,11 +6521,11 @@ var EnrollProfile = function (_Remediator) {
 }(Remediator);
 EnrollProfile.remediationName = 'enroll-profile';
 
-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; } }
+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$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 Identify = function (_Remediator) {
   _inherits(Identify, _Remediator);
-  var _super = _createSuper$c(Identify);
+  var _super = _createSuper$d(Identify);
   function Identify() {
     var _this;
     _classCallCheck(this, Identify);
@@ -6538,11 +6568,11 @@ var Identify = function (_Remediator) {
 }(Remediator);
 Identify.remediationName = 'identify';
 
-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$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 _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 ReEnrollAuthenticator = function (_Remediator) {
   _inherits(ReEnrollAuthenticator, _Remediator);
-  var _super = _createSuper$b(ReEnrollAuthenticator);
+  var _super = _createSuper$c(ReEnrollAuthenticator);
   function ReEnrollAuthenticator() {
     _classCallCheck(this, ReEnrollAuthenticator);
     return _super.apply(this, arguments);
@@ -6572,11 +6602,11 @@ var ReEnrollAuthenticator = function (_Remediator) {
 }(Remediator);
 ReEnrollAuthenticator.remediationName = 'reenroll-authenticator';
 
-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$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 _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$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 RedirectIdp = function (_Remediator) {
   _inherits(RedirectIdp, _Remediator);
-  var _super = _createSuper$a(RedirectIdp);
+  var _super = _createSuper$b(RedirectIdp);
   function RedirectIdp() {
     _classCallCheck(this, RedirectIdp);
     return _super.apply(this, arguments);
@@ -6607,13 +6637,13 @@ var RedirectIdp = function (_Remediator) {
 RedirectIdp.remediationName = 'redirect-idp';
 
 function _createForOfIteratorHelper$2(o, allowArrayLike) { var it = typeof _Symbol !== "undefined" && _getIteratorMethod(o) || 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) { var _context4; if (!o) return; if (typeof o === "string") return _arrayLikeToArray$2(o, minLen); var n = _sliceInstanceProperty(_context4 = Object.prototype.toString.call(o)).call(_context4, 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 _unsupportedIterableToArray$2(o, minLen) { var _context5; if (!o) return; if (typeof o === "string") return _arrayLikeToArray$2(o, minLen); var n = _sliceInstanceProperty(_context5 = Object.prototype.toString.call(o)).call(_context5, 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 _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$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 _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$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 SelectAuthenticator = function (_Remediator) {
   _inherits(SelectAuthenticator, _Remediator);
-  var _super = _createSuper$9(SelectAuthenticator);
+  var _super = _createSuper$a(SelectAuthenticator);
   function SelectAuthenticator() {
     _classCallCheck(this, SelectAuthenticator);
     return _super.apply(this, arguments);
@@ -6669,9 +6699,9 @@ var SelectAuthenticator = function (_Remediator) {
     }
   }, {
     key: "getNextStep",
-    value: function getNextStep() {
+    value: function getNextStep(authClient) {
       var _context;
-      var common = _get(_getPrototypeOf(SelectAuthenticator.prototype), "getNextStep", this).call(this);
+      var common = _get(_getPrototypeOf(SelectAuthenticator.prototype), "getNextStep", this).call(this, authClient);
       var authenticatorFromRemediation = getAuthenticatorFromRemediation(this.remediation);
       var options = _mapInstanceProperty(_context = authenticatorFromRemediation.options).call(_context, function (option) {
         var label = option.label,
@@ -6710,19 +6740,29 @@ var SelectAuthenticator = function (_Remediator) {
     }
   }, {
     key: "getInputAuthenticator",
-    value: function getInputAuthenticator() {
+    value: function getInputAuthenticator(remediation) {
+      var _context3;
+      var options = _mapInstanceProperty(_context3 = remediation.options).call(_context3, function (_ref3) {
+        var label = _ref3.label,
+            relatesTo = _ref3.relatesTo;
+        return {
+          label: label,
+          value: relatesTo.key
+        };
+      });
       return {
         name: 'authenticator',
-        key: 'string'
+        type: 'string',
+        options: options
       };
     }
   }, {
     key: "getValuesAfterProceed",
     value: function getValuesAfterProceed() {
-      var _context3,
+      var _context4,
           _this = this;
       this.values = _get(_getPrototypeOf(SelectAuthenticator.prototype), "getValuesAfterProceed", this).call(this);
-      var authenticators = _filterInstanceProperty(_context3 = _valuesInstanceProperty(this).authenticators).call(_context3, function (authenticator) {
+      var authenticators = _filterInstanceProperty(_context4 = _valuesInstanceProperty(this).authenticators).call(_context4, function (authenticator) {
         return compareAuthenticators(authenticator, _this.selectedAuthenticator) !== true;
       });
       return _Object$assign(_Object$assign({}, _valuesInstanceProperty(this)), {
@@ -6733,11 +6773,11 @@ var SelectAuthenticator = function (_Remediator) {
   return SelectAuthenticator;
 }(Remediator);
 
-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$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 _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$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 SelectAuthenticatorAuthenticate = function (_SelectAuthenticator) {
   _inherits(SelectAuthenticatorAuthenticate, _SelectAuthenticator);
-  var _super = _createSuper$8(SelectAuthenticatorAuthenticate);
+  var _super = _createSuper$9(SelectAuthenticatorAuthenticate);
   function SelectAuthenticatorAuthenticate(remediation) {
     var _this;
     var values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -6762,11 +6802,11 @@ var SelectAuthenticatorAuthenticate = function (_SelectAuthenticator) {
 }(SelectAuthenticator);
 SelectAuthenticatorAuthenticate.remediationName = 'select-authenticator-authenticate';
 
-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$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 _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$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 SelectAuthenticatorEnroll = function (_SelectAuthenticator) {
   _inherits(SelectAuthenticatorEnroll, _SelectAuthenticator);
-  var _super = _createSuper$7(SelectAuthenticatorEnroll);
+  var _super = _createSuper$8(SelectAuthenticatorEnroll);
   function SelectAuthenticatorEnroll() {
     _classCallCheck(this, SelectAuthenticatorEnroll);
     return _super.apply(this, arguments);
@@ -6775,11 +6815,11 @@ var SelectAuthenticatorEnroll = function (_SelectAuthenticator) {
 }(SelectAuthenticator);
 SelectAuthenticatorEnroll.remediationName = 'select-authenticator-enroll';
 
-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$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 _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$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; } }
 var SelectAuthenticatorUnlockAccount = function (_SelectAuthenticator) {
   _inherits(SelectAuthenticatorUnlockAccount, _SelectAuthenticator);
-  var _super = _createSuper$6(SelectAuthenticatorUnlockAccount);
+  var _super = _createSuper$7(SelectAuthenticatorUnlockAccount);
   function SelectAuthenticatorUnlockAccount() {
     var _this;
     _classCallCheck(this, SelectAuthenticatorUnlockAccount);
@@ -6818,7 +6858,7 @@ var SelectAuthenticatorUnlockAccount = function (_SelectAuthenticator) {
     value: function getInputUsername() {
       return {
         name: 'username',
-        key: 'string'
+        type: 'string'
       };
     }
   }]);
@@ -6826,11 +6866,11 @@ var SelectAuthenticatorUnlockAccount = function (_SelectAuthenticator) {
 }(SelectAuthenticator);
 SelectAuthenticatorUnlockAccount.remediationName = 'select-authenticator-unlock-account';
 
-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$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 _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$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 SelectEnrollProfile = function (_Remediator) {
   _inherits(SelectEnrollProfile, _Remediator);
-  var _super = _createSuper$5(SelectEnrollProfile);
+  var _super = _createSuper$6(SelectEnrollProfile);
   function SelectEnrollProfile() {
     _classCallCheck(this, SelectEnrollProfile);
     return _super.apply(this, arguments);
@@ -6845,11 +6885,11 @@ var SelectEnrollProfile = function (_Remediator) {
 }(Remediator);
 SelectEnrollProfile.remediationName = 'select-enroll-profile';
 
-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$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; } }
+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$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 AuthenticatorData = function (_Remediator) {
   _inherits(AuthenticatorData, _Remediator);
-  var _super = _createSuper$4(AuthenticatorData);
+  var _super = _createSuper$5(AuthenticatorData);
   function AuthenticatorData(remediation) {
     var _this;
     var values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -6898,8 +6938,8 @@ var AuthenticatorData = function (_Remediator) {
     }
   }, {
     key: "getNextStep",
-    value: function getNextStep() {
-      var common = _get(_getPrototypeOf(AuthenticatorData.prototype), "getNextStep", this).call(this);
+    value: function getNextStep(authClient) {
+      var common = _get(_getPrototypeOf(AuthenticatorData.prototype), "getNextStep", this).call(this, authClient);
       var options = this.getMethodTypes();
       return _Object$assign(_Object$assign({}, common), options && {
         options: options
@@ -6963,11 +7003,11 @@ var AuthenticatorData = function (_Remediator) {
   return AuthenticatorData;
 }(Remediator);
 
-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$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; } }
+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$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 AuthenticatorVerificationData = function (_AuthenticatorData) {
   _inherits(AuthenticatorVerificationData, _AuthenticatorData);
-  var _super = _createSuper$3(AuthenticatorVerificationData);
+  var _super = _createSuper$4(AuthenticatorVerificationData);
   function AuthenticatorVerificationData(remediation) {
     var _this;
     var values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -7018,7 +7058,8 @@ var AuthenticatorVerificationData = function (_AuthenticatorData) {
         return {
           name: 'methodType',
           type: 'string',
-          required: true
+          required: true,
+          options: methodType.options
         };
       }
       var inputs = _toConsumableArray(authenticator.form.value);
@@ -7042,11 +7083,11 @@ var AuthenticatorVerificationData = function (_AuthenticatorData) {
 }(AuthenticatorData);
 AuthenticatorVerificationData.remediationName = 'authenticator-verification-data';
 
-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; } }
+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$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 AuthenticatorEnrollmentData = function (_AuthenticatorData) {
   _inherits(AuthenticatorEnrollmentData, _AuthenticatorData);
-  var _super = _createSuper$2(AuthenticatorEnrollmentData);
+  var _super = _createSuper$3(AuthenticatorEnrollmentData);
   function AuthenticatorEnrollmentData() {
     _classCallCheck(this, AuthenticatorEnrollmentData);
     return _super.apply(this, arguments);
@@ -7068,17 +7109,22 @@ var AuthenticatorEnrollmentData = function (_AuthenticatorData) {
     }
   }, {
     key: "getInputAuthenticator",
-    value: function getInputAuthenticator() {
-      return [{
+    value: function getInputAuthenticator(remediation) {
+      var _context2;
+      return _mapInstanceProperty(_context2 = [{
         name: 'methodType',
-        type: 'string',
-        required: true
+        type: 'string'
       }, {
         name: 'phoneNumber',
-        type: 'string',
-        required: true,
-        label: 'Phone Number'
-      }];
+        label: 'Phone Number',
+        type: 'string'
+      }]).call(_context2, function (item) {
+        var _context3;
+        var value = _findInstanceProperty(_context3 = remediation.form.value).call(_context3, function (val) {
+          return val.name === item.name;
+        });
+        return _Object$assign(_Object$assign({}, value), item);
+      });
     }
   }, {
     key: "mapAuthenticatorDataFromValues",
@@ -7097,11 +7143,11 @@ var AuthenticatorEnrollmentData = function (_AuthenticatorData) {
 }(AuthenticatorData);
 AuthenticatorEnrollmentData.remediationName = 'authenticator-enrollment-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; } }
+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 Skip = function (_Remediator) {
   _inherits(Skip, _Remediator);
-  var _super = _createSuper$1(Skip);
+  var _super = _createSuper$2(Skip);
   function Skip() {
     _classCallCheck(this, Skip);
     return _super.apply(this, arguments);
@@ -7116,6 +7162,197 @@ var Skip = function (_Remediator) {
 }(Remediator);
 Skip.remediationName = 'skip';
 
+function unwrapFormValue(remediation) {
+  var res = {};
+  for (var _i = 0, _Object$entries$1 = _Object$entries(remediation); _i < _Object$entries$1.length; _i++) {
+    var _Object$entries$_i = _slicedToArray(_Object$entries$1[_i], 2),
+        key = _Object$entries$_i[0],
+        value = _Object$entries$_i[1];
+    if (value === null || typeof value === 'undefined') {
+      continue;
+    }
+    if (Array.isArray(value)) {
+      res[key] = _mapInstanceProperty(value).call(value, unwrapFormValue);
+    } else if (_typeof(value) === 'object') {
+      var _context, _context2;
+      var formKeys = _Object$keys(value);
+      if (_includesInstanceProperty(_context = ['value', 'form']).call(_context, key) && formKeys.length === 1 && _includesInstanceProperty(_context2 = ['value', 'form']).call(_context2, formKeys[0])) {
+        var unwrappedForm = unwrapFormValue(value);
+        _Object$entries(unwrappedForm).forEach(function (_ref) {
+          var _ref2 = _slicedToArray(_ref, 2),
+              key = _ref2[0],
+              value = _ref2[1];
+          res[key] = value;
+        });
+      } else {
+        res[key] = unwrapFormValue(value);
+      }
+    } else {
+      res[key] = value;
+    }
+  }
+  return res;
+}
+function hasValidInputValue(input, values) {
+  var fn = function fn(input, values, requiredTracker) {
+    var name = input.name,
+        value = input.value,
+        required = input.required;
+    var isRequired = required || requiredTracker
+    || name === 'authenticator';
+    if (!isRequired) {
+      return true;
+    }
+    if (Array.isArray(value)) {
+      return _reduceInstanceProperty(value).call(value, function (acc, item) {
+        return acc && fn(item, values[name], isRequired);
+      }, true);
+    } else {
+      return !!(values && values[name]);
+    }
+  };
+  return fn(input, values, false);
+}
+
+function canProceed(authClient) {
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var meta = getSavedTransactionMeta(authClient, options);
+  return !!(meta || options.stateHandle);
+}
+function proceed(_x) {
+  return _proceed.apply(this, arguments);
+}
+function _proceed() {
+  _proceed = _asyncToGenerator( _regeneratorRuntime.mark(function _callee(authClient) {
+    var options,
+        flow,
+        state,
+        meta,
+        _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 (canProceed(authClient, options)) {
+              _context.next = 3;
+              break;
+            }
+            throw new AuthSdkError('Unable to proceed: saved transaction could not be loaded');
+          case 3:
+            flow = options.flow, state = options.state;
+            if (!flow) {
+              meta = getSavedTransactionMeta(authClient, {
+                state: state
+              });
+              flow = meta === null || meta === void 0 ? void 0 : meta.flow;
+            }
+            return _context.abrupt("return", run(authClient, _Object$assign(_Object$assign({}, options), {
+              flow: flow
+            })));
+          case 6:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+  return _proceed.apply(this, arguments);
+}
+
+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 GenericRemediator = function (_Remediator) {
+  _inherits(GenericRemediator, _Remediator);
+  var _super = _createSuper$1(GenericRemediator);
+  function GenericRemediator() {
+    _classCallCheck(this, GenericRemediator);
+    return _super.apply(this, arguments);
+  }
+  _createClass(GenericRemediator, [{
+    key: "canRemediate",
+    value: function canRemediate() {
+      var _this = this;
+      if (typeof this.remediation.action !== 'function') {
+        return false;
+      }
+      var inputs = this.getInputs();
+      var res = _reduceInstanceProperty(inputs).call(inputs, function (acc, input) {
+        return acc && hasValidInputValue(input, _valuesInstanceProperty(_this));
+      }, true);
+      return res;
+    }
+  }, {
+    key: "getData",
+    value: function getData() {
+      var _context2,
+          _this2 = this;
+      var data = _reduceInstanceProperty(_context2 = this.getInputs()).call(_context2, function (acc, _ref) {
+        var name = _ref.name;
+        acc[name] = _valuesInstanceProperty(_this2)[name];
+        return acc;
+      }, {});
+      return data;
+    }
+  }, {
+    key: "getNextStep",
+    value: function getNextStep(authClient, _context) {
+      var name = this.getName();
+      var inputs = this.getInputs();
+      var _a = this.remediation;
+          _a.href;
+          _a.method;
+          _a.rel;
+          _a.accepts;
+          _a.produces;
+          _a.value;
+          var action = _a.action,
+          rest = __rest(_a, ["href", "method", "rel", "accepts", "produces", "value", "action"]);
+      if (action) {
+        return _Object$assign(_Object$assign(_Object$assign({}, rest), !!inputs.length && {
+          inputs: inputs
+        }), {
+          action: function () {
+            var _action = _asyncToGenerator( _regeneratorRuntime.mark(function _callee(params) {
+              return _regeneratorRuntime.wrap(function _callee$(_context3) {
+                while (1) {
+                  switch (_context3.prev = _context3.next) {
+                    case 0:
+                      return _context3.abrupt("return", proceed(authClient, _Object$assign({
+                        step: name
+                      }, params)));
+                    case 1:
+                    case "end":
+                      return _context3.stop();
+                  }
+                }
+              }, _callee);
+            }));
+            function action(_x) {
+              return _action.apply(this, arguments);
+            }
+            return action;
+          }()
+        });
+      }
+      return _Object$assign({}, this.remediation);
+    }
+  }, {
+    key: "getInputs",
+    value: function getInputs() {
+      var _context4, _context5, _context6;
+      return _mapInstanceProperty(_context4 = _mapInstanceProperty(_context5 = _filterInstanceProperty(_context6 = this.remediation.value || []).call(_context6, function (_ref2) {
+        var name = _ref2.name;
+        return name !== 'stateHandle';
+      })).call(_context5, unwrapFormValue)).call(_context4, function (input) {
+        input.type = input.type || 'string';
+        return input;
+      });
+    }
+  }]);
+  return GenericRemediator;
+}(Remediator);
+
 var remediators = /*#__PURE__*/Object.freeze({
   __proto__: null,
   Remediator: Remediator,
@@ -7136,11 +7373,12 @@ var remediators = /*#__PURE__*/Object.freeze({
   SelectEnrollProfile: SelectEnrollProfile,
   AuthenticatorVerificationData: AuthenticatorVerificationData,
   AuthenticatorEnrollmentData: AuthenticatorEnrollmentData,
-  Skip: Skip
+  Skip: Skip,
+  GenericRemediator: GenericRemediator
 });
 
 function _createForOfIteratorHelper$1(o, allowArrayLike) { var it = typeof _Symbol !== "undefined" && _getIteratorMethod(o) || 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) { var _context12; if (!o) return; if (typeof o === "string") return _arrayLikeToArray$1(o, minLen); var n = _sliceInstanceProperty(_context12 = Object.prototype.toString.call(o)).call(_context12, 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$1(o, minLen) { var _context13; if (!o) return; if (typeof o === "string") return _arrayLikeToArray$1(o, minLen); var n = _sliceInstanceProperty(_context13 = Object.prototype.toString.call(o)).call(_context13, 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 isTerminalResponse(idxResponse) {
   var neededToProceed = idxResponse.neededToProceed,
@@ -7258,7 +7496,7 @@ function getEnabledFeatures(idxResponse) {
   }
   return res;
 }
-function getAvailableSteps(idxResponse) {
+function getAvailableSteps(authClient, idxResponse, useGenericRemediator) {
   var _context9;
   var res = [];
   var remediatorMap = _reduceInstanceProperty(_context9 = _Object$values(remediators)).call(_context9, function (map, remediatorClass) {
@@ -7272,10 +7510,13 @@ function getAvailableSteps(idxResponse) {
   try {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
       var remediation = _step2.value;
-      var T = remediatorMap[remediation.name];
+      var T = getRemediatorClass(remediation, {
+        useGenericRemediator: useGenericRemediator,
+        remediators: remediatorMap
+      });
       if (T) {
         var remediator = new T(remediation);
-        res.push(remediator.getNextStep(idxResponse.context));
+        res.push(remediator.getNextStep(authClient, idxResponse.context));
       }
     }
   } catch (err) {
@@ -7283,10 +7524,44 @@ function getAvailableSteps(idxResponse) {
   } finally {
     _iterator2.f();
   }
+  var _loop = function _loop() {
+    var _Object$entries$_i = _slicedToArray(_Object$entries$1[_i], 1),
+        name = _Object$entries$_i[0];
+    res.push({
+      name: name,
+      action: function () {
+        var _action = _asyncToGenerator( _regeneratorRuntime.mark(function _callee(params) {
+          return _regeneratorRuntime.wrap(function _callee$(_context10) {
+            while (1) {
+              switch (_context10.prev = _context10.next) {
+                case 0:
+                  return _context10.abrupt("return", proceed(authClient, {
+                    actions: [{
+                      name: name,
+                      params: params
+                    }]
+                  }));
+                case 1:
+                case "end":
+                  return _context10.stop();
+              }
+            }
+          }, _callee);
+        }));
+        function action(_x) {
+          return _action.apply(this, arguments);
+        }
+        return action;
+      }()
+    });
+  };
+  for (var _i = 0, _Object$entries$1 = _Object$entries(idxResponse.actions || {}); _i < _Object$entries$1.length; _i++) {
+    _loop();
+  }
   return res;
 }
 function filterValuesForRemediation(idxResponse, remediationName, values) {
-  var _context10;
+  var _context11;
   var remediations = idxResponse.neededToProceed || [];
   var remediation = _findInstanceProperty(remediations).call(remediations, function (r) {
     return r.name === remediationName;
@@ -7295,7 +7570,7 @@ function filterValuesForRemediation(idxResponse, remediationName, values) {
     warn("filterValuesForRemediation: \"".concat(remediationName, "\" did not match any remediations"));
     return values;
   }
-  var valuesForRemediation = _reduceInstanceProperty(_context10 = remediation.value).call(_context10, function (res, entry) {
+  var valuesForRemediation = _reduceInstanceProperty(_context11 = remediation.value).call(_context11, function (res, entry) {
     var name = entry.name,
         value = entry.value;
     if (name === 'stateHandle') {
@@ -7307,8 +7582,20 @@ function filterValuesForRemediation(idxResponse, remediationName, values) {
   }, {});
   return valuesForRemediation;
 }
+function getRemediatorClass(remediation, options) {
+  var useGenericRemediator = options.useGenericRemediator,
+      remediators = options.remediators;
+  if (!remediation) {
+    return undefined;
+  }
+  if (useGenericRemediator) {
+    return GenericRemediator;
+  }
+  return remediators[remediation.name];
+}
 function getRemediator(idxRemediations, values, options) {
   var remediators = options.remediators;
+  var useGenericRemediator = options.useGenericRemediator;
   var remediator;
   if (options.step) {
     var remediation = _findInstanceProperty(idxRemediations).call(idxRemediations, function (_ref5) {
@@ -7316,7 +7603,7 @@ function getRemediator(idxRemediations, values, options) {
       return name === options.step;
     });
     if (remediation) {
-      var T = remediation ? remediators[remediation.name] : undefined;
+      var T = getRemediatorClass(remediation, options);
       return T ? new T(remediation, values, options) : undefined;
     } else {
       warn("step \"".concat(options.step, "\" did not match any remediations"));
@@ -7328,13 +7615,13 @@ function getRemediator(idxRemediations, values, options) {
       _step3;
   try {
     for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-      var _context11;
+      var _context12;
       var _remediation = _step3.value;
-      var isRemeditionInFlow = _includesInstanceProperty(_context11 = _Object$keys(remediators)).call(_context11, _remediation.name);
+      var isRemeditionInFlow = _includesInstanceProperty(_context12 = _Object$keys(remediators)).call(_context12, _remediation.name);
       if (!isRemeditionInFlow) {
         continue;
       }
-      var _T = remediators[_remediation.name];
+      var _T = getRemediatorClass(_remediation, options);
       remediator = new _T(_remediation, values, options);
       if (remediator.canRemediate()) {
         return remediator;
@@ -7346,10 +7633,13 @@ function getRemediator(idxRemediations, values, options) {
   } finally {
     _iterator3.f();
   }
+  if (!remediatorCandidates.length && !!idxRemediations.length && useGenericRemediator) {
+    return new GenericRemediator(idxRemediations[0], values, options);
+  }
   return remediatorCandidates[0];
 }
-function getNextStep(remediator, idxResponse) {
-  var nextStep = remediator.getNextStep(idxResponse.context);
+function getNextStep(authClient, remediator, idxResponse) {
+  var nextStep = remediator.getNextStep(authClient, idxResponse.context);
   var canSkip = canSkipFn(idxResponse);
   var canResend = canResendFn(idxResponse);
   return _Object$assign(_Object$assign(_Object$assign({}, nextStep), canSkip && {
@@ -7358,7 +7648,7 @@ function getNextStep(remediator, idxResponse) {
     canResend: canResend
   });
 }
-function handleIdxError(e, remediator) {
+function handleIdxError(authClient, e, remediator) {
   var idxResponse = isIdxResponse(e) ? e : null;
   if (!idxResponse) {
     throw e;
@@ -7375,7 +7665,7 @@ function handleIdxError(e, remediator) {
       messages: messages
     };
   } else {
-    var nextStep = remediator && getNextStep(remediator, idxResponse);
+    var nextStep = remediator && getNextStep(authClient, remediator, idxResponse);
     return _Object$assign({
       idxResponse: idxResponse,
       messages: messages
@@ -7411,13 +7701,13 @@ function removeActionFromOptions(options, actionName) {
     actions: actions
   });
 }
-function remediate(_x, _x2, _x3) {
+function remediate(_x, _x2, _x3, _x4) {
   return _remediate.apply(this, arguments);
 }
 function _remediate() {
-  _remediate = _asyncToGenerator( _regeneratorRuntime.mark(function _callee(idxResponse, values, options) {
+  _remediate = _asyncToGenerator( _regeneratorRuntime.mark(function _callee(authClient, idxResponse, values, options) {
     var _context2;
-    var _idxResponse, neededToProceed, interactionCode, _options, flow, terminal, messages, remediator, actionFromValues, actionFromOptions, actions, _iterator, _step, _loop, _ret, nextStep, name, data;
+    var _idxResponse, neededToProceed, interactionCode, _options, flow, remediator, actionFromValues, actionFromOptions, actions, _iterator, _step, _loop, _ret, terminal, messages, nextStep, name, data;
     return _regeneratorRuntime.wrap(function _callee$(_context4) {
       while (1) {
         switch (_context4.prev = _context4.next) {
@@ -7432,28 +7722,16 @@ function _remediate() {
               idxResponse: idxResponse
             });
           case 4:
-            terminal = isTerminalResponse(idxResponse);
-            messages = getMessagesFromResponse(idxResponse);
-            if (!terminal) {
-              _context4.next = 8;
-              break;
-            }
-            return _context4.abrupt("return", {
-              idxResponse: idxResponse,
-              terminal: terminal,
-              messages: messages
-            });
-          case 8:
             remediator = getRemediator(neededToProceed, values, options);
             actionFromValues = getActionFromValues(values, idxResponse);
             actionFromOptions = options.actions || [];
             actions = _concatInstanceProperty(_context2 = []).call(_context2, _toConsumableArray(actionFromOptions), _toConsumableArray(actionFromValues && [actionFromValues] || []));
             if (!actions) {
-              _context4.next = 32;
+              _context4.next = 28;
               break;
             }
             _iterator = _createForOfIteratorHelper(actions);
-            _context4.prev = 14;
+            _context4.prev = 10;
             _loop = _regeneratorRuntime.mark(function _loop() {
               var action, params, valuesWithoutExecutedAction, optionsWithoutExecutedAction, remediationAction;
               return _regeneratorRuntime.wrap(function _loop$(_context3) {
@@ -7486,7 +7764,7 @@ function _remediate() {
                       _context3.prev = 13;
                       _context3.t0 = _context3["catch"](6);
                       return _context3.abrupt("return", {
-                        v: handleIdxError(_context3.t0, remediator)
+                        v: handleIdxError(authClient, _context3.t0, remediator)
                       });
                     case 16:
                       if (!(action === 'cancel')) {
@@ -7501,7 +7779,7 @@ function _remediate() {
                       });
                     case 18:
                       return _context3.abrupt("return", {
-                        v: remediate(idxResponse, valuesWithoutExecutedAction, optionsWithoutExecutedAction)
+                        v: remediate(authClient, idxResponse, valuesWithoutExecutedAction, optionsWithoutExecutedAction)
                       });
                     case 19:
                       remediationAction = _findInstanceProperty(neededToProceed).call(neededToProceed, function (_ref) {
@@ -7526,11 +7804,11 @@ function _remediate() {
                       _context3.prev = 28;
                       _context3.t1 = _context3["catch"](21);
                       return _context3.abrupt("return", {
-                        v: handleIdxError(_context3.t1, remediator)
+                        v: handleIdxError(authClient, _context3.t1, remediator)
                       });
                     case 31:
                       return _context3.abrupt("return", {
-                        v: remediate(idxResponse, values, optionsWithoutExecutedAction)
+                        v: remediate(authClient, idxResponse, values, optionsWithoutExecutedAction)
                       });
                     case 32:
                     case "end":
@@ -7540,33 +7818,45 @@ function _remediate() {
               }, _loop, null, [[6, 13], [21, 28]]);
             });
             _iterator.s();
-          case 17:
+          case 13:
             if ((_step = _iterator.n()).done) {
-              _context4.next = 24;
+              _context4.next = 20;
               break;
             }
-            return _context4.delegateYield(_loop(), "t0", 19);
-          case 19:
+            return _context4.delegateYield(_loop(), "t0", 15);
+          case 15:
             _ret = _context4.t0;
             if (!(_typeof(_ret) === "object")) {
-              _context4.next = 22;
+              _context4.next = 18;
               break;
             }
             return _context4.abrupt("return", _ret.v);
-          case 22:
-            _context4.next = 17;
+          case 18:
+            _context4.next = 13;
             break;
-          case 24:
-            _context4.next = 29;
+          case 20:
+            _context4.next = 25;
             break;
-          case 26:
-            _context4.prev = 26;
-            _context4.t1 = _context4["catch"](14);
+          case 22:
+            _context4.prev = 22;
+            _context4.t1 = _context4["catch"](10);
             _iterator.e(_context4.t1);
-          case 29:
-            _context4.prev = 29;
+          case 25:
+            _context4.prev = 25;
             _iterator.f();
-            return _context4.finish(29);
+            return _context4.finish(25);
+          case 28:
+            terminal = isTerminalResponse(idxResponse);
+            messages = getMessagesFromResponse(idxResponse);
+            if (!terminal) {
+              _context4.next = 32;
+              break;
+            }
+            return _context4.abrupt("return", {
+              idxResponse: idxResponse,
+              terminal: terminal,
+              messages: messages
+            });
           case 32:
             if (remediator) {
               _context4.next = 49;
@@ -7591,7 +7881,7 @@ function _remediate() {
           case 43:
             _context4.prev = 43;
             _context4.t2 = _context4["catch"](35);
-            return _context4.abrupt("return", handleIdxError(_context4.t2));
+            return _context4.abrupt("return", handleIdxError(authClient, _context4.t2));
           case 46:
             if (!(flow === 'default')) {
               _context4.next = 48;
@@ -7609,7 +7899,7 @@ function _remediate() {
               _context4.next = 52;
               break;
             }
-            nextStep = getNextStep(remediator, idxResponse);
+            nextStep = getNextStep(authClient, remediator, idxResponse);
             return _context4.abrupt("return", {
               idxResponse: idxResponse,
               nextStep: nextStep,
@@ -7630,17 +7920,17 @@ function _remediate() {
             options = _Object$assign(_Object$assign({}, options), {
               step: undefined
             });
-            return _context4.abrupt("return", remediate(idxResponse, values, options));
+            return _context4.abrupt("return", remediate(authClient, idxResponse, values, options));
           case 64:
             _context4.prev = 64;
             _context4.t3 = _context4["catch"](54);
-            return _context4.abrupt("return", handleIdxError(_context4.t3, remediator));
+            return _context4.abrupt("return", handleIdxError(authClient, _context4.t3, remediator));
           case 67:
           case "end":
             return _context4.stop();
         }
       }
-    }, _callee, null, [[14, 26, 29, 32], [35, 43], [54, 64]]);
+    }, _callee, null, [[10, 22, 25, 28], [35, 43], [54, 64]]);
   }));
   return _remediate.apply(this, arguments);
 }
@@ -7743,11 +8033,13 @@ function initializeValues(options) {
   return values;
 }
 function initializeData(authClient, data) {
+  var _a;
   var options = data.options;
   var flow = options.flow,
       withCredentials = options.withCredentials,
       remediators = options.remediators,
-      actions = options.actions;
+      actions = options.actions,
+      useGenericRemediator = options.useGenericRemediator;
   var status = IdxStatus.PENDING;
   flow = flow || authClient.idx.getFlow() || 'default';
   if (flow) {
@@ -7757,12 +8049,14 @@ function initializeData(authClient, data) {
     remediators = remediators || flowSpec.remediators;
     actions = actions || flowSpec.actions;
   }
+  useGenericRemediator = useGenericRemediator || ((_a = authClient.options.idx) === null || _a === void 0 ? void 0 : _a.useGenericRemediator) || false;
   return _Object$assign(_Object$assign({}, data), {
     options: _Object$assign(_Object$assign({}, options), {
       flow: flow,
       withCredentials: withCredentials,
       remediators: remediators,
-      actions: actions
+      actions: actions,
+      useGenericRemediator: useGenericRemediator
     }),
     status: status
   });
@@ -7772,13 +8066,13 @@ function getDataFromIntrospect(_x, _x2) {
 }
 function _getDataFromIntrospect() {
   _getDataFromIntrospect = _asyncToGenerator( _regeneratorRuntime.mark(function _callee(authClient, data) {
-    var options, stateHandle, withCredentials, version, state, scopes, recoveryToken, activationToken, idxResponse, meta, interactionHandle, interactResponse;
+    var options, stateHandle, withCredentials, version, state, scopes, recoveryToken, activationToken, maxAge, idxResponse, meta, interactionHandle, interactResponse;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
             options = data.options;
-            stateHandle = options.stateHandle, withCredentials = options.withCredentials, version = options.version, state = options.state, scopes = options.scopes, recoveryToken = options.recoveryToken, activationToken = options.activationToken;
+            stateHandle = options.stateHandle, withCredentials = options.withCredentials, version = options.version, state = options.state, scopes = options.scopes, recoveryToken = options.recoveryToken, activationToken = options.activationToken, maxAge = options.maxAge;
             meta = getSavedTransactionMeta(authClient, {
               state: state,
               recoveryToken: recoveryToken,
@@ -7811,7 +8105,8 @@ function _getDataFromIntrospect() {
               state: state,
               scopes: scopes,
               activationToken: activationToken,
-              recoveryToken: recoveryToken
+              recoveryToken: recoveryToken,
+              maxAge: maxAge
             });
           case 14:
             interactResponse = _context.sent;
@@ -7840,18 +8135,18 @@ function _getDataFromIntrospect() {
   }));
   return _getDataFromIntrospect.apply(this, arguments);
 }
-function getDataFromRemediate(_x3) {
+function getDataFromRemediate(_x3, _x4) {
   return _getDataFromRemediate.apply(this, arguments);
 }
 function _getDataFromRemediate() {
-  _getDataFromRemediate = _asyncToGenerator( _regeneratorRuntime.mark(function _callee2(data) {
-    var idxResponse, options, values, autoRemediate, remediators, actions, flow, step, shouldProceedWithEmailAuthenticator, shouldRemediate, _yield$remediate, idxResponseFromRemediation, nextStep, canceled;
+  _getDataFromRemediate = _asyncToGenerator( _regeneratorRuntime.mark(function _callee2(authClient, data) {
+    var idxResponse, options, values, autoRemediate, remediators, actions, flow, step, shouldProceedWithEmailAuthenticator, useGenericRemediator, shouldRemediate, _yield$remediate, idxResponseFromRemediation, nextStep, canceled;
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
             idxResponse = data.idxResponse, options = data.options, values = _valuesInstanceProperty(data);
-            autoRemediate = options.autoRemediate, remediators = options.remediators, actions = options.actions, flow = options.flow, step = options.step, shouldProceedWithEmailAuthenticator = options.shouldProceedWithEmailAuthenticator;
+            autoRemediate = options.autoRemediate, remediators = options.remediators, actions = options.actions, flow = options.flow, step = options.step, shouldProceedWithEmailAuthenticator = options.shouldProceedWithEmailAuthenticator, useGenericRemediator = options.useGenericRemediator;
             shouldRemediate = autoRemediate !== false && (remediators || actions || step);
             if (shouldRemediate) {
               _context2.next = 5;
@@ -7863,12 +8158,13 @@ function _getDataFromRemediate() {
               stateHandle: idxResponse.rawIdxState.stateHandle
             });
             _context2.next = 8;
-            return remediate(idxResponse, values, {
+            return remediate(authClient, idxResponse, values, {
               remediators: remediators,
               actions: actions,
               flow: flow,
               step: step,
-              shouldProceedWithEmailAuthenticator: shouldProceedWithEmailAuthenticator
+              shouldProceedWithEmailAuthenticator: shouldProceedWithEmailAuthenticator,
+              useGenericRemediator: useGenericRemediator
             });
           case 8:
             _yield$remediate = _context2.sent;
@@ -7890,7 +8186,7 @@ function _getDataFromRemediate() {
   }));
   return _getDataFromRemediate.apply(this, arguments);
 }
-function getTokens(_x4, _x5) {
+function getTokens(_x5, _x6) {
   return _getTokens.apply(this, arguments);
 }
 function _getTokens() {
@@ -7924,70 +8220,82 @@ function _getTokens() {
   }));
   return _getTokens.apply(this, arguments);
 }
-function finalizeData(_x6, _x7) {
+function finalizeData(_x7, _x8) {
   return _finalizeData.apply(this, arguments);
 }
 function _finalizeData() {
   _finalizeData = _asyncToGenerator( _regeneratorRuntime.mark(function _callee4(authClient, data) {
-    var options, idxResponse, canceled, status, exchangeCodeForTokens, shouldClearTransaction, clearSharedStorage, interactionCode, tokens, enabledFeatures, availableSteps, messages, terminal;
+    var options, idxResponse, canceled, status, exchangeCodeForTokens, shouldSaveResponse, shouldClearTransaction, clearSharedStorage, interactionCode, tokens, enabledFeatures, availableSteps, messages, terminal, hasActions, hasErrors, isTerminalSuccess;
     return _regeneratorRuntime.wrap(function _callee4$(_context4) {
       while (1) {
         switch (_context4.prev = _context4.next) {
           case 0:
             options = data.options, idxResponse = data.idxResponse, canceled = data.canceled, status = data.status;
             exchangeCodeForTokens = options.exchangeCodeForTokens;
+            shouldSaveResponse = false;
             shouldClearTransaction = false;
             clearSharedStorage = true;
             if (idxResponse) {
+              shouldSaveResponse = !!(idxResponse.requestDidSucceed || idxResponse.stepUp);
               enabledFeatures = getEnabledFeatures(idxResponse);
-              availableSteps = getAvailableSteps(idxResponse);
+              availableSteps = getAvailableSteps(authClient, idxResponse, options.useGenericRemediator);
               messages = getMessagesFromResponse(idxResponse);
               terminal = isTerminalResponse(idxResponse);
             }
             if (!terminal) {
-              _context4.next = 11;
+              _context4.next = 15;
               break;
             }
             status = IdxStatus.TERMINAL;
-            shouldClearTransaction = true;
+            hasActions = _Object$keys(idxResponse.actions).length > 0;
+            hasErrors = !!_findInstanceProperty(messages).call(messages, function (msg) {
+              return msg.class === 'ERROR';
+            });
+            isTerminalSuccess = !hasActions && !hasErrors && idxResponse.requestDidSucceed === true;
+            if (isTerminalSuccess) {
+              shouldClearTransaction = true;
+            } else {
+              shouldSaveResponse = shouldSaveResponse && hasActions;
+            }
             clearSharedStorage = false;
-            _context4.next = 28;
+            _context4.next = 32;
             break;
-          case 11:
+          case 15:
             if (!canceled) {
-              _context4.next = 16;
+              _context4.next = 20;
               break;
             }
             status = IdxStatus.CANCELED;
             shouldClearTransaction = true;
-            _context4.next = 28;
+            _context4.next = 32;
             break;
-          case 16:
+          case 20:
             if (!(idxResponse === null || idxResponse === void 0 ? void 0 : idxResponse.interactionCode)) {
-              _context4.next = 28;
+              _context4.next = 32;
               break;
             }
             interactionCode = idxResponse.interactionCode;
             if (!(exchangeCodeForTokens === false)) {
-              _context4.next = 23;
+              _context4.next = 27;
               break;
             }
             status = IdxStatus.SUCCESS;
             shouldClearTransaction = false;
-            _context4.next = 28;
+            _context4.next = 32;
             break;
-          case 23:
-            _context4.next = 25;
+          case 27:
+            _context4.next = 29;
             return getTokens(authClient, data);
-          case 25:
+          case 29:
             tokens = _context4.sent;
             status = IdxStatus.SUCCESS;
             shouldClearTransaction = true;
-          case 28:
+          case 32:
             return _context4.abrupt("return", _Object$assign(_Object$assign({}, data), {
               status: status,
               interactionCode: interactionCode,
               tokens: tokens,
+              shouldSaveResponse: shouldSaveResponse,
               shouldClearTransaction: shouldClearTransaction,
               clearSharedStorage: clearSharedStorage,
               enabledFeatures: enabledFeatures,
@@ -7995,7 +8303,7 @@ function _finalizeData() {
               messages: messages,
               terminal: terminal
             }));
-          case 29:
+          case 33:
           case "end":
             return _context4.stop();
         }
@@ -8021,16 +8329,18 @@ function handleError(err, data) {
     shouldClearTransaction: shouldClearTransaction
   });
 }
-function run(_x8) {
+function run(_x9) {
   return _run.apply(this, arguments);
 }
 function _run() {
   _run = _asyncToGenerator( _regeneratorRuntime.mark(function _callee5(authClient) {
     var options,
+        _a,
         data,
         _data,
         idxResponse,
         meta,
+        shouldSaveResponse,
         shouldClearTransaction,
         clearSharedStorage,
         status,
@@ -8067,7 +8377,7 @@ function _run() {
           case 6:
             data = _context5.sent;
             _context5.next = 9;
-            return getDataFromRemediate(data);
+            return getDataFromRemediate(authClient, data);
           case 9:
             data = _context5.sent;
             _context5.next = 15;
@@ -8081,18 +8391,20 @@ function _run() {
             return finalizeData(authClient, data);
           case 17:
             data = _context5.sent;
-            _data = data, idxResponse = _data.idxResponse, meta = _data.meta, shouldClearTransaction = _data.shouldClearTransaction, clearSharedStorage = _data.clearSharedStorage, status = _data.status, enabledFeatures = _data.enabledFeatures, availableSteps = _data.availableSteps, tokens = _data.tokens, nextStep = _data.nextStep, messages = _data.messages, error = _data.error, interactionCode = _data.interactionCode;
+            _data = data, idxResponse = _data.idxResponse, meta = _data.meta, shouldSaveResponse = _data.shouldSaveResponse, shouldClearTransaction = _data.shouldClearTransaction, clearSharedStorage = _data.clearSharedStorage, status = _data.status, enabledFeatures = _data.enabledFeatures, availableSteps = _data.availableSteps, tokens = _data.tokens, nextStep = _data.nextStep, messages = _data.messages, error = _data.error, interactionCode = _data.interactionCode;
             if (shouldClearTransaction) {
               authClient.transactionManager.clear({
                 clearSharedStorage: clearSharedStorage
               });
             } else {
               saveTransactionMeta(authClient, _Object$assign({}, meta));
-              if (idxResponse) {
+              if (shouldSaveResponse) {
                 rawIdxResponse = idxResponse.rawIdxState, _requestDidSucceed = idxResponse.requestDidSucceed;
                 authClient.transactionManager.saveIdxResponse({
                   rawIdxResponse: rawIdxResponse,
-                  requestDidSucceed: _requestDidSucceed
+                  requestDidSucceed: _requestDidSucceed,
+                  stateHandle: (_a = idxResponse.context) === null || _a === void 0 ? void 0 : _a.stateHandle,
+                  interactionHandle: meta === null || meta === void 0 ? void 0 : meta.interactionHandle
                 });
               }
             }
@@ -8250,52 +8562,6 @@ function _handleEmailVerifyCallback() {
   return _handleEmailVerifyCallback.apply(this, arguments);
 }
 
-function canProceed(authClient) {
-  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var meta = getSavedTransactionMeta(authClient, options);
-  return !!(meta || options.stateHandle);
-}
-function proceed(_x) {
-  return _proceed.apply(this, arguments);
-}
-function _proceed() {
-  _proceed = _asyncToGenerator( _regeneratorRuntime.mark(function _callee(authClient) {
-    var options,
-        flow,
-        state,
-        meta,
-        _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 (canProceed(authClient, options)) {
-              _context.next = 3;
-              break;
-            }
-            throw new AuthSdkError('Unable to proceed: saved transaction could not be loaded');
-          case 3:
-            flow = options.flow, state = options.state;
-            if (!flow) {
-              meta = getSavedTransactionMeta(authClient, {
-                state: state
-              });
-              flow = meta === null || meta === void 0 ? void 0 : meta.flow;
-            }
-            return _context.abrupt("return", run(authClient, _Object$assign(_Object$assign({}, options), {
-              flow: flow
-            })));
-          case 6:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee);
-  }));
-  return _proceed.apply(this, arguments);
-}
-
 function poll(_x) {
   return _poll.apply(this, arguments);
 }
@@ -8584,7 +8850,7 @@ function _unlockAccount() {
 var OktaUserAgent = function () {
   function OktaUserAgent() {
     _classCallCheck(this, OktaUserAgent);
-    this.environments = ["okta-auth-js/".concat("6.4.1")];
+    this.environments = ["okta-auth-js/".concat("6.5.0")];
   }
   _createClass(OktaUserAgent, [{
     key: "addEnvironment",
@@ -8602,7 +8868,7 @@ var OktaUserAgent = function () {
   }, {
     key: "getVersion",
     value: function getVersion() {
-      return "6.4.1";
+      return "6.5.0";
     }
   }, {
     key: "maybeAddNodeEnvironment",