fix labels, date field, enable

This commit is contained in:
Bernd Storath
2025-03-05 15:38:09 +01:00
parent ded148a0f5
commit 84ee8c35f0
6 changed files with 31 additions and 24 deletions

View File

@@ -2,8 +2,6 @@
name: 🐛 Bug Report name: 🐛 Bug Report
description: Create a report to help us improve description: Create a report to help us improve
title: "[Bug]: " title: "[Bug]: "
labels:
- "type: bug"
type: Bug type: Bug
body: body:

View File

@@ -7,19 +7,38 @@
<IconsInfo class="size-4" /> <IconsInfo class="size-4" />
</BaseTooltip> </BaseTooltip>
</div> </div>
<BaseInput :id="id" v-model="data" :name="id" type="date" /> <BaseInput
:id="id"
:model-value="formattedDate"
:name="id"
type="date"
max="9999-12-31"
@update:model-value="updateDate"
/>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
defineProps<{ id: string; label: string; description?: string }>(); defineProps<{ id: string; label: string; description?: string }>();
const data = defineModel<string | null>({ const data = defineModel<string | null>();
set(value) {
const temp = value?.trim() ?? null; const date = ref(data);
if (temp === '') {
return null; const formattedDate = computed(() => {
} return date.value ? date.value.split('T')[0] : '';
return temp;
},
}); });
const updateDate = (value: unknown) => {
if (typeof value !== 'string' && value !== null) {
return;
}
const temp = value?.trim() ?? null;
if (temp === '' || temp === null) {
date.value = null;
} else {
date.value = new Date(temp).toISOString();
}
};
</script> </script>

View File

@@ -12,7 +12,7 @@ export default definePermissionEventHandler(
const client = await Database.clients.get(clientId); const client = await Database.clients.get(clientId);
checkPermissions(client); checkPermissions(client);
await Database.clients.toggle(clientId, false); await Database.clients.toggle(clientId, true);
await WireGuard.saveConfig(); await WireGuard.saveConfig();
return { success: true }; return { success: true };
} }

View File

@@ -75,15 +75,6 @@ export class ClientService {
const publicKey = await wg.getPublicKey(privateKey); const publicKey = await wg.getPublicKey(privateKey);
const preSharedKey = await wg.generatePreSharedKey(); const preSharedKey = await wg.generatePreSharedKey();
let parsedExpiresAt = expiresAt;
if (parsedExpiresAt) {
const expiresAtDate = new Date(parsedExpiresAt);
expiresAtDate.setHours(23);
expiresAtDate.setMinutes(59);
expiresAtDate.setSeconds(59);
parsedExpiresAt = expiresAtDate.toISOString();
}
return this.#db.transaction(async (tx) => { return this.#db.transaction(async (tx) => {
const clients = await tx.query.client.findMany().execute(); const clients = await tx.query.client.findMany().execute();
const clientInterface = await tx.query.wgInterface const clientInterface = await tx.query.wgInterface
@@ -117,7 +108,7 @@ export class ClientService {
name, name,
// TODO: properly assign user id // TODO: properly assign user id
userId: 1, userId: 1,
expiresAt: parsedExpiresAt, expiresAt,
privateKey, privateKey,
publicKey, publicKey,
preSharedKey, preSharedKey,

View File

@@ -22,6 +22,7 @@ const name = z
.min(1, t('zod.client.name')) .min(1, t('zod.client.name'))
.pipe(safeStringRefine); .pipe(safeStringRefine);
// TODO?: validate iso string
const expiresAt = z const expiresAt = z
.string({ message: t('zod.client.expiresAt') }) .string({ message: t('zod.client.expiresAt') })
.min(1, t('zod.client.expiresAt')) .min(1, t('zod.client.expiresAt'))

View File

@@ -16,5 +16,3 @@ export const WG_ENV = {
/** UI is hosted on HTTP instead of HTTPS */ /** UI is hosted on HTTP instead of HTTPS */
INSECURE: process.env.INSECURE === 'true', INSECURE: process.env.INSECURE === 'true',
}; };
console.log(WG_ENV);