Merge pull request #17453 from nextcloud/fix/axios-csrf-token-update-event-stable17

[stable17] Fix axios csrf token update event

Author: rullzer

core/js/dist/login.js

@@ -19,6 +19,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { subscribe } from '@nextcloud/event-bus'
+
 import {addScript, addStyle} from './legacy-loader'
 import {
 	ajaxConnectionLostHandler,
@@ -67,8 +69,7 @@ import {
 	getProtocol,
 } from './host'
 import {
-	getToken as getRequestToken,
-	subscribe as subscribeToRequestTokenChange,
+	getToken as getRequestToken
 } from './requesttoken'
 import {
 	hideMenus,
@@ -257,4 +258,9 @@ export default {
 }
 
 // Keep the request token prop in sync
-subscribeToRequestTokenChange(token => OC.requestToken = token)
+subscribe('csrf-token-update', e => {
+	OC.requestToken = e.token
+
+	// Logging might help debug (Sentry) issues
+	console.info('OC.requestToken changed', e.token)
+})

core/js/dist/login.js.map

@@ -19,25 +19,22 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-let token = document.getElementsByTagName('head')[0].getAttribute('data-requesttoken');
-const observers = []
+import { emit } from '@nextcloud/event-bus'
+
+let token = document.getElementsByTagName('head')[0].getAttribute('data-requesttoken')
 
 /**
  * @return {string}
  */
 export const getToken = () => token
 
-/**
- * @param {Function} observer
- * @return {number}
- */
-export const subscribe = observer => observers.push(observer)
-
 /**
  * @param {String} newToken
  */
 export const setToken = newToken => {
 	token = newToken
 
-	observers.forEach(o => o(token))
+	emit('csrf-token-update', {
+		token
+	})
 }

core/js/dist/main.js

@@ -23,6 +23,7 @@
   "dependencies": {
     "@babel/polyfill": "^7.4.4",
     "@chenfengyuan/vue-qrcode": "^1.0.1",
+    "@nextcloud/event-bus": "^0.2.1",
     "Select2": "git+https://github.com/select2/select2.git#3.4.8",
     "autosize": "^4.0.2",
     "backbone": "^1.4.0",