chore(web): remove createEventDispatcher from LoginForm

immich-app · Feb 18, 2024 · 009e1c4 · 009e1c4
1 parent 0730b54
commit 009e1c4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/web/src/lib/components/forms/login-form.svelte b/web/src/lib/components/forms/login-form.svelte
@@ -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;
@@ -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);
@@ -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';

diff --git a/web/src/routes/auth/login/+page.svelte b/web/src/routes/auth/login/+page.svelte
@@ -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}