From f6a32f202d3e0150e598d8b64474910c0758cb06 Mon Sep 17 00:00:00 2001
From: Bernd Storath <999999bst@gmail.com>
Date: Fri, 7 Mar 2025 08:10:45 +0100
Subject: [PATCH] minor fixes

---
 src/app/components/Form/ArrayField.vue        |  2 +-
 src/i18n/locales/en.json                      |  4 ++--
 .../database/repositories/client/types.ts     | 24 ++++---------------
 .../database/repositories/hooks/types.ts      | 10 ++++----
 src/server/utils/types.ts                     |  4 ++++
 src/server/utils/wgHelper.ts                  | 14 ++++++-----
 6 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/src/app/components/Form/ArrayField.vue b/src/app/components/Form/ArrayField.vue
index f3ad0785..d3676900 100644
--- a/src/app/components/Form/ArrayField.vue
+++ b/src/app/components/Form/ArrayField.vue
@@ -3,7 +3,7 @@
     <div v-if="data?.length === 0">
       {{ emptyText || $t('form.noItems') }}
     </div>
-    <div v-for="(item, i) in data" :key="i">
+    <div v-for="(item, i) in data" v-else :key="i">
       <div class="mt-1 flex flex-row gap-1">
         <input
           :value="item"
diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index 4a266fe6..3723a09d 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -100,8 +100,8 @@
     "mtuDesc": "Sets the maximum transmission unit (packet size) for the VPN tunnel",
     "persistentKeepaliveDesc": "Sets the interval (in seconds) for keep-alive packets. 0 disables it",
     "hooks": "Hooks",
-    "hooksDescription": "Hooks only works with wg-quick",
-    "hooksLeaveEmpty": "Only for wg-quick. Otherwise, please leave it empty"
+    "hooksDescription": "Hooks only work with wg-quick",
+    "hooksLeaveEmpty": "Only for wg-quick. Otherwise, leave it empty"
   },
   "dialog": {
     "change": "Change",
diff --git a/src/server/database/repositories/client/types.ts b/src/server/database/repositories/client/types.ts
index 26783a1d..06bffc00 100644
--- a/src/server/database/repositories/client/types.ts
+++ b/src/server/database/repositories/client/types.ts
@@ -39,22 +39,6 @@ const address6 = z
   .min(1, { message: t('zod.client.address6') })
   .pipe(safeStringRefine);
 
-const preUp = z
-  .string({ message: t('zod.client.preUp') })
-  .pipe(safeStringRefine);
-
-const postUp = z
-  .string({ message: t('zod.client.postUp') })
-  .pipe(safeStringRefine);
-
-const preDown = z
-  .string({ message: t('zod.client.preDown') })
-  .pipe(safeStringRefine);
-
-const postDown = z
-  .string({ message: t('zod.client.postDown') })
-  .pipe(safeStringRefine);
-
 const serverAllowedIps = z.array(AddressSchema, {
   message: t('zod.client.serverAllowedIps'),
 });
@@ -73,10 +57,10 @@ export const ClientUpdateSchema = schemaForType<UpdateClientType>()(
     expiresAt: expiresAt,
     ipv4Address: address4,
     ipv6Address: address6,
-    preUp: preUp,
-    postUp: postUp,
-    preDown: preDown,
-    postDown: postDown,
+    preUp: HookSchema,
+    postUp: HookSchema,
+    preDown: HookSchema,
+    postDown: HookSchema,
     allowedIps: AllowedIpsSchema,
     serverAllowedIps: serverAllowedIps,
     mtu: MtuSchema,
diff --git a/src/server/database/repositories/hooks/types.ts b/src/server/database/repositories/hooks/types.ts
index c42a05bf..f9bba9a4 100644
--- a/src/server/database/repositories/hooks/types.ts
+++ b/src/server/database/repositories/hooks/types.ts
@@ -6,13 +6,11 @@ export type HooksType = InferSelectModel<typeof hooks>;
 
 export type HooksUpdateType = Omit<HooksType, 'id' | 'createdAt' | 'updatedAt'>;
 
-const hook = z.string({ message: t('zod.hook') }).pipe(safeStringRefine);
-
 export const HooksUpdateSchema = schemaForType<HooksUpdateType>()(
   z.object({
-    preUp: hook,
-    postUp: hook,
-    preDown: hook,
-    postDown: hook,
+    preUp: HookSchema,
+    postUp: HookSchema,
+    preDown: HookSchema,
+    postDown: HookSchema,
   })
 );
diff --git a/src/server/utils/types.ts b/src/server/utils/types.ts
index 14157549..898cf957 100644
--- a/src/server/utils/types.ts
+++ b/src/server/utils/types.ts
@@ -52,6 +52,10 @@ export const FileSchema = z.object({
   file: z.string({ message: t('zod.file') }),
 });
 
+export const HookSchema = z
+  .string({ message: t('zod.hook') })
+  .pipe(safeStringRefine);
+
 export const schemaForType =
   <T>() =>
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/src/server/utils/wgHelper.ts b/src/server/utils/wgHelper.ts
index c2154863..5fdb8604 100644
--- a/src/server/utils/wgHelper.ts
+++ b/src/server/utils/wgHelper.ts
@@ -49,17 +49,19 @@ PostDown = ${iptablesTemplate(hooks.postDown, wgInterface)}`;
     const cidr4Block = parseCidr(wgInterface.ipv4Cidr).prefix;
     const cidr6Block = parseCidr(wgInterface.ipv6Cidr).prefix;
 
+    const hookLines = [
+      client.preUp ? `PreUp = ${client.preUp}` : null,
+      client.postUp ? `PostUp = ${client.postUp}` : null,
+      client.preDown ? `PreDown = ${client.preDown}` : null,
+      client.postDown ? `PostDown = ${client.postDown}` : null,
+    ].filter((v) => v !== null);
+
     return `[Interface]
 PrivateKey = ${client.privateKey}
 Address = ${client.ipv4Address}/${cidr4Block}, ${client.ipv6Address}/${cidr6Block}
 DNS = ${client.dns.join(', ')}
 MTU = ${client.mtu}
-${client.preUp ? `PreUp = ${client.preUp}\n` : ''}${
-      client.postUp ? `PostUp = ${client.postUp}\n` : ''
-    }${client.preDown ? `PreDown = ${client.preDown}\n` : ''}${
-      client.postDown ? `PostDown = ${client.postDown}\n` : ''
-    }
-
+${hookLines.length ? `${hookLines.join('\n')}\n` : ''}
 [Peer]
 PublicKey = ${wgInterface.publicKey}
 PresharedKey = ${client.preSharedKey}