Cutlery/immich
1
0
Fork 1
mirror of https://github.com/immich-app/immich.git synced 2025-05-31 20:25:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(web): log out (#5706)

Browse Source 
* fix: logging out

* fix: websocket

---------

Co-authored-by: Alex Tran <alex.tran1502@gmail.com>
This commit is contained in:
martin 2023-12-15 03:29:05 +01:00 committed by GitHub
parent 2836b8cda9
commit 502495883d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/src/lib/components/shared-components/navigation-bar/navigation-bar.svelte
View File

@ -16,7 +16,7 @@
import UserAvatar from '../user-avatar.svelte'; import UserAvatar from '../user-avatar.svelte';
import { featureFlags } from '$lib/stores/server-config.store'; import { featureFlags } from '$lib/stores/server-config.store';
import { mdiMagnify, mdiTrayArrowUp, mdiCog } from '@mdi/js'; import { mdiMagnify, mdiTrayArrowUp, mdiCog } from '@mdi/js';
import { user } from '$lib/stores/user.store'; import { resetSavedUser, user } from '$lib/stores/user.store';
export let showUploadButton = true; export let showUploadButton = true;
@ -28,6 +28,7 @@
}>(); }>();
const logOut = async () => { const logOut = async () => {
resetSavedUser();
const { data } = await api.authenticationApi.logout(); const { data } = await api.authenticationApi.logout();
goto(data.redirectUri || '/auth/login?autoLaunch=0'); goto(data.redirectUri || '/auth/login?autoLaunch=0');
}; };

6
web/src/lib/stores/user.store.ts
View File

@ -1,7 +1,7 @@
import { get, writable } from 'svelte/store'; import { get, writable } from 'svelte/store';
import type { UserResponseDto } from '@api'; import type { UserResponseDto } from '@api';
export const user = writable<UserResponseDto>(); export let user = writable<UserResponseDto>();
export const setUser = (value: UserResponseDto) => { export const setUser = (value: UserResponseDto) => {
user.set(value); user.set(value);
@ -10,3 +10,7 @@ export const setUser = (value: UserResponseDto) => {
export const getSavedUser = () => { export const getSavedUser = () => {
return get(user); return get(user);
}; };
export const resetSavedUser = () => {
user = writable<UserResponseDto>();
};

3
web/src/lib/stores/websocket.ts
View File

@ -2,7 +2,6 @@ import type { AssetResponseDto, ServerVersionResponseDto } from '@api';
import { Socket, io } from 'socket.io-client'; import { Socket, io } from 'socket.io-client';
import { writable } from 'svelte/store'; import { writable } from 'svelte/store';
import { loadConfig } from './server-config.store'; import { loadConfig } from './server-config.store';
import { getSavedUser } from './user.store';
export interface ReleaseEvent { export interface ReleaseEvent {
isAvailable: boolean; isAvailable: boolean;
@ -26,7 +25,7 @@ let websocket: Socket | null = null;
export const openWebsocketConnection = () => { export const openWebsocketConnection = () => {
try { try {
if (websocket || !getSavedUser()) { if (websocket) {
return; return;
} }