Docker/mealie
Docker/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-07-23 07:09:41 +02:00
Code Issues Releases Activity

fix: (OAuth) redirect to direct login on failure (#3406)
Some checks failed
CodeQL / Analyze (javascript-typescript) (push) Waiting to run
Details
CodeQL / Analyze (python) (push) Waiting to run
Details
Docker Nightly Production / Backend Server Tests (push) Has been cancelled
Details
Docker Nightly Production / Frontend and End-to-End Tests (push) Has been cancelled
Details
Docker Nightly Production / Build Tagged Release (push) Has been cancelled
Details
Docker Nightly Production / Notify Discord (push) Has been cancelled
Details

Browse source
This commit is contained in:
Carter 2024-04-02 10:13:30 -05:00 • committed by GitHub
parent 2a3463b746
commit f709d11952
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

26
frontend/schemes/DynamicOpenIDConnectScheme.js
View file

@ -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() {