Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(web): remove createEventDispatcher from LoginForm #7177

Merged
merged 1 commit into from
Feb 18, 2024
Merged

chore(web): remove createEventDispatcher from LoginForm #7177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 9 additions & 11 deletions web/src/lib/components/forms/login-form.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,21 @@
import { oauth } from '$lib/utils';
import { getServerErrorMessage, handleError } from '$lib/utils/handle-error';
import { getServerConfig, login } from '@immich/sdk';
import { createEventDispatcher, onMount } from 'svelte';
import { onMount } from 'svelte';
import { fade } from 'svelte/transition';
import Button from '../elements/buttons/button.svelte';

export let onSuccess: () => unknown | Promise<unknown>;
export let onFirstLogin: () => unknown | Promise<unknown>;
export let onOnboarding: () => unknown | Promise<unknown>;

let errorMessage: string;
let email = '';
let password = '';
let oauthError = '';
let loading = false;
let oauthLoading = true;

const dispatch = createEventDispatcher<{
success: void;
firstLogin: void;
onboarding: void;
}>();

onMount(async () => {
if (!$featureFlags.oauth) {
oauthLoading = false;
Expand All @@ -32,7 +30,7 @@
if (oauth.isCallback(window.location)) {
try {
await oauth.login(window.location);
dispatch('success');
await onSuccess();
return;
} catch (error) {
console.error('Error [login-form] [oauth.callback]', error);
Expand Down Expand Up @@ -63,15 +61,15 @@
const serverConfig = await getServerConfig();

if (user.isAdmin && !serverConfig.isOnboarded) {
dispatch('onboarding');
await onOnboarding();
return;
}

if (!user.isAdmin && user.shouldChangePassword) {
dispatch('firstLogin');
await onFirstLogin();
return;
}
dispatch('success');
await onSuccess();
return;
} catch (error) {
errorMessage = (await getServerErrorMessage(error)) || 'Incorrect email or password';
Expand Down
6 changes: 3 additions & 3 deletions web/src/routes/auth/login/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
</p>

<LoginForm
on:success={() => goto(AppRoute.PHOTOS, { invalidateAll: true })}
on:firstLogin={() => goto(AppRoute.AUTH_CHANGE_PASSWORD)}
on:onboarding={() => goto(AppRoute.AUTH_ONBOARDING)}
onSuccess={() => goto(AppRoute.PHOTOS, { invalidateAll: true })}
onFirstLogin={() => goto(AppRoute.AUTH_CHANGE_PASSWORD)}
onOnboarding={() => goto(AppRoute.AUTH_ONBOARDING)}
/>
</FullscreenContainer>
{/if}