fix: acl parsing

rickli-cloud · Nov 23, 2024 · 91a9e0a · 91a9e0a
1 parent 13fbfdb
commit 91a9e0a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/lib/api/headscale.ts b/src/lib/api/headscale.ts
@@ -88,7 +88,7 @@ export interface V1Policy {
 	 */
 	Hosts: { [x: string]: string };
 	acls: {
-		action: 'accept';
+		action: string;
 		proto?: string;
 		src: string[];
 		dst: string[];
@@ -690,7 +690,7 @@ export class Acl {
 		} catch (err) {
 			return {
 				...response,
-				data: undefined,
+				data: new Acl({}),
 				error: err
 			};
 		}

diff --git a/src/routes/(app)/+page.ts b/src/routes/(app)/+page.ts
@@ -1,4 +1,4 @@
-import { Acl, formatApiErrors, Headscale, Machine, Route, User } from '$lib/api/index.js';
+import { Acl, ApiError, formatApiErrors, Headscale, Machine, Route, User } from '$lib/api/index.js';
 
 export async function load({ data, fetch }) {
 	const headscale = new Headscale({ fetch });
@@ -16,6 +16,17 @@ export async function load({ data, fetch }) {
 		users: users.data,
 		routes: routes.data,
 		machines: machines.data,
-		errors: formatApiErrors([machines.error, routes.error, users.error, acl.error])
+		errors: (
+			formatApiErrors([
+				machines.error,
+				routes.error,
+				users.error,
+				acl.error instanceof ApiError ? acl.error : undefined
+			]) as unknown[]
+		).concat(
+			acl.error !== null && typeof acl.error !== 'undefined' && !(acl.error instanceof ApiError)
+				? [acl.error]
+				: []
+		)
 	};
 }