From 1258a1a180d8760b52a0cb0fa91293a6e05783aa Mon Sep 17 00:00:00 2001
From: Krishna Acondy <kc.acondy@outlook.com>
Date: Sat, 8 Aug 2020 12:56:31 +0100
Subject: [PATCH] fix(login-callback): fix request failure when login is
 required

---
 src/utils/makeRequest.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/utils/makeRequest.ts b/src/utils/makeRequest.ts
index 5fda9c8..f8c3bd4 100644
--- a/src/utils/makeRequest.ts
+++ b/src/utils/makeRequest.ts
@@ -18,6 +18,9 @@ export async function makeRequest<T>(
       : (res: Response) => res.text();
   let etag = null;
   const result = await fetch(url, request).then(async (response) => {
+    if (response.redirected && response.url.includes("SASLogon/login")) {
+      return Promise.reject({ status: 401 });
+    }
     if (!response.ok) {
       if (response.status === 403) {
         const tokenHeader = response.headers.get("X-CSRF-HEADER");
@@ -75,10 +78,6 @@ export async function makeRequest<T>(
         responseText = JSON.stringify(responseTransformed);
       }
 
-      if (response.redirected && response.url.includes("SASLogon/login")) {
-        return Promise.reject({ status: 401, responseTransformed });
-      }
-
       if (needsRetry(responseText)) {
         if (retryCount < retryLimit) {
           retryCount++;