From 6f41abe652ee2cec1bf6282f8b49a657145e8169 Mon Sep 17 00:00:00 2001
From: tetuaoro <65575727+tetuaoro@users.noreply.github.com>
Date: Sun, 15 Sep 2024 15:44:37 +0200
Subject: [PATCH] update: setup page error handle

- use fetch error data to provide error message
- use translation to provider error message
---
 src/app/components/error/Toast.vue   | 27 +++++++++
 src/app/pages/setup.vue              | 53 +++++++++++------
 src/locales/en.json                  | 38 ++++++++++--
 src/locales/fr.json                  | 40 +++++++++++--
 src/server/api/account/setup.post.ts |  2 +-
 src/server/utils/types.ts            | 86 ++++++++++++++++------------
 6 files changed, 180 insertions(+), 66 deletions(-)
 create mode 100644 src/app/components/error/Toast.vue

diff --git a/src/app/components/error/Toast.vue b/src/app/components/error/Toast.vue
new file mode 100644
index 00000000..6eff1611
--- /dev/null
+++ b/src/app/components/error/Toast.vue
@@ -0,0 +1,27 @@
+<script setup lang="ts">
+const props = defineProps<{
+  title: string;
+  message: string;
+  duration?: number;
+}>();
+
+const open = ref(true);
+
+const autoCloseToast = props.duration ? Number(props.duration) : 5000; // 5 seconds
+
+onMounted(() => {
+  setTimeout(() => {
+    open.value = false;
+  }, autoCloseToast);
+});
+</script>
+
+<template>
+  <ToastRoot
+    v-model:open="open"
+    class="bg-red-800 rounded-md p-2 text-neutral-200"
+  >
+    <ToastTitle class="mb-4 font-medium text-lg">{{ title }} </ToastTitle>
+    <ToastDescription as-child>{{ message }}</ToastDescription>
+  </ToastRoot>
+</template>
diff --git a/src/app/pages/setup.vue b/src/app/pages/setup.vue
index 18808664..a90dc2ec 100644
--- a/src/app/pages/setup.vue
+++ b/src/app/pages/setup.vue
@@ -28,16 +28,12 @@
             autocomplete="username"
             :placeholder="$t('setup.usernamePlaceholder')"
             class="px-3 py-2 text-sm dark:bg-neutral-700 text-gray-500 dark:text-gray-500 mb-5 border-2 border-gray-100 dark:border-neutral-800 rounded-lg w-full focus:border-red-800 dark:focus:border-red-800 dark:placeholder:text-neutral-400 outline-none"
-            required="true"
           />
-          <small v-if="errorCU" class="text-danger">{{
-            $t('setup.usernameCondition')
-          }}</small>
         </div>
         <div>
-          <label for="password" class="inline-block py-2">{{
+          <Label for="password" class="inline-block py-2">{{
             $t('setup.newPassword')
-          }}</label>
+          }}</Label>
           <input
             id="password"
             v-model="password"
@@ -46,17 +42,13 @@
             autocomplete="new-password"
             :placeholder="$t('setup.passwordPlaceholder')"
             class="px-3 py-2 text-sm dark:bg-neutral-700 text-gray-500 dark:text-gray-500 mb-5 border-2 border-gray-100 dark:border-neutral-800 rounded-lg w-full focus:border-red-800 dark:focus:border-red-800 dark:placeholder:text-neutral-400 outline-none"
-            required="true"
           />
-          <small v-if="errorPWD" class="text-danger">{{
-            $t('setup.passwordCondition')
-          }}</small>
         </div>
         <div>
-          <label for="accept" class="inline-block my-4 mr-4">{{
+          <Label for="accept" class="inline-block my-4 mr-4">{{
             $t('setup.accept')
-          }}</label>
-          <input id="accept" type="checkbox" name="accept" required="true" />
+          }}</Label>
+          <input id="accept" type="checkbox" name="accept" />
         </div>
         <button
           type="submit"
@@ -74,16 +66,38 @@
         </button>
       </form>
     </div>
+
+    <ErrorToast
+      v-if="setupError"
+      :title="setupError.title"
+      :message="setupError.message"
+      :duration="12000"
+    />
   </main>
 </template>
 
 <script setup lang="ts">
+import { FetchError } from 'ofetch';
+
+const { t } = useI18n();
 const username = ref<null | string>(null);
 const password = ref<null | string>(null);
 const authStore = useAuthStore();
 
-const errorCU = ref(false);
-const errorPWD = ref(false);
+type SetupError = {
+  title: string;
+  message: string;
+};
+
+const setupError = ref<null | SetupError>(null);
+
+watch(setupError, (value) => {
+  if (value) {
+    setTimeout(() => {
+      setupError.value = null;
+    }, 6000);
+  }
+});
 
 async function newAccount() {
   if (!username.value || !password.value) return;
@@ -94,10 +108,11 @@ async function newAccount() {
       navigateTo('/login');
     }
   } catch (error) {
-    if (error instanceof Error) {
-      // TODO: replace alert with actual ui error message
-      // TODO: also use errorCU & errorPWD to show prompt error
-      alert(error.message || error.toString());
+    if (error instanceof FetchError) {
+      setupError.value = {
+        title: t('setup.requirements'),
+        message: error.data.message,
+      };
     }
   }
 }
diff --git a/src/locales/en.json b/src/locales/en.json
index 0f3469ee..8705ff24 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -14,10 +14,37 @@
     "newPassword": "New Password",
     "accept": "I accept the condition",
     "submitBtn": "Create admin account",
-    "usernameCondition": "The username must contain at least 8 characters.",
-    "passwordCondition": "The password must contain at least 12 characters, including 1 uppercase letter, 1 lowercase letter, 1 digit, and 1 special character.",
     "usernamePlaceholder": "Administrator",
-    "passwordPlaceholder": "Strong password"
+    "passwordPlaceholder": "Strong password",
+    "requirements": "Setup requirements"
+  },
+  "zod": {
+    "id": "Client ID must be a valid UUID",
+    "address4": "IPv4 Address must be a valid string",
+    "name": "Name must be a valid string",
+    "nameMin": "Name must be at least 1 Character",
+    "file": "File must be a valid string",
+    "username": "Username must be a valid string",
+    "usernameMin": "Username must be at least 8 Characters",
+    "password": "Password must be a valid string",
+    "passwordMin": "Password must be at least 12 Characters",
+    "passwordUppercase": "Password must have at least 1 uppercase letter",
+    "passwordLowercase": "Password must have at least 1 lowercase letter",
+    "passwordNumber": "Password must have at least 1 number",
+    "passwordSpecial": "Password must have at least 1 special character",
+    "remember": "Remember must be a valid boolean",
+    "expireDate": "expiredDate must be a valid string",
+    "expireDateMin": "expiredDate must be at least 1 Character",
+    "otl": "oneTimeLink must be a valid string",
+    "otlMin": "oneTimeLink must be at least 1 Character",
+    "features": "key must be a valid string",
+    "ftBool": "enabled must be a valid boolean",
+    "ftObj": "value must be a valid object",
+    "ftObj2": "features must be a valid record",
+    "stat": "statistics must be a valid object",
+    "statBool": "enabled must be a valid boolean",
+    "statNumber": "chartType must be a valid number",
+    "body": "Body must be a valid object"
   },
   "name": "Name",
   "username": "Username",
@@ -61,5 +88,8 @@
   "ExpireDate": "Expire Date",
   "Permanent": "Permanent",
   "OneTimeLink": "Generate short one time link",
-  "errorInit": "Initialization failed."
+  "errorInit": "Initialization failed.",
+  "error": {
+    "clear": "Clear"
+  }
 }
diff --git a/src/locales/fr.json b/src/locales/fr.json
index 8f388506..cf0800db 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -7,7 +7,7 @@
   "save": "Enregistrer",
   "updatePassword": "Changer le mot de passe",
   "currentPassword": "Mot de passe actuel",
-  "confirmPassword": "Confirmer le mot de passse",
+  "confirmPassword": "Confirmer le mot de passe",
   "setup": {
     "welcome": "Bienvenue à la page de configuration de votre wg-easy !",
     "msg": "Veuillez renseigner votre nom d'utilisateur et votre mot de passe. Ces informations seront utilisées pour vous connecter à votre page d'administration.",
@@ -17,15 +17,44 @@
     "usernameCondition": "Le nom d'utilisateur doit contenir au moins 8 caractères.",
     "passwordCondition": "Le mot de passe doit contenir au moins 12 caractères dont 1 majuscule, 1 minuscule, 1 chiffre et 1 caractère spécial.",
     "usernamePlaceholder": "Administrateur",
-    "passwordPlaceholder": "Mot de passe sapau"
+    "passwordPlaceholder": "Mot de passe sapau",
+    "requirements": "Conditions de configuration"
+  },
+  "zod": {
+    "id": "L'ID du client doit être un UUID valide",
+    "address4": "L'adresse IPv4 doit être une chaîne valide",
+    "name": "Le nom doit être une chaîne valide",
+    "nameMin": "Le nom doit contenir au moins 1 caractère",
+    "file": "Le fichier doit être une chaîne valide",
+    "username": "Le nom d'utilisateur doit être une chaîne valide",
+    "usernameMin": "Le nom d'utilisateur doit contenir au moins 8 caractères",
+    "password": "Le mot de passe doit être une chaîne valide",
+    "passwordMin": "Le mot de passe doit contenir au moins 12 caractères",
+    "passwordUppercase": "Le mot de passe doit contenir au moins 1 lettre majuscule",
+    "passwordLowercase": "Le mot de passe doit contenir au moins 1 lettre minuscule",
+    "passwordNumber": "Le mot de passe doit contenir au moins 1 chiffre",
+    "passwordSpecial": "Le mot de passe doit contenir au moins 1 caractère spécial",
+    "remember": "La case « se souvenir de moi » doit être un booléen valide",
+    "expireDate": "La date d'expiration doit être une chaîne valide",
+    "expireDateMin": "La date d'expiration doit contenir au moins 1 caractère",
+    "otl": "Le lien à usage unique doit être une chaîne valide",
+    "otlMin": "Le lien à usage unique doit contenir au moins 1 caractère",
+    "features": "La clé doit être une chaîne valide",
+    "ftBool": "Le paramètre « activé » doit être un booléen valide",
+    "ftObj": "La valeur doit être un objet valide",
+    "ftObj2": "Les fonctionnalités doivent être un enregistrement valide",
+    "stat": "Les statistiques doivent être un objet valide",
+    "statBool": "Le paramètre « activé » doit être un booléen valide",
+    "statNumber": "Le type de graphique doit être un nombre valide",
+    "body": "Le corps doit être un objet valide"
   },
   "name": "Nom",
+  "username": "Nom d'utilisateur",
   "password": "Mot de passe",
   "signIn": "Se Connecter",
   "logout": "Se déconnecter",
   "updateAvailable": "Une mise à jour est disponible !",
   "update": "Mise à jour",
-  "clients": "Clients",
   "new": "Nouveau",
   "deleteClient": "Supprimer ce client",
   "deleteDialog1": "Êtes-vous sûr de vouloir supprimer",
@@ -61,5 +90,8 @@
   "ExpireDate": "Date d'expiration",
   "Permanent": "Permanent",
   "OneTimeLink": "Générer un lien court à usage unique",
-  "errorInit": "Échec de l'initialisation."
+  "errorInit": "Échec de l'initialisation.",
+  "error": {
+    "clear": "Effacer"
+  }
 }
diff --git a/src/server/api/account/setup.post.ts b/src/server/api/account/setup.post.ts
index 123308af..e3f54a6a 100644
--- a/src/server/api/account/setup.post.ts
+++ b/src/server/api/account/setup.post.ts
@@ -1,7 +1,7 @@
 export default defineEventHandler(async (event) => {
   const { username, password } = await readValidatedBody(
     event,
-    validateZod(passwordType)
+    validateZod(passwordType, event)
   );
   const users = await Database.user.findAll();
   if (users.length !== 0) {
diff --git a/src/server/utils/types.ts b/src/server/utils/types.ts
index 3e1697de..da382122 100644
--- a/src/server/utils/types.ts
+++ b/src/server/utils/types.ts
@@ -1,5 +1,6 @@
 import type { ZodSchema } from 'zod';
 import { z, ZodError } from 'zod';
+import type { H3Event, EventHandlerRequest } from 'h3';
 
 // TODO: use i18n for messages
 
@@ -10,74 +11,64 @@ const safeStringRefine = z
     { message: 'String is malformed' }
   );
 
-const id = z
-  .string()
-  .uuid('Client ID must be a valid UUID')
-  .pipe(safeStringRefine);
+const id = z.string().uuid('zod.id').pipe(safeStringRefine);
 
-const address4 = z
-  .string({ message: 'IPv4 Address must be a valid string' })
-  .pipe(safeStringRefine);
+const address4 = z.string({ message: 'zod.address4' }).pipe(safeStringRefine);
 
 const name = z
-  .string({ message: 'Name must be a valid string' })
-  .min(1, 'Name must be at least 1 Character')
+  .string({ message: 'zod.name' })
+  .min(1, 'zod.nameMin')
   .pipe(safeStringRefine);
 
-const file = z
-  .string({ message: 'File must be a valid string' })
-  .pipe(safeStringRefine);
+const file = z.string({ message: 'zod.file' }).pipe(safeStringRefine);
 
 const username = z
-  .string({ message: 'Username must be a valid string' })
-  .min(8, 'Username must be at least 8 Characters')
+  .string({ message: 'zod.username' })
+  .min(8, 'zod.usernameMin') // i18n key
   .pipe(safeStringRefine);
 
 const password = z
-  .string({ message: 'Password must be a valid string' })
-  .min(12, 'Password must be at least 12 Characters')
-  .regex(/[A-Z]/, 'Password must have at least 1 uppercase letter')
-  .regex(/[a-z]/, 'Password must have at least 1 lowercase letter')
-  .regex(/\d/, 'Password must have at least 1 number')
-  .regex(
-    /[!@#$%^&*(),.?":{}|<>]/,
-    'Password must have at least 1 special character'
-  )
+  .string({ message: 'zod.password' })
+  .min(12, 'zod.passwordMin') // i18n key
+  .regex(/[A-Z]/, 'zod.passwordUppercase') // i18n key
+  .regex(/[a-z]/, 'zod.passwordLowercase') // i18n key
+  .regex(/\d/, 'zod.passwordNumber') // i18n key
+  .regex(/[!@#$%^&*(),.?":{}|<>]/, 'zod.passwordSpecial') // i18n key
   .pipe(safeStringRefine);
 
-const remember = z.boolean({ message: 'Remember must be a valid boolean' });
+const remember = z.boolean({ message: 'zod.remember' }); // i18n key
 
 const expireDate = z
-  .string({ message: 'expiredDate must be a valid string' })
-  .min(1, 'expiredDate must be at least 1 Character')
+  .string({ message: 'zod.expireDate' }) // i18n key
+  .min(1, 'zod.expireDateMin') // i18n key
   .pipe(safeStringRefine)
   .nullable();
 
 const oneTimeLink = z
-  .string({ message: 'oneTimeLink must be a valid string' })
-  .min(1, 'oneTimeLink must be at least 1 Character')
+  .string({ message: 'zod.otl' }) // i18n key
+  .min(1, 'zod.otlMin') // i18n key
   .pipe(safeStringRefine);
 
 const features = z.record(
-  z.string({ message: 'key must be a valid string' }),
+  z.string({ message: 'zod.features' }), // i18n key
   z.object(
     {
-      enabled: z.boolean({ message: 'enabled must be a valid boolean' }),
+      enabled: z.boolean({ message: 'zod.ftBool' }), // i18n key
     },
-    { message: 'value must be a valid object' }
+    { message: 'zod.ftObj' } // i18n key
   ),
-  { message: 'features must be a valid record' }
+  { message: 'zod.ftObj2' } // i18n key
 );
 
 const statistics = z.object(
   {
-    enabled: z.boolean({ message: 'enabled must be a valid boolean' }),
-    chartType: z.number({ message: 'chartType must be a valid number' }),
+    enabled: z.boolean({ message: 'zod.statBool' }), // i18n key
+    chartType: z.number({ message: 'zod.statNumber' }), // i18n key
   },
-  { message: 'statistics must be a valid object' }
+  { message: 'zod.stat' } // i18n key
 );
 
-const objectMessage = 'Body must be a valid object';
+const objectMessage = 'zod.body'; // i18n key
 
 export const clientIdType = z.object(
   {
@@ -160,14 +151,33 @@ export const statisticsType = z.object(
   { message: objectMessage }
 );
 
-export function validateZod<T>(schema: ZodSchema<T>) {
+export function validateZod<T>(
+  schema: ZodSchema<T>,
+  event?: H3Event<EventHandlerRequest>
+) {
   return async (data: unknown) => {
+    let t: null | ((key: string) => string) = null;
+
+    if (event) {
+      t = await useTranslation(event);
+    }
+
     try {
       return await schema.parseAsync(data);
     } catch (error) {
       let message = 'Unexpected Error';
       if (error instanceof ZodError) {
-        message = error.issues.map((v) => v.message).join('; ');
+        message = error.issues
+          .map((v) => {
+            let m = v.message;
+
+            if (t) {
+              m = t(m); // m key else v.message
+            }
+
+            return m;
+          })
+          .join('; ');
       }
       throw new Error(message);
     }