From e32cc0302649d873503285967fe74de25355db81 Mon Sep 17 00:00:00 2001
From: Daniel LaCosse <3759828+daniellacosse@users.noreply.github.com>
Date: Wed, 6 Mar 2024 14:06:26 +0530
Subject: [PATCH] fix error pass through

---
 src/www/app/app.ts      | 20 +++++---------------
 src/www/model/server.ts |  3 +++
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/www/app/app.ts b/src/www/app/app.ts
index 65e712d965..9e01c7df66 100644
--- a/src/www/app/app.ts
+++ b/src/www/app/app.ts
@@ -599,21 +599,11 @@ export class App {
       connectionState: ServerConnectionState.DISCONNECTED,
     };
 
-    if (server.sessionConfig?.extra) {
-      const extraParams = server.sessionConfig.extra;
-
-      if (['error', 'warning', 'info'].includes(extraParams.messageType) && extraParams.messageContent) {
-        serverListItem.message = {
-          type: extraParams.messageType as 'error' | 'warning' | 'info',
-          content: extraParams.messageContent,
-        };
-      }
-
-      if (extraParams.contactEmail) {
-        serverListItem.contact = {
-          email: extraParams.email,
-        };
-      }
+    if (server.error) {
+      serverListItem.message = {
+        type: 'error',
+        content: server.error,
+      };
     }
 
     return serverListItem;
diff --git a/src/www/model/server.ts b/src/www/model/server.ts
index f789f78331..f69cfb659e 100644
--- a/src/www/model/server.ts
+++ b/src/www/model/server.ts
@@ -34,6 +34,9 @@ export interface Server {
   // The name of this server, as given by the user.
   name: string;
 
+  // Error returned pertaining to the server's status
+  error: string;
+
   // The location to pull the session config from on each connection.
   sessionConfigLocation?: URL;