fix error pass through

Jigsaw-Code · Mar 6, 2024 · e32cc03 · e32cc03
1 parent a18b00a
commit e32cc03
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 15 deletions.
diff --git 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
@@ -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;