Merge pull request #1249 from nextcloud/backport/1247/stable24

[stable24] Use modern API to cancel requests
nextcloud · May 30, 2022 · 2f81ea2 · 2f81ea2
2 parents 1652dee + 5b203ee
commit 2f81ea2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/js/viewer-main.js b/js/viewer-main.js
diff --git a/js/viewer-main.js.LICENSE.txt b/js/viewer-main.js.LICENSE.txt
@@ -82,6 +82,7 @@ object-assign
  *
  * @author Marco Ambrosini <marcoambrosini@pm.me>
  * @author John Molakvoæ <skjnldsv@protonmail.com>
+ * @author Louis Chemineau <louis@chmn.me>
  *
  * @license AGPL-3.0-or-later
  *

diff --git a/js/viewer-main.js.map b/js/viewer-main.js.map
diff --git a/src/utils/CancelableRequest.js b/src/utils/CancelableRequest.js
@@ -3,6 +3,7 @@
  *
  * @author Marco Ambrosini <marcoambrosini@pm.me>
  * @author John Molakvoæ <skjnldsv@protonmail.com>
+ * @author Louis Chemineau <louis@chmn.me>
  *
  * @license AGPL-3.0-or-later
  *
@@ -21,20 +22,14 @@
  *
  */
 
-import axios from '@nextcloud/axios'
-
 /**
  * Creates a cancelable axios 'request object'.
  *
  * @param {Function} request the axios promise request
  * @return {object}
  */
 const CancelableRequest = function(request) {
-	/**
-	 * Generate an axios cancel token
-	 */
-	const CancelToken = axios.CancelToken
-	const source = CancelToken.source()
+	const controller = new AbortController()
 
 	/**
 	 * Execute the request
@@ -45,12 +40,12 @@ const CancelableRequest = function(request) {
 	const fetch = async function(url, options) {
 		return request(
 			url,
-			Object.assign({ cancelToken: source.token }, { options })
+			{ ...options, signal: controller.signal }
 		)
 	}
 	return {
 		request: fetch,
-		cancel: source.cancel,
+		cancel: () => controller.abort(),
 	}
 }