add error converter

chriskapp · chriskapp · commit c8f48a61e293 · 2022-09-13T21:25:28.000+02:00
diff --git a/projects/fusio-sdk/src/lib/abstract/list.ts b/projects/fusio-sdk/src/lib/abstract/list.ts
@@ -8,6 +8,7 @@ import {Message} from "fusio-sdk/dist/src/generated/backend/Message";
 import {Collection_Query} from "fusio-sdk/dist/src/generated/backend/Collection_Query";
 import {FusioService} from "../service/fusio.service";
 import {ClientAbstract} from "sdkgen-client";
+import {ErrorConverter} from "../util/error-converter";
 
 @Component({
   template: '',
@@ -63,11 +64,7 @@ export abstract class List<C extends ClientAbstract, T extends ModelId> implemen
 
       this.onList();
     } catch (error) {
-      if (axios.isAxiosError(error) && error.response)  {
-        this.response = error.response.data as Message;
-      } else {
-        throw error;
-      }
+      this.response = ErrorConverter.convert(error);
     }
 
     // in case we are not at a specific route redirect to the first
@@ -97,11 +94,7 @@ export abstract class List<C extends ClientAbstract, T extends ModelId> implemen
 
       this.onGet();
     } catch (error) {
-      if (axios.isAxiosError(error) && error.response)  {
-        this.response = error.response.data as Message;
-      } else {
-        throw error;
-      }
+      this.response = ErrorConverter.convert(error);
     }
 
     this.finishLoading();
diff --git a/projects/fusio-sdk/src/lib/abstract/modal.ts b/projects/fusio-sdk/src/lib/abstract/modal.ts
@@ -5,6 +5,7 @@ import {NgbActiveModal, NgbModal} from "@ng-bootstrap/ng-bootstrap";
 import axios, {AxiosResponse} from "axios";
 import {FusioService} from "../service/fusio.service";
 import {ClientAbstract} from "sdkgen-client";
+import {ErrorConverter} from "../util/error-converter";
 
 @Component({
   template: '',
@@ -42,11 +43,7 @@ export abstract class Modal<C extends ClientAbstract, T extends ModelId> impleme
         this.modal.close(response.data);
       }
     } catch (error) {
-      if (axios.isAxiosError(error) && error.response)  {
-        this.response = error.response.data as Message;
-      } else {
-        throw error;
-      }
+      this.response = ErrorConverter.convert(error);
     }
   }
 
diff --git a/projects/fusio-sdk/src/lib/component/login/provider/provider.component.ts b/projects/fusio-sdk/src/lib/component/login/provider/provider.component.ts
@@ -8,6 +8,7 @@ import {User_Account} from "fusio-sdk/dist/src/generated/consumer/User_Account";
 import {ProviderService} from "../../../service/provider.service";
 import {UserService} from "../../../service/user.service";
 import {ConsumerService} from "../../../service/consumer.service";
+import {ErrorConverter} from "../../../util/error-converter";
 
 @Component({
   selector: 'fusio-login-provider',
@@ -63,14 +64,7 @@ export class ProviderComponent implements OnInit {
 
       await this.obtainUserInfo();
     } catch (error) {
-      if (axios.isAxiosError(error) && error.response)  {
-        this.response = error.response.data as Message;
-      } else {
-        this.response = {
-          success: false,
-          message: String(error),
-        };
-      }
+      this.response = ErrorConverter.convert(error);
     }
   }
 
diff --git a/projects/fusio-sdk/src/lib/component/password/confirm/confirm.component.ts b/projects/fusio-sdk/src/lib/component/password/confirm/confirm.component.ts
@@ -4,6 +4,7 @@ import {ActivatedRoute} from "@angular/router";
 import axios from "axios";
 import {User_PasswordReset} from "fusio-sdk/dist/src/generated/consumer/User_PasswordReset";
 import {ConsumerService} from "../../../service/consumer.service";
+import {ErrorConverter} from "../../../util/error-converter";
 
 @Component({
   selector: 'fusio-password-confirm',
@@ -50,17 +51,7 @@ export class ConfirmComponent implements OnInit {
       this.loading = false;
     } catch (error) {
       this.loading = false;
-      if (axios.isAxiosError(error) && error.response)  {
-        this.response = {
-          success: false,
-          message: error.response.data.message || 'An unknown error occurred',
-        };
-      } else {
-        this.response = {
-          success: false,
-          message: String(error),
-        };
-      }
+      this.response = ErrorConverter.convert(error);
     }
   }
 
diff --git a/projects/fusio-sdk/src/lib/component/password/reset/reset.component.ts b/projects/fusio-sdk/src/lib/component/password/reset/reset.component.ts
@@ -5,6 +5,7 @@ import axios from "axios";
 import {User_Email} from "fusio-sdk/dist/src/generated/consumer/User_Email";
 import {ConsumerService} from "../../../service/consumer.service";
 import {Config, FUSIO_CONFIG} from "../../../config/config";
+import {ErrorConverter} from "../../../util/error-converter";
 
 @Component({
   selector: 'fusio-password-reset',
@@ -48,17 +49,7 @@ export class ResetComponent implements OnInit {
       this.loading = false;
     } catch (error) {
       this.loading = false;
-      if (axios.isAxiosError(error) && error.response)  {
-        this.response = {
-          success: false,
-          message: error.response.data.message || 'An unknown error occurred',
-        };
-      } else {
-        this.response = {
-          success: false,
-          message: String(error),
-        };
-      }
+      this.response = ErrorConverter.convert(error);
     }
   }
 
diff --git a/projects/fusio-sdk/src/lib/component/register/activate/activate.component.ts b/projects/fusio-sdk/src/lib/component/register/activate/activate.component.ts
@@ -4,6 +4,7 @@ import {ActivatedRoute} from "@angular/router";
 import axios from "axios";
 import {User_Activate} from "fusio-sdk/dist/src/generated/consumer/User_Activate";
 import {ConsumerService} from "../../../service/consumer.service";
+import {ErrorConverter} from "../../../util/error-converter";
 
 @Component({
   selector: 'fusio-register-activate',
@@ -38,17 +39,7 @@ export class ActivateComponent implements OnInit {
 
       this.response = response.data;
     } catch (error) {
-      if (axios.isAxiosError(error) && error.response)  {
-        this.response = {
-          success: false,
-          message: error.response.data.message || 'An unknown error occurred',
-        };
-      } else {
-        this.response = {
-          success: false,
-          message: String(error),
-        };
-      }
+      this.response = ErrorConverter.convert(error);
     }
   }
 
diff --git a/projects/fusio-sdk/src/lib/component/register/register.component.ts b/projects/fusio-sdk/src/lib/component/register/register.component.ts
@@ -4,6 +4,7 @@ import axios from "axios";
 import {User_Register} from "fusio-sdk/dist/src/generated/consumer/User_Register";
 import {ConsumerService} from "../../service/consumer.service";
 import {Config, FUSIO_CONFIG} from "../../config/config";
+import {ErrorConverter} from "../../util/error-converter";
 
 @Component({
   selector: 'fusio-register',
@@ -54,17 +55,7 @@ export class RegisterComponent implements OnInit {
       this.loading = false;
     } catch (error) {
       this.loading = false;
-      if (axios.isAxiosError(error) && error.response)  {
-        this.response = {
-          success: false,
-          message: error.response.data.message || 'An unknown error occurred',
-        };
-      } else {
-        this.response = {
-          success: false,
-          message: String(error),
-        };
-      }
+      this.response = ErrorConverter.convert(error);
     }
   }
 
diff --git a/projects/fusio-sdk/src/lib/util/error-converter.ts b/projects/fusio-sdk/src/lib/util/error-converter.ts
@@ -0,0 +1,20 @@
+import axios from "axios";
+import {Message} from "fusio-sdk/dist/src/generated/backend/Message";
+
+export class ErrorConverter {
+
+  public static convert(error: any): Message {
+    if (axios.isAxiosError(error) && error.response)  {
+      return {
+        success: false,
+        message: error.response.data.message || 'An unknown error occurred',
+      };
+    } else {
+      return {
+        success: false,
+        message: String(error),
+      };
+    }
+  }
+
+}
diff --git a/projects/fusio-sdk/src/public-api.ts b/projects/fusio-sdk/src/public-api.ts
@@ -29,4 +29,6 @@ export * from './lib/service/help.service';
 export * from './lib/service/provider.service';
 export * from './lib/service/user.service';
 
+export * from './lib/util/error-converter';
+
 export * from './lib/fusio-sdk.module';

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import {NgbActiveModal, NgbModal} from "@ng-bootstrap/ng-bootstrap";`
`5`	`5`	`import axios, {AxiosResponse} from "axios";`
`6`	`6`	`import {FusioService} from "../service/fusio.service";`
`7`	`7`	`import {ClientAbstract} from "sdkgen-client";`
	`8`	`+import {ErrorConverter} from "../util/error-converter";`
`8`	`9`
`9`	`10`	`@Component({`
`10`	`11`	`template: '',`
`@@ -42,11 +43,7 @@ export abstract class Modal<C extends ClientAbstract, T extends ModelId> impleme`
`42`	`43`	`this.modal.close(response.data);`
`43`	`44`	`}`
`44`	`45`	`} catch (error) {`
`45`		`- if (axios.isAxiosError(error) && error.response) {`
`46`		`- this.response = error.response.data as Message;`
`47`		`- } else {`
`48`		`- throw error;`
`49`		`- }`
	`46`	`+ this.response = ErrorConverter.convert(error);`
`50`	`47`	`}`
`51`	`48`	`}`
`52`	`49`