Merge pull request 'refactor: centralize access token handling in cookies and improve related functions' (#356) from feature/cookies into development
Reviewed-on: ADUANASOFT/anexo76#356
This commit is contained in:
@@ -3,6 +3,7 @@
|
||||
import { page } from '$app/stores';
|
||||
import { browser } from '$app/environment';
|
||||
import { GLOBAL_NAV } from '$lib/config/shortcuts';
|
||||
import { hasAccessTokenInDocument } from '$lib/access-token-cookie-browser';
|
||||
import { shortcutStore, activeShortcutsList } from '$lib/stores/shortcut-store';
|
||||
import { focusStore, interactionMode } from '$lib/stores/focus-store';
|
||||
import ShortcutsHelpModal from './ShortcutsHelpModal.svelte';
|
||||
@@ -30,7 +31,7 @@
|
||||
const currentPath = $page?.url?.pathname || '';
|
||||
const isAuthenticatedRoute = currentPath.startsWith('/dashboard');
|
||||
const hasAccessToken =
|
||||
document.cookie.includes('access_token=') || localStorage.getItem('access_token');
|
||||
hasAccessTokenInDocument() || localStorage.getItem('access_token');
|
||||
return isAuthenticatedRoute && !!hasAccessToken;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,20 +1,21 @@
|
||||
<script lang="ts">
|
||||
import * as Card from "$lib/components/ui/card/index.ts";
|
||||
import * as Card from "$lib/components/ui/card/index";
|
||||
import {
|
||||
FieldGroup,
|
||||
Field,
|
||||
FieldLabel,
|
||||
FieldDescription,
|
||||
} from "$lib/components/ui/field/index.ts";
|
||||
import { Input } from "$lib/components/ui/input/index.ts";
|
||||
import { Button } from "$lib/components/ui/button/index.ts";
|
||||
import { cn } from "$lib/utils.ts";
|
||||
} from "$lib/components/ui/field/index";
|
||||
import { Input } from "$lib/components/ui/input/index";
|
||||
import { Button } from "$lib/components/ui/button/index";
|
||||
import { cn } from "$lib/utils";
|
||||
import faviconUrl from '$lib/assets/favicon.svg';
|
||||
import type { HTMLAttributes } from "svelte/elements";
|
||||
import { page } from '$app/state';
|
||||
import { enhance } from '$app/forms';
|
||||
import { loginWithProvider } from '$lib/sso.ts';
|
||||
import { loginWithProvider } from '$lib/sso';
|
||||
import { onMount, tick } from 'svelte';
|
||||
import { clearAccessTokenOnDocument } from '$lib/access-token-cookie-browser';
|
||||
|
||||
let { class: className, ...restProps }: HTMLAttributes<HTMLDivElement> = $props();
|
||||
|
||||
@@ -51,7 +52,7 @@
|
||||
if (typeof document !== 'undefined') {
|
||||
const isSecure = window.location.protocol === 'https:';
|
||||
const secureFlag = isSecure ? '; Secure' : '';
|
||||
document.cookie = `access_token=; path=/; expires=Thu, 01 Jan 1970 00:00:00 UTC; SameSite=Lax${secureFlag}`;
|
||||
clearAccessTokenOnDocument();
|
||||
document.cookie = `refresh_token=; path=/; expires=Thu, 01 Jan 1970 00:00:00 UTC; SameSite=Lax${secureFlag}`;
|
||||
document.cookie = `active_company_id=; path=/; expires=Thu, 01 Jan 1970 00:00:00 UTC; SameSite=Lax${secureFlag}`;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user