diff --git a/src/app/components/Base/Dialog.vue b/src/app/components/Base/Dialog.vue index e687f0c2..c6d6db5f 100644 --- a/src/app/components/Base/Dialog.vue +++ b/src/app/components/Base/Dialog.vue @@ -6,7 +6,7 @@ class="fixed inset-0 z-30 bg-gray-500 opacity-75 dark:bg-black dark:opacity-50" /> {{ $t('form.hooks') }} - - + + {{ $t('form.actions') }} diff --git a/src/server/database/repositories/client/schema.ts b/src/server/database/repositories/client/schema.ts index e0e75a63..f1dd4163 100644 --- a/src/server/database/repositories/client/schema.ts +++ b/src/server/database/repositories/client/schema.ts @@ -14,10 +14,10 @@ export const client = sqliteTable('clients_table', { name: text().notNull(), ipv4Address: text('ipv4_address').notNull().unique(), ipv6Address: text('ipv6_address').notNull().unique(), - preUp: text('pre_up').default(''), - postUp: text('post_up').default(''), - preDown: text('pre_down').default(''), - postDown: text('post_down').default(''), + preUp: text('pre_up').default('').notNull(), + postUp: text('post_up').default('').notNull(), + preDown: text('pre_down').default('').notNull(), + postDown: text('post_down').default('').notNull(), privateKey: text('private_key').notNull(), publicKey: text('public_key').notNull(), preSharedKey: text('pre_shared_key').notNull(), diff --git a/src/server/database/repositories/client/types.ts b/src/server/database/repositories/client/types.ts index fb369efc..26783a1d 100644 --- a/src/server/database/repositories/client/types.ts +++ b/src/server/database/repositories/client/types.ts @@ -41,23 +41,19 @@ const address6 = z const preUp = z .string({ message: t('zod.client.preUp') }) - .pipe(safeStringRefine) - .nullable(); + .pipe(safeStringRefine); const postUp = z .string({ message: t('zod.client.postUp') }) - .pipe(safeStringRefine) - .nullable(); + .pipe(safeStringRefine); const preDown = z .string({ message: t('zod.client.preDown') }) - .pipe(safeStringRefine) - .nullable(); + .pipe(safeStringRefine); const postDown = z .string({ message: t('zod.client.postDown') }) - .pipe(safeStringRefine) - .nullable(); + .pipe(safeStringRefine); const serverAllowedIps = z.array(AddressSchema, { message: t('zod.client.serverAllowedIps'), diff --git a/src/server/utils/wgHelper.ts b/src/server/utils/wgHelper.ts index 18a3c126..c2154863 100644 --- a/src/server/utils/wgHelper.ts +++ b/src/server/utils/wgHelper.ts @@ -54,10 +54,10 @@ 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` : '' +${client.preUp ? `PreUp = ${client.preUp}\n` : ''}${ + client.postUp ? `PostUp = ${client.postUp}\n` : '' + }${client.preDown ? `PreDown = ${client.preDown}\n` : ''}${ + client.postDown ? `PostDown = ${client.postDown}\n` : '' } [Peer]