From 2dbdf4108680f838cf525974717f08f261996583 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 31 Jan 2024 09:39:51 +0100
Subject: [PATCH] FHC-Api: finetuning

---
 public/js/components/Form/Form.js |  6 ++++--
 public/js/plugin/FhcApi.js        | 26 ++++++++++++++++----------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/public/js/components/Form/Form.js b/public/js/components/Form/Form.js
index 98f346b52..7620f85c8 100644
--- a/public/js/components/Form/Form.js
+++ b/public/js/components/Form/Form.js
@@ -56,14 +56,16 @@ export default {
 				args[0] = this;
 			else
 				args.unshift(this);
-			this.$fhcApi.get(...args);
+			
+			return this.$fhcApi.get(...args);
 		},
 		post(...args) {
 			if (typeof args[0] == 'object' && args[0].clearValidation && args[0].setFeedback)
 				args[0] = this;
 			else
 				args.unshift(this);
-			this.$fhcApi.post(...args);
+			
+			return this.$fhcApi.post(...args);
 		},
 		_sendFeedbackToInput(inputs, feedback, valid) {
 			if (inputs.length) {
diff --git a/public/js/plugin/FhcApi.js b/public/js/plugin/FhcApi.js
index 7bd57858b..3a2f7543b 100644
--- a/public/js/plugin/FhcApi.js
+++ b/public/js/plugin/FhcApi.js
@@ -43,20 +43,21 @@ export default {
 		});
 
 		fhcApiAxios.interceptors.response.use(response => {
-			if (response.config.errorHandling == 'off'
-				|| response.config.errorHandling === false
-				|| response.config.errorHandling == 'fail')
-				return Promise.reject(response);
+			if (response.config?.errorHandling == 'off'
+				|| response.config?.errorHandling === false
+				|| response.config?.errorHandling == 'fail')
+				return response;
 			
 			// NOTE(chris): loop through errors
 			if (response.data.errors)
 				response.data.errors = response.data.errors.filter(
 					err => (response.config[err.type + 'ErrorHandler'] || app.config.globalProperties.$fhcApi._defaultErrorHandlers[err.type])(err, response.config.form)
 				);
+
 			return response;
 		}, error => {
 			if (error.code == 'ERR_CANCELED')
-				return;
+				return new Promise(() => {});
 			
 			if (error.config?.errorHandling == 'off'
 				|| error.config?.errorHandling === false
@@ -64,20 +65,25 @@ export default {
 				return Promise.reject(error);
 
 			if (error.response) {
-				if (error.response.status == 404)
-					return app.config.globalProperties.$fhcAlert.alertDefault('error', error.message, error.request.responseURL, true);
+				if (error.response.status == 404) {
+					app.config.globalProperties.$fhcAlert.alertDefault('error', error.message, error.request.responseURL, true);
+					return new Promise(() => {});
+				}
 				
 				// NOTE(chris): loop through errors
 				error.response.data.errors = error.response.data.errors.filter(
 					err => (error.config[err.type + 'ErrorHandler'] || app.config.globalProperties.$fhcApi._defaultErrorHandlers[err.type])(err, error.config.form)
 				);
 				if (!error.response.data.errors.length)
-					return;
+					return new Promise(() => {});
 			} else if (error.request) {
-				return app.config.globalProperties.$fhcAlert.alertDefault('error', error.message, error.request.responseURL);
+				app.config.globalProperties.$fhcAlert.alertDefault('error', error.message, error.request.responseURL);
+				return new Promise(() => {});
 			} else {
-				return app.config.globalProperties.$fhcAlert.alertError(error.message);
+				app.config.globalProperties.$fhcAlert.alertError(error.message);
+				return new Promise(() => {});
 			}
+			
 			return Promise.reject(error);
 		});