From e6714d35314460ad1d93b78beff16d376593f9f7 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Tue, 11 Jun 2019 10:58:32 +0200 Subject: [PATCH] Revert "DEV: attempts to prevent session object to be retain in csrf init (#7743)" This reverts commit 62c56b6e59c234bdca3fab47a0029f97ca54fbd5. --- .../javascripts/discourse/initializers/csrf-token.js.es6 | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/discourse/initializers/csrf-token.js.es6 b/app/assets/javascripts/discourse/initializers/csrf-token.js.es6 index 5fd21b31428..fd95c274d96 100644 --- a/app/assets/javascripts/discourse/initializers/csrf-token.js.es6 +++ b/app/assets/javascripts/discourse/initializers/csrf-token.js.es6 @@ -1,16 +1,15 @@ // Append our CSRF token to AJAX requests when necessary. export default { name: "csrf-token", - initialize(container) { - const session = container.lookup("session:main"); - const csrfToken = $("meta[name=csrf-token]").attr("content"); + initialize: function(container) { + var session = container.lookup("session:main"); // Add a CSRF token to all AJAX requests - session.set("csrfToken", csrfToken); + session.set("csrfToken", $("meta[name=csrf-token]").attr("content")); $.ajaxPrefilter(function(options, originalOptions, xhr) { if (!options.crossDomain) { - xhr.setRequestHeader("X-CSRF-Token", csrfToken); + xhr.setRequestHeader("X-CSRF-Token", session.get("csrfToken")); } }); }