From 2bf6cd9241981765e2477914d172a3ccef658714 Mon Sep 17 00:00:00 2001
From: bo0tzz <git@bo0tzz.me>
Date: Sat, 13 Aug 2022 16:54:29 +0200
Subject: [PATCH] Fix redirect to login page after password change (#461)

* Fix redirect to login page after password change

Copied from the similar fix in #414

* Fix typo in change-password form

* Remove misplaced text from user management page
---
 web/src/lib/components/admin-page/user-management.svelte | 2 --
 web/src/lib/components/forms/change-password-form.svelte | 2 +-
 web/src/routes/auth/change-password/index.svelte         | 9 +++------
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/web/src/lib/components/admin-page/user-management.svelte b/web/src/lib/components/admin-page/user-management.svelte
index 7728e23119..8da3bda4e5 100644
--- a/web/src/lib/components/admin-page/user-management.svelte
+++ b/web/src/lib/components/admin-page/user-management.svelte
@@ -8,8 +8,6 @@
 	const dispatch = createEventDispatcher();
 </script>
 
-<p class="text-sm">USER LIST</p>
-
 <table class="text-left w-full my-4">
 	<thead class="border rounded-md mb-2 bg-gray-50 flex text-immich-primary w-full h-12 ">
 		<tr class="flex w-full place-items-center">
diff --git a/web/src/lib/components/forms/change-password-form.svelte b/web/src/lib/components/forms/change-password-form.svelte
index 34a7116d41..0b6b5fdfe8 100644
--- a/web/src/lib/components/forms/change-password-form.svelte
+++ b/web/src/lib/components/forms/change-password-form.svelte
@@ -47,7 +47,7 @@
 <div class="border bg-white p-4 shadow-sm w-[500px] rounded-md py-8">
 	<div class="flex flex-col place-items-center place-content-center gap-4 px-4">
 		<img class="text-center" src="/immich-logo.svg" height="100" width="100" alt="immich-logo" />
-		<h1 class="text-2xl text-immich-primary font-medium">Chage Password</h1>
+		<h1 class="text-2xl text-immich-primary font-medium">Change Password</h1>
 
 		<p class="text-sm border rounded-md p-4 font-mono text-gray-600">
 			Hi {user.firstName}
diff --git a/web/src/routes/auth/change-password/index.svelte b/web/src/routes/auth/change-password/index.svelte
index 7b5d1d3797..82e7890916 100644
--- a/web/src/routes/auth/change-password/index.svelte
+++ b/web/src/routes/auth/change-password/index.svelte
@@ -39,12 +39,9 @@
 	export let user: UserResponseDto;
 
 	const onSuccessHandler = async () => {
-		/** Svelte route fetch */
-		const res = await fetch('/auth/logout', { method: 'POST' });
-
-		if (res.status == 200 && res.statusText == 'OK') {
-			goto('/auth/login');
-		}
+		await fetch('auth/logout', { method: 'POST' });
+		
+		goto('/auth/login');
 	};
 </script>