diff --git a/README.md b/README.md index ef8b1738..a9b1a2f4 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,6 @@ - Currently not supported: - Screen sharing ([#11](https://github.com/nextcloud/talk-desktop/issues/11)) - - Share from Nextcloud (including files creation) ([#12](https://github.com/nextcloud/talk-desktop/issues/12)) - Contacts menu on user avatars menus ([#34](https://github.com/nextcloud/talk-desktop/issues/34)) - Setting User Status ([#26](https://github.com/nextcloud/talk-desktop/issues/26)) - Search ([#30](https://github.com/nextcloud/talk-desktop/issues/30)) diff --git a/src/app/webRequestInterceptor.js b/src/app/webRequestInterceptor.js index fc80faba..3bc1a7df 100644 --- a/src/app/webRequestInterceptor.js +++ b/src/app/webRequestInterceptor.js @@ -81,7 +81,7 @@ function enableWebRequestInterceptor(serverUrl, { } const ALLOWED_ORIGIN = [process.env.NODE_ENV === 'production' ? 'file://' : `${DEV_SERVER_ORIGIN}`] - const ALLOWED_METHODS = ['GET, POST, PUT, PATCH, DELETE, PROPFIND, MKCOL'] // Includes WebDAV + const ALLOWED_METHODS = ['GET, POST, PUT, PATCH, DELETE, PROPFIND, MKCOL, SEARCH, REPORT'] // Includes WebDAV const ALLOWED_CREDENTIALS_TRUE = ['true'] const ALLOWED_HEADERS = [[ // Common @@ -90,10 +90,11 @@ function enableWebRequestInterceptor(serverUrl, { 'If-None-Match', // WebDAV 'Depth', - 'requesttoken', // Nextcloud + 'requesttoken', 'OCS-APIRequest', 'X-OC-MTIME', + 'X-Requested-With', ].join(', ')] const EXPOSED_HEADERS = [[ // Common headers diff --git a/src/patchers/@nextcloud/axios.js b/src/patchers/@nextcloud/axios.js index 534e508c..b00b6f4d 100644 --- a/src/patchers/@nextcloud/axios.js +++ b/src/patchers/@nextcloud/axios.js @@ -23,7 +23,6 @@ import axios from '@desktop-modules--@nextcloud/axios' axios.interceptors.request.use((config) => { config.withCredentials = true - delete config.headers.requesttoken config.headers['OCS-APIRequest'] = 'true' return config }, (error) => Promise.reject(error)) diff --git a/src/patchers/@nextcloud/initial-state.js b/src/patchers/@nextcloud/initial-state.js index d236872b..79e63bb2 100644 --- a/src/patchers/@nextcloud/initial-state.js +++ b/src/patchers/@nextcloud/initial-state.js @@ -84,8 +84,8 @@ function getInitialStateFromCapabilities(capabilities, userMetadata) { // eslint-disable-next-line jsdoc/require-jsdoc export function loadState(app, key, fallback) { const capabilities = getInitialStateFromCapabilities(appData.capabilities, appData.userMetadata) - const elem = capabilities[app][key] - if (elem === null) { + const elem = capabilities[app]?.[key] + if (elem === null || elem === undefined) { if (fallback !== undefined) { return fallback }