Mirrors/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2026-06-16 05:50:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: refactor cookie settings for Home Assistant i-frame login (#7741)

Browse Source
This commit is contained in:
cheebreezee
2026-06-15 07:08:35 -07:00
committed by GitHub
parent ecb6caf71b
commit 544071f3e7
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/app/composables/use-auth-backend.ts
View File

@@ -1,6 +1,7 @@
import { ref, computed } from "vue"; import { ref, computed } from "vue";
import type { UserOut } from "~/lib/api/types/user"; import type { UserOut } from "~/lib/api/types/user";
import { clearAllStores } from "~/composables/store"; import { clearAllStores } from "~/composables/store";
import { getTokenCookieOptions } from "~/composables/use-token-cookie";
interface AuthData { interface AuthData {
value: UserOut | null; value: UserOut | null;
@@ -30,10 +31,7 @@ export const useAuthBackend = function (): AuthState {
const runtimeConfig = useRuntimeConfig(); const runtimeConfig = useRuntimeConfig();
const tokenName = runtimeConfig.public.AUTH_TOKEN; const tokenName = runtimeConfig.public.AUTH_TOKEN;
const tokenCookie = useCookie(tokenName, { const tokenCookie = useCookie(tokenName, getTokenCookieOptions());
maxAge: $appInfo.tokenTime * 60 * 60,
secure: $appInfo.production && window?.location?.protocol === "https:",
});
function setToken(token: string | null) { function setToken(token: string | null) {
tokenCookie.value = token; tokenCookie.value = token;

9
frontend/app/composables/use-token-cookie.ts Normal file
View File

@@ -0,0 +1,9 @@
export function getTokenCookieOptions(): Parameters<typeof useCookie>[1] {
const isSecureConnection = useNuxtApp().$appInfo.production && window?.location?.protocol === "https:";
return {
maxAge: useNuxtApp().$appInfo.tokenTime * 60 * 60,
secure: isSecureConnection,
sameSite: isSecureConnection ? "none" : "lax",
partitioned: isSecureConnection,
};
}

3
frontend/app/plugins/axios.ts
View File

@@ -1,5 +1,6 @@
import axios from "axios"; import axios from "axios";
import { alert } from "~/composables/use-toast"; import { alert } from "~/composables/use-toast";
import { getTokenCookieOptions } from "~/composables/use-token-cookie";
declare module "axios" { declare module "axios" {
interface AxiosRequestConfig { interface AxiosRequestConfig {
@@ -42,7 +43,7 @@ export default defineNuxtPlugin(() => {
// If we receive a 401 Unauthorized response, clear the token cookie and redirect to login // If we receive a 401 Unauthorized response, clear the token cookie and redirect to login
if (error?.response?.status === 401) { if (error?.response?.status === 401) {
// If tokenCookie is not set, we may just be an unauthenticated user using the wrong API, so don't redirect // If tokenCookie is not set, we may just be an unauthenticated user using the wrong API, so don't redirect
const tokenCookie = useCookie(tokenName); const tokenCookie = useCookie(tokenName, getTokenCookieOptions());
if (tokenCookie.value) { if (tokenCookie.value) {
tokenCookie.value = null; tokenCookie.value = null;