From 06c9af9670b8ac7134a27956c0d7de53e6b03059 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= <kevin.aberg@gmail.com>
Date: Fri, 21 May 2021 13:25:40 +0200
Subject: [PATCH] fix erroneous disable state in resetform

---
 .../builder/src/pages/builder/auth/reset.svelte    | 14 +++++++++++---
 packages/builder/src/stores/portal/auth.js         |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/packages/builder/src/pages/builder/auth/reset.svelte b/packages/builder/src/pages/builder/auth/reset.svelte
index 5678cfab7a..da7e2a7073 100644
--- a/packages/builder/src/pages/builder/auth/reset.svelte
+++ b/packages/builder/src/pages/builder/auth/reset.svelte
@@ -12,8 +12,11 @@
   async function reset() {
     try {
       if (forceResetPassword) {
-        console.log("Updating self!")
-        await auth.updateSelf({ ...$auth.user, password })
+        await auth.updateSelf({
+          ...$auth.user,
+          password,
+          forceResetPassword: false,
+        })
         $goto("../portal/")
       } else {
         await auth.resetPassword(password, resetCode)
@@ -43,7 +46,12 @@
         </Body>
         <PasswordRepeatInput bind:password bind:error />
       </Layout>
-      <Button cta on:click={reset} disabled={error}>Reset your password</Button>
+      <Button
+        cta
+        on:click={reset}
+        disabled={error || (forceResetPassword ? false : !resetCode)}
+        >Reset your password</Button
+      >
     </Layout>
   </div>
 </div>
diff --git a/packages/builder/src/stores/portal/auth.js b/packages/builder/src/stores/portal/auth.js
index c642a5708d..db94e2d01c 100644
--- a/packages/builder/src/stores/portal/auth.js
+++ b/packages/builder/src/stores/portal/auth.js
@@ -53,7 +53,7 @@ export function createAuthStore() {
     resetPassword: async (password, code) => {
       const response = await api.post(`/api/admin/auth/reset/update`, {
         password,
-        resetCode: code,
+        resetCode: code
       })
       if (response.status !== 200) {
         throw "Unable to reset password"