fix: better error reporting

mickvandijke · mickvandijke · commit 4ca4bba57e28 · 2023-06-07T17:13:17.000+02:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "torrust-index-api-lib",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "description": "Contains API functions for the Torrust project.",
   "repository": "https://github.com/torrust/torrust-index-types-lib",
   "license": "MIT",
diff --git a/src/modes/rest/resources/category.ts b/src/modes/rest/resources/category.ts
@@ -30,7 +30,7 @@ export class CategoryResource implements IRestResource {
                 return Promise.resolve(res.data);
             })
             .catch((err) => {
-                return Promise.reject(err);
+                return Promise.reject(err.response?.data?.error ?? err);
             });
     }
 
@@ -47,7 +47,7 @@ export class CategoryResource implements IRestResource {
                 return Promise.resolve(res.data);
             })
             .catch((err) => {
-                return Promise.reject(err);
+                return Promise.reject(err.response?.data?.error ?? err);
             });
     }
 
@@ -64,7 +64,7 @@ export class CategoryResource implements IRestResource {
                 return Promise.resolve(res.data);
             })
             .catch((err) => {
-                return Promise.reject(err);
+                return Promise.reject(err.response?.data?.error ?? err);
             });
     }
 }
diff --git a/src/modes/rest/resources/settings.ts b/src/modes/rest/resources/settings.ts
@@ -27,7 +27,7 @@ export class SettingsResource implements IRestResource {
                 return Promise.resolve(res.data);
             })
             .catch((err) => {
-                return Promise.reject(err);
+                return Promise.reject(err.response?.data?.error ?? err);
             });
     }
 
@@ -41,7 +41,7 @@ export class SettingsResource implements IRestResource {
                 return Promise.resolve(res.data);
             })
             .catch((err) => {
-                return Promise.reject(err);
+                return Promise.reject(err.response?.data?.error ?? err);
             });
     }
 
@@ -53,7 +53,7 @@ export class SettingsResource implements IRestResource {
                 return Promise.resolve(res.data);
             })
             .catch((err) => {
-                return Promise.reject(err);
+                return Promise.reject(err.response?.data?.error ?? err);
             });
     }
 }
diff --git a/src/modes/rest/resources/tag.ts b/src/modes/rest/resources/tag.ts
@@ -35,7 +35,7 @@ export class TagResource implements IRestResource {
                 return Promise.resolve(res.data);
             })
             .catch((err) => {
-                return Promise.reject(err);
+                return Promise.reject(err.response?.data?.error ?? err);
             });
     }
 
@@ -52,7 +52,7 @@ export class TagResource implements IRestResource {
                 return Promise.resolve(res.data);
             })
             .catch((err) => {
-                return Promise.reject(err);
+                return Promise.reject(err.response?.data?.error ?? err);
             });
     }
 
@@ -64,7 +64,7 @@ export class TagResource implements IRestResource {
                 return Promise.resolve(res.data);
             })
             .catch((err) => {
-                return Promise.reject(err);
+                return Promise.reject(err.response?.data?.error ?? err);
             });
     }
 }
diff --git a/src/modes/rest/resources/torrent.ts b/src/modes/rest/resources/torrent.ts
@@ -72,7 +72,7 @@ export class TorrentResource implements IRestResource {
                 return Promise.resolve(res.data);
             })
             .catch((err) => {
-                return Promise.reject(err);
+                return Promise.reject(err.response?.data?.error ?? err);
             });
     }
 
@@ -84,7 +84,7 @@ export class TorrentResource implements IRestResource {
                 return Promise.resolve(res.data);
             })
             .catch((err) => {
-                return Promise.reject(err);
+                return Promise.reject(err.response?.data?.error ?? err);
             });
     }
 
@@ -98,7 +98,7 @@ export class TorrentResource implements IRestResource {
                 return Promise.resolve(true);
             })
             .catch((err) => {
-                return Promise.reject(err);
+                return Promise.reject(err.response?.data?.error ?? err);
             });
     }
 
@@ -112,7 +112,7 @@ export class TorrentResource implements IRestResource {
                 return Promise.resolve(res.data);
             })
             .catch((err) => {
-                return Promise.reject(err);
+                return Promise.reject(err.response?.data?.error ?? err);
             });
     }
 
@@ -146,7 +146,7 @@ export class TorrentResource implements IRestResource {
                 return Promise.resolve(blob);
             })
             .catch((err) => {
-                return Promise.reject(err);
+                return Promise.reject(err.response?.data?.error ?? err);
             });
     }
 
@@ -161,7 +161,7 @@ export class TorrentResource implements IRestResource {
                 return Promise.resolve(blob);
             })
             .catch((err) => {
-                return Promise.reject(err);
+                return Promise.reject(err.response?.data?.error ?? err);
             });
     }
 }
diff --git a/src/modes/rest/resources/user.ts b/src/modes/rest/resources/user.ts
@@ -43,7 +43,7 @@ export class UserResource implements IRestResource {
                 return Promise.resolve(res.data);
             })
             .catch((err) => {
-                return Promise.reject(err);
+                return Promise.reject(err.response?.data?.error ?? err);
             });
     }
 
@@ -57,7 +57,7 @@ export class UserResource implements IRestResource {
                 return Promise.resolve(true);
             })
             .catch((err) => {
-                return Promise.reject(err);
+                return Promise.reject(err.response?.data?.error ?? err);
             });
     }
 
@@ -74,8 +74,7 @@ export class UserResource implements IRestResource {
                 return Promise.resolve(res.data);
             })
             .catch((err) => {
-                console.error(err);
-                return Promise.reject(err);
+                return Promise.reject(err.response?.data?.error ?? err);
             });
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "torrust-index-api-lib",`
`3`		`- "version": "0.1.13",`
	`3`	`+ "version": "0.1.14",`
`4`	`4`	`"description": "Contains API functions for the Torrust project.",`
`5`	`5`	`"repository": "https://github.com/torrust/torrust-index-types-lib",`
`6`	`6`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ export class CategoryResource implements IRestResource {`
`30`	`30`	`return Promise.resolve(res.data);`
`31`	`31`	`})`
`32`	`32`	`.catch((err) => {`
`33`		`- return Promise.reject(err);`
	`33`	`+ return Promise.reject(err.response?.data?.error ?? err);`
`34`	`34`	`});`
`35`	`35`	`}`
`36`	`36`
`@@ -47,7 +47,7 @@ export class CategoryResource implements IRestResource {`
`47`	`47`	`return Promise.resolve(res.data);`
`48`	`48`	`})`
`49`	`49`	`.catch((err) => {`
`50`		`- return Promise.reject(err);`
	`50`	`+ return Promise.reject(err.response?.data?.error ?? err);`
`51`	`51`	`});`
`52`	`52`	`}`
`53`	`53`
`@@ -64,7 +64,7 @@ export class CategoryResource implements IRestResource {`
`64`	`64`	`return Promise.resolve(res.data);`
`65`	`65`	`})`
`66`	`66`	`.catch((err) => {`
`67`		`- return Promise.reject(err);`
	`67`	`+ return Promise.reject(err.response?.data?.error ?? err);`
`68`	`68`	`});`
`69`	`69`	`}`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ export class SettingsResource implements IRestResource {`
`27`	`27`	`return Promise.resolve(res.data);`
`28`	`28`	`})`
`29`	`29`	`.catch((err) => {`
`30`		`- return Promise.reject(err);`
	`30`	`+ return Promise.reject(err.response?.data?.error ?? err);`
`31`	`31`	`});`
`32`	`32`	`}`
`33`	`33`
`@@ -41,7 +41,7 @@ export class SettingsResource implements IRestResource {`
`41`	`41`	`return Promise.resolve(res.data);`
`42`	`42`	`})`
`43`	`43`	`.catch((err) => {`
`44`		`- return Promise.reject(err);`
	`44`	`+ return Promise.reject(err.response?.data?.error ?? err);`
`45`	`45`	`});`
`46`	`46`	`}`
`47`	`47`
`@@ -53,7 +53,7 @@ export class SettingsResource implements IRestResource {`
`53`	`53`	`return Promise.resolve(res.data);`
`54`	`54`	`})`
`55`	`55`	`.catch((err) => {`
`56`		`- return Promise.reject(err);`
	`56`	`+ return Promise.reject(err.response?.data?.error ?? err);`
`57`	`57`	`});`
`58`	`58`	`}`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ export class TagResource implements IRestResource {`
`35`	`35`	`return Promise.resolve(res.data);`
`36`	`36`	`})`
`37`	`37`	`.catch((err) => {`
`38`		`- return Promise.reject(err);`
	`38`	`+ return Promise.reject(err.response?.data?.error ?? err);`
`39`	`39`	`});`
`40`	`40`	`}`
`41`	`41`
`@@ -52,7 +52,7 @@ export class TagResource implements IRestResource {`
`52`	`52`	`return Promise.resolve(res.data);`
`53`	`53`	`})`
`54`	`54`	`.catch((err) => {`
`55`		`- return Promise.reject(err);`
	`55`	`+ return Promise.reject(err.response?.data?.error ?? err);`
`56`	`56`	`});`
`57`	`57`	`}`
`58`	`58`
`@@ -64,7 +64,7 @@ export class TagResource implements IRestResource {`
`64`	`64`	`return Promise.resolve(res.data);`
`65`	`65`	`})`
`66`	`66`	`.catch((err) => {`
`67`		`- return Promise.reject(err);`
	`67`	`+ return Promise.reject(err.response?.data?.error ?? err);`
`68`	`68`	`});`
`69`	`69`	`}`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ export class UserResource implements IRestResource {`
`43`	`43`	`return Promise.resolve(res.data);`
`44`	`44`	`})`
`45`	`45`	`.catch((err) => {`
`46`		`- return Promise.reject(err);`
	`46`	`+ return Promise.reject(err.response?.data?.error ?? err);`
`47`	`47`	`});`
`48`	`48`	`}`
`49`	`49`
`@@ -57,7 +57,7 @@ export class UserResource implements IRestResource {`
`57`	`57`	`return Promise.resolve(true);`
`58`	`58`	`})`
`59`	`59`	`.catch((err) => {`
`60`		`- return Promise.reject(err);`
	`60`	`+ return Promise.reject(err.response?.data?.error ?? err);`
`61`	`61`	`});`
`62`	`62`	`}`
`63`	`63`
`@@ -74,8 +74,7 @@ export class UserResource implements IRestResource {`
`74`	`74`	`return Promise.resolve(res.data);`
`75`	`75`	`})`
`76`	`76`	`.catch((err) => {`
`77`		`- console.error(err);`
`78`		`- return Promise.reject(err);`
	`77`	`+ return Promise.reject(err.response?.data?.error ?? err);`
`79`	`78`	`});`
`80`	`79`	`}`
`81`	`80`	`}`