Merge pull request #58670 from nextcloud/backport/58669/stable31

[stable31] fix(files_sharing): ensure the server share API errors are shown

Author: AndyScherzinger

apps/files_sharing/src/mixins/ShareRequests.js

@@ -3,15 +3,12 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-// TODO: remove when ie not supported
-import 'url-search-params-polyfill'
-
-import { emit } from '@nextcloud/event-bus'
+import axios, { isAxiosError } from '@nextcloud/axios'
 import { showError } from '@nextcloud/dialogs'
+import { emit } from '@nextcloud/event-bus'
 import { generateOcsUrl } from '@nextcloud/router'
-import axios from '@nextcloud/axios'
-
 import Share from '../models/Share.ts'
+import logger from '../services/logger.ts'
 
 const shareUrl = generateOcsUrl('apps/files_sharing/api/v1/shares')
 
@@ -45,13 +42,9 @@ export default {
 				emit('files_sharing:share:created', { share })
 				return share
 			} catch (error) {
-				console.error('Error while creating share', error)
-				const errorMessage = error?.response?.data?.ocs?.meta?.message
-				showError(
-					errorMessage ? t('files_sharing', 'Error creating the share: {errorMessage}', { errorMessage }) : t('files_sharing', 'Error creating the share'),
-					{ type: 'error' },
-				)
-				throw error
+				const errorMessage = getErrorMessage(error) ?? t('files_sharing', 'Error creating the share')
+				showError(errorMessage)
+				throw new Error(errorMessage, { cause: error })
 			}
 		},
 
@@ -70,13 +63,9 @@ export default {
 				emit('files_sharing:share:deleted', { id })
 				return true
 			} catch (error) {
-				console.error('Error while deleting share', error)
-				const errorMessage = error?.response?.data?.ocs?.meta?.message
-				OC.Notification.showTemporary(
-					errorMessage ? t('files_sharing', 'Error deleting the share: {errorMessage}', { errorMessage }) : t('files_sharing', 'Error deleting the share'),
-					{ type: 'error' },
-				)
-				throw error
+				const errorMessage = getErrorMessage(error) ?? t('files_sharing', 'Error deleting the share')
+				showError(errorMessage)
+				throw new Error(errorMessage, { cause: error })
 			}
 		},
 
@@ -96,17 +85,27 @@ export default {
 					return request.data.ocs.data
 				}
 			} catch (error) {
-				console.error('Error while updating share', error)
-				if (error.response.status !== 400) {
-					const errorMessage = error?.response?.data?.ocs?.meta?.message
-					OC.Notification.showTemporary(
-						errorMessage ? t('files_sharing', 'Error updating the share: {errorMessage}', { errorMessage }) : t('files_sharing', 'Error updating the share'),
-						{ type: 'error' },
-					)
-				}
-				const message = error.response.data.ocs.meta.message
-				throw new Error(message)
+				logger.error('Error while updating share', { error })
+				const errorMessage = getErrorMessage(error) ?? t('files_sharing', 'Error updating the share')
+				// the error will be shown in apps/files_sharing/src/mixins/SharesMixin.js
+				throw new Error(errorMessage, { cause: error })
 			}
 		},
 	},
 }
+
+/**
+ * Handle an error response from the server and show a notification with the error message if possible
+ *
+ * @param {unknown} error - The received error
+ * @return {string|undefined} the error message if it could be extracted from the response, otherwise undefined
+ */
+function getErrorMessage(error) {
+	if (isAxiosError(error) && error.response.data?.ocs) {
+		/** @type {import('@nextcloud/typings/ocs').OCSResponse} */
+		const response = error.response.data
+		if (response.ocs.meta?.message) {
+			return response.ocs.meta.message
+		}
+	}
+}

dist/4185-4185.js

@@ -24,7 +24,6 @@ SPDX-FileCopyrightText: Nextcloud GmbH and Nextcloud contributors
 SPDX-FileCopyrightText: Nathan Rajlich <nathan@tootallnate.net> (http://n8.io/)
 SPDX-FileCopyrightText: Matt Zabriskie
 SPDX-FileCopyrightText: Jonas Schade <derzade@gmail.com>
-SPDX-FileCopyrightText: Jerry Bendy <jerry@icewingcc.com>
 SPDX-FileCopyrightText: Jeff Sagal <sagalbot@gmail.com>
 SPDX-FileCopyrightText: James Halliday
 SPDX-FileCopyrightText: Jacob Clevenger<https://github.com/wheatjs>
@@ -238,9 +237,6 @@ This file is generated from multiple sources. Included packages:
 - unist-util-visit
 	- version: 5.1.0
 	- license: MIT
-- url-search-params-polyfill
-	- version: 8.2.5
-	- license: MIT
 - util-deprecate
 	- version: 1.0.2
 	- license: MIT

dist/4185-4185.js.license

@@ -193,7 +193,7 @@ This file is generated from multiple sources. Included packages:
 	- version: 1.1.2
 	- license: MIT
 - underscore
-	- version: 1.13.7
+	- version: 1.13.8
 	- license: MIT
 - vue-loader
 	- version: 15.11.1

dist/4185-4185.js.map

@@ -238,7 +238,7 @@ This file is generated from multiple sources. Included packages:
 	- version: 1.1.2
 	- license: MIT
 - underscore
-	- version: 1.13.7
+	- version: 1.13.8
 	- license: MIT
 - unist-builder
 	- version: 4.0.0