fix(settings): Fix mail server settings formbackport/50046/stable29

Signed-off-by: provokateurin <kate@provokateurin.de>

1 files changed, 19 insertions, 29 deletions

diff --git a/apps/settings/src/admin.js b/apps/settings/src/admin.js
index 054dd7ced2e..876e7358899 100644
--- a/apps/settings/src/admin.js
+++ b/apps/settings/src/admin.js
@@ -1,3 +1,7 @@
+import { generateUrl } from '@nextcloud/router'
+import $ from 'jquery'
+import axios from '@nextcloud/axios'
+
 window.addEventListener('DOMContentLoaded', () => {
 	$('#loglevel').change(function() {
 		$.post(OC.generateUrl('/settings/admin/log/level'), { level: $(this).val() }, () => {
@@ -40,17 +44,12 @@ window.addEventListener('DOMContentLoaded', () => {
 		}
 
 		OC.msg.startSaving('#mail_settings_msg')
-		$.ajax({
-			url: OC.generateUrl('/settings/admin/mailsettings'),
-			type: 'POST',
-			data: $('#mail_general_settings_form').serialize(),
-			success: () => {
+		axios.post(generateUrl('/settings/admin/mailsettings'), $('#mail_general_settings_form').serialize())
+			.then(() => {
 				OC.msg.finishedSuccess('#mail_settings_msg', t('settings', 'Saved'))
-			},
-			error: (xhr) => {
-				OC.msg.finishedError('#mail_settings_msg', xhr.responseJSON)
-			},
-		})
+			}).catch((error) => {
+				OC.msg.finishedError('#mail_settings_msg', error)
+			})
 	}
 
 	const toggleEmailCredentials = function() {
@@ -60,17 +59,12 @@ window.addEventListener('DOMContentLoaded', () => {
 		}
 
 		OC.msg.startSaving('#mail_settings_msg')
-		$.ajax({
-			url: OC.generateUrl('/settings/admin/mailsettings/credentials'),
-			type: 'POST',
-			data: $('#mail_credentials_settings').serialize(),
-			success: () => {
+		axios.post(generateUrl('/settings/admin/mailsettings/credentials'), $('#mail_credentials_settings').serialize())
+			.then(() => {
 				OC.msg.finishedSuccess('#mail_settings_msg', t('settings', 'Saved'))
-			},
-			error: (xhr) => {
-				OC.msg.finishedError('#mail_settings_msg', xhr.responseJSON)
-			},
-		})
+			}).catch((error) => {
+				OC.msg.finishedError('#mail_settings_msg', error)
+			})
 	}
 
 	$('#mail_general_settings_form').change(changeEmailSettings)
@@ -86,16 +80,12 @@ window.addEventListener('DOMContentLoaded', () => {
 		event.preventDefault()
 		OC.msg.startAction('#sendtestmail_msg', t('settings', 'Sending…'))
 
-		$.ajax({
-			url: OC.generateUrl('/settings/admin/mailtest'),
-			type: 'POST',
-			success: () => {
+		axios.post(generateUrl('/settings/admin/mailtest'))
+			.then(() => {
 				OC.msg.finishedSuccess('#sendtestmail_msg', t('settings', 'Email sent'))
-			},
-			error: (xhr) => {
-				OC.msg.finishedError('#sendtestmail_msg', xhr.responseJSON)
-			},
-		})
+			}).catch((error) => {
+				OC.msg.finishedError('#sendtestmail_msg', error)
+			})
 	})
 
 	const setupChecks = () => {