From ac147086f12eaa5efee4fdb702d81f994ec9ec95 Mon Sep 17 00:00:00 2001
From: Xyphyn <james@xylight.dev>
Date: Tue, 26 Sep 2023 18:35:51 -0700
Subject: [PATCH] fix: make password changing actually work

---
 src/lib/auth.ts                                 | 13 -------------
 src/routes/admin/config/+page.svelte            | 10 ++++++++++
 src/routes/login/+page.svelte                   |  3 +--
 .../profile/(local_user)/password/+page.svelte  | 17 +++++++++++++----
 4 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/lib/auth.ts b/src/lib/auth.ts
index 34fab3c4..5e824d6e 100644
--- a/src/lib/auth.ts
+++ b/src/lib/auth.ts
@@ -227,19 +227,6 @@ instance.subscribe(async (i) => {
   } catch (e) {}
 })
 
-export function updateJwt(id: number, newJwt: string) {
-  const pd = get(profileData)
-  let prof = pd.profiles.find((p) => p.id == id)
-
-  if (!prof) return
-  prof = serializeUser(prof)
-  prof.jwt = newJwt
-
-  profileData.update((p) => ({ ...p, profile: id }))
-
-  profile.update(() => prof)
-}
-
 export async function setUserID(id: number) {
   const pd = get(profileData)
   if (id == -1) {
diff --git a/src/routes/admin/config/+page.svelte b/src/routes/admin/config/+page.svelte
index 920d7e82..dc293a15 100644
--- a/src/routes/admin/config/+page.svelte
+++ b/src/routes/admin/config/+page.svelte
@@ -128,6 +128,16 @@
     <Checkbox bind:checked={formData.federation_enabled} defaultValue={true}>
       Federation enabled
     </Checkbox>
+    <Checkbox bind:checked={formData.federation_debug} defaultValue={false}>
+      Federation debug mode
+    </Checkbox>
+    <Checkbox bind:checked={formData.captcha_enabled} defaultValue={false}>
+      Captcha enabled
+    </Checkbox>
+    {#if formData.captcha_enabled}
+      {console.log(formData.captcha_difficulty)}
+      <Select bind:value={formData.captcha_difficulty} />
+    {/if}
   {/if}
   <Button color="primary" size="lg" loading={saving} disabled={saving} submit>
     Save
diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte
index 8b0ffce2..e0363ea9 100644
--- a/src/routes/login/+page.svelte
+++ b/src/routes/login/+page.svelte
@@ -1,8 +1,7 @@
 <script lang="ts">
   import { goto } from '$app/navigation'
   import { setUser } from '$lib/auth.js'
-  import Link from '$lib/components/input/Link.svelte'
-  import { Material, toast } from 'mono-svelte'
+  import { toast } from 'mono-svelte'
   import { DEFAULT_INSTANCE_URL, LINKED_INSTANCE_URL } from '$lib/instance.js'
   import { getClient, validateInstance } from '$lib/lemmy.js'
   import { Button, TextInput } from 'mono-svelte'
diff --git a/src/routes/profile/(local_user)/password/+page.svelte b/src/routes/profile/(local_user)/password/+page.svelte
index 37723bbf..3e225c33 100644
--- a/src/routes/profile/(local_user)/password/+page.svelte
+++ b/src/routes/profile/(local_user)/password/+page.svelte
@@ -1,14 +1,17 @@
 <script lang="ts">
-  import { profile, setUser, setUserID, updateJwt } from '$lib/auth.js'
+  import { deleteProfile, profile, setUser } from '$lib/auth.js'
   import { getClient } from '$lib/lemmy.js'
   import { trycatch } from '$lib/util.js'
   import { Button, TextInput, toast } from 'mono-svelte'
+  import { instance as currentInstance } from '$lib/instance.js'
 
   let oldPassword = '',
     newPassword = '',
     newPasswordVerify = ''
+  let loading = false
 
   async function submit() {
+    loading = true
     const res = await trycatch(async () => {
       if (!$profile?.jwt) return
       const res = await getClient().changePassword({
@@ -18,8 +21,10 @@
         old_password: oldPassword,
       })
       if (res?.jwt) {
-        updateJwt($profile.id, res.jwt)
-        await setUserID($profile.id)
+        const { instance, username } = $profile
+        deleteProfile($profile.id)
+        await setUser(res.jwt, instance, username!)
+        $currentInstance = instance
 
         toast({ content: 'Your login was refreshed.', type: 'success' })
       } else {
@@ -28,6 +33,8 @@
     })
 
     if (res) toast({ content: 'Successfully changed your password. ' })
+
+    loading = false
   }
 </script>
 
@@ -51,5 +58,7 @@
     type="password"
     required
   />
-  <Button size="lg" color="primary" submit>Submit</Button>
+  <Button size="lg" color="primary" submit {loading} disabled={loading}>
+    Submit
+  </Button>
 </form>