From f709d11952ca8552214e4b9e8c2a189bc11bfb2a Mon Sep 17 00:00:00 2001
From: Carter <35710697+cmintey@users.noreply.github.com>
Date: Tue, 2 Apr 2024 10:13:30 -0500
Subject: [PATCH] fix: (OAuth) redirect to direct login on failure (#3406)

---
 .../schemes/DynamicOpenIDConnectScheme.js     | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/frontend/schemes/DynamicOpenIDConnectScheme.js b/frontend/schemes/DynamicOpenIDConnectScheme.js
index 179cd29a1c7..eb907d5b617 100644
--- a/frontend/schemes/DynamicOpenIDConnectScheme.js
+++ b/frontend/schemes/DynamicOpenIDConnectScheme.js
@@ -34,6 +34,11 @@ export default class DynamicOpenIDConnectScheme extends OpenIDConnectScheme {
     }
 
     async _handleCallback() {
+      // sometimes the mealie token is being sent in the request to the IdP on callback which
+      // causes an error, so we clear it if we have one
+      if (this.token.get()) {
+        this.token.reset();
+      }
       const redirect = await super._handleCallback()
       await this.updateAccessToken()
 
@@ -49,13 +54,20 @@ export default class DynamicOpenIDConnectScheme extends OpenIDConnectScheme {
         return
       }
 
-      const response = await this.$auth.requestWith(this.name, {
-        url: "/api/auth/token",
-        method: "post"
-      })
-
-      // Update tokens with mealie token
-      this.updateTokens(response)
+      try {
+        const response = await this.$auth.requestWith(this.name, {
+          url: "/api/auth/token",
+          method: "post"
+        })
+        // Update tokens with mealie token
+        this.updateTokens(response)
+      } catch {
+        const currentUrl = new URL(window.location.href)
+        if (currentUrl.pathname === "/login" && currentUrl.searchParams.has("direct")) {
+          return
+        }
+        window.location.replace("/login?direct=1")
+      }
     }
 
     isValidMealieToken() {