diff --git a/src/app/pages/clients/[id].vue b/src/app/pages/clients/[id].vue index 4e8f9961..21daa9e9 100644 --- a/src/app/pages/clients/[id].vue +++ b/src/app/pages/clients/[id].vue @@ -44,7 +44,7 @@ {{ $t('general.allowedIps') }} - + diff --git a/src/server/database/migrations/0000_short_skin.sql b/src/server/database/migrations/0000_short_skin.sql index 922efb2b..268da7f6 100644 --- a/src/server/database/migrations/0000_short_skin.sql +++ b/src/server/database/migrations/0000_short_skin.sql @@ -12,7 +12,7 @@ CREATE TABLE `clients_table` ( `public_key` text NOT NULL, `pre_shared_key` text NOT NULL, `expires_at` text, - `allowed_ips` text NOT NULL, + `allowed_ips` text, `server_allowed_ips` text NOT NULL, `persistent_keepalive` integer NOT NULL, `mtu` integer NOT NULL, diff --git a/src/server/database/migrations/meta/0000_snapshot.json b/src/server/database/migrations/meta/0000_snapshot.json index 773ba800..6da7ebf5 100644 --- a/src/server/database/migrations/meta/0000_snapshot.json +++ b/src/server/database/migrations/meta/0000_snapshot.json @@ -1,7 +1,7 @@ { "version": "6", "dialect": "sqlite", - "id": "80307290-b752-4fc4-8ba4-c6d39222c7f5", + "id": "8c2af02b-c4bd-4880-a9ad-b38805636208", "prevId": "00000000-0000-0000-0000-000000000000", "tables": { "clients_table": { @@ -106,7 +106,7 @@ "name": "allowed_ips", "type": "text", "primaryKey": false, - "notNull": true, + "notNull": false, "autoincrement": false }, "server_allowed_ips": { diff --git a/src/server/database/migrations/meta/0001_snapshot.json b/src/server/database/migrations/meta/0001_snapshot.json index 793ae341..35ea74a2 100644 --- a/src/server/database/migrations/meta/0001_snapshot.json +++ b/src/server/database/migrations/meta/0001_snapshot.json @@ -1,6 +1,6 @@ { - "id": "241a0a75-03d1-4b39-9a13-e7b1b621e8b2", - "prevId": "80307290-b752-4fc4-8ba4-c6d39222c7f5", + "id": "a61263b1-9af1-4d2e-99e9-80d08127b545", + "prevId": "8c2af02b-c4bd-4880-a9ad-b38805636208", "version": "6", "dialect": "sqlite", "tables": { @@ -106,7 +106,7 @@ "name": "allowed_ips", "type": "text", "primaryKey": false, - "notNull": true, + "notNull": false, "autoincrement": false }, "server_allowed_ips": { diff --git a/src/server/database/migrations/meta/_journal.json b/src/server/database/migrations/meta/_journal.json index 82135bef..a1b7501f 100644 --- a/src/server/database/migrations/meta/_journal.json +++ b/src/server/database/migrations/meta/_journal.json @@ -5,14 +5,14 @@ { "idx": 0, "version": "6", - "when": 1741354212954, + "when": 1741355094140, "tag": "0000_short_skin", "breakpoints": true }, { "idx": 1, "version": "6", - "when": 1741354219144, + "when": 1741355098159, "tag": "0001_classy_the_stranger", "breakpoints": true } diff --git a/src/server/database/repositories/client/schema.ts b/src/server/database/repositories/client/schema.ts index a4166ead..8f5f402e 100644 --- a/src/server/database/repositories/client/schema.ts +++ b/src/server/database/repositories/client/schema.ts @@ -24,7 +24,7 @@ export const client = sqliteTable('clients_table', { publicKey: text('public_key').notNull(), preSharedKey: text('pre_shared_key').notNull(), expiresAt: text('expires_at'), - allowedIps: text('allowed_ips', { mode: 'json' }).$type().notNull(), + allowedIps: text('allowed_ips', { mode: 'json' }).$type(), serverAllowedIps: text('server_allowed_ips', { mode: 'json' }) .$type() .notNull(), diff --git a/src/server/database/repositories/client/service.ts b/src/server/database/repositories/client/service.ts index c4f02f3d..422378f1 100644 --- a/src/server/database/repositories/client/service.ts +++ b/src/server/database/repositories/client/service.ts @@ -115,7 +115,6 @@ export class ClientService { ipv4Address, ipv6Address, mtu: clientConfig.defaultMtu, - allowedIps: clientConfig.defaultAllowedIps, persistentKeepalive: clientConfig.defaultPersistentKeepalive, serverAllowedIps: [], enabled: true, diff --git a/src/server/database/repositories/client/types.ts b/src/server/database/repositories/client/types.ts index 6b483790..f52afabc 100644 --- a/src/server/database/repositories/client/types.ts +++ b/src/server/database/repositories/client/types.ts @@ -61,7 +61,7 @@ export const ClientUpdateSchema = schemaForType()( postUp: HookSchema, preDown: HookSchema, postDown: HookSchema, - allowedIps: AllowedIpsSchema, + allowedIps: AllowedIpsSchema.nullable(), serverAllowedIps: serverAllowedIps, mtu: MtuSchema, persistentKeepalive: PersistentKeepaliveSchema,