Merge pull request #40471 from nextcloud/enh/fix-x-requested-with

Only add x-requested-with header in requests to Nextcloud
pull/40749/head
Julien Veyssier 2023-10-16 12:06:49 +07:00 committed by GitHub
commit 9bf824eb90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 4 deletions

@ -19,6 +19,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import { getRootUrl } from '@nextcloud/router'
const isNextcloudUrl = (url) => {
const nextcloudBaseUrl = window.location.protocol + '//' + window.location.host + getRootUrl()
// try with relative and absolute URL
return url.startsWith(nextcloudBaseUrl) || url.startsWith(getRootUrl())
}
/**
* Intercept XMLHttpRequest and fetch API calls to add X-Requested-With header
*
@ -28,7 +36,7 @@ export const interceptRequests = () => {
XMLHttpRequest.prototype.open = (function(open) {
return function(method, url, async) {
open.apply(this, arguments)
if (!this.getResponseHeader('X-Requested-With')) {
if (isNextcloudUrl(url) && !this.getResponseHeader('X-Requested-With')) {
this.setRequestHeader('X-Requested-With', 'XMLHttpRequest')
}
}
@ -36,6 +44,9 @@ export const interceptRequests = () => {
window.fetch = (function(fetch) {
return (input, init) => {
if (!isNextcloudUrl(input.url)) {
return fetch(input, init)
}
if (!init) {
init = {}
}

4
dist/core-main.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long