Fix:(webapp) PR review updates. Remove string parsing.

Devolutions · Mar 5, 2024 · 0a34ec9 · 0a34ec9
1 parent 86da9dc
commit 0a34ec9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 58 deletions.
diff --git a/webapp/src/client/app/modules/web-client/ard/web-client-ard.component.ts b/webapp/src/client/app/modules/web-client/ard/web-client-ard.component.ts
@@ -380,7 +380,13 @@ export class WebClientArdComponent extends WebClientBaseComponent implements  On
   }
 
   private getMessage(errorData: UserIronRdpError | string): string {
-    const errorKind: UserIronRdpErrorKind = this.getErrorKind(errorData);
+    let errorKind: UserIronRdpErrorKind = UserIronRdpErrorKind.General;
+
+    if (typeof errorData === 'string') {
+      console.error(errorData);
+    } else {
+      errorKind = errorData.kind();
+    }
 
     //For translation 'UnknownError'
     //For translation 'ConnectionErrorPleaseVerifyYourConnectionSettings'
@@ -398,32 +404,4 @@ export class WebClientArdComponent extends WebClientBaseComponent implements  On
         return 'Connection error: Please verify your connection settings.';
     }
   }
-
-  private getErrorKind(errorData: UserIronRdpError | string): UserIronRdpErrorKind {
-    if (typeof errorData === 'string') {
-      return this.parseErrorString(errorData);
-    }
-
-    if (errorData?.kind() !== UserIronRdpErrorKind.General) {
-      return errorData.kind();
-    }
-
-    console.error('Error Kind:', errorData.kind());
-    const backtrace: string = errorData?.backtrace();
-    return this.parseErrorString(backtrace);
-  }
-
-  private parseErrorString(error: string): UserIronRdpErrorKind {
-    console.error(error);
-
-    if (error.indexOf('authentication rejected') >= 0) {
-      return UserIronRdpErrorKind.WrongPassword;
-    }
-
-    if (error.indexOf('connection has been rejected') >= 0) {
-      return UserIronRdpErrorKind.LogonFailure;
-    }
-
-    return UserIronRdpErrorKind.General;
-  }
 }
diff --git a/webapp/src/client/app/modules/web-client/vnc/web-client-vnc.component.ts b/webapp/src/client/app/modules/web-client/vnc/web-client-vnc.component.ts
@@ -380,7 +380,13 @@ export class WebClientVncComponent extends WebClientBaseComponent implements  On
   }
 
   private getMessage(errorData: UserIronRdpError | string): string {
-    const errorKind: UserIronRdpErrorKind = this.getErrorKind(errorData);
+    let errorKind: UserIronRdpErrorKind = UserIronRdpErrorKind.General;
+
+    if (typeof errorData === 'string') {
+      console.error(errorData);
+    } else {
+      errorKind = errorData.kind();
+    }
 
     //For translation 'UnknownError'
     //For translation 'ConnectionErrorPleaseVerifyYourConnectionSettings'
@@ -398,32 +404,4 @@ export class WebClientVncComponent extends WebClientBaseComponent implements  On
         return 'Connection error: Please verify your connection settings.';
     }
   }
-
-  private getErrorKind(errorData: UserIronRdpError | string): UserIronRdpErrorKind {
-    if (typeof errorData === 'string') {
-      return this.parseErrorString(errorData);
-    }
-
-    if (errorData?.kind() !== UserIronRdpErrorKind.General) {
-      return errorData.kind();
-    }
-
-    console.error('Error Kind:', errorData.kind());
-    const backtrace: string = errorData?.backtrace();
-    return this.parseErrorString(backtrace);
-  }
-
-  private parseErrorString(error: string): UserIronRdpErrorKind {
-    console.error(error);
-
-    if (error.indexOf('authentication rejected') >= 0) {
-      return UserIronRdpErrorKind.WrongPassword;
-    }
-
-    if (error.indexOf('connection has been rejected') >= 0) {
-      return UserIronRdpErrorKind.LogonFailure;
-    }
-
-    return UserIronRdpErrorKind.General;
-  }
 }