Merge pull request #50046 from nextcloud/fix/settings/mail-server-set…

…tings-form

fix(settings): Fix mail server settings form

apps/settings/src/admin.js

@@ -5,6 +5,7 @@
 
 import { generateUrl } from '@nextcloud/router'
 import $ from 'jquery'
+import axios from '@nextcloud/axios'
 
 window.addEventListener('DOMContentLoaded', () => {
 	$('#loglevel').change(function() {
@@ -48,17 +49,12 @@ window.addEventListener('DOMContentLoaded', () => {
 		}
 
 		OC.msg.startSaving('#mail_settings_msg')
-		$.ajax({
-			url: 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() {
@@ -68,17 +64,12 @@ window.addEventListener('DOMContentLoaded', () => {
 		}
 
 		OC.msg.startSaving('#mail_settings_msg')
-		$.ajax({
-			url: 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)
@@ -94,16 +85,12 @@ window.addEventListener('DOMContentLoaded', () => {
 		event.preventDefault()
 		OC.msg.startAction('#sendtestmail_msg', t('settings', 'Sending…'))
 
-		$.ajax({
-			url: 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 = () => {

dist/settings-legacy-admin.js.license

@@ -1,19 +1,56 @@
 SPDX-License-Identifier: MIT
+SPDX-License-Identifier: ISC
 SPDX-License-Identifier: GPL-3.0-or-later
+SPDX-License-Identifier: BSD-3-Clause
 SPDX-License-Identifier: AGPL-3.0-or-later
 SPDX-FileCopyrightText: Tobias Koppers @sokra
+SPDX-FileCopyrightText: T. Jameson Little <[email protected]>
+SPDX-FileCopyrightText: Roman Shtylman <[email protected]>
 SPDX-FileCopyrightText: OpenJS Foundation and other contributors
 SPDX-FileCopyrightText: Nextcloud GmbH and Nextcloud contributors
+SPDX-FileCopyrightText: Matt Zabriskie
+SPDX-FileCopyrightText: GitHub Inc.
+SPDX-FileCopyrightText: Feross Aboukhadijeh
 SPDX-FileCopyrightText: Christoph Wurst
 
 
 This file is generated from multiple sources. Included packages:
+- @nextcloud/auth
+	- version: 2.4.0
+	- license: GPL-3.0-or-later
+- @nextcloud/axios
+	- version: 2.5.1
+	- license: GPL-3.0-or-later
+- @nextcloud/browser-storage
+	- version: 0.4.0
+	- license: GPL-3.0-or-later
+- semver
+	- version: 7.6.3
+	- license: ISC
+- @nextcloud/event-bus
+	- version: 3.3.1
+	- license: GPL-3.0-or-later
 - @nextcloud/router
 	- version: 3.0.1
 	- license: GPL-3.0-or-later
+- axios
+	- version: 1.7.7
+	- license: MIT
+- base64-js
+	- version: 1.5.1
+	- license: MIT
+- ieee754
+	- version: 1.2.1
+	- license: BSD-3-Clause
 - jquery
 	- version: 3.7.1
 	- license: MIT
+- buffer
+	- version: 6.0.3
+	- license: MIT
+- process
+	- version: 0.11.10
+	- license: MIT
 - webpack
 	- version: 5.94.0
 	- license: MIT