From 4c70a3f72dda547ca1ff774be1a943291fb91804 Mon Sep 17 00:00:00 2001
From: Mark Hoekveen <mark@hoekveen.net>
Date: Sat, 9 Aug 2025 10:46:11 +0200
Subject: [PATCH] merge fetch and fetcher

---
 frontend/src/app/users/page.tsx |  1 -
 frontend/src/data/fetch.ts      | 13 -------------
 frontend/src/data/fetcher.ts    | 13 ++++++++++++-
 3 files changed, 12 insertions(+), 15 deletions(-)
 delete mode 100644 frontend/src/data/fetch.ts

diff --git a/frontend/src/app/users/page.tsx b/frontend/src/app/users/page.tsx
index 6c680ab..a2499c5 100644
--- a/frontend/src/app/users/page.tsx
+++ b/frontend/src/app/users/page.tsx
@@ -1,5 +1,4 @@
 "use client";
-import { getUser } from "muzak/data/fetch";
 import { useEffect, useState } from "react";
 import { api, User } from "muzak/data/fetcher";
 
diff --git a/frontend/src/data/fetch.ts b/frontend/src/data/fetch.ts
deleted file mode 100644
index 145ad20..0000000
--- a/frontend/src/data/fetch.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-"use client";
-import { oidcConfig } from "muzak/config/auth";
-import { User } from "oidc-client-ts";
-
-export function getUser() {
-  let oidcStorage = window?.sessionStorage.getItem(
-    `oidc.user:${oidcConfig.authority}:${oidcConfig.client_id}`,
-  );
-  if (!oidcStorage) {
-    return null;
-  }
-  return User.fromStorageString(oidcStorage);
-}
diff --git a/frontend/src/data/fetcher.ts b/frontend/src/data/fetcher.ts
index bef1cf2..54b6124 100644
--- a/frontend/src/data/fetcher.ts
+++ b/frontend/src/data/fetcher.ts
@@ -1,7 +1,18 @@
 "use client";
 import { Fetcher } from "openapi-typescript-fetch";
-import { getUser } from "./fetch";
 import { paths, components } from "muzak/data/types";
+import { oidcConfig } from "muzak/config/auth";
+import { User } from "oidc-client-ts";
+
+export function getUser() {
+  let oidcStorage = window?.sessionStorage.getItem(
+    `oidc.user:${oidcConfig.authority}:${oidcConfig.client_id}`,
+  );
+  if (!oidcStorage) {
+    return null;
+  }
+  return User.fromStorageString(oidcStorage);
+}
 
 const fetcher = Fetcher.for<paths>();
 const BASE_URL = process.env.NEXT_PUBLIC_BACKEND_HOST!;