clarify cause and details

Jigsaw-Code · Apr 25, 2024 · 368f1cb · 368f1cb
1 parent 6b2561b
commit 368f1cb
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 12 deletions.
diff --git a/client/src/www/app/app.ts b/client/src/www/app/app.ts
@@ -204,37 +204,36 @@ export class App {
       toastMessage = this.localize('error-connection-configuration');
       buttonMessage = this.localize('error-details');
       buttonHandler = () => {
-        this.showErrorDetailDialog(error);
+        this.showErrorCauseDialog(error);
       };
     } else if (error instanceof errors.SessionConfigFetchFailed) {
       toastMessage = this.localize('error-connection-configuration-fetch');
       buttonMessage = this.localize('error-details');
       buttonHandler = () => {
-        this.showErrorDetailDialog(error);
+        this.showErrorCauseDialog(error);
       };
     } else if (error instanceof errors.ProxyConnectionFailure) {
       toastMessage = this.localize('error-connection-proxy');
       buttonMessage = this.localize('error-details');
       buttonHandler = () => {
-        this.showErrorDetailDialog(error);
+        this.showErrorCauseDialog(error);
       };
     } else if (error instanceof errors.SessionConfigError) {
       toastMessage = error.message;
-
-      if (error.cause) {
-        buttonMessage = this.localize('error-details');
-        buttonHandler = () => {
-          this.showErrorDetailDialog(error);
-        };
-      }
+    } else if (error instanceof errors.SessionProviderError) {
+      toastMessage = error.message;
+      buttonMessage = this.localize('error-details');
+      buttonHandler = () => {
+        this.showErrorDetailDialog(error);
+      };
     } else {
       const hasErrorDetails = Boolean(error.message || error.cause);
       toastMessage = this.localize('error-unexpected');
 
       if (hasErrorDetails) {
         buttonMessage = this.localize('error-details');
         buttonHandler = () => {
-          this.showErrorDetailDialog(error);
+          this.showErrorCauseDialog(error);
         };
       }
     }
@@ -580,7 +579,7 @@ export class App {
     return new Promise<boolean>(resolve => resolve(confirm(message)));
   }
 
-  private showErrorDetailDialog(error: Error) {
+  private showErrorCauseDialog(error: Error) {
     let message = error.toString();
 
     if (error.cause) {
@@ -592,6 +591,13 @@ export class App {
     return alert(message);
   }
 
+  private showErrorDetailDialog(error: errors.SessionProviderError) {
+    if (!error.details) return;
+
+    // Temporarily use window.alert here
+    return alert(error.details);
+  }
+
   //#endregion UI dialogs
 
   // Helpers:

diff --git a/client/src/www/model/errors.ts b/client/src/www/model/errors.ts
@@ -51,6 +51,16 @@ export class SessionConfigError extends CustomError {
   }
 }
 
+export class SessionProviderError extends CustomError {
+  details: string | undefined;
+
+  constructor(message: string, options?: {details?: string}) {
+    super(message);
+
+    this.details = options && options.details;
+  }
+}
+
 export class ServerAccessKeyInvalid extends CustomError {
   constructor(message: string, options?: {cause?: Error}) {
     super(message, options);