From 54cc50169bd13e300c237501601cb6c8f53cf4f8 Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Wed, 25 Oct 2023 09:49:19 +0200
Subject: [PATCH] improve recover and user_confirm error messages

---
 pages/recover/_code.vue      | 38 ++++++++++++++++++++----------------
 pages/user_confirm/_code.vue |  7 ++++---
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/pages/recover/_code.vue b/pages/recover/_code.vue
index 254465b9..8845c5ed 100644
--- a/pages/recover/_code.vue
+++ b/pages/recover/_code.vue
@@ -1,24 +1,28 @@
 <template lang='pug'>
 v-container
-  v-row.mt-5(align='center' justify='center')
-    v-col(cols='12' md="6" lg="5" xl="4")
-      v-card
-        v-card-title {{$t('common.recover_password')}}
-        template(v-if='user')
-          v-card-subtitle {{user.email}}
-          v-card-text
-            v-text-field(type='password'
-              :rules="$validators.password"
-              autofocus :placeholder='$t("common.new_password")'
-              v-model='new_password')
-        div(v-else) {{$t('recover.not_valid_code')}}
+  v-form(@submit.prevent="change_password" v-model='valid')
+    v-row.mt-5(align='center' justify='center')
+      v-col(cols='12' md="6" lg="5" xl="4")
+        v-card
+          v-card-title {{$t('common.recover_password')}}
+          template(v-if='user')
+            v-card-subtitle {{user.email}}
+            v-card-text
+              v-text-field(type='password'
+                :rules="$validators.password"
+                autofocus :placeholder='$t("common.new_password")'
+                v-model='new_password')
+          template(v-else)
+            v-card-text
+              v-alert(type='error' :icon='mdiAlert') {{$t('recover.not_valid_code')}} <br/> {{ error }}
 
-        v-card-actions
-          v-spacer
-          v-btn(v-if='user' text color='primary' @click='change_password') {{$t('common.send')}}
+          v-card-actions
+            v-spacer
+            v-btn(v-if='user' outlined color='primary' type='submit' :disabled='!valid') {{$t('common.send')}}
 </template>
 <script>
 import { mapState } from 'vuex'
+import { mdiAlert } from '@mdi/js'
 
 export default {
   name: 'Recover',
@@ -28,11 +32,11 @@ export default {
       const user = await $axios.$post('/user/check_recover_code', { recover_code: code })
       return { user, code }
     } catch (e) {
-      return { user: false }
+      return { user: false, error: String(e) }
     }
   },
   data () {
-    return { new_password: '' }
+    return { new_password: '', valid: false, mdiAlert }
   },
   computed: mapState(['settings']),
   methods: {
diff --git a/pages/user_confirm/_code.vue b/pages/user_confirm/_code.vue
index a452d5bc..f7c8ce71 100644
--- a/pages/user_confirm/_code.vue
+++ b/pages/user_confirm/_code.vue
@@ -15,10 +15,11 @@ v-container
               v-btn(color="primary" type='submit' :disabled='!new_password' @click='change_password' outlined) {{$t('common.send')}}
 
           v-card-text(v-else)
-            v-alert.ma-5(type='error') {{$t('recover.not_valid_code')}}
+            v-alert.ma-5(type='error' :icon='mdiAlert') {{$t('recover.not_valid_code')}} <br/> {{ error }}
 
 </template>
 <script>
+import { mdiAlert } from '@mdi/js'
 
 export default {
   name: 'Recover',
@@ -28,11 +29,11 @@ export default {
       const user = await $axios.$post('/user/check_recover_code', { recover_code: code })
       return { user, code }
     } catch (e) {
-      return { user: false }
+      return { user: false, error: String(e) }
     }
   },
   data () {
-    return { new_password: '' }
+    return { new_password: '', mdiAlert }
   },
   methods: {
     async change_password () {