From 2930e081a5ba19f8e5d68cccf682af5817697e45 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Thu, 30 Jul 2020 12:45:36 +0200
Subject: [PATCH] core-api: ensure instantPopup is synchronous in
 RefreshingAuthSessionManager

---
 .../RefreshingAuthSessionManager.test.ts                   | 4 ++--
 .../lib/AuthSessionManager/RefreshingAuthSessionManager.ts | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/core-api/src/lib/AuthSessionManager/RefreshingAuthSessionManager.test.ts b/packages/core-api/src/lib/AuthSessionManager/RefreshingAuthSessionManager.test.ts
index 12e7c0a978..9e22e4cd69 100644
--- a/packages/core-api/src/lib/AuthSessionManager/RefreshingAuthSessionManager.test.ts
+++ b/packages/core-api/src/lib/AuthSessionManager/RefreshingAuthSessionManager.test.ts
@@ -137,7 +137,7 @@ describe('RefreshingAuthSessionManager', () => {
     expect(refreshSession).toBeCalledTimes(1);
   });
 
-  it('should forward option to instantly show auth popup', async () => {
+  it('should forward option to instantly show auth popup and not attempt refresh', async () => {
     const createSession = jest.fn();
     const refreshSession = jest.fn().mockRejectedValue(new Error('NOPE'));
     const manager = new RefreshingAuthSessionManager({
@@ -151,7 +151,7 @@ describe('RefreshingAuthSessionManager', () => {
       scopes: new Set(),
       instantPopup: true,
     });
-    expect(refreshSession).toBeCalledTimes(1);
+    expect(refreshSession).toBeCalledTimes(0);
   });
 
   it('should remove session straight away', async () => {
diff --git a/packages/core-api/src/lib/AuthSessionManager/RefreshingAuthSessionManager.ts b/packages/core-api/src/lib/AuthSessionManager/RefreshingAuthSessionManager.ts
index e46c505c12..a098b384f9 100644
--- a/packages/core-api/src/lib/AuthSessionManager/RefreshingAuthSessionManager.ts
+++ b/packages/core-api/src/lib/AuthSessionManager/RefreshingAuthSessionManager.ts
@@ -90,7 +90,12 @@ export class RefreshingAuthSessionManager<T> implements SessionManager<T> {
 
     // The user may still have a valid refresh token in their cookies. Attempt to
     // initiate a fresh session through the backend using that refresh token.
-    if (!this.currentSession) {
+    //
+    // We skip this check if an instant login popup is requested, as we need to
+    // stay in a synchronous call stack from the user interaction. The downside
+    // is that that the user will sometimes be requested to log in even if they
+    // already had an existing session.
+    if (!this.currentSession && !options.instantPopup) {
       try {
         const newSession = await this.collapsedSessionRefresh();
         this.currentSession = newSession;