From 101bbcb3b640aa1c97c2f467c00f7f7f8f6eea31 Mon Sep 17 00:00:00 2001
From: ian <licitdev@gmail.com>
Date: Fri, 15 Oct 2021 22:56:41 +0800
Subject: [PATCH] Fix broken access token refresh on page load (#8809)

* Fix broken access token refresh on page load

* Add comment and tidy to one liner
---
 app/src/auth.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/auth.ts b/app/src/auth.ts
index dfb12de5f6..b5bcc2fa52 100644
--- a/app/src/auth.ts
+++ b/app/src/auth.ts
@@ -45,6 +45,7 @@ export async function login(credentials: LoginCredentials): Promise<void> {
 let refreshTimeout: any;
 let idle = false;
 let isRefreshing = false;
+let firstRefresh = true;
 
 // Prevent the auto-refresh when the app isn't in use
 idleTracker.on('idle', () => {
@@ -73,8 +74,10 @@ idleTracker.on('show', () => {
 });
 
 export async function refresh({ navigate }: LogoutOptions = { navigate: true }): Promise<string | undefined> {
+	// Allow refresh during initial page load
+	if (firstRefresh) firstRefresh = false;
 	// Skip if not logged in
-	if (!api.defaults.headers?.['Authorization']) return;
+	else if (!api.defaults.headers?.['Authorization']) return;
 
 	// Prevent concurrent refreshes
 	if (isRefreshing) return;