fix: axios does not preserve symbols in config

Axios (somehow) does not preserve entries in the config,
which have an symbol as their key.
So this migrates the internally used symbols to string-keys.

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

Author: susnux

lib/interceptors/csrf-token.ts

@@ -9,7 +9,7 @@ import type { InterceptorErrorHandler } from './index.ts'
 import { generateUrl } from '@nextcloud/router'
 import { isAxiosError } from 'axios'
 
-const RETRY_KEY = Symbol('csrf-retry')
+const RETRY_KEY = '_nextcloudCsrfTokenReloaded'
 
 /**
  * Handle CSRF token errors in Axios requests.
@@ -26,7 +26,7 @@ export function onCsrfTokenError(axios: CancelableAxiosInstance): InterceptorErr
 		const responseURL = request?.responseURL
 
 		if (config
-			&& !config[RETRY_KEY]
+			&& !(RETRY_KEY in config)
 			&& response?.status === 412
 			&& response?.data?.message === 'CSRF check failed') {
 			console.warn(`Request to ${responseURL} failed because of a CSRF mismatch. Fetching a new token`)
@@ -35,14 +35,9 @@ export function onCsrfTokenError(axios: CancelableAxiosInstance): InterceptorErr
 			console.debug(`New request token ${token} fetched`)
 			axios.defaults.headers.requesttoken = token
 
-			return axios({
-				...config,
-				headers: {
-					...config.headers,
-					requesttoken: token,
-				},
-				[RETRY_KEY]: true,
-			})
+			config.headers.requesttoken = token
+			config[RETRY_KEY] = true
+			return axios(config)
 		}
 
 		throw error

lib/interceptors/maintenance-mode.ts

@@ -8,7 +8,7 @@ import type { InterceptorErrorHandler } from './index.ts'
 
 import { isAxiosError } from 'axios'
 
-export const RETRY_DELAY_KEY = Symbol('retryDelay')
+const RETRY_DELAY_KEY = '_nextcloudMaintenanceModeRetryDelay'
 
 /**
  * Handles Nextcloud maintenance mode errors in Axios requests.
@@ -25,9 +25,7 @@ export function onMaintenanceModeError(axios: CancelableAxiosInstance): Intercep
 		const responseURL = request?.responseURL
 		const status = response?.status
 		const headers = response?.headers
-		let retryDelay = typeof config?.[RETRY_DELAY_KEY] === 'number'
-			? config?.[RETRY_DELAY_KEY]
-			: 1
+		let retryDelay = config?.[RETRY_DELAY_KEY] ?? 1
 
 		/**
 		 * Retry requests if they failed due to maintenance mode

lib/axios.d.ts lib/internal.d.tslib/axios.d.ts renamed to lib/internal.d.ts

@@ -9,8 +9,16 @@
 declare module 'axios' {
 	// eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/no-explicit-any -- needed as we extend the interface only.
 	interface AxiosRequestConfig<D = any> {
-		[key: symbol]: unknown
+		_nextcloudCsrfTokenReloaded?: true
+		_nextcloudMaintenanceModeRetryDelay?: number
 	}
 }
 
+declare global {
+	var OC: {
+		/** NC 32 and before */
+		reload?: () => void
+	} | undefined
+}
+
 export {}