@okta/okta-auth-js 6.2.0 → 6.3.0

package/esm/esm.browser.js

@@ -49,13 +49,14 @@ import { BroadcastChannel, createLeaderElection } from 'broadcast-channel';
 import PCancelable from 'p-cancelable';
 import _entriesInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/entries';
 import crossFetch from 'cross-fetch';
-import _URL from '@babel/runtime-corejs3/core-js-stable/url';
+import NodeCache from 'node-cache';
 import _Object$fromEntries from '@babel/runtime-corejs3/core-js-stable/object/from-entries';
 import { JSONPath } from 'jsonpath-plus';
 import _includesInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/includes';
-import _get from '@babel/runtime-corejs3/helpers/get';
 import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
+import _get from '@babel/runtime-corejs3/helpers/get';
 import _Number$isInteger from '@babel/runtime-corejs3/core-js-stable/number/is-integer';
+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); }; }
@@ -1711,6 +1712,9 @@ var IdxFeature;
   IdxFeature["SOCIAL_IDP"] = "redirect-idp";
   IdxFeature["ACCOUNT_UNLOCK"] = "unlock-account";
 })(IdxFeature || (IdxFeature = {}));
+function isAuthenticator(obj) {
+  return obj && (obj.key || obj.id);
+}
 
 function isToken(obj) {
   if (obj && (obj.accessToken || obj.idToken || obj.refreshToken) && Array.isArray(obj.scopes)) {
@@ -2649,16 +2653,16 @@ var storageUtil = {
   },
   browserHasLocalStorage: function browserHasLocalStorage() {
     try {
-      var storage = storageUtil.getLocalStorage();
-      return storageUtil.testStorage(storage);
+      var storage = this.getLocalStorage();
+      return this.testStorage(storage);
     } catch (e) {
       return false;
     }
   },
   browserHasSessionStorage: function browserHasSessionStorage() {
     try {
-      var storage = storageUtil.getSessionStorage();
-      return storageUtil.testStorage(storage);
+      var storage = this.getSessionStorage();
+      return this.testStorage(storage);
     } catch (e) {
       return false;
     }
@@ -2667,10 +2671,10 @@ var storageUtil = {
     var supported = false;
     switch (storageType) {
       case 'sessionStorage':
-        supported = storageUtil.browserHasSessionStorage();
+        supported = this.browserHasSessionStorage();
         break;
       case 'localStorage':
-        supported = storageUtil.browserHasLocalStorage();
+        supported = this.browserHasLocalStorage();
         break;
       case 'cookie':
       case 'memory':
@@ -2686,16 +2690,16 @@ var storageUtil = {
     var storageProvider;
     switch (storageType) {
       case 'sessionStorage':
-        storageProvider = storageUtil.getSessionStorage();
+        storageProvider = this.getSessionStorage();
         break;
       case 'localStorage':
-        storageProvider = storageUtil.getLocalStorage();
+        storageProvider = this.getLocalStorage();
         break;
       case 'cookie':
-        storageProvider = storageUtil.getCookieStorage(options);
+        storageProvider = this.getCookieStorage(options);
         break;
       case 'memory':
-        storageProvider = storageUtil.getInMemoryStorage();
+        storageProvider = this.getInMemoryStorage();
         break;
       default:
         throw new AuthSdkError("Unrecognized storage option: ".concat(storageType));
@@ -2712,11 +2716,11 @@ var storageUtil = {
     if (!nextType) {
       return curType;
     }
-    if (storageUtil.testStorageType(curType)) {
+    if (this.testStorageType(curType)) {
       return curType;
     }
     warn(_concatInstanceProperty(_context = "This browser doesn't support ".concat(curType, ". Switching to ")).call(_context, nextType, "."));
-    return storageUtil.findStorageType(types);
+    return this.findStorageType(types);
   },
   getLocalStorage: function getLocalStorage() {
     return localStorage;
@@ -2725,6 +2729,7 @@ var storageUtil = {
     return sessionStorage;
   },
   getCookieStorage: function getCookieStorage(options) {
+    var _this = this;
     var secure = options.secure;
     var sameSite = options.sameSite;
     var sessionCookie = options.sessionCookie;
@@ -2732,17 +2737,17 @@ var storageUtil = {
       throw new AuthSdkError('getCookieStorage: "secure" and "sameSite" options must be provided');
     }
     var storage = {
-      getItem: storageUtil.storage.get,
+      getItem: this.storage.get,
       setItem: function setItem(key, value) {
         var expiresAt = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '2200-01-01T00:00:00.000Z';
         expiresAt = sessionCookie ? null : expiresAt;
-        storageUtil.storage.set(key, value, expiresAt, {
+        _this.storage.set(key, value, expiresAt, {
           secure: secure,
           sameSite: sameSite
         });
       },
       removeItem: function removeItem(key) {
-        storageUtil.storage.delete(key);
+        _this.storage.delete(key);
       }
     };
     if (!options.useSeparateCookies) {
@@ -2782,13 +2787,13 @@ var storageUtil = {
   },
   inMemoryStore: {},
   getInMemoryStorage: function getInMemoryStorage() {
-    var _this = this;
+    var _this2 = this;
     return {
       getItem: function getItem(key) {
-        return _this.inMemoryStore[key];
+        return _this2.inMemoryStore[key];
       },
       setItem: function setItem(key, value) {
-        _this.inMemoryStore[key] = value;
+        _this2.inMemoryStore[key] = value;
       }
     };
   },
@@ -2818,7 +2823,7 @@ var storageUtil = {
         cookieOptions.expires = new Date(expiresAt);
       }
       Cookies.set(name, value, cookieOptions);
-      return storageUtil.storage.get(name);
+      return this.get(name);
     },
     get: function get(name) {
       if (!arguments.length) {
@@ -3458,9 +3463,9 @@ var SyncStorageService = function () {
   return SyncStorageService;
 }();
 
-function _createForOfIteratorHelper$6(o, allowArrayLike) { var it = typeof _Symbol !== "undefined" && _getIteratorMethod(o) || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$6(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$6(o, minLen) { var _context4; if (!o) return; if (typeof o === "string") return _arrayLikeToArray$6(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$6(o, minLen); }
-function _arrayLikeToArray$6(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 _createForOfIteratorHelper$7(o, allowArrayLike) { var it = typeof _Symbol !== "undefined" && _getIteratorMethod(o) || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$7(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$7(o, minLen) { var _context4; if (!o) return; if (typeof o === "string") return _arrayLikeToArray$7(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$7(o, minLen); }
+function _arrayLikeToArray$7(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 var ServiceManager = function () {
   function ServiceManager(sdk) {
     var _this = this;
@@ -3545,7 +3550,7 @@ var ServiceManager = function () {
     key: "startServices",
     value: function startServices() {
       var _context2;
-      var _iterator = _createForOfIteratorHelper$6(_valuesInstanceProperty(_context2 = this.services).call(_context2)),
+      var _iterator = _createForOfIteratorHelper$7(_valuesInstanceProperty(_context2 = this.services).call(_context2)),
           _step;
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -3565,7 +3570,7 @@ var ServiceManager = function () {
     key: "stopServices",
     value: function stopServices() {
       var _context3;
-      var _iterator2 = _createForOfIteratorHelper$6(_valuesInstanceProperty(_context3 = this.services).call(_context3)),
+      var _iterator2 = _createForOfIteratorHelper$7(_valuesInstanceProperty(_context3 = this.services).call(_context3)),
           _step2;
       try {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
@@ -3577,7 +3582,6 @@ var ServiceManager = function () {
       } finally {
         _iterator2.f();
       }
-      this.services = new _Map();
     }
   }, {
     key: "startElector",
@@ -3598,10 +3602,12 @@ var ServiceManager = function () {
   }, {
     key: "stopElector",
     value: function stopElector() {
-      var _a;
+      var _a, _b;
       if (this.elector) {
         (_a = this.elector) === null || _a === void 0 ? void 0 : _a.die();
         this.elector = undefined;
+        (_b = this.channel) === null || _b === void 0 ? void 0 : _b.close();
+        this.channel = undefined;
       }
     }
   }, {
@@ -3638,9 +3644,13 @@ ServiceManager.defaultOptions = {
 
 var PromiseQueue = function () {
   function PromiseQueue() {
+    var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
+      quiet: false
+    };
     _classCallCheck(this, PromiseQueue);
     this.queue = [];
     this.running = false;
+    this.options = options;
   }
   _createClass(PromiseQueue, [{
     key: "push",
@@ -3651,7 +3661,9 @@ var PromiseQueue = function () {
       }
       return new _Promise(function (resolve, reject) {
         if (_this.queue.length > 0) {
-          warn('Async method is being called but another async method is already running. ' + 'The new method will be delayed until the previous method completes.');
+          if (_this.options.quiet !== false) {
+            warn('Async method is being called but another async method is already running. ' + 'The new method will be delayed until the previous method completes.');
+          }
         }
         _this.queue.push({
           method: method,
@@ -3764,6 +3776,9 @@ var AuthStateManager = function () {
     this._authState = INITIAL_AUTH_STATE;
     this._logOptions = {};
     this._prevAuthState = null;
+    this._transformQueue = new PromiseQueue({
+      quiet: true
+    });
     sdk.tokenManager.on(EVENT_ADDED, function (key, token) {
       _this._setLogOptions({
         event: EVENT_ADDED,
@@ -3882,7 +3897,7 @@ var AuthStateManager = function () {
                       refreshToken: refreshToken,
                       isAuthenticated: !!(accessToken && idToken)
                     };
-                    var promise = transformAuthState ? transformAuthState(_this2._sdk, authState) : _Promise.resolve(authState);
+                    var promise = transformAuthState ? _this2._transformQueue.push(transformAuthState, null, _this2._sdk, authState) : _Promise.resolve(authState);
                     promise.then(function (authState) {
                       return emitAndResolve(authState);
                     }).catch(function (error) {
@@ -4415,7 +4430,9 @@ var TransactionManager = function () {
     }
   }, {
     key: "saveIdxResponse",
-    value: function saveIdxResponse(idxResponse) {
+    value: function saveIdxResponse(_ref) {
+      var rawIdxResponse = _ref.rawIdxResponse,
+          requestDidSucceed = _ref.requestDidSucceed;
       if (!this.saveLastResponse) {
         return;
       }
@@ -4423,7 +4440,10 @@ var TransactionManager = function () {
       if (!storage) {
         return;
       }
-      storage.setStorage(idxResponse);
+      storage.setStorage({
+        rawIdxResponse: rawIdxResponse,
+        requestDidSucceed: requestDidSucceed
+      });
     }
   }, {
     key: "loadIdxResponse",
@@ -4473,9 +4493,9 @@ function assertValidConfig(args) {
   }
 }
 
-function _createForOfIteratorHelper$5(o, allowArrayLike) { var it = typeof _Symbol !== "undefined" && _getIteratorMethod(o) || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$5(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$5(o, minLen) { var _context3; if (!o) return; if (typeof o === "string") return _arrayLikeToArray$5(o, minLen); var n = _sliceInstanceProperty(_context3 = Object.prototype.toString.call(o)).call(_context3, 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$5(o, minLen); }
-function _arrayLikeToArray$5(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 _createForOfIteratorHelper$6(o, allowArrayLike) { var it = typeof _Symbol !== "undefined" && _getIteratorMethod(o) || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$6(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$6(o, minLen) { var _context3; if (!o) return; if (typeof o === "string") return _arrayLikeToArray$6(o, minLen); var n = _sliceInstanceProperty(_context3 = Object.prototype.toString.call(o)).call(_context3, 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$6(o, minLen); }
+function _arrayLikeToArray$6(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 function readData(response) {
   var _context;
   if (response.headers.get('Content-Type') &&
@@ -4495,7 +4515,7 @@ function formatResult(status, data, response) {
   var _context2;
   var isObject = _typeof(data) === 'object';
   var headers = {};
-  var _iterator = _createForOfIteratorHelper$5(_entriesInstanceProperty(_context2 = response.headers).call(_context2)),
+  var _iterator = _createForOfIteratorHelper$6(_entriesInstanceProperty(_context2 = response.headers).call(_context2)),
       _step;
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -4550,7 +4570,93 @@ function fetchRequest(method, url, args) {
   });
 }
 
-var STORAGE_MANAGER_OPTIONS = {
+var sharedStorage = typeof NodeCache === 'function' ? new NodeCache() : null;
+var ServerCookies = function () {
+  function ServerCookies(nodeCache) {
+    _classCallCheck(this, ServerCookies);
+    this.nodeCache = nodeCache;
+  }
+  _createClass(ServerCookies, [{
+    key: "set",
+    value: function set(name, value, expiresAt) {
+      if (!!Date.parse(expiresAt)) {
+        var ttl = (Date.parse(expiresAt) - Date.now()) / 1000;
+        this.nodeCache.set(name, value, ttl);
+      } else {
+        this.nodeCache.set(name, value);
+      }
+      return this.get(name);
+    }
+  }, {
+    key: "get",
+    value: function get(name) {
+      return this.nodeCache.get(name);
+    }
+  }, {
+    key: "delete",
+    value: function _delete(name) {
+      return this.nodeCache.del(name);
+    }
+  }]);
+  return ServerCookies;
+}();
+var ServerStorage = function () {
+  function ServerStorage(nodeCache) {
+    _classCallCheck(this, ServerStorage);
+    this.nodeCache = nodeCache;
+    this.storage = new ServerCookies(nodeCache);
+  }
+  _createClass(ServerStorage, [{
+    key: "testStorageType",
+    value: function testStorageType(storageType) {
+      var supported = false;
+      switch (storageType) {
+        case 'memory':
+          supported = true;
+          break;
+      }
+      return supported;
+    }
+  }, {
+    key: "getStorageByType",
+    value: function getStorageByType(storageType) {
+      var storageProvider;
+      switch (storageType) {
+        case 'memory':
+          storageProvider = this.getStorage();
+          break;
+        default:
+          throw new AuthSdkError("Unrecognized storage option: ".concat(storageType));
+      }
+      return storageProvider;
+    }
+  }, {
+    key: "findStorageType",
+    value: function findStorageType() {
+      return 'memory';
+    }
+  }, {
+    key: "getHttpCache",
+    value: function getHttpCache() {
+      return null;
+    }
+  }, {
+    key: "getStorage",
+    value: function getStorage() {
+      var _this = this;
+      return {
+        getItem: this.nodeCache.get,
+        setItem: function setItem(key, value) {
+          _this.nodeCache.set(key, value, '2200-01-01T00:00:00.000Z');
+        }
+      };
+    }
+  }]);
+  return ServerStorage;
+}();
+var serverStorage = new ServerStorage(sharedStorage);
+
+var BROWSER_STORAGE = {
   token: {
     storageTypes: ['localStorage', 'sessionStorage', 'cookie']
   },
@@ -4567,7 +4673,17 @@ var STORAGE_MANAGER_OPTIONS = {
     storageTypes: ['localStorage']
   }
 };
-var enableSharedStorage = true;
+var SERVER_STORAGE = {
+  token: {
+    storageTypes: ['memory']
+  },
+  cache: {
+    storageTypes: ['memory']
+  },
+  transaction: {
+    storageTypes: ['memory']
+  }
+};
 function getCookieSettings() {
   var args = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var isHTTPS = arguments.length > 1 ? arguments[1] : undefined;
@@ -4587,18 +4703,26 @@ function getCookieSettings() {
   }
   return cookieSettings;
 }
-
 function getDefaultOptions() {
-  var options = {
+  var storageUtil$1;
+  if (isBrowser()) {
+    storageUtil$1 = _Object$assign({}, storageUtil, {
+      inMemoryStore: {}
+    });
+  } else {
+    storageUtil$1 = serverStorage;
+  }
+  var storageManager = isBrowser() ? BROWSER_STORAGE : SERVER_STORAGE;
+  var enableSharedStorage = isBrowser() ? true : false;
+  return {
     devMode: false,
     httpRequestClient: fetchRequest,
-    storageUtil: storageUtil,
-    storageManager: STORAGE_MANAGER_OPTIONS,
+    storageUtil: storageUtil$1,
+    storageManager: storageManager,
     transactionManager: {
       enableSharedStorage: enableSharedStorage
     }
   };
-  return options;
 }
 function mergeOptions(options, args) {
   return _Object$assign({}, options, removeNils(args), {
@@ -4635,7 +4759,7 @@ function buildOptions() {
     devMode: !!args.devMode,
     storageManager: args.storageManager,
     transactionManager: args.transactionManager,
-    cookies: getCookieSettings(args, isHTTPS()),
+    cookies: isBrowser() ? getCookieSettings(args, isHTTPS()) : args.cookies,
     flow: args.flow,
     codeChallenge: args.codeChallenge,
     codeChallengeMethod: args.codeChallengeMethod,
@@ -4706,9 +4830,9 @@ var request = function () {
   };
 }();
 
-function _createForOfIteratorHelper$4(o, allowArrayLike) { var it = typeof _Symbol !== "undefined" && _getIteratorMethod(o) || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$4(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray$4(o, minLen) { var _context; if (!o) return; if (typeof o === "string") return _arrayLikeToArray$4(o, minLen); var n = _sliceInstanceProperty(_context = Object.prototype.toString.call(o)).call(_context, 8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return _Array$from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$4(o, minLen); }
-function _arrayLikeToArray$4(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _createForOfIteratorHelper$5(o, allowArrayLike) { var it = typeof _Symbol !== "undefined" && _getIteratorMethod(o) || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$5(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$5(o, minLen) { var _context; if (!o) return; if (typeof o === "string") return _arrayLikeToArray$5(o, minLen); var n = _sliceInstanceProperty(_context = Object.prototype.toString.call(o)).call(_context, 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$5(o, minLen); }
+function _arrayLikeToArray$5(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 var isFieldMutable = function isFieldMutable(field) {
   return field.mutable !== false;
 };
@@ -4725,7 +4849,7 @@ var divideSingleActionParamsByMutability = function divideSingleActionParamsByMu
       immutableParamsForAction: immutableParamsForAction
     };
   }
-  var _iterator = _createForOfIteratorHelper$4(action.value),
+  var _iterator = _createForOfIteratorHelper$5(action.value),
       _step;
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -4755,7 +4879,7 @@ var divideActionParamsByMutability = function divideActionParamsByMutability(act
   var neededParams = [];
   var defaultParams = {};
   var immutableParams = {};
-  var _iterator2 = _createForOfIteratorHelper$4(actionList),
+  var _iterator2 = _createForOfIteratorHelper$5(actionList),
       _step2;
   try {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
@@ -4790,7 +4914,7 @@ var generateDirectFetch = function generateDirectFetch(_ref) {
   var target = actionDefinition.href;
   return function () {
     var _ref2 = _asyncToGenerator( _regeneratorRuntime.mark(function _callee(params) {
-      var headers, body, credentials;
+      var headers, body, credentials, response, responseJSON, requestDidSucceed, idxResponse;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -4801,29 +4925,32 @@ var generateDirectFetch = function generateDirectFetch(_ref) {
               };
               body = _JSON$stringify(_Object$assign(_Object$assign(_Object$assign({}, defaultParamsForAction), params), immutableParamsForAction));
               credentials = toPersist && toPersist.withCredentials === false ? 'omit' : 'include';
-              return _context.abrupt("return", request(target, {
+              _context.next = 5;
+              return request(target, {
                 method: actionDefinition.method,
                 headers: headers,
                 body: body,
                 credentials: credentials
-              }).then(function (response) {
-                var respJson = response.json();
-                if (response.ok) {
-                  return respJson;
-                } else if (response.status === 401 && response.headers.get('WWW-Authenticate') === 'Oktadevicejwt realm="Okta Device"') {
-                  return respJson.then(function (err) {
-                    var ms = makeIdxState$1(err, toPersist);
-                    ms.stepUp = true;
-                    return _Promise.reject(ms);
-                  });
-                }
-                return respJson.then(function (err) {
-                  return _Promise.reject(makeIdxState$1(err, toPersist));
-                });
-              }).then(function (idxResponse) {
-                return makeIdxState$1(idxResponse, toPersist);
-              }));
-            case 4:
+              });
+            case 5:
+              response = _context.sent;
+              _context.next = 8;
+              return response.json();
+            case 8:
+              responseJSON = _context.sent;
+              requestDidSucceed = response.ok;
+              idxResponse = makeIdxState$1(responseJSON, toPersist, requestDidSucceed);
+              if (response.status === 401 && response.headers.get('WWW-Authenticate') === 'Oktadevicejwt realm="Okta Device"') {
+                idxResponse.stepUp = true;
+              }
+              if (requestDidSucceed) {
+                _context.next = 14;
+                break;
+              }
+              throw idxResponse;
+            case 14:
+              return _context.abrupt("return", idxResponse);
+            case 15:
             case "end":
               return _context.stop();
           }
@@ -4958,9 +5085,8 @@ var parseIdxResponse = function parseIdxResponse(idxResponse) {
   };
 };
 
-function makeIdxState$1(idxResponse, toPersist) {
-  var _context2;
-  var _a;
+function makeIdxState$1(idxResponse, toPersist, requestDidSucceed) {
+  var _a, _b, _c;
   var rawIdxResponse = idxResponse;
   var _parseIdxResponse = parseIdxResponse(idxResponse, toPersist),
       remediations = _parseIdxResponse.remediations,
@@ -5001,7 +5127,7 @@ function makeIdxState$1(idxResponse, toPersist) {
   var findCode = function findCode(item) {
     return item.name === 'interaction_code';
   };
-  var interactionCode = (_a = rawIdxResponse.successWithInteractionCode) === null || _a === void 0 ? void 0 : _findInstanceProperty(_context2 = _a.value).call(_context2, findCode).value;
+  var interactionCode = (_c = (_b = (_a = rawIdxResponse.successWithInteractionCode) === null || _a === void 0 ? void 0 : _a.value) === null || _b === void 0 ? void 0 : _findInstanceProperty(_b).call(_b, findCode)) === null || _c === void 0 ? void 0 : _c.value;
   return {
     proceed: proceed,
     neededToProceed: neededToProceed,
@@ -5009,7 +5135,8 @@ function makeIdxState$1(idxResponse, toPersist) {
     context: context,
     rawIdxState: rawIdxResponse,
     interactionCode: interactionCode,
-    toPersist: toPersist
+    toPersist: toPersist,
+    requestDidSucceed: requestDidSucceed
   };
 }
 
@@ -5040,14 +5167,9 @@ function validateVersionConfig(version) {
   parsersForVersion(version);
 }
 
-var parseAndReject$1 = function parseAndReject(response) {
-  return response.json().then(function (err) {
-    return _Promise.reject(err);
-  });
-};
 var introspect$1 = function () {
   var _introspect = _asyncToGenerator( _regeneratorRuntime.mark(function _callee(_ref) {
-    var withCredentials, domain, interactionHandle, stateHandle, version, target, body, headers, credentials;
+    var withCredentials, domain, interactionHandle, stateHandle, version, target, body, headers, credentials, response, requestDidSucceed, rawIdxResponse;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -5065,14 +5187,27 @@ var introspect$1 = function () {
               accept: "application/ion+json; okta-version=".concat(version)
             };
             credentials = withCredentials === false ? 'omit' : 'include';
-            return _context.abrupt("return", request(target, {
+            _context.next = 8;
+            return request(target, {
               credentials: credentials,
               headers: headers,
               body: _JSON$stringify(body)
-            }).then(function (response) {
-              return response.ok ? response.json() : parseAndReject$1(response);
-            }));
-          case 7:
+            });
+          case 8:
+            response = _context.sent;
+            requestDidSucceed = response.ok;
+            _context.next = 12;
+            return response.json();
+          case 12:
+            rawIdxResponse = _context.sent;
+            if (requestDidSucceed) {
+              _context.next = 15;
+              break;
+            }
+            throw rawIdxResponse;
+          case 15:
+            return _context.abrupt("return", rawIdxResponse);
+          case 16:
           case "end":
             return _context.stop();
         }
@@ -5151,131 +5286,9 @@ var interact$1 = function () {
 }();
 
 var LATEST_SUPPORTED_IDX_API_VERSION = '1.0.0';
-var start = function () {
-  var _start = _asyncToGenerator( _regeneratorRuntime.mark(function _callee(_ref) {
-    var withCredentials, clientId, domain, issuer, stateHandle, interactionHandle, version, redirectUri, state, scopes, codeChallenge, codeChallengeMethod, activationToken, recoveryToken, baseUrl, toPersist, interactParams, interaction_handle, _parsersForVersion, _makeIdxState, idxResponse, idxState;
-    return _regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            withCredentials = _ref.withCredentials, clientId = _ref.clientId, domain = _ref.domain, issuer = _ref.issuer, stateHandle = _ref.stateHandle, interactionHandle = _ref.interactionHandle, version = _ref.version, redirectUri = _ref.redirectUri, state = _ref.state, scopes = _ref.scopes, codeChallenge = _ref.codeChallenge, codeChallengeMethod = _ref.codeChallengeMethod, activationToken = _ref.activationToken, recoveryToken = _ref.recoveryToken;
-            issuer = issuer === null || issuer === void 0 ? void 0 : issuer.replace(/\/+$/, '');
-            baseUrl = (issuer === null || issuer === void 0 ? void 0 : _indexOfInstanceProperty(issuer).call(issuer, '/oauth2')) > 0 ? issuer : issuer + '/oauth2';
-            toPersist = {
-              baseUrl: baseUrl,
-              clientId: clientId,
-              state: state,
-              withCredentials: withCredentials
-            };
-            if (!(!domain && !issuer)) {
-              _context.next = 6;
-              break;
-            }
-            return _context.abrupt("return", _Promise.reject({
-              error: 'issuer is required'
-            }));
-          case 6:
-            if (!(!stateHandle && !clientId)) {
-              _context.next = 8;
-              break;
-            }
-            return _context.abrupt("return", _Promise.reject({
-              error: 'clientId is required'
-            }));
-          case 8:
-            if (!(!stateHandle && !redirectUri)) {
-              _context.next = 10;
-              break;
-            }
-            return _context.abrupt("return", _Promise.reject({
-              error: 'redirectUri is required'
-            }));
-          case 10:
-            if (!(!stateHandle && !(codeChallenge && codeChallengeMethod))) {
-              _context.next = 12;
-              break;
-            }
-            return _context.abrupt("return", _Promise.reject({
-              error: 'PKCE params (codeChallenge, codeChallengeMethod) are required'
-            }));
-          case 12:
-            if (!domain) {
-              domain = new _URL(issuer).origin;
-            }
-            validateVersionConfig(version);
-            if (!(!stateHandle && !interactionHandle)) {
-              _context.next = 27;
-              break;
-            }
-            _context.prev = 15;
-            interactParams = {
-              withCredentials: withCredentials,
-              clientId: clientId,
-              baseUrl: baseUrl,
-              scopes: scopes,
-              redirectUri: redirectUri,
-              codeChallenge: codeChallenge,
-              codeChallengeMethod: codeChallengeMethod,
-              state: state,
-              activationToken: activationToken,
-              recoveryToken: recoveryToken
-            };
-            _context.next = 19;
-            return interact$1(interactParams);
-          case 19:
-            interaction_handle = _context.sent;
-            interactionHandle = interaction_handle;
-            toPersist.interactionHandle = interactionHandle;
-            _context.next = 27;
-            break;
-          case 24:
-            _context.prev = 24;
-            _context.t0 = _context["catch"](15);
-            return _context.abrupt("return", _Promise.reject({
-              error: _context.t0
-            }));
-          case 27:
-            _context.prev = 27;
-            _parsersForVersion = parsersForVersion(version), _makeIdxState = _parsersForVersion.makeIdxState;
-            _context.next = 31;
-            return introspect$1({
-              withCredentials: withCredentials,
-              domain: domain,
-              interactionHandle: interactionHandle,
-              stateHandle: stateHandle,
-              version: version
-            }).catch(function (err) {
-              return _Promise.reject({
-                error: 'introspect call failed',
-                details: _makeIdxState(err, toPersist)
-              });
-            });
-          case 31:
-            idxResponse = _context.sent;
-            idxState = _makeIdxState(idxResponse, toPersist);
-            return _context.abrupt("return", idxState);
-          case 36:
-            _context.prev = 36;
-            _context.t1 = _context["catch"](27);
-            return _context.abrupt("return", _Promise.reject({
-              error: _context.t1
-            }));
-          case 39:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee, null, [[15, 24], [27, 36]]);
-  }));
-  function start(_x) {
-    return _start.apply(this, arguments);
-  }
-  return start;
-}();
-var _parsersForVersion2 = parsersForVersion(LATEST_SUPPORTED_IDX_API_VERSION),
-    makeIdxState = _parsersForVersion2.makeIdxState;
+var _parsersForVersion = parsersForVersion(LATEST_SUPPORTED_IDX_API_VERSION),
+    makeIdxState = _parsersForVersion.makeIdxState;
 var idx = {
-  start: start,
   introspect: introspect$1,
   interact: interact$1,
   makeIdxState: makeIdxState,
@@ -5512,6 +5525,8 @@ function _introspect() {
   _introspect = _asyncToGenerator( _regeneratorRuntime.mark(function _callee(authClient) {
     var options,
         rawIdxResponse,
+        requestDidSucceed,
+        savedIdxResponse,
         version,
         domain,
         withCredentials,
@@ -5521,47 +5536,53 @@ function _introspect() {
         switch (_context.prev = _context.next) {
           case 0:
             options = _args.length > 1 && _args[1] !== undefined ? _args[1] : {};
-            rawIdxResponse = authClient.transactionManager.loadIdxResponse();
+            savedIdxResponse = authClient.transactionManager.loadIdxResponse();
+            if (savedIdxResponse) {
+              rawIdxResponse = savedIdxResponse.rawIdxResponse;
+              requestDidSucceed = savedIdxResponse.requestDidSucceed;
+            }
             if (rawIdxResponse) {
-              _context.next = 18;
+              _context.next = 21;
               break;
             }
             version = options.version || IDX_API_VERSION;
             domain = getOAuthDomain(authClient);
-            _context.prev = 5;
-            _context.next = 8;
+            _context.prev = 6;
+            _context.next = 9;
             return idx.introspect(_Object$assign(_Object$assign({
               domain: domain
             }, options), {
               version: version
             }));
-          case 8:
+          case 9:
             rawIdxResponse = _context.sent;
-            _context.next = 18;
+            requestDidSucceed = true;
+            _context.next = 21;
             break;
-          case 11:
-            _context.prev = 11;
-            _context.t0 = _context["catch"](5);
+          case 13:
+            _context.prev = 13;
+            _context.t0 = _context["catch"](6);
             if (!isRawIdxResponse(_context.t0)) {
-              _context.next = 17;
+              _context.next = 20;
               break;
             }
             rawIdxResponse = _context.t0;
-            _context.next = 18;
+            requestDidSucceed = false;
+            _context.next = 21;
             break;
-          case 17:
+          case 20:
             throw _context.t0;
-          case 18:
+          case 21:
             withCredentials = options.withCredentials;
             return _context.abrupt("return", idx.makeIdxState(rawIdxResponse, {
               withCredentials: withCredentials
-            }));
-          case 20:
+            }, requestDidSucceed));
+          case 23:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[5, 11]]);
+    }, _callee, null, [[6, 13]]);
   }));
   return _introspect.apply(this, arguments);
 }
@@ -5592,42 +5613,91 @@ function getAuthenticatorFromRemediation(remediation) {
   });
 }
 
+function _createForOfIteratorHelper$4(o, allowArrayLike) { var it = typeof _Symbol !== "undefined" && _getIteratorMethod(o) || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$4(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray$4(o, minLen) { var _context; if (!o) return; if (typeof o === "string") return _arrayLikeToArray$4(o, minLen); var n = _sliceInstanceProperty(_context = Object.prototype.toString.call(o)).call(_context, 8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return _Array$from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$4(o, minLen); }
+function _arrayLikeToArray$4(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function formatAuthenticator(incoming) {
+  var authenticator;
+  if (isAuthenticator(incoming)) {
+    authenticator = incoming;
+  } else if (typeof incoming === 'string') {
+    authenticator = {
+      key: incoming
+    };
+  } else {
+    throw new Error('Invalid format for authenticator');
+  }
+  return authenticator;
+}
+function compareAuthenticators(auth1, auth2) {
+  if (!auth1 || !auth2) {
+    return false;
+  }
+  if (auth1.id && auth2.id) {
+    return auth1.id === auth2.id;
+  }
+  if (auth1.key && auth2.key) {
+    return auth1.key === auth2.key;
+  }
+  return false;
+}
+function findMatchedOption(authenticators, options) {
+  var option;
+  var _iterator = _createForOfIteratorHelper$4(authenticators),
+      _step;
+  try {
+    var _loop = function _loop() {
+      var authenticator = _step.value;
+      option = _findInstanceProperty(options).call(options, function (_ref) {
+        var relatesTo = _ref.relatesTo;
+        return relatesTo.key === authenticator.key;
+      });
+      if (option) {
+        return "break";
+      }
+    };
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var _ret = _loop();
+      if (_ret === "break") break;
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return option;
+}
+
 function _createForOfIteratorHelper$3(o, allowArrayLike) { var it = typeof _Symbol !== "undefined" && _getIteratorMethod(o) || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$3(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray$3(o, minLen) { var _context12; if (!o) return; if (typeof o === "string") return _arrayLikeToArray$3(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$3(o, minLen); }
+function _unsupportedIterableToArray$3(o, minLen) { var _context10; if (!o) return; if (typeof o === "string") return _arrayLikeToArray$3(o, minLen); var n = _sliceInstanceProperty(_context10 = Object.prototype.toString.call(o)).call(_context10, 8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return _Array$from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$3(o, minLen); }
 function _arrayLikeToArray$3(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 var Remediator = function () {
   function Remediator(remediation) {
     var values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
     _classCallCheck(this, Remediator);
     this.values = _Object$assign({}, values);
+    this.options = _Object$assign({}, options);
     this.formatAuthenticators();
     this.remediation = remediation;
   }
   _createClass(Remediator, [{
     key: "formatAuthenticators",
     value: function formatAuthenticators() {
-      var _this = this,
-          _context2,
-          _context3;
+      var _context2, _context3;
       _valuesInstanceProperty(this).authenticators = _valuesInstanceProperty(this).authenticators || [];
+      _valuesInstanceProperty(this).authenticators = _mapInstanceProperty(_context2 = _valuesInstanceProperty(this).authenticators).call(_context2, function (authenticator) {
+        return formatAuthenticator(authenticator);
+      });
       if (_valuesInstanceProperty(this).authenticator) {
-        var hasAuthenticatorInList = _valuesInstanceProperty(this).authenticators.some(function (authenticator) {
-          if (typeof authenticator === 'string') {
-            return authenticator === _valuesInstanceProperty(_this).authenticator;
-          }
-          return authenticator.key === _valuesInstanceProperty(_this).authenticator;
+        var authenticator = formatAuthenticator(_valuesInstanceProperty(this).authenticator);
+        var hasAuthenticatorInList = _valuesInstanceProperty(this).authenticators.some(function (existing) {
+          return compareAuthenticators(authenticator, existing);
         });
         if (!hasAuthenticatorInList) {
-          _valuesInstanceProperty(this).authenticators.push({
-            key: _valuesInstanceProperty(this).authenticator
-          });
+          _valuesInstanceProperty(this).authenticators.push(authenticator);
         }
       }
-      _valuesInstanceProperty(this).authenticators = _mapInstanceProperty(_context2 = _valuesInstanceProperty(this).authenticators).call(_context2, function (authenticator) {
-        return typeof authenticator === 'string' ? {
-          key: authenticator
-        } : authenticator;
-      });
       _valuesInstanceProperty(this).authenticatorsData = _reduceInstanceProperty(_context3 = _valuesInstanceProperty(this).authenticators).call(_context3, function (acc, authenticator) {
         if (_typeof(authenticator) === 'object' && _Object$keys(authenticator).length > 1) {
           acc.push(authenticator);
@@ -5643,13 +5713,10 @@ var Remediator = function () {
   }, {
     key: "canRemediate",
     value: function canRemediate() {
-      var _this2 = this;
-      if (!_mapInstanceProperty(this)) {
-        return false;
-      }
+      var _this = this;
       var required = getRequiredValues(this.remediation);
       var needed = _findInstanceProperty(required).call(required, function (key) {
-        return !_this2.hasData(key);
+        return !_this.hasData(key);
       });
       if (needed) {
         return false;
@@ -5659,48 +5726,41 @@ var Remediator = function () {
   }, {
     key: "getData",
     value: function getData(key) {
-      var _this3 = this;
+      var _this2 = this;
       if (!key) {
         var allValues = getAllValues(this.remediation);
         var res = _reduceInstanceProperty(allValues).call(allValues, function (data, key) {
-          data[key] = _this3.getData(key);
+          data[key] = _this2.getData(key);
           return data;
         }, {});
         return res;
       }
       if (typeof this["map".concat(titleCase(key))] === 'function') {
         var _context4;
-        return this["map".concat(titleCase(key))](_findInstanceProperty(_context4 = this.remediation.value).call(_context4, function (_ref) {
+        var val = this["map".concat(titleCase(key))](_findInstanceProperty(_context4 = this.remediation.value).call(_context4, function (_ref) {
           var name = _ref.name;
           return name === key;
         }));
-      }
-      if (!_mapInstanceProperty(this)) {
-        return _valuesInstanceProperty(this)[key];
-      }
-      var entry = _mapInstanceProperty(this)[key];
-      if (!entry) {
-        return _valuesInstanceProperty(this)[key];
-      }
-      for (var i = 0; i < entry.length; i++) {
-        var val = _valuesInstanceProperty(this)[entry[i]];
         if (val) {
           return val;
         }
       }
+      if (_mapInstanceProperty(this) && _mapInstanceProperty(this)[key]) {
+        var entry = _mapInstanceProperty(this)[key];
+        for (var i = 0; i < entry.length; i++) {
+          var _val = _valuesInstanceProperty(this)[entry[i]];
+          if (_val) {
+            return _val;
+          }
+        }
+      }
+      return _valuesInstanceProperty(this)[key];
     }
   }, {
     key: "hasData",
     value: function hasData(key
     ) {
-      var data = this.getData(key);
-      if (_typeof(data) === 'object') {
-        var _context5;
-        return !!_findInstanceProperty(_context5 = _Object$keys(data)).call(_context5, function (key) {
-          return !!data[key];
-        });
-      }
-      return !!data;
+      return !!this.getData(key);
     }
   }, {
     key: "getNextStep",
@@ -5721,43 +5781,38 @@ var Remediator = function () {
   }, {
     key: "getInputs",
     value: function getInputs() {
-      var _context6,
-          _this4 = this;
-      if (!_mapInstanceProperty(this)) {
-        return [];
-      }
-      return _reduceInstanceProperty(_context6 = _Object$keys(_mapInstanceProperty(this))).call(_context6, function (inputs, key) {
-        var _context7;
-        var inputFromRemediation = _findInstanceProperty(_context7 = _this4.remediation.value).call(_context7, function (item) {
-          return item.name === key;
-        });
-        if (!inputFromRemediation) {
-          return inputs;
-        }
+      var _this3 = this;
+      var inputs = [];
+      var inputsFromRemediation = this.remediation.value || [];
+      inputsFromRemediation.forEach(function (inputFromRemediation) {
         var input;
-        var aliases = _mapInstanceProperty(_this4)[key];
-        var type = inputFromRemediation.type;
-        if (typeof _this4["getInput".concat(titleCase(key))] === 'function') {
-          input = _this4["getInput".concat(titleCase(key))](inputFromRemediation);
+        var name = inputFromRemediation.name,
+            type = inputFromRemediation.type,
+            visible = inputFromRemediation.visible;
+        if (visible === false) {
+          return;
+        }
+        if (typeof _this3["getInput".concat(titleCase(name))] === 'function') {
+          input = _this3["getInput".concat(titleCase(name))](inputFromRemediation);
         } else if (type !== 'object') {
-          var name;
+          var alias;
+          var aliases = (_mapInstanceProperty(_this3) ? _mapInstanceProperty(_this3)[name] : null) || [];
           if (aliases.length === 1) {
-            name = aliases[0];
+            alias = aliases[0];
           } else {
-            name = _findInstanceProperty(aliases).call(aliases, function (name) {
-              var _context8;
-              return _includesInstanceProperty(_context8 = _Object$keys(_valuesInstanceProperty(_this4))).call(_context8, name);
+            alias = _findInstanceProperty(aliases).call(aliases, function (name) {
+              var _context5;
+              return _includesInstanceProperty(_context5 = _Object$keys(_valuesInstanceProperty(_this3))).call(_context5, name);
             });
           }
-          if (name) {
+          if (alias) {
             input = _Object$assign(_Object$assign({}, inputFromRemediation), {
-              name: name
+              name: alias
             });
           }
         }
         if (!input) {
-          var _context9;
-          throw new AuthSdkError(_concatInstanceProperty(_context9 = "Missing custom getInput".concat(titleCase(key), " method in Remediator: ")).call(_context9, _this4.getName()));
+          input = inputFromRemediation;
         }
         if (Array.isArray(input)) {
           input.forEach(function (i) {
@@ -5766,8 +5821,8 @@ var Remediator = function () {
         } else {
           inputs.push(input);
         }
-        return inputs;
-      }, []);
+      });
+      return inputs;
     }
   }, {
     key: "getValuesAfterProceed",
@@ -5791,21 +5846,41 @@ var Remediator = function () {
   }, {
     key: "getAuthenticator",
     value: function getAuthenticator() {
-      var _a;
-      return (_a = this.remediation.relatesTo) === null || _a === void 0 ? void 0 : _a.value;
+      var _context6, _context7;
+      var _a, _b;
+      var relatesTo = (_a = this.remediation.relatesTo) === null || _a === void 0 ? void 0 : _a.value;
+      if (!relatesTo) {
+        return;
+      }
+      var authenticatorFromRemediation = getAuthenticatorFromRemediation(this.remediation);
+      if (!authenticatorFromRemediation) {
+        return relatesTo;
+      }
+      var id = _findInstanceProperty(_context6 = authenticatorFromRemediation.form.value).call(_context6, function (_ref2) {
+        var name = _ref2.name;
+        return name === 'id';
+      }).value;
+      var enrollmentId = (_b = _findInstanceProperty(_context7 = authenticatorFromRemediation.form.value).call(_context7, function (_ref3) {
+        var name = _ref3.name;
+        return name === 'enrollmentId';
+      })) === null || _b === void 0 ? void 0 : _b.value;
+      return _Object$assign(_Object$assign({}, relatesTo), {
+        id: id,
+        enrollmentId: enrollmentId
+      });
     }
   }], [{
     key: "getMessages",
     value: function getMessages(remediation) {
-      var _context10;
+      var _context8;
       var _a, _b;
       if (!remediation.value) {
         return;
       }
-      return (_b = (_a = remediation.value[0]) === null || _a === void 0 ? void 0 : _a.form) === null || _b === void 0 ? void 0 : _reduceInstanceProperty(_context10 = _b.value).call(_context10, function (messages, field) {
+      return (_b = (_a = remediation.value[0]) === null || _a === void 0 ? void 0 : _a.form) === null || _b === void 0 ? void 0 : _reduceInstanceProperty(_context8 = _b.value).call(_context8, function (messages, field) {
         if (field.messages) {
-          var _context11;
-          messages = _concatInstanceProperty(_context11 = []).call(_context11, _toConsumableArray(messages), _toConsumableArray(field.messages.value));
+          var _context9;
+          messages = _concatInstanceProperty(_context9 = []).call(_context9, _toConsumableArray(messages), _toConsumableArray(field.messages.value));
         }
         return messages;
       }, []);
@@ -5831,13 +5906,19 @@ var VerificationCodeAuthenticator = function (_Authenticator) {
   _createClass(VerificationCodeAuthenticator, [{
     key: "canVerify",
     value: function canVerify(values) {
-      return !!(values.verificationCode || values.otp);
+      return !!(values.credentials || values.verificationCode || values.otp);
     }
   }, {
     key: "mapCredentials",
     value: function mapCredentials(values) {
-      return {
-        passcode: values.verificationCode || values.otp
+      var credentials = values.credentials,
+          verificationCode = values.verificationCode,
+          otp = values.otp;
+      if (!credentials && !verificationCode && !otp) {
+        return;
+      }
+      return credentials || {
+        passcode: verificationCode || otp
       };
     }
   }, {
@@ -5866,8 +5947,12 @@ var OktaVerifyTotp = function (_VerificationCodeAuth) {
   _createClass(OktaVerifyTotp, [{
     key: "mapCredentials",
     value: function mapCredentials(values) {
+      var verificationCode = values.verificationCode;
+      if (!verificationCode) {
+        return;
+      }
       return {
-        totp: values.verificationCode
+        totp: verificationCode
       };
     }
   }]);
@@ -5886,14 +5971,19 @@ var OktaPassword = function (_Authenticator) {
   _createClass(OktaPassword, [{
     key: "canVerify",
     value: function canVerify(values) {
-      return !!values.password;
+      return !!(values.credentials || values.password);
     }
   }, {
     key: "mapCredentials",
     value: function mapCredentials(values) {
-      return {
-        passcode: values.password
-      };
+      var credentials = values.credentials,
+          password = values.password;
+      if (!credentials && !password) {
+        return;
+      }
+      return credentials || {
+        passcode: password
+      };
     }
   }, {
     key: "getInputs",
@@ -5921,6 +6011,10 @@ var SecurityQuestionEnrollment = function (_Authenticator) {
   _createClass(SecurityQuestionEnrollment, [{
     key: "canVerify",
     value: function canVerify(values) {
+      var credentials = values.credentials;
+      if (credentials && credentials.questionKey && credentials.answer) {
+        return true;
+      }
       var questionKey = values.questionKey,
           question = values.question,
           answer = values.answer;
@@ -5932,6 +6026,9 @@ var SecurityQuestionEnrollment = function (_Authenticator) {
       var questionKey = values.questionKey,
           question = values.question,
           answer = values.answer;
+      if (!questionKey && !question && !answer) {
+        return;
+      }
       return {
         questionKey: question ? 'custom' : questionKey,
         question: question,
@@ -5944,7 +6041,7 @@ var SecurityQuestionEnrollment = function (_Authenticator) {
       return [{
         name: 'questionKey',
         type: 'string',
-        require: true
+        required: true
       }, {
         name: 'question',
         type: 'string',
@@ -5977,9 +6074,13 @@ var SecurityQuestionVerification = function (_Authenticator) {
   }, {
     key: "mapCredentials",
     value: function mapCredentials(values) {
+      var answer = values.answer;
+      if (!answer) {
+        return;
+      }
       return {
         questionKey: this.meta.contextualData.enrolledQuestion.questionKey,
-        answer: values.answer
+        answer: answer
       };
     }
   }, {
@@ -6017,6 +6118,9 @@ var WebauthnEnrollment = function (_Authenticator) {
     value: function mapCredentials(values) {
       var clientData = values.clientData,
           attestation = values.attestation;
+      if (!clientData && !attestation) {
+        return;
+      }
       return {
         clientData: clientData,
         attestation: attestation
@@ -6066,6 +6170,9 @@ var WebauthnVerification = function (_Authenticator) {
       var authenticatorData = values.authenticatorData,
           clientData = values.clientData,
           signatureData = values.signatureData;
+      if (!authenticatorData && !clientData && !signatureData) {
+        return;
+      }
       return {
         authenticatorData: authenticatorData,
         clientData: clientData,
@@ -6135,9 +6242,6 @@ var VerifyAuthenticator = function (_Remediator) {
     var values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     _classCallCheck(this, VerifyAuthenticator);
     _this = _super.call(this, remediation, values);
-    _this.map = {
-      'credentials': []
-    };
     _this.authenticator = getAuthenticator(remediation);
     return _this;
   }
@@ -6166,6 +6270,19 @@ var VerifyAuthenticator = function (_Remediator) {
     value: function getInputCredentials(input) {
       return this.authenticator.getInputs(input);
     }
+  }, {
+    key: "getValuesAfterProceed",
+    value: function getValuesAfterProceed() {
+      var _context,
+          _this2 = this;
+      this.values = _get(_getPrototypeOf(VerifyAuthenticator.prototype), "getValuesAfterProceed", this).call(this);
+      var trimmedValues = _filterInstanceProperty(_context = _Object$keys(_valuesInstanceProperty(this))).call(_context, function (valueKey) {
+        return valueKey !== 'credentials';
+      });
+      return _reduceInstanceProperty(trimmedValues).call(trimmedValues, function (values, valueKey) {
+        return _Object$assign(_Object$assign({}, values), _defineProperty({}, valueKey, _valuesInstanceProperty(_this2)[valueKey]));
+      }, {});
+    }
   }]);
   return VerifyAuthenticator;
 }(Remediator);
@@ -6195,7 +6312,7 @@ var EnrollPoll = function (_Remediator) {
   _createClass(EnrollPoll, [{
     key: "canRemediate",
     value: function canRemediate() {
-      return Boolean(_valuesInstanceProperty(this).startPolling);
+      return !!_valuesInstanceProperty(this).startPolling || this.options.step === 'enroll-poll';
     }
   }, {
     key: "getNextStep",
@@ -6303,14 +6420,8 @@ var EnrollmentChannelData = function (_Remediator) {
   _inherits(EnrollmentChannelData, _Remediator);
   var _super = _createSuper$h(EnrollmentChannelData);
   function EnrollmentChannelData() {
-    var _this;
     _classCallCheck(this, EnrollmentChannelData);
-    _this = _super.apply(this, arguments);
-    _this.map = {
-      email: [],
-      phoneNumber: []
-    };
-    return _this;
+    return _super.apply(this, arguments);
   }
   _createClass(EnrollmentChannelData, [{
     key: "getInputEmail",
@@ -6359,13 +6470,13 @@ var EnrollmentChannelData = function (_Remediator) {
     key: "getValuesAfterProceed",
     value: function getValuesAfterProceed() {
       var _context,
-          _this2 = this;
+          _this = this;
       var trimmedValues = _filterInstanceProperty(_context = _Object$keys(_valuesInstanceProperty(this))).call(_context, function (valueKey) {
         var _context2;
         return !_includesInstanceProperty(_context2 = ['email', 'phoneNumber']).call(_context2, valueKey);
       });
       return _reduceInstanceProperty(trimmedValues).call(trimmedValues, function (values, valueKey) {
-        return _Object$assign(_Object$assign({}, values), _defineProperty({}, valueKey, _valuesInstanceProperty(_this2)[valueKey]));
+        return _Object$assign(_Object$assign({}, values), _defineProperty({}, valueKey, _valuesInstanceProperty(_this)[valueKey]));
       }, {});
     }
   }]);
@@ -6395,6 +6506,12 @@ var ChallengePoll = function (_EnrollPoll) {
     _classCallCheck(this, ChallengePoll);
     return _super.apply(this, arguments);
   }
+  _createClass(ChallengePoll, [{
+    key: "canRemediate",
+    value: function canRemediate() {
+      return !!_valuesInstanceProperty(this).startPolling || this.options.step === 'challenge-poll';
+    }
+  }]);
   return ChallengePoll;
 }(EnrollPoll);
 ChallengePoll.remediationName = 'challenge-poll';
@@ -6418,19 +6535,17 @@ var EnrollProfile = function (_Remediator) {
   _inherits(EnrollProfile, _Remediator);
   var _super = _createSuper$d(EnrollProfile);
   function EnrollProfile() {
-    var _this;
     _classCallCheck(this, EnrollProfile);
-    _this = _super.apply(this, arguments);
-    _this.map = {
-      'userProfile': []
-    };
-    return _this;
+    return _super.apply(this, arguments);
   }
   _createClass(EnrollProfile, [{
     key: "canRemediate",
     value: function canRemediate() {
       var _context, _context2;
       var userProfileFromValues = this.getData().userProfile;
+      if (!userProfileFromValues) {
+        return false;
+      }
       var userProfileFromRemediation = _findInstanceProperty(_context = this.remediation.value).call(_context, function (_ref) {
         var name = _ref.name;
         return name === 'userProfile';
@@ -6445,15 +6560,19 @@ var EnrollProfile = function (_Remediator) {
   }, {
     key: "mapUserProfile",
     value: function mapUserProfile(_ref2) {
-      var _this2 = this;
+      var _this = this;
       var profileAttributes = _ref2.form.value;
       var attributeNames = _mapInstanceProperty(profileAttributes).call(profileAttributes, function (_ref3) {
         var name = _ref3.name;
         return name;
       });
-      return _reduceInstanceProperty(attributeNames).call(attributeNames, function (attributeValues, attributeName) {
-        return _valuesInstanceProperty(_this2)[attributeName] ? _Object$assign(_Object$assign({}, attributeValues), _defineProperty({}, attributeName, _valuesInstanceProperty(_this2)[attributeName])) : attributeValues;
+      var data = _reduceInstanceProperty(attributeNames).call(attributeNames, function (attributeValues, attributeName) {
+        return _valuesInstanceProperty(_this)[attributeName] ? _Object$assign(_Object$assign({}, attributeValues), _defineProperty({}, attributeName, _valuesInstanceProperty(_this)[attributeName])) : attributeValues;
       }, {});
+      if (_Object$keys(data).length === 0) {
+        return;
+      }
+      return data;
     }
   }, {
     key: "getInputUserProfile",
@@ -6486,9 +6605,7 @@ var Identify = function (_Remediator) {
     _classCallCheck(this, Identify);
     _this = _super.apply(this, arguments);
     _this.map = {
-      'identifier': ['username'],
-      'credentials': [],
-      'rememberMe': ['rememberMe']
+      'identifier': ['username']
     };
     return _this;
   }
@@ -6502,8 +6619,14 @@ var Identify = function (_Remediator) {
   }, {
     key: "mapCredentials",
     value: function mapCredentials() {
-      return {
-        passcode: _valuesInstanceProperty(this).password
+      var _this$values = _valuesInstanceProperty(this),
+          credentials = _this$values.credentials,
+          password = _this$values.password;
+      if (!credentials && !password) {
+        return;
+      }
+      return credentials || {
+        passcode: password
       };
     }
   }, {
@@ -6525,19 +6648,18 @@ var ReEnrollAuthenticator = function (_Remediator) {
   _inherits(ReEnrollAuthenticator, _Remediator);
   var _super = _createSuper$b(ReEnrollAuthenticator);
   function ReEnrollAuthenticator() {
-    var _this;
     _classCallCheck(this, ReEnrollAuthenticator);
-    _this = _super.apply(this, arguments);
-    _this.map = {
-      'credentials': []
-    };
-    return _this;
+    return _super.apply(this, arguments);
   }
   _createClass(ReEnrollAuthenticator, [{
     key: "mapCredentials",
     value: function mapCredentials() {
+      var newPassword = _valuesInstanceProperty(this).newPassword;
+      if (!newPassword) {
+        return;
+      }
       return {
-        passcode: _valuesInstanceProperty(this).newPassword
+        passcode: newPassword
       };
     }
   }, {
@@ -6597,17 +6719,13 @@ var SelectAuthenticator = function (_Remediator) {
   _inherits(SelectAuthenticator, _Remediator);
   var _super = _createSuper$9(SelectAuthenticator);
   function SelectAuthenticator() {
-    var _this;
     _classCallCheck(this, SelectAuthenticator);
-    _this = _super.apply(this, arguments);
-    _this.map = {
-      authenticator: []
-    };
-    return _this;
+    return _super.apply(this, arguments);
   }
   _createClass(SelectAuthenticator, [{
     key: "findMatchedOption",
-    value: function findMatchedOption(authenticators, options) {
+    value:
+    function findMatchedOption(authenticators, options) {
       var option;
       var _iterator = _createForOfIteratorHelper$2(authenticators),
           _step;
@@ -6636,12 +6754,17 @@ var SelectAuthenticator = function (_Remediator) {
   }, {
     key: "canRemediate",
     value: function canRemediate() {
-      var authenticators = _valuesInstanceProperty(this).authenticators;
+      var _this$values = _valuesInstanceProperty(this),
+          authenticators = _this$values.authenticators,
+          authenticator = _this$values.authenticator;
       var authenticatorFromRemediation = getAuthenticatorFromRemediation(this.remediation);
       var options = authenticatorFromRemediation.options;
       if (!authenticators || !authenticators.length) {
         return false;
       }
+      if (isAuthenticator(authenticator) && authenticator.id) {
+        return true;
+      }
       var matchedOption = this.findMatchedOption(authenticators, options);
       if (matchedOption) {
         return true;
@@ -6671,9 +6794,15 @@ var SelectAuthenticator = function (_Remediator) {
     key: "mapAuthenticator",
     value: function mapAuthenticator(remediationValue) {
       var _context2;
-      var authenticators = _valuesInstanceProperty(this).authenticators;
+      var _this$values2 = _valuesInstanceProperty(this),
+          authenticators = _this$values2.authenticators,
+          authenticator = _this$values2.authenticator;
+      if (isAuthenticator(authenticator) && authenticator.id) {
+        this.selectedAuthenticator = authenticator;
+        return authenticator;
+      }
       var options = remediationValue.options;
-      var selectedOption = this.findMatchedOption(authenticators, options);
+      var selectedOption = findMatchedOption(authenticators, options);
       this.selectedAuthenticator = selectedOption.relatesTo;
       this.selectedOption = selectedOption;
       return {
@@ -6695,10 +6824,10 @@ var SelectAuthenticator = function (_Remediator) {
     key: "getValuesAfterProceed",
     value: function getValuesAfterProceed() {
       var _context3,
-          _this2 = this;
+          _this = this;
       this.values = _get(_getPrototypeOf(SelectAuthenticator.prototype), "getValuesAfterProceed", this).call(this);
       var authenticators = _filterInstanceProperty(_context3 = _valuesInstanceProperty(this).authenticators).call(_context3, function (authenticator) {
-        return authenticator.key !== _this2.selectedAuthenticator.key;
+        return compareAuthenticators(authenticator, _this.selectedAuthenticator) !== true;
       });
       return _Object$assign(_Object$assign({}, _valuesInstanceProperty(this)), {
         authenticators: authenticators
@@ -6716,14 +6845,16 @@ var SelectAuthenticatorAuthenticate = function (_SelectAuthenticator) {
   function SelectAuthenticatorAuthenticate(remediation) {
     var _this;
     var values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
     _classCallCheck(this, SelectAuthenticatorAuthenticate);
     var _a;
-    _this = _super.call(this, remediation, values);
+    _this = _super.call(this, remediation, values, options);
+    var isRecoveryFlow = _this.options.flow === 'recoverPassword';
     var hasPasswordInOptions = (_a = getAuthenticatorFromRemediation(remediation).options) === null || _a === void 0 ? void 0 : _a.some(function (_ref) {
       var relatesTo = _ref.relatesTo;
       return (relatesTo === null || relatesTo === void 0 ? void 0 : relatesTo.key) === AuthenticatorKey.OKTA_PASSWORD;
     });
-    if (hasPasswordInOptions && (_valuesInstanceProperty(_this).flow === 'recoverPassword' || _valuesInstanceProperty(_this).password)) {
+    if (hasPasswordInOptions && (isRecoveryFlow || _valuesInstanceProperty(_this).password)) {
       var _context;
       _valuesInstanceProperty(_this).authenticators = _concatInstanceProperty(_context = []).call(_context, _toConsumableArray(_valuesInstanceProperty(_this).authenticators || []), [{
         key: AuthenticatorKey.OKTA_PASSWORD
@@ -6758,7 +6889,6 @@ var SelectAuthenticatorUnlockAccount = function (_SelectAuthenticator) {
     _classCallCheck(this, SelectAuthenticatorUnlockAccount);
     _this = _super.apply(this, arguments);
     _this.map = {
-      authenticator: [],
       identifier: ['username']
     };
     return _this;
@@ -6829,9 +6959,6 @@ var AuthenticatorData = function (_Remediator) {
     var values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     _classCallCheck(this, AuthenticatorData);
     _this = _super.call(this, remediation, values);
-    _this.map = {
-      'authenticator': []
-    };
     _this.authenticator = _this.getAuthenticator();
     _this.formatAuthenticatorData();
     return _this;
@@ -6844,7 +6971,7 @@ var AuthenticatorData = function (_Remediator) {
       if (authenticatorData) {
         var _context;
         _valuesInstanceProperty(this).authenticatorsData = _mapInstanceProperty(_context = _valuesInstanceProperty(this).authenticatorsData).call(_context, function (data) {
-          if (data.key === _this2.authenticator.key) {
+          if (compareAuthenticators(_this2.authenticator, data)) {
             return _this2.mapAuthenticatorDataFromValues(data);
           }
           return data;
@@ -6861,9 +6988,8 @@ var AuthenticatorData = function (_Remediator) {
     value: function getAuthenticatorData() {
       var _context2,
           _this3 = this;
-      return _findInstanceProperty(_context2 = _valuesInstanceProperty(this).authenticatorsData).call(_context2, function (_ref) {
-        var key = _ref.key;
-        return key === _this3.authenticator.key;
+      return _findInstanceProperty(_context2 = _valuesInstanceProperty(this).authenticatorsData).call(_context2, function (data) {
+        return compareAuthenticators(_this3.authenticator, data);
       });
     }
   }, {
@@ -6871,7 +6997,7 @@ var AuthenticatorData = function (_Remediator) {
     value: function canRemediate() {
       var _this4 = this;
       return _valuesInstanceProperty(this).authenticatorsData.some(function (data) {
-        return data.key === _this4.authenticator.key;
+        return compareAuthenticators(_this4.authenticator, data);
       });
     }
   }, {
@@ -6886,9 +7012,18 @@ var AuthenticatorData = function (_Remediator) {
   }, {
     key: "mapAuthenticatorDataFromValues",
     value: function mapAuthenticatorDataFromValues(authenticatorData) {
-      var methodType = _valuesInstanceProperty(this).methodType;
+      var _this$values = _valuesInstanceProperty(this),
+          methodType = _this$values.methodType,
+          authenticator = _this$values.authenticator;
+      if (!methodType && isAuthenticator(authenticator)) {
+        methodType = authenticator === null || authenticator === void 0 ? void 0 : authenticator.methodType;
+      }
+      var _this$authenticator = this.authenticator,
+          id = _this$authenticator.id,
+          enrollmentId = _this$authenticator.enrollmentId;
       var data = _Object$assign(_Object$assign({
-        key: this.authenticator.key
+        id: id,
+        enrollmentId: enrollmentId
       }, authenticatorData && authenticatorData), methodType && {
         methodType: methodType
       });
@@ -6898,8 +7033,8 @@ var AuthenticatorData = function (_Remediator) {
     key: "getAuthenticatorFromRemediation",
     value: function getAuthenticatorFromRemediation() {
       var _context3;
-      var authenticator = _findInstanceProperty(_context3 = this.remediation.value).call(_context3, function (_ref2) {
-        var name = _ref2.name;
+      var authenticator = _findInstanceProperty(_context3 = this.remediation.value).call(_context3, function (_ref) {
+        var name = _ref.name;
         return name === 'authenticator';
       });
       return authenticator;
@@ -6910,8 +7045,8 @@ var AuthenticatorData = function (_Remediator) {
       var _context4;
       var _a;
       var authenticator = this.getAuthenticatorFromRemediation();
-      return (_a = _findInstanceProperty(_context4 = authenticator.form.value).call(_context4, function (_ref3) {
-        var name = _ref3.name;
+      return (_a = _findInstanceProperty(_context4 = authenticator.form.value).call(_context4, function (_ref2) {
+        var name = _ref2.name;
         return name === 'methodType';
       })) === null || _a === void 0 ? void 0 : _a.options;
     }
@@ -6922,7 +7057,7 @@ var AuthenticatorData = function (_Remediator) {
           _this5 = this;
       this.values = _get(_getPrototypeOf(AuthenticatorData.prototype), "getValuesAfterProceed", this).call(this);
       var authenticatorsData = _filterInstanceProperty(_context5 = _valuesInstanceProperty(this).authenticatorsData).call(_context5, function (data) {
-        return data.key !== _this5.authenticator.key;
+        return compareAuthenticators(_this5.authenticator, data) !== true;
       });
       return _Object$assign(_Object$assign({}, _valuesInstanceProperty(this)), {
         authenticatorsData: authenticatorsData
@@ -6956,12 +7091,10 @@ var AuthenticatorVerificationData = function (_AuthenticatorData) {
   }, {
     key: "mapAuthenticator",
     value: function mapAuthenticator() {
-      var _context2, _context3;
-      var _a, _b;
-      var authenticatorData = this.getAuthenticatorData();
-      var authenticatorFromRemediation = this.getAuthenticatorFromRemediation();
+      var _a;
       if (this.shouldProceedWithEmailAuthenticator) {
         var _context;
+        var authenticatorFromRemediation = this.getAuthenticatorFromRemediation();
         return (_a = authenticatorFromRemediation.form) === null || _a === void 0 ? void 0 : _reduceInstanceProperty(_context = _a.value).call(_context, function (acc, curr) {
           if (curr.value) {
             acc[curr.name] = curr.value;
@@ -6973,25 +7106,15 @@ var AuthenticatorVerificationData = function (_AuthenticatorData) {
           return acc;
         }, {});
       }
-      return {
-        id: _findInstanceProperty(_context2 = authenticatorFromRemediation.form.value).call(_context2, function (_ref) {
-          var name = _ref.name;
-          return name === 'id';
-        }).value,
-        enrollmentId: (_b = _findInstanceProperty(_context3 = authenticatorFromRemediation.form.value).call(_context3, function (_ref2) {
-          var name = _ref2.name;
-          return name === 'enrollmentId';
-        })) === null || _b === void 0 ? void 0 : _b.value,
-        methodType: authenticatorData === null || authenticatorData === void 0 ? void 0 : authenticatorData.methodType
-      };
+      return this.getAuthenticatorData();
     }
   }, {
     key: "getInputAuthenticator",
     value: function getInputAuthenticator() {
-      var _context4;
+      var _context2;
       var authenticator = this.getAuthenticatorFromRemediation();
-      var methodType = _findInstanceProperty(_context4 = authenticator.form.value).call(_context4, function (_ref3) {
-        var name = _ref3.name;
+      var methodType = _findInstanceProperty(_context2 = authenticator.form.value).call(_context2, function (_ref) {
+        var name = _ref.name;
         return name === 'methodType';
       });
       if (methodType && methodType.options) {
@@ -7004,6 +7127,19 @@ var AuthenticatorVerificationData = function (_AuthenticatorData) {
       var inputs = _toConsumableArray(authenticator.form.value);
       return inputs;
     }
+  }, {
+    key: "getValuesAfterProceed",
+    value: function getValuesAfterProceed() {
+      var _context3,
+          _this2 = this;
+      this.values = _get(_getPrototypeOf(AuthenticatorVerificationData.prototype), "getValuesAfterProceed", this).call(this);
+      var trimmedValues = _filterInstanceProperty(_context3 = _Object$keys(_valuesInstanceProperty(this))).call(_context3, function (valueKey) {
+        return valueKey !== 'authenticator';
+      });
+      return _reduceInstanceProperty(trimmedValues).call(trimmedValues, function (values, valueKey) {
+        return _Object$assign(_Object$assign({}, values), _defineProperty({}, valueKey, _valuesInstanceProperty(_this2)[valueKey]));
+      }, {});
+    }
   }]);
   return AuthenticatorVerificationData;
 }(AuthenticatorData);
@@ -7052,10 +7188,12 @@ var AuthenticatorEnrollmentData = function (_AuthenticatorData) {
     value: function mapAuthenticatorDataFromValues(data) {
       data = _get(_getPrototypeOf(AuthenticatorEnrollmentData.prototype), "mapAuthenticatorDataFromValues", this).call(this, data);
       var phoneNumber = _valuesInstanceProperty(this).phoneNumber;
-      data = _Object$assign(_Object$assign({}, data && data), phoneNumber && {
+      if (!data && !phoneNumber) {
+        return;
+      }
+      return _Object$assign(_Object$assign({}, data && data), phoneNumber && {
         phoneNumber: phoneNumber
       });
-      return data.phoneNumber && data.methodType ? data : null;
     }
   }]);
   return AuthenticatorEnrollmentData;
@@ -7068,18 +7206,13 @@ var Skip = function (_Remediator) {
   _inherits(Skip, _Remediator);
   var _super = _createSuper$1(Skip);
   function Skip() {
-    var _this;
     _classCallCheck(this, Skip);
-    _this = _super.apply(this, arguments);
-    _this.map = {
-      skip: ['skip']
-    };
-    return _this;
+    return _super.apply(this, arguments);
   }
   _createClass(Skip, [{
     key: "canRemediate",
     value: function canRemediate() {
-      return !!_valuesInstanceProperty(this).skip;
+      return !!_valuesInstanceProperty(this).skip || this.options.step === 'skip';
     }
   }]);
   return Skip;
@@ -7110,52 +7243,16 @@ var remediators = /*#__PURE__*/Object.freeze({
 });
 
 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 _context9; if (!o) return; if (typeof o === "string") return _arrayLikeToArray$1(o, minLen); var n = _sliceInstanceProperty(_context9 = Object.prototype.toString.call(o)).call(_context9, 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 _context11; if (!o) return; if (typeof o === "string") return _arrayLikeToArray$1(o, minLen); var n = _sliceInstanceProperty(_context11 = Object.prototype.toString.call(o)).call(_context11, 8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return _Array$from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$1(o, minLen); }
 function _arrayLikeToArray$1(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-function getRemediator(idxRemediations, values, options) {
-  var remediators = options.remediators;
-  var remediator;
-  if (options.step) {
-    var remediation = _findInstanceProperty(idxRemediations).call(idxRemediations, function (_ref) {
-      var name = _ref.name;
-      return name === options.step;
-    });
-    var T = remediators[remediation.name];
-    return new T(remediation, values);
-  }
-  var remediatorCandidates = [];
-  var _iterator = _createForOfIteratorHelper$1(idxRemediations),
-      _step;
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var _context;
-      var _remediation = _step.value;
-      var isRemeditionInFlow = _includesInstanceProperty(_context = _Object$keys(remediators)).call(_context, _remediation.name);
-      if (!isRemeditionInFlow) {
-        continue;
-      }
-      var _T = remediators[_remediation.name];
-      remediator = new _T(_remediation, values);
-      if (remediator.canRemediate()) {
-        return remediator;
-      }
-      remediatorCandidates.push(remediator);
-    }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
-  }
-  return remediatorCandidates[0];
-}
 function isTerminalResponse(idxResponse) {
   var neededToProceed = idxResponse.neededToProceed,
       interactionCode = idxResponse.interactionCode;
   return !neededToProceed.length && !interactionCode;
 }
 function canSkipFn(idxResponse) {
-  return idxResponse.neededToProceed.some(function (_ref2) {
-    var name = _ref2.name;
+  return idxResponse.neededToProceed.some(function (_ref) {
+    var name = _ref.name;
     return name === 'skip';
   });
 }
@@ -7164,28 +7261,124 @@ function canResendFn(idxResponse) {
     return _includesInstanceProperty(actionName).call(actionName, 'resend');
   });
 }
-function getIdxMessages(idxResponse) {
-  var _context2;
+function getMessagesFromIdxRemediationValue(value) {
+  if (!value || !Array.isArray(value)) {
+    return;
+  }
+  return _reduceInstanceProperty(value).call(value, function (messages, value) {
+    if (value.messages) {
+      var _context;
+      messages = _concatInstanceProperty(_context = []).call(_context, _toConsumableArray(messages), _toConsumableArray(value.messages.value));
+    }
+    if (value.form) {
+      var _context2;
+      var messagesFromForm = getMessagesFromIdxRemediationValue(value.form.value) || [];
+      messages = _concatInstanceProperty(_context2 = []).call(_context2, _toConsumableArray(messages), _toConsumableArray(messagesFromForm));
+    }
+    if (value.options) {
+      var _context4;
+      var optionValues = [];
+      value.options.forEach(function (option) {
+        var _context3;
+        if (!option.value || typeof option.value === 'string') {
+          return;
+        }
+        optionValues = _concatInstanceProperty(_context3 = []).call(_context3, _toConsumableArray(optionValues), [option.value]);
+      });
+      var messagesFromOptions = getMessagesFromIdxRemediationValue(optionValues) || [];
+      messages = _concatInstanceProperty(_context4 = []).call(_context4, _toConsumableArray(messages), _toConsumableArray(messagesFromOptions));
+    }
+    return messages;
+  }, []);
+}
+function getMessagesFromResponse(idxResponse) {
+  var _context5;
   var _a;
   var messages = [];
   var rawIdxState = idxResponse.rawIdxState,
       neededToProceed = idxResponse.neededToProceed;
-  var globalMessages = (_a = rawIdxState.messages) === null || _a === void 0 ? void 0 : _mapInstanceProperty(_context2 = _a.value).call(_context2, function (message) {
+  var globalMessages = (_a = rawIdxState.messages) === null || _a === void 0 ? void 0 : _mapInstanceProperty(_context5 = _a.value).call(_context5, function (message) {
     return message;
   });
   if (globalMessages) {
-    var _context3;
-    messages = _concatInstanceProperty(_context3 = []).call(_context3, _toConsumableArray(messages), _toConsumableArray(globalMessages));
+    var _context6;
+    messages = _concatInstanceProperty(_context6 = []).call(_context6, _toConsumableArray(messages), _toConsumableArray(globalMessages));
+  }
+  var _iterator = _createForOfIteratorHelper$1(neededToProceed),
+      _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var remediation = _step.value;
+      var fieldMessages = getMessagesFromIdxRemediationValue(remediation.value);
+      if (fieldMessages) {
+        var _context8;
+        messages = _concatInstanceProperty(_context8 = []).call(_context8, _toConsumableArray(messages), _toConsumableArray(fieldMessages));
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  var seen = {};
+  messages = _reduceInstanceProperty(messages).call(messages, function (filtered, message) {
+    var _context7;
+    var _a;
+    var key = (_a = message.i18n) === null || _a === void 0 ? void 0 : _a.key;
+    if (key && seen[key]) {
+      return filtered;
+    }
+    seen[key] = message;
+    filtered = _concatInstanceProperty(_context7 = []).call(_context7, _toConsumableArray(filtered), [message]);
+    return filtered;
+  }, []);
+  return messages;
+}
+function getEnabledFeatures(idxResponse) {
+  var res = [];
+  var actions = idxResponse.actions,
+      neededToProceed = idxResponse.neededToProceed;
+  if (actions['currentAuthenticator-recover']) {
+    res.push(IdxFeature.PASSWORD_RECOVERY);
   }
-  var _iterator2 = _createForOfIteratorHelper$1(neededToProceed),
+  if (neededToProceed.some(function (_ref2) {
+    var name = _ref2.name;
+    return name === 'select-enroll-profile';
+  })) {
+    res.push(IdxFeature.REGISTRATION);
+  }
+  if (neededToProceed.some(function (_ref3) {
+    var name = _ref3.name;
+    return name === 'redirect-idp';
+  })) {
+    res.push(IdxFeature.SOCIAL_IDP);
+  }
+  if (neededToProceed.some(function (_ref4) {
+    var name = _ref4.name;
+    return name === 'unlock-account';
+  })) {
+    res.push(IdxFeature.ACCOUNT_UNLOCK);
+  }
+  return res;
+}
+function getAvailableSteps(idxResponse) {
+  var _context9;
+  var res = [];
+  var remediatorMap = _reduceInstanceProperty(_context9 = _Object$values(remediators)).call(_context9, function (map, remediatorClass) {
+    if (remediatorClass.remediationName) {
+      map[remediatorClass.remediationName] = remediatorClass;
+    }
+    return map;
+  }, {});
+  var _iterator2 = _createForOfIteratorHelper$1(idxResponse.neededToProceed),
       _step2;
   try {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
       var remediation = _step2.value;
-      var fieldMessages = Remediator.getMessages(remediation);
-      if (fieldMessages) {
-        var _context4;
-        messages = _concatInstanceProperty(_context4 = []).call(_context4, _toConsumableArray(messages), _toConsumableArray(fieldMessages));
+      var T = remediatorMap[remediation.name];
+      if (T) {
+        var remediator = new T(remediation);
+        res.push(remediator.getNextStep(idxResponse.context));
       }
     }
   } catch (err) {
@@ -7193,33 +7386,90 @@ function getIdxMessages(idxResponse) {
   } finally {
     _iterator2.f();
   }
-  return messages;
+  return res;
 }
-function getNextStep(remediator, idxResponse) {
-  var nextStep = remediator.getNextStep(idxResponse.context);
-  var canSkip = canSkipFn(idxResponse);
-  var canResend = canResendFn(idxResponse);
-  return _Object$assign(_Object$assign(_Object$assign({}, nextStep), canSkip && {
-    canSkip: canSkip
-  }), canResend && {
-    canResend: canResend
-  });
+function filterValuesForRemediation(idxResponse, values) {
+  var _context10;
+  var valuesForRemediation = _reduceInstanceProperty(_context10 = idxResponse.neededToProceed[0].value).call(_context10, function (res, entry) {
+    var name = entry.name;
+    res[name] = values[name];
+    return res;
+  }, {});
+  return valuesForRemediation;
 }
-function handleIdxError(e, remediator) {
-  var idxState = isIdxResponse(e) ? e : null;
-  if (!idxState) {
-    throw e;
+
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof _Symbol !== "undefined" && _getIteratorMethod(o) || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { var _context6; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context6 = Object.prototype.toString.call(o)).call(_context6, 8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return _Array$from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function getRemediator(idxRemediations, values, options) {
+  var remediators = options.remediators;
+  var remediator;
+  if (options.step) {
+    var remediation = _findInstanceProperty(idxRemediations).call(idxRemediations, function (_ref) {
+      var name = _ref.name;
+      return name === options.step;
+    });
+    if (remediation) {
+      var T = remediation ? remediators[remediation.name] : undefined;
+      return T ? new T(remediation, values, options) : undefined;
+    } else {
+      warn("step \"".concat(options.step, "\" did not match any remediations"));
+      return;
+    }
   }
-  var terminal = isTerminalResponse(idxState);
-  var messages = getIdxMessages(idxState);
-  if (terminal) {
-    return {
-      terminal: terminal,
-      messages: messages
+  var remediatorCandidates = [];
+  var _iterator = _createForOfIteratorHelper(idxRemediations),
+      _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var _context;
+      var _remediation = _step.value;
+      var isRemeditionInFlow = _includesInstanceProperty(_context = _Object$keys(remediators)).call(_context, _remediation.name);
+      if (!isRemeditionInFlow) {
+        continue;
+      }
+      var _T = remediators[_remediation.name];
+      remediator = new _T(_remediation, values, options);
+      if (remediator.canRemediate()) {
+        return remediator;
+      }
+      remediatorCandidates.push(remediator);
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return remediatorCandidates[0];
+}
+function getNextStep(remediator, idxResponse) {
+  var nextStep = remediator.getNextStep(idxResponse.context);
+  var canSkip = canSkipFn(idxResponse);
+  var canResend = canResendFn(idxResponse);
+  return _Object$assign(_Object$assign(_Object$assign({}, nextStep), canSkip && {
+    canSkip: canSkip
+  }), canResend && {
+    canResend: canResend
+  });
+}
+function handleIdxError(e, remediator) {
+  var idxResponse = isIdxResponse(e) ? e : null;
+  if (!idxResponse) {
+    throw e;
+  }
+  idxResponse.requestDidSucceed = false;
+  var terminal = isTerminalResponse(idxResponse);
+  var messages = getMessagesFromResponse(idxResponse);
+  if (terminal) {
+    return {
+      idxResponse: idxResponse,
+      terminal: terminal,
+      messages: messages
     };
   } else {
-    var nextStep = remediator && getNextStep(remediator, idxState);
+    var nextStep = remediator && getNextStep(remediator, idxResponse);
     return _Object$assign({
+      idxResponse: idxResponse,
       messages: messages
     }, nextStep && {
       nextStep: nextStep
@@ -7227,8 +7477,8 @@ function handleIdxError(e, remediator) {
   }
 }
 function getActionFromValues(values, idxResponse) {
-  var _context5;
-  return _findInstanceProperty(_context5 = _Object$keys(idxResponse.actions)).call(_context5, function (action) {
+  var _context2;
+  return _findInstanceProperty(_context2 = _Object$keys(idxResponse.actions)).call(_context2, function (action) {
     return !!values.resend && _includesInstanceProperty(action).call(action, '-resend');
   });
 }
@@ -7241,198 +7491,230 @@ function remediate(_x, _x2, _x3) {
 }
 function _remediate() {
   _remediate = _asyncToGenerator( _regeneratorRuntime.mark(function _callee(idxResponse, values, options) {
-    var _context6;
-    var _idxResponse, neededToProceed, interactionCode, remediators, flow, terminal, messages, actionFromValues, actions, _iterator3, _step3, _loop, _ret, remediator, nextStep, _nextStep, name, data;
-    return _regeneratorRuntime.wrap(function _callee$(_context8) {
+    var _context3;
+    var _idxResponse, neededToProceed, interactionCode, remediators, flow, terminal, messages, actionFromValues, actionFromOptions, actions, _iterator2, _step2, _loop, _ret, remediator, nextStep, _nextStep, name, data;
+    return _regeneratorRuntime.wrap(function _callee$(_context5) {
       while (1) {
-        switch (_context8.prev = _context8.next) {
+        switch (_context5.prev = _context5.next) {
           case 0:
             _idxResponse = idxResponse, neededToProceed = _idxResponse.neededToProceed, interactionCode = _idxResponse.interactionCode;
             remediators = options.remediators, flow = options.flow;
             if (!interactionCode) {
-              _context8.next = 4;
+              _context5.next = 4;
               break;
             }
-            return _context8.abrupt("return", {
+            return _context5.abrupt("return", {
               idxResponse: idxResponse
             });
           case 4:
             terminal = isTerminalResponse(idxResponse);
-            messages = getIdxMessages(idxResponse);
+            messages = getMessagesFromResponse(idxResponse);
             if (!terminal) {
-              _context8.next = 8;
+              _context5.next = 8;
               break;
             }
-            return _context8.abrupt("return", {
+            return _context5.abrupt("return", {
+              idxResponse: idxResponse,
               terminal: terminal,
               messages: messages
             });
           case 8:
             actionFromValues = getActionFromValues(values, idxResponse);
-            actions = _concatInstanceProperty(_context6 = []).call(_context6, _toConsumableArray(options.actions || []), _toConsumableArray(actionFromValues && [actionFromValues] || []));
+            actionFromOptions = options.actions || [];
+            actions = _concatInstanceProperty(_context3 = []).call(_context3, _toConsumableArray(actionFromOptions), _toConsumableArray(actionFromValues && [actionFromValues] || []));
             if (!actions) {
-              _context8.next = 30;
+              _context5.next = 31;
               break;
             }
-            _iterator3 = _createForOfIteratorHelper$1(actions);
-            _context8.prev = 12;
+            _iterator2 = _createForOfIteratorHelper(actions);
+            _context5.prev = 13;
             _loop = _regeneratorRuntime.mark(function _loop() {
-              var action, valuesWithoutExecutedAction, remediationAction;
-              return _regeneratorRuntime.wrap(function _loop$(_context7) {
+              var action, valuesWithoutExecutedAction, optionsWithoutExecutedAction, remediationAction;
+              return _regeneratorRuntime.wrap(function _loop$(_context4) {
                 while (1) {
-                  switch (_context7.prev = _context7.next) {
+                  switch (_context4.prev = _context4.next) {
                     case 0:
-                      action = _step3.value;
+                      action = _step2.value;
                       valuesWithoutExecutedAction = removeActionFromValues(values);
+                      optionsWithoutExecutedAction = _Object$assign(_Object$assign({}, options), {
+                        actions: _filterInstanceProperty(actionFromOptions).call(actionFromOptions, function (entry) {
+                          return entry !== action;
+                        })
+                      });
                       if (!(typeof idxResponse.actions[action] === 'function')) {
-                        _context7.next = 15;
+                        _context4.next = 17;
                         break;
                       }
-                      _context7.prev = 3;
-                      _context7.next = 6;
+                      _context4.prev = 4;
+                      _context4.next = 7;
                       return idxResponse.actions[action]();
-                    case 6:
-                      idxResponse = _context7.sent;
-                      _context7.next = 12;
+                    case 7:
+                      idxResponse = _context4.sent;
+                      idxResponse.requestDidSucceed = true;
+                      _context4.next = 14;
                       break;
-                    case 9:
-                      _context7.prev = 9;
-                      _context7.t0 = _context7["catch"](3);
-                      return _context7.abrupt("return", {
-                        v: handleIdxError(_context7.t0, remediators)
+                    case 11:
+                      _context4.prev = 11;
+                      _context4.t0 = _context4["catch"](4);
+                      return _context4.abrupt("return", {
+                        v: handleIdxError(_context4.t0, remediators)
                       });
-                    case 12:
+                    case 14:
                       if (!(action === 'cancel')) {
-                        _context7.next = 14;
+                        _context4.next = 16;
                         break;
                       }
-                      return _context7.abrupt("return", {
+                      return _context4.abrupt("return", {
                         v: {
+                          idxResponse: idxResponse,
                           canceled: true
                         }
                       });
-                    case 14:
-                      return _context7.abrupt("return", {
-                        v: remediate(idxResponse, valuesWithoutExecutedAction, options)
+                    case 16:
+                      return _context4.abrupt("return", {
+                        v: remediate(idxResponse, valuesWithoutExecutedAction, optionsWithoutExecutedAction)
                       });
-                    case 15:
-                      remediationAction = _findInstanceProperty(neededToProceed).call(neededToProceed, function (_ref3) {
-                        var name = _ref3.name;
+                    case 17:
+                      remediationAction = _findInstanceProperty(neededToProceed).call(neededToProceed, function (_ref2) {
+                        var name = _ref2.name;
                         return name === action;
                       });
                       if (!remediationAction) {
-                        _context7.next = 27;
+                        _context4.next = 30;
                         break;
                       }
-                      _context7.prev = 17;
-                      _context7.next = 20;
+                      _context4.prev = 19;
+                      _context4.next = 22;
                       return idxResponse.proceed(action, {});
-                    case 20:
-                      idxResponse = _context7.sent;
-                      _context7.next = 26;
+                    case 22:
+                      idxResponse = _context4.sent;
+                      idxResponse.requestDidSucceed = true;
+                      _context4.next = 29;
                       break;
-                    case 23:
-                      _context7.prev = 23;
-                      _context7.t1 = _context7["catch"](17);
-                      return _context7.abrupt("return", {
-                        v: handleIdxError(_context7.t1, remediators)
-                      });
                     case 26:
-                      return _context7.abrupt("return", {
-                        v: remediate(idxResponse, values, options)
+                      _context4.prev = 26;
+                      _context4.t1 = _context4["catch"](19);
+                      return _context4.abrupt("return", {
+                        v: handleIdxError(_context4.t1, remediators)
+                      });
+                    case 29:
+                      return _context4.abrupt("return", {
+                        v: remediate(idxResponse, values, optionsWithoutExecutedAction)
                       });
-                    case 27:
+                    case 30:
                     case "end":
-                      return _context7.stop();
+                      return _context4.stop();
                   }
                 }
-              }, _loop, null, [[3, 9], [17, 23]]);
+              }, _loop, null, [[4, 11], [19, 26]]);
             });
-            _iterator3.s();
-          case 15:
-            if ((_step3 = _iterator3.n()).done) {
-              _context8.next = 22;
+            _iterator2.s();
+          case 16:
+            if ((_step2 = _iterator2.n()).done) {
+              _context5.next = 23;
               break;
             }
-            return _context8.delegateYield(_loop(), "t0", 17);
-          case 17:
-            _ret = _context8.t0;
+            return _context5.delegateYield(_loop(), "t0", 18);
+          case 18:
+            _ret = _context5.t0;
             if (!(_typeof(_ret) === "object")) {
-              _context8.next = 20;
+              _context5.next = 21;
               break;
             }
-            return _context8.abrupt("return", _ret.v);
-          case 20:
-            _context8.next = 15;
+            return _context5.abrupt("return", _ret.v);
+          case 21:
+            _context5.next = 16;
             break;
-          case 22:
-            _context8.next = 27;
+          case 23:
+            _context5.next = 28;
             break;
-          case 24:
-            _context8.prev = 24;
-            _context8.t1 = _context8["catch"](12);
-            _iterator3.e(_context8.t1);
-          case 27:
-            _context8.prev = 27;
-            _iterator3.f();
-            return _context8.finish(27);
-          case 30:
+          case 25:
+            _context5.prev = 25;
+            _context5.t1 = _context5["catch"](13);
+            _iterator2.e(_context5.t1);
+          case 28:
+            _context5.prev = 28;
+            _iterator2.f();
+            return _context5.finish(28);
+          case 31:
             remediator = getRemediator(neededToProceed, values, options);
-            if (!(!remediator && flow === 'default')) {
-              _context8.next = 33;
+            if (remediator) {
+              _context5.next = 49;
               break;
             }
-            return _context8.abrupt("return", {
+            if (!options.step) {
+              _context5.next = 46;
+              break;
+            }
+            values = filterValuesForRemediation(idxResponse, values);
+            _context5.prev = 35;
+            _context5.next = 38;
+            return idxResponse.proceed(options.step, values);
+          case 38:
+            idxResponse = _context5.sent;
+            idxResponse.requestDidSucceed = true;
+            return _context5.abrupt("return", {
               idxResponse: idxResponse
             });
-          case 33:
-            if (remediator) {
-              _context8.next = 35;
+          case 43:
+            _context5.prev = 43;
+            _context5.t2 = _context5["catch"](35);
+            return _context5.abrupt("return", handleIdxError(_context5.t2));
+          case 46:
+            if (!(flow === 'default')) {
+              _context5.next = 48;
               break;
             }
+            return _context5.abrupt("return", {
+              idxResponse: idxResponse
+            });
+          case 48:
             throw new AuthSdkError("\n      No remediation can match current flow, check policy settings in your org.\n      Remediations: [".concat(_reduceInstanceProperty(neededToProceed).call(neededToProceed, function (acc, curr) {
               return acc ? acc + ' ,' + curr.name : curr.name;
             }, ''), "]\n    "));
-          case 35:
+          case 49:
             if (!messages.length) {
-              _context8.next = 38;
+              _context5.next = 52;
               break;
             }
             nextStep = getNextStep(remediator, idxResponse);
-            return _context8.abrupt("return", {
+            return _context5.abrupt("return", {
+              idxResponse: idxResponse,
               nextStep: nextStep,
               messages: messages
             });
-          case 38:
+          case 52:
             if (remediator.canRemediate()) {
-              _context8.next = 41;
+              _context5.next = 55;
               break;
             }
             _nextStep = getNextStep(remediator, idxResponse);
-            return _context8.abrupt("return", {
+            return _context5.abrupt("return", {
               idxResponse: idxResponse,
               nextStep: _nextStep
             });
-          case 41:
+          case 55:
             name = remediator.getName();
             data = remediator.getData();
-            _context8.prev = 43;
-            _context8.next = 46;
+            _context5.prev = 57;
+            _context5.next = 60;
             return idxResponse.proceed(name, data);
-          case 46:
-            idxResponse = _context8.sent;
+          case 60:
+            idxResponse = _context5.sent;
+            idxResponse.requestDidSucceed = true;
             values = remediator.getValuesAfterProceed();
-            return _context8.abrupt("return", remediate(idxResponse, values, options));
-          case 51:
-            _context8.prev = 51;
-            _context8.t2 = _context8["catch"](43);
-            return _context8.abrupt("return", handleIdxError(_context8.t2, remediator));
-          case 54:
+            delete options.step;
+            return _context5.abrupt("return", remediate(idxResponse, values, options));
+          case 67:
+            _context5.prev = 67;
+            _context5.t3 = _context5["catch"](57);
+            return _context5.abrupt("return", handleIdxError(_context5.t3, remediator));
+          case 70:
           case "end":
-            return _context8.stop();
+            return _context5.stop();
         }
       }
-    }, _callee, null, [[12, 24, 27, 30], [43, 51]]);
+    }, _callee, null, [[13, 25, 28, 31], [35, 43], [57, 67]]);
   }));
   return _remediate.apply(this, arguments);
 }
@@ -7526,148 +7808,78 @@ function getFlowSpecification(oktaAuth) {
   };
 }
 
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof _Symbol !== "undefined" && _getIteratorMethod(o) || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray(o, minLen) { var _context3; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context3 = Object.prototype.toString.call(o)).call(_context3, 8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return _Array$from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-function getEnabledFeatures(idxResponse) {
-  var res = [];
-  var actions = idxResponse.actions,
-      neededToProceed = idxResponse.neededToProceed;
-  if (actions['currentAuthenticator-recover']) {
-    res.push(IdxFeature.PASSWORD_RECOVERY);
-  }
-  if (neededToProceed.some(function (_ref) {
-    var name = _ref.name;
-    return name === 'select-enroll-profile';
-  })) {
-    res.push(IdxFeature.REGISTRATION);
-  }
-  if (neededToProceed.some(function (_ref2) {
-    var name = _ref2.name;
-    return name === 'redirect-idp';
-  })) {
-    res.push(IdxFeature.SOCIAL_IDP);
-  }
-  if (neededToProceed.some(function (_ref3) {
-    var name = _ref3.name;
-    return name === 'unlock-account';
-  })) {
-    res.push(IdxFeature.ACCOUNT_UNLOCK);
-  }
-  return res;
+function initializeValues(options) {
+  var knownOptions = ['flow', 'remediators', 'actions', 'withCredentials', 'step'];
+  var values = _Object$assign({}, options);
+  knownOptions.forEach(function (option) {
+    delete values[option];
+  });
+  return values;
 }
-function getAvailableSteps(idxResponse) {
-  var _context;
-  var res = [];
-  var remediatorMap = _reduceInstanceProperty(_context = _Object$values(remediators)).call(_context, function (map, remediatorClass) {
-    if (remediatorClass.remediationName) {
-      map[remediatorClass.remediationName] = remediatorClass;
-    }
-    return map;
-  }, {});
-  var _iterator = _createForOfIteratorHelper(idxResponse.neededToProceed),
-      _step;
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var remediation = _step.value;
-      var T = remediatorMap[remediation.name];
-      if (T) {
-        var remediator = new T(remediation);
-        res.push(remediator.getNextStep(idxResponse.context));
-      }
-    }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
-  }
-  return res;
+function initializeData(authClient, data) {
+  var options = data.options;
+  var flow = options.flow,
+      withCredentials = options.withCredentials,
+      remediators = options.remediators,
+      actions = options.actions;
+  var status = IdxStatus.PENDING;
+  flow = flow || authClient.idx.getFlow() || 'default';
+  if (flow) {
+    authClient.idx.setFlow(flow);
+    var flowSpec = getFlowSpecification(authClient, flow);
+    withCredentials = typeof withCredentials !== 'undefined' ? withCredentials : flowSpec.withCredentials;
+    remediators = remediators || flowSpec.remediators;
+    actions = actions || flowSpec.actions;
+  }
+  return _Object$assign(_Object$assign({}, data), {
+    options: _Object$assign(_Object$assign({}, options), {
+      flow: flow,
+      withCredentials: withCredentials,
+      remediators: remediators,
+      actions: actions
+    }),
+    status: status
+  });
 }
-function run(_x) {
-  return _run.apply(this, arguments);
+function getDataFromIntrospect(_x, _x2) {
+  return _getDataFromIntrospect.apply(this, arguments);
 }
-function _run() {
-  _run = _asyncToGenerator( _regeneratorRuntime.mark(function _callee(authClient) {
-    var options,
-        tokens,
-        nextStep,
-        messages,
-        error,
-        meta,
-        enabledFeatures,
-        availableSteps,
-        status,
-        shouldClearTransaction,
-        clearSharedStorage,
-        idxResponse,
-        interactionHandle,
-        metaFromResp,
-        interactionCode,
-        flow,
-        state,
-        scopes,
-        version,
-        _remediators,
-        _actions,
-        withCredentials,
-        exchangeCodeForTokens,
-        autoRemediate,
-        step,
-        recoveryToken,
-        activationToken,
-        flowSpec,
-        interactResponse,
-        values,
-        _yield$remediate,
-        idxResponseFromResp,
-        nextStepFromResp,
-        terminal,
-        canceled,
-        messagesFromResp,
-        _metaFromResp,
-        clientId,
-        codeVerifier,
-        ignoreSignature,
-        redirectUri,
-        urls,
-        _scopes,
-        _ref4,
-        actions,
-        context,
-        neededToProceed,
-        proceed,
-        rawIdxState,
-        _args = arguments;
-    return _regeneratorRuntime.wrap(function _callee$(_context2) {
+function _getDataFromIntrospect() {
+  _getDataFromIntrospect = _asyncToGenerator( _regeneratorRuntime.mark(function _callee(authClient, data) {
+    var options, stateHandle, withCredentials, version, state, scopes, recoveryToken, activationToken, idxResponse, meta, interactionHandle, interactResponse;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
-        switch (_context2.prev = _context2.next) {
+        switch (_context.prev = _context.next) {
           case 0:
-            options = _args.length > 1 && _args[1] !== undefined ? _args[1] : {};
-            status = IdxStatus.PENDING;
-            shouldClearTransaction = false;
-            clearSharedStorage = true;
-            _context2.prev = 4;
-            flow = options.flow, state = options.state, scopes = options.scopes, version = options.version, _remediators = options.remediators, _actions = options.actions, withCredentials = options.withCredentials, exchangeCodeForTokens = options.exchangeCodeForTokens, autoRemediate = options.autoRemediate, step = options.step, recoveryToken = options.recoveryToken, activationToken = options.activationToken;
-            flow = flow || authClient.idx.getFlow() || 'default';
-            if (flow) {
-              authClient.idx.setFlow(flow);
-              flowSpec = getFlowSpecification(authClient, flow);
-              withCredentials = typeof withCredentials !== 'undefined' ? withCredentials : flowSpec.withCredentials;
-              _remediators = _remediators || flowSpec.remediators;
-              _actions = _actions || flowSpec.actions;
+            options = data.options;
+            stateHandle = options.stateHandle, withCredentials = options.withCredentials, version = options.version, state = options.state, scopes = options.scopes, recoveryToken = options.recoveryToken, activationToken = options.activationToken;
+            if (!stateHandle) {
+              _context.next = 8;
+              break;
             }
-            metaFromResp = getSavedTransactionMeta(authClient, {
+            _context.next = 5;
+            return introspect(authClient, {
+              withCredentials: withCredentials,
+              version: version,
+              stateHandle: stateHandle
+            });
+          case 5:
+            idxResponse = _context.sent;
+            _context.next = 20;
+            break;
+          case 8:
+            meta = getSavedTransactionMeta(authClient, {
               state: state,
               recoveryToken: recoveryToken,
               activationToken: activationToken
             });
-            interactionHandle = metaFromResp === null || metaFromResp === void 0 ? void 0 : metaFromResp.interactionHandle;
+            interactionHandle = meta === null || meta === void 0 ? void 0 : meta.interactionHandle;
             if (interactionHandle) {
-              _context2.next = 18;
+              _context.next = 17;
               break;
             }
             authClient.transactionManager.clear();
-            _context2.next = 14;
+            _context.next = 14;
             return interact(authClient, {
               withCredentials: withCredentials,
               state: state,
@@ -7676,119 +7888,288 @@ function _run() {
               recoveryToken: recoveryToken
             });
           case 14:
-            interactResponse = _context2.sent;
+            interactResponse = _context.sent;
             interactionHandle = interactResponse.interactionHandle;
-            metaFromResp = interactResponse.meta;
-            withCredentials = metaFromResp.withCredentials;
-          case 18:
-            _context2.next = 20;
+            meta = interactResponse.meta;
+          case 17:
+            _context.next = 19;
             return introspect(authClient, {
               withCredentials: withCredentials,
               version: version,
               interactionHandle: interactionHandle
             });
+          case 19:
+            idxResponse = _context.sent;
           case 20:
-            idxResponse = _context2.sent;
-            enabledFeatures = getEnabledFeatures(idxResponse);
-            availableSteps = getAvailableSteps(idxResponse);
-            meta = metaFromResp;
-            if (!(autoRemediate !== false && (_remediators || _actions))) {
-              _context2.next = 57;
+            return _context.abrupt("return", _Object$assign(_Object$assign({}, data), {
+              idxResponse: idxResponse,
+              meta: meta
+            }));
+          case 21:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+  return _getDataFromIntrospect.apply(this, arguments);
+}
+function getDataFromRemediate(_x3) {
+  return _getDataFromRemediate.apply(this, arguments);
+}
+function _getDataFromRemediate() {
+  _getDataFromRemediate = _asyncToGenerator( _regeneratorRuntime.mark(function _callee2(data) {
+    var idxResponse, options, values, autoRemediate, remediators, actions, flow, step, 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;
+            shouldRemediate = autoRemediate !== false && (remediators || actions || step);
+            if (shouldRemediate) {
+              _context2.next = 5;
               break;
             }
-            values = _Object$assign(_Object$assign({}, options), {
+            return _context2.abrupt("return", data);
+          case 5:
+            values = _Object$assign(_Object$assign({}, values), {
               stateHandle: idxResponse.rawIdxState.stateHandle
             });
-            _context2.next = 28;
+            _context2.next = 8;
             return remediate(idxResponse, values, {
-              remediators: _remediators,
-              actions: _actions,
+              remediators: remediators,
+              actions: actions,
               flow: flow,
               step: step
             });
-          case 28:
+          case 8:
             _yield$remediate = _context2.sent;
-            idxResponseFromResp = _yield$remediate.idxResponse;
-            nextStepFromResp = _yield$remediate.nextStep;
-            terminal = _yield$remediate.terminal;
+            idxResponseFromRemediation = _yield$remediate.idxResponse;
+            nextStep = _yield$remediate.nextStep;
             canceled = _yield$remediate.canceled;
-            messagesFromResp = _yield$remediate.messages;
-            idxResponse = idxResponseFromResp || idxResponse;
-            nextStep = nextStepFromResp;
-            messages = messagesFromResp;
-            if (nextStep) {
-              authClient.transactionManager.saveIdxResponse(idxResponse.rawIdxState);
+            idxResponse = idxResponseFromRemediation;
+            return _context2.abrupt("return", _Object$assign(_Object$assign({}, data), {
+              idxResponse: idxResponse,
+              nextStep: nextStep,
+              canceled: canceled
+            }));
+          case 14:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  }));
+  return _getDataFromRemediate.apply(this, arguments);
+}
+function getTokens(_x4, _x5) {
+  return _getTokens.apply(this, arguments);
+}
+function _getTokens() {
+  _getTokens = _asyncToGenerator( _regeneratorRuntime.mark(function _callee3(authClient, data) {
+    var meta, idxResponse, interactionCode, clientId, codeVerifier, ignoreSignature, redirectUri, urls, scopes, tokenResponse;
+    return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+      while (1) {
+        switch (_context3.prev = _context3.next) {
+          case 0:
+            meta = data.meta, idxResponse = data.idxResponse;
+            interactionCode = idxResponse.interactionCode;
+            clientId = meta.clientId, codeVerifier = meta.codeVerifier, ignoreSignature = meta.ignoreSignature, redirectUri = meta.redirectUri, urls = meta.urls, scopes = meta.scopes;
+            _context3.next = 5;
+            return authClient.token.exchangeCodeForTokens({
+              interactionCode: interactionCode,
+              clientId: clientId,
+              codeVerifier: codeVerifier,
+              ignoreSignature: ignoreSignature,
+              redirectUri: redirectUri,
+              scopes: scopes
+            }, urls);
+          case 5:
+            tokenResponse = _context3.sent;
+            return _context3.abrupt("return", tokenResponse.tokens);
+          case 7:
+          case "end":
+            return _context3.stop();
+        }
+      }
+    }, _callee3);
+  }));
+  return _getTokens.apply(this, arguments);
+}
+function finalizeData(_x6, _x7) {
+  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;
+    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;
+            shouldClearTransaction = false;
+            clearSharedStorage = true;
+            if (idxResponse) {
+              enabledFeatures = getEnabledFeatures(idxResponse);
               availableSteps = getAvailableSteps(idxResponse);
+              messages = getMessagesFromResponse(idxResponse);
+              terminal = isTerminalResponse(idxResponse);
             }
-            if (terminal) {
-              status = IdxStatus.TERMINAL;
-              shouldClearTransaction = true;
-              clearSharedStorage = false;
+            if (!terminal) {
+              _context4.next = 11;
+              break;
             }
+            status = IdxStatus.TERMINAL;
+            shouldClearTransaction = true;
+            clearSharedStorage = false;
+            _context4.next = 28;
+            break;
+          case 11:
             if (!canceled) {
-              _context2.next = 44;
+              _context4.next = 16;
               break;
             }
             status = IdxStatus.CANCELED;
             shouldClearTransaction = true;
-            _context2.next = 57;
+            _context4.next = 28;
             break;
-          case 44:
+          case 16:
             if (!(idxResponse === null || idxResponse === void 0 ? void 0 : idxResponse.interactionCode)) {
-              _context2.next = 57;
+              _context4.next = 28;
               break;
             }
             interactionCode = idxResponse.interactionCode;
             if (!(exchangeCodeForTokens === false)) {
-              _context2.next = 51;
+              _context4.next = 23;
               break;
             }
             status = IdxStatus.SUCCESS;
             shouldClearTransaction = false;
-            _context2.next = 57;
+            _context4.next = 28;
             break;
-          case 51:
-            _metaFromResp = metaFromResp, clientId = _metaFromResp.clientId, codeVerifier = _metaFromResp.codeVerifier, ignoreSignature = _metaFromResp.ignoreSignature, redirectUri = _metaFromResp.redirectUri, urls = _metaFromResp.urls, _scopes = _metaFromResp.scopes;
-            _context2.next = 54;
-            return authClient.token.exchangeCodeForTokens({
-              interactionCode: interactionCode,
-              clientId: clientId,
-              codeVerifier: codeVerifier,
-              ignoreSignature: ignoreSignature,
-              redirectUri: redirectUri,
-              scopes: _scopes
-            }, urls);
-          case 54:
-            tokens = _context2.sent;
+          case 23:
+            _context4.next = 25;
+            return getTokens(authClient, data);
+          case 25:
+            tokens = _context4.sent;
             status = IdxStatus.SUCCESS;
             shouldClearTransaction = true;
-          case 57:
-            _context2.next = 68;
-            break;
-          case 59:
-            _context2.prev = 59;
-            _context2.t0 = _context2["catch"](4);
-            if (!isIdxResponse(_context2.t0)) {
-              _context2.next = 67;
-              break;
-            }
-            error = _context2.t0;
-            status = IdxStatus.FAILURE;
-            shouldClearTransaction = true;
-            _context2.next = 68;
+          case 28:
+            return _context4.abrupt("return", _Object$assign(_Object$assign({}, data), {
+              status: status,
+              interactionCode: interactionCode,
+              tokens: tokens,
+              shouldClearTransaction: shouldClearTransaction,
+              clearSharedStorage: clearSharedStorage,
+              enabledFeatures: enabledFeatures,
+              availableSteps: availableSteps,
+              messages: messages,
+              terminal: terminal
+            }));
+          case 29:
+          case "end":
+            return _context4.stop();
+        }
+      }
+    }, _callee4);
+  }));
+  return _finalizeData.apply(this, arguments);
+}
+function handleError(err, data) {
+  var error = data.error,
+      status = data.status,
+      shouldClearTransaction = data.shouldClearTransaction;
+  if (isIdxResponse(err)) {
+    error = err;
+    status = IdxStatus.FAILURE;
+    shouldClearTransaction = true;
+  } else {
+    throw err;
+  }
+  return _Object$assign(_Object$assign({}, data), {
+    error: error,
+    status: status,
+    shouldClearTransaction: shouldClearTransaction
+  });
+}
+function run(_x8) {
+  return _run.apply(this, arguments);
+}
+function _run() {
+  _run = _asyncToGenerator( _regeneratorRuntime.mark(function _callee5(authClient) {
+    var options,
+        data,
+        _data,
+        idxResponse,
+        meta,
+        shouldClearTransaction,
+        clearSharedStorage,
+        status,
+        enabledFeatures,
+        availableSteps,
+        tokens,
+        nextStep,
+        messages,
+        error,
+        interactionCode,
+        rawIdxResponse,
+        requestDidSucceed,
+        _ref,
+        actions,
+        context,
+        neededToProceed,
+        proceed,
+        rawIdxState,
+        _args5 = arguments;
+    return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+      while (1) {
+        switch (_context5.prev = _context5.next) {
+          case 0:
+            options = _args5.length > 1 && _args5[1] !== undefined ? _args5[1] : {};
+            data = {
+              options: options,
+              values: initializeValues(options)
+            };
+            data = initializeData(authClient, data);
+            _context5.prev = 3;
+            _context5.next = 6;
+            return getDataFromIntrospect(authClient, data);
+          case 6:
+            data = _context5.sent;
+            _context5.next = 9;
+            return getDataFromRemediate(data);
+          case 9:
+            data = _context5.sent;
+            _context5.next = 15;
             break;
-          case 67:
-            throw _context2.t0;
-          case 68:
+          case 12:
+            _context5.prev = 12;
+            _context5.t0 = _context5["catch"](3);
+            data = handleError(_context5.t0, data);
+          case 15:
+            _context5.next = 17;
+            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;
             if (shouldClearTransaction) {
               authClient.transactionManager.clear({
                 clearSharedStorage: clearSharedStorage
               });
-            } else if (meta === null || meta === void 0 ? void 0 : meta.state) {
+            } else {
               saveTransactionMeta(authClient, _Object$assign({}, meta));
+              if (idxResponse) {
+                rawIdxResponse = idxResponse.rawIdxState, requestDidSucceed = idxResponse.requestDidSucceed;
+                authClient.transactionManager.saveIdxResponse({
+                  rawIdxResponse: rawIdxResponse,
+                  requestDidSucceed: requestDidSucceed
+                });
+              }
             }
-            _ref4 = idxResponse || {}, actions = _ref4.actions, context = _ref4.context, neededToProceed = _ref4.neededToProceed, proceed = _ref4.proceed, rawIdxState = _ref4.rawIdxState;
-            return _context2.abrupt("return", _Object$assign(_Object$assign(_Object$assign(_Object$assign(_Object$assign(_Object$assign(_Object$assign(_Object$assign({
+            _ref = idxResponse || {}, actions = _ref.actions, context = _ref.context, neededToProceed = _ref.neededToProceed, proceed = _ref.proceed, rawIdxState = _ref.rawIdxState;
+            return _context5.abrupt("return", _Object$assign(_Object$assign(_Object$assign(_Object$assign(_Object$assign(_Object$assign(_Object$assign(_Object$assign({
               status: status
             }, meta && {
               meta: meta
@@ -7797,10 +8178,10 @@ function _run() {
             }), availableSteps && {
               availableSteps: availableSteps
             }), tokens && {
-              tokens: tokens.tokens
+              tokens: tokens
             }), nextStep && {
               nextStep: nextStep
-            }), messages && {
+            }), messages && messages.length && {
               messages: messages
             }), error && {
               error: error
@@ -7812,12 +8193,12 @@ function _run() {
               proceed: proceed,
               rawIdxState: rawIdxState
             }));
-          case 71:
+          case 22:
           case "end":
-            return _context2.stop();
+            return _context5.stop();
         }
       }
-    }, _callee, null, [[4, 59]]);
+    }, _callee5, null, [[3, 12]]);
   }));
   return _run.apply(this, arguments);
 }
@@ -7940,9 +8321,10 @@ function _handleEmailVerifyCallback() {
   return _handleEmailVerifyCallback.apply(this, arguments);
 }
 
-function canProceed(authClient, options) {
+function canProceed(authClient) {
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var meta = getSavedTransactionMeta(authClient, options);
-  return !!meta;
+  return !!(meta || options.stateHandle);
 }
 function proceed(_x) {
   return _proceed.apply(this, arguments);
@@ -7950,30 +8332,32 @@ function proceed(_x) {
 function _proceed() {
   _proceed = _asyncToGenerator( _regeneratorRuntime.mark(function _callee(authClient) {
     var options,
+        flow,
         state,
         meta,
-        flow,
         _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] : {};
-            state = options.state;
-            meta = getSavedTransactionMeta(authClient, {
-              state: state
-            });
-            if (meta) {
-              _context.next = 5;
+            if (canProceed(authClient, options)) {
+              _context.next = 3;
               break;
             }
             throw new AuthSdkError('Unable to proceed: saved transaction could not be loaded');
-          case 5:
-            flow = meta === null || meta === void 0 ? void 0 : meta.flow;
+          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 7:
+          case 6:
           case "end":
             return _context.stop();
         }
@@ -8171,7 +8555,7 @@ function handleInteractionCodeRedirect(_x, _x2) {
 }
 function _handleInteractionCodeRedirect() {
   _handleInteractionCodeRedirect = _asyncToGenerator( _regeneratorRuntime.mark(function _callee(authClient, url) {
-    var meta, codeVerifier, savedState, _URL$1, searchParams, state, interactionCode, error, _yield$authClient$tok, tokens;
+    var meta, codeVerifier, savedState, _URL, searchParams, state, interactionCode, error, _yield$authClient$tok, tokens;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -8184,7 +8568,7 @@ function _handleInteractionCodeRedirect() {
             throw new AuthSdkError('No transaction data was found in storage');
           case 3:
             codeVerifier = meta.codeVerifier, savedState = meta.state;
-            _URL$1 = new _URL(url), searchParams = _URL$1.searchParams;
+            _URL = new _URL2(url), searchParams = _URL.searchParams;
             state = searchParams.get('state');
             interactionCode = searchParams.get('interaction_code');
             error = searchParams.get('error');
@@ -8287,7 +8671,7 @@ function createGlobalRequestInterceptor(sdk) {
 var OktaUserAgent = function () {
   function OktaUserAgent() {
     _classCallCheck(this, OktaUserAgent);
-    this.environments = ["okta-auth-js/".concat("6.2.0")];
+    this.environments = ["okta-auth-js/".concat("6.3.0")];
   }
   _createClass(OktaUserAgent, [{
     key: "addEnvironment",
@@ -8305,7 +8689,7 @@ var OktaUserAgent = function () {
   }, {
     key: "getVersion",
     value: function getVersion() {
-      return "6.2.0";
+      return "6.3.0";
     }
   }, {
     key: "maybeAddNodeEnvironment",
@@ -9172,5 +9556,5 @@ _Object$assign(OktaAuth, {
   constants: constants
 });
 
-export { ACCESS_TOKEN_STORAGE_KEY, AuthApiError, AuthPollStopError, AuthSdkError, AuthStateManager, AuthTransaction, AuthenticatorKey, CACHE_STORAGE_NAME, DEFAULT_CACHE_DURATION, DEFAULT_CODE_CHALLENGE_METHOD, DEFAULT_MAX_CLOCK_SKEW, DEFAULT_POLLING_DELAY, EVENT_ADDED, EVENT_ERROR, EVENT_EXPIRED, EVENT_REMOVED, EVENT_RENEWED, IDX_API_VERSION, IDX_RESPONSE_STORAGE_NAME, ID_TOKEN_STORAGE_KEY, INITIAL_AUTH_STATE, IdxFeature, IdxStatus, MAX_VERIFIER_LENGTH, MIN_VERIFIER_LENGTH, OAuthError, ORIGINAL_URI_STORAGE_NAME, OktaAuth, PKCE_STORAGE_NAME, REDIRECT_NONCE_COOKIE_NAME, REDIRECT_OAUTH_PARAMS_NAME, REDIRECT_STATE_COOKIE_NAME, REFERRER_PATH_STORAGE_KEY, REFRESH_TOKEN_STORAGE_KEY, SHARED_TRANSACTION_STORAGE_NAME, STATE_TOKEN_KEY_NAME, StorageManager, TOKEN_STORAGE_NAME, TRANSACTION_STORAGE_NAME, TokenManager, addListener, addPostMessageListener, addStateToken, assertPKCESupport, authenticate, bind, buildAuthorizeParams, canProceed, cancel, clearTransactionMeta, clone, convertTokenParamsToOAuthParams, createOAuthMeta, createTransactionMeta, crypto$1 as crypto, decodeToken, delay, deprecate, deprecateWrap, exchangeCodeForTokens, extend, find, genRandomString, generateNonce, generateState, getConsole, getDefaultTokenParams, getHashOrSearch, getKey, getLink, getNativeConsole, getOAuthBaseUrl, getOAuthDomain, getOAuthUrls, getPollFn, getSavedTransactionMeta, getStateToken, getToken, getTransactionMeta, getUserInfo, getWellKnown, getWithPopup, getWithRedirect, getWithoutPrompt, handleEmailVerifyCallback, handleInteractionCodeRedirect, handleOAuthResponse, hasAuthorizationCode, hasErrorInUrl, hasInteractionCode, hasSavedInteractionHandle, hasTokensInHash, interact, introspect, introspectAuthn, isAbsoluteUrl, isAccessToken, isAuthApiError, isAuthorizationCodeError, isCodeFlow, isCustomAuthTransactionMeta, isEmailVerifyCallback, isEmailVerifyCallbackError, isFunction, isIDToken, isIdxTransactionMeta, isInteractionRequired, isInteractionRequiredError, isLoginRedirect, isNumber, isOAuthTransactionMeta, isObject, isPKCETransactionMeta, isPromise, isRedirectUri, isRefreshToken, isRefreshTokenError, isSameRefreshToken, isString, isToken, isTransactionMeta, isTransactionMetaValid, isTransactionMetaValidForFlow, isTransactionMetaValidForOptions, isoToUTCString, loadFrame, loadPopup, omit, parseEmailVerifyCallback, parseFromUrl, PKCE as pkce, poll, postRefreshToken, postToTokenEndpoint, postToTransaction, preparePKCE, prepareTokenParams, proceed, recoverPassword, register, removeListener, removeNils, removeTrailingSlash, renewToken, renewTokens, renewTokensWithRefresh, resumeTransaction, revokeToken, saveTransactionMeta, startTransaction, toAbsoluteUrl, toQueryString, toRelativeUrl, transactionExists, transactionStatus, transactionStep, unlockAccount, urlParamsToObject, validateClaims, validateCodeChallengeMethod, validateToken, verifyToken, warn };
+export { ACCESS_TOKEN_STORAGE_KEY, AuthApiError, AuthPollStopError, AuthSdkError, AuthStateManager, AuthTransaction, AuthenticatorKey, CACHE_STORAGE_NAME, DEFAULT_CACHE_DURATION, DEFAULT_CODE_CHALLENGE_METHOD, DEFAULT_MAX_CLOCK_SKEW, DEFAULT_POLLING_DELAY, EVENT_ADDED, EVENT_ERROR, EVENT_EXPIRED, EVENT_REMOVED, EVENT_RENEWED, IDX_API_VERSION, IDX_RESPONSE_STORAGE_NAME, ID_TOKEN_STORAGE_KEY, INITIAL_AUTH_STATE, IdxFeature, IdxStatus, MAX_VERIFIER_LENGTH, MIN_VERIFIER_LENGTH, OAuthError, ORIGINAL_URI_STORAGE_NAME, OktaAuth, PKCE_STORAGE_NAME, REDIRECT_NONCE_COOKIE_NAME, REDIRECT_OAUTH_PARAMS_NAME, REDIRECT_STATE_COOKIE_NAME, REFERRER_PATH_STORAGE_KEY, REFRESH_TOKEN_STORAGE_KEY, SHARED_TRANSACTION_STORAGE_NAME, STATE_TOKEN_KEY_NAME, StorageManager, TOKEN_STORAGE_NAME, TRANSACTION_STORAGE_NAME, TokenManager, addListener, addPostMessageListener, addStateToken, assertPKCESupport, authenticate, bind, buildAuthorizeParams, canProceed, cancel, clearTransactionMeta, clone, convertTokenParamsToOAuthParams, createOAuthMeta, createTransactionMeta, crypto$1 as crypto, decodeToken, delay, deprecate, deprecateWrap, exchangeCodeForTokens, extend, find, genRandomString, generateNonce, generateState, getConsole, getDefaultTokenParams, getHashOrSearch, getKey, getLink, getNativeConsole, getOAuthBaseUrl, getOAuthDomain, getOAuthUrls, getPollFn, getSavedTransactionMeta, getStateToken, getToken, getTransactionMeta, getUserInfo, getWellKnown, getWithPopup, getWithRedirect, getWithoutPrompt, handleEmailVerifyCallback, handleInteractionCodeRedirect, handleOAuthResponse, hasAuthorizationCode, hasErrorInUrl, hasInteractionCode, hasSavedInteractionHandle, hasTokensInHash, interact, introspect, introspectAuthn, isAbsoluteUrl, isAccessToken, isAuthApiError, isAuthenticator, isAuthorizationCodeError, isCodeFlow, isCustomAuthTransactionMeta, isEmailVerifyCallback, isEmailVerifyCallbackError, isFunction, isIDToken, isIdxTransactionMeta, isInteractionRequired, isInteractionRequiredError, isLoginRedirect, isNumber, isOAuthTransactionMeta, isObject, isPKCETransactionMeta, isPromise, isRedirectUri, isRefreshToken, isRefreshTokenError, isSameRefreshToken, isString, isToken, isTransactionMeta, isTransactionMetaValid, isTransactionMetaValidForFlow, isTransactionMetaValidForOptions, isoToUTCString, loadFrame, loadPopup, omit, parseEmailVerifyCallback, parseFromUrl, PKCE as pkce, poll, postRefreshToken, postToTokenEndpoint, postToTransaction, preparePKCE, prepareTokenParams, proceed, recoverPassword, register, removeListener, removeNils, removeTrailingSlash, renewToken, renewTokens, renewTokensWithRefresh, resumeTransaction, revokeToken, saveTransactionMeta, startTransaction, toAbsoluteUrl, toQueryString, toRelativeUrl, transactionExists, transactionStatus, transactionStep, unlockAccount, urlParamsToObject, validateClaims, validateCodeChallengeMethod, validateToken, verifyToken, warn };
 //# sourceMappingURL=esm.browser.js.map