From f0fa249d3609848cb7bd5b30b7ec88ece375782d Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 27 May 2020 13:16:10 -0600
Subject: [PATCH] Request fresh flows on the initial registration request

---
 src/interactive-auth.js | 13 +++++++------
 src/utils.ts            |  1 +
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/interactive-auth.js b/src/interactive-auth.js
index 2dfdc44d8..c2187f344 100644
--- a/src/interactive-auth.js
+++ b/src/interactive-auth.js
@@ -143,11 +143,13 @@ InteractiveAuth.prototype = {
             this._resolveFunc = resolve;
             this._rejectFunc = reject;
 
-            // if we have no flows, try a request (we'll have
-            // just a session ID in _data if resuming)
-            if (this._data && !this._data.flows) {
+            const hasFlows = this._data && this._data.flows;
+
+            // if we have no flows, try a request to acquire the flows
+            if (!hasFlows) {
                 if (this._busyChangedCallback) this._busyChangedCallback(true);
-                this._doRequest(this._data).finally(() => {
+                // Do a fresh request as we're just acquiring flows.
+                this._doRequest(null).finally(() => {
                     if (this._busyChangedCallback) this._busyChangedCallback(false);
                 });
             } else {
@@ -264,8 +266,7 @@ InteractiveAuth.prototype = {
             }
         }
 
-        // use the sessionid from the last request.
-        // but keep the null in authData if this is the first stage.
+        // use the sessionid from the last request, if one is present.
         let auth;
         if (this._data.session) {
             auth = {
diff --git a/src/utils.ts b/src/utils.ts
index 350c48ae5..e5fd7d619 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -373,6 +373,7 @@ export function extend() {
     const target = arguments[0] || {};
     for (let i = 1; i < arguments.length; i++) {
         const source = arguments[i];
+        if (!source) continue;
         for (const propName in source) { // eslint-disable-line guard-for-in
             target[propName] = source[propName];
         }