From c9531d79df680748f111937e5a076aaa2bdeba6a Mon Sep 17 00:00:00 2001
From: Max Peintner <peintnerm@gmail.com>
Date: Wed, 22 Jan 2025 08:37:18 +0100
Subject: [PATCH] cleanup token

---
 apps/login/src/lib/service.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/apps/login/src/lib/service.ts b/apps/login/src/lib/service.ts
index 4888f120ac..e0382c03b7 100644
--- a/apps/login/src/lib/service.ts
+++ b/apps/login/src/lib/service.ts
@@ -20,20 +20,24 @@ export async function createServiceForHost<T extends ServiceClass>(
   service: T,
   host: string,
 ) {
-  let instanceUrl;
+  let instanceUrl, token;
   try {
     instanceUrl = await getInstanceUrl(host);
+    token = await systemAPIToken();
   } catch (error) {
     console.error(
       `Could not get instance url for ${host}, fallback to ZITADEL_API_URL`,
       error,
     );
     instanceUrl = process.env.ZITADEL_API_URL;
+    token = process.env.ZITADEL_SERVICE_USER_TOKEN;
   }
 
-  const systemToken = await systemAPIToken();
+  if (!instanceUrl || !token) {
+    throw new Error("No instance url or token found");
+  }
 
-  const transport = createServerTransport(systemToken, {
+  const transport = createServerTransport(token, {
     baseUrl: instanceUrl,
   });