11 files changed, 76 insertions, 66 deletions
diff --git a/core/src/OC/dialogs.js b/core/src/OC/dialogs.js
index fb203f31d28..5c6934e67a2 100644
--- a/core/src/OC/dialogs.js
+++ b/core/src/OC/dialogs.js
@@ -9,7 +9,7 @@ import _ from 'underscore'
 import $ from 'jquery'
 
 import IconMove from '@mdi/svg/svg/folder-move.svg?raw'
-import IconCopy from '@mdi/svg/svg/folder-multiple.svg?raw'
+import IconCopy from '@mdi/svg/svg/folder-multiple-outline.svg?raw'
 
 import OC from './index.js'
 import { DialogBuilder, FilePickerType, getFilePickerBuilder, spawnDialog } from '@nextcloud/dialogs'
@@ -278,13 +278,13 @@ const Dialogs = {
 		} else {
 			builder.setButtonFactory((nodes, path) => {
 				const buttons = []
-				const node = nodes?.[0]?.attributes?.displayName || nodes?.[0]?.basename
-				const target = node || basename(path)
+				const [node] = nodes
+				const target = node?.displayname || node?.basename || basename(path)
 
 				if (type === FilePickerType.Choose) {
 					buttons.push({
 						callback: legacyCallback(callback, FilePickerType.Choose),
-						label: node && !this.multiSelect ? t('core', 'Choose {file}', { file: node }) : t('core', 'Choose'),
+						label: node && !this.multiSelect ? t('core', 'Choose {file}', { file: target }) : t('core', 'Choose'),
 						type: 'primary',
 					})
 				}
@@ -772,7 +772,7 @@ const Dialogs = {
 		var defer = $.Deferred()
 		if (!this.$fileexistsTemplate) {
 			var self = this
-			$.get(OC.filePath('files', 'templates', 'fileexists.html'), function(tmpl) {
+			$.get(OC.filePath('core', 'templates/legacy', 'fileexists.html'), function(tmpl) {
 				self.$fileexistsTemplate = $(tmpl)
 				defer.resolve(self.$fileexistsTemplate)
 			})
diff --git a/core/src/OC/eventsource.js b/core/src/OC/eventsource.js
index bdafa364beb..090c351c057 100644
--- a/core/src/OC/eventsource.js
+++ b/core/src/OC/eventsource.js
@@ -7,7 +7,7 @@
 /* eslint-disable */
 import $ from 'jquery'
 
-import { getToken } from './requesttoken.js'
+import { getRequestToken } from './requesttoken.ts'
 
 /**
  * Create a new event source
@@ -28,7 +28,7 @@ const OCEventSource = function(src, data) {
 			dataStr += name + '=' + encodeURIComponent(data[name]) + '&'
 		}
 	}
-	dataStr += 'requesttoken=' + encodeURIComponent(getToken())
+	dataStr += 'requesttoken=' + encodeURIComponent(getRequestToken())
 	if (!this.useFallBack && typeof EventSource !== 'undefined') {
 		joinChar = '&'
 		if (src.indexOf('?') === -1) {
diff --git a/core/src/OC/index.js b/core/src/OC/index.js
index eff3289308a..5afc941b396 100644
--- a/core/src/OC/index.js
+++ b/core/src/OC/index.js
@@ -49,9 +49,7 @@ import {
 	getPort,
 	getProtocol,
 } from './host.js'
-import {
-	getToken as getRequestToken,
-} from './requesttoken.js'
+import { getRequestToken } from './requesttoken.ts'
 import {
 	hideMenus,
 	registerMenu,
diff --git a/core/src/OC/l10n.js b/core/src/OC/l10n.js
index 83fea41a16a..02f912d6a99 100644
--- a/core/src/OC/l10n.js
+++ b/core/src/OC/l10n.js
@@ -40,7 +40,7 @@ const L10n = {
 	 * @deprecated 26.0.0 use `register` from https://www.npmjs.com/package/@nextcloud/l10
 	 *
 	 * @param {string} appName name of the app
-	 * @param {Object<string, string>} bundle bundle
+	 * @param {Record<string, string>} bundle bundle
 	 */
 	register,
 
diff --git a/core/src/OC/menu.js b/core/src/OC/menu.js
index 87ec5327047..4b4eb658592 100644
--- a/core/src/OC/menu.js
+++ b/core/src/OC/menu.js
@@ -104,7 +104,7 @@ export const hideMenus = function(complete) {
 /**
  * Shows a given element as menu
  *
- * @param {object} [$toggle=null] menu toggle
+ * @param {object} [$toggle] menu toggle
  * @param {object} $menuEl menu element
  * @param {Function} complete callback when the showing animation is done
  */
diff --git a/core/src/OC/notification.js b/core/src/OC/notification.js
index 817620e9634..b658f4163bb 100644
--- a/core/src/OC/notification.js
+++ b/core/src/OC/notification.js
@@ -76,7 +76,7 @@ export default {
 	 * @param {string} html Message to display
 	 * @param {object} [options] options
 	 * @param {string} [options.type] notification type
-	 * @param {number} [options.timeout=0] timeout value, defaults to 0 (permanent)
+	 * @param {number} [options.timeout] timeout value, defaults to 0 (permanent)
 	 * @return {jQuery} jQuery element for notification row
 	 * @deprecated 17.0.0 use the `@nextcloud/dialogs` package
 	 */
@@ -95,7 +95,7 @@ export default {
 	 * @param {string} text Message to display
 	 * @param {object} [options] options
 	 * @param {string} [options.type] notification type
-	 * @param {number} [options.timeout=0] timeout value, defaults to 0 (permanent)
+	 * @param {number} [options.timeout] timeout value, defaults to 0 (permanent)
 	 * @return {jQuery} jQuery element for notification row
 	 * @deprecated 17.0.0 use the `@nextcloud/dialogs` package
 	 */
@@ -120,7 +120,7 @@ export default {
 	 * Updates (replaces) a sanitized notification.
 	 *
 	 * @param {string} text Message to display
-	 * @return {jQuery} JQuery element for notificaiton row
+	 * @return {jQuery} JQuery element for notification row
 	 * @deprecated 17.0.0 use the `@nextcloud/dialogs` package
 	 */
 	showUpdate(text) {
@@ -138,10 +138,10 @@ export default {
 	 *
 	 * @param {string} text Message to show
 	 * @param {Array} [options] options array
-	 * @param {number} [options.timeout=7] timeout in seconds, if this is 0 it will show the message permanently
-	 * @param {boolean} [options.isHTML=false] an indicator for HTML notifications (true) or text (false)
+	 * @param {number} [options.timeout] timeout in seconds, if this is 0 it will show the message permanently
+	 * @param {boolean} [options.isHTML] an indicator for HTML notifications (true) or text (false)
 	 * @param {string} [options.type] notification type
-	 * @return {JQuery} the toast element
+	 * @return {jQuery} the toast element
 	 * @deprecated 17.0.0 use the `@nextcloud/dialogs` package
 	 */
 	showTemporary(text, options) {
diff --git a/core/src/OC/query-string.js b/core/src/OC/query-string.js
index 57aef7a6850..df0f366133a 100644
--- a/core/src/OC/query-string.js
+++ b/core/src/OC/query-string.js
@@ -9,7 +9,7 @@ import $ from 'jquery'
  * Parses a URL query string into a JS map
  *
  * @param {string} queryString query string in the format param1=1234&param2=abcde&param3=xyz
- * @return {Object<string, string>} map containing key/values matching the URL parameters
+ * @return {Record<string, string>} map containing key/values matching the URL parameters
  */
 export const parse = queryString => {
 	let pos
@@ -58,7 +58,7 @@ export const parse = queryString => {
 /**
  * Builds a URL query from a JS map.
  *
- * @param {Object<string, string>} params map containing key/values matching the URL parameters
+ * @param {Record<string, string>} params map containing key/values matching the URL parameters
  * @return {string} String containing a URL query (without question) mark
  */
 export const build = params => {
diff --git a/core/src/OC/requesttoken.js b/core/src/OC/requesttoken.js
deleted file mode 100644
index ed89af59c17..00000000000
--- a/core/src/OC/requesttoken.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-
-import { emit } from '@nextcloud/event-bus'
-
-/**
- * @private
- * @param {Document} global the document to read the initial value from
- * @param {Function} emit the function to invoke for every new token
- * @return {object}
- */
-export const manageToken = (global, emit) => {
-	let token = global.getElementsByTagName('head')[0].getAttribute('data-requesttoken')
-
-	return {
-		getToken: () => token,
-		setToken: newToken => {
-			token = newToken
-
-			emit('csrf-token-update', {
-				token,
-			})
-		},
-	}
-}
-
-const manageFromDocument = manageToken(document, emit)
-
-/**
- * @return {string}
- */
-export const getToken = manageFromDocument.getToken
-
-/**
- * @param {string} newToken new token
- */
-export const setToken = manageFromDocument.setToken
diff --git a/core/src/OC/requesttoken.ts b/core/src/OC/requesttoken.ts
new file mode 100644
index 00000000000..8ecf0b3de7e
--- /dev/null
+++ b/core/src/OC/requesttoken.ts
@@ -0,0 +1,49 @@
+/**
+ * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import { emit } from '@nextcloud/event-bus'
+import { generateUrl } from '@nextcloud/router'
+
+/**
+ * Get the current CSRF token.
+ */
+export function getRequestToken(): string {
+	return document.head.dataset.requesttoken!
+}
+
+/**
+ * Set a new CSRF token (e.g. because of session refresh).
+ * This also emits an event bus event for the updated token.
+ *
+ * @param token - The new token
+ * @fires Error - If the passed token is not a potential valid token
+ */
+export function setRequestToken(token: string): void {
+	if (!token || typeof token !== 'string') {
+		throw new Error('Invalid CSRF token given', { cause: { token } })
+	}
+
+	document.head.dataset.requesttoken = token
+	emit('csrf-token-update', { token })
+}
+
+/**
+ * Fetch the request token from the API.
+ * This does also set it on the current context, see `setRequestToken`.
+ *
+ * @fires Error - If the request failed
+ */
+export async function fetchRequestToken(): Promise<string> {
+	const url = generateUrl('/csrftoken')
+
+	const response = await fetch(url)
+	if (!response.ok) {
+		throw new Error('Could not fetch CSRF token from API', { cause: response })
+	}
+
+	const { token } = await response.json()
+	setRequestToken(token)
+	return token
+}
diff --git a/core/src/OC/util-history.js b/core/src/OC/util-history.js
index eb4ddb185c8..7ecd0e098c6 100644
--- a/core/src/OC/util-history.js
+++ b/core/src/OC/util-history.js
@@ -27,7 +27,7 @@ export default {
 	 * or a map
 	 * @param {string} [url] URL to be used, otherwise the current URL will be used,
 	 * using the params as query string
-	 * @param {boolean} [replace=false] whether to replace instead of pushing
+	 * @param {boolean} [replace] whether to replace instead of pushing
 	 */
 	_pushState(params, url, replace) {
 		let strParams
diff --git a/core/src/OC/xhr-error.js b/core/src/OC/xhr-error.js
index f7dda747e67..233aaf60350 100644
--- a/core/src/OC/xhr-error.js
+++ b/core/src/OC/xhr-error.js
@@ -8,16 +8,18 @@ import $ from 'jquery'
 
 import OC from './index.js'
 import Notification from './notification.js'
+import { getCurrentUser } from '@nextcloud/auth'
+import { showWarning } from '@nextcloud/dialogs'
 
 /**
  * Warn users that the connection to the server was lost temporarily
  *
- * This function is throttled to prevent stacked notfications.
+ * This function is throttled to prevent stacked notifications.
  * After 7sec the first notification is gone, then we can show another one
  * if necessary.
  */
 export const ajaxConnectionLostHandler = _.throttle(() => {
-	Notification.showTemporary(t('core', 'Connection to server lost'))
+	showWarning(t('core', 'Connection to server lost'))
 }, 7 * 1000, { trailing: false })
 
 /**
@@ -28,13 +30,13 @@ export const ajaxConnectionLostHandler = _.throttle(() => {
  */
 export const processAjaxError = xhr => {
 	// purposefully aborted request ?
-	// OC._userIsNavigatingAway needed to distinguish ajax calls cancelled by navigating away
-	// from calls cancelled by failed cross-domain ajax due to SSO redirect
+	// OC._userIsNavigatingAway needed to distinguish Ajax calls cancelled by navigating away
+	// from calls cancelled by failed cross-domain Ajax due to SSO redirect
 	if (xhr.status === 0 && (xhr.statusText === 'abort' || xhr.statusText === 'timeout' || OC._reloadCalled)) {
 		return
 	}
 
-	if (_.contains([302, 303, 307, 401], xhr.status) && OC.currentUser) {
+	if ([302, 303, 307, 401].includes(xhr.status) && getCurrentUser()) {
 		// sometimes "beforeunload" happens later, so need to defer the reload a bit
 		setTimeout(function() {
 			if (!OC._userIsNavigatingAway && !OC._reloadCalled) {
@@ -47,7 +49,7 @@ export const processAjaxError = xhr => {
 						OC.reload()
 					}
 					timer++
-				}, 1000 // 1 second interval
+				}, 1000, // 1 second interval
 				)
 
 				// only call reload once