diff options
author | Phil Hughes <me@iamphill.com> | 2017-11-03 11:42:39 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-11-03 11:42:39 +0300 |
commit | 96e8f3c128da33747921f6f1d5357bb208e91fe4 (patch) | |
tree | a5895aae5c388152c615571d91dabb8a4af7128d /app | |
parent | 354256d04c704209d65d21c967d947aa577f6a20 (diff) | |
parent | 24817c65d4960e658c3d268d8590fe5e4344c80b (diff) |
Merge branch '39726-add-crsf-token-axios' into 'master'
Add crsf token in axios calls
Closes #39726
See merge request gitlab-org/gitlab-ce!15155
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/clusters.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/lib/utils/axios_utils.js | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/app/assets/javascripts/clusters.js b/app/assets/javascripts/clusters.js index 661870c226c..c9fef94efea 100644 --- a/app/assets/javascripts/clusters.js +++ b/app/assets/javascripts/clusters.js @@ -1,6 +1,7 @@ /* globals Flash */ import Visibility from 'visibilityjs'; import axios from 'axios'; +import setAxiosCsrfToken from './lib/utils/axios_utils'; import Poll from './lib/utils/poll'; import { s__ } from './locale'; import initSettingsPanels from './settings_panels'; @@ -17,6 +18,7 @@ import Flash from './flash'; class ClusterService { constructor(options = {}) { this.options = options; + setAxiosCsrfToken(); } fetchData() { return axios.get(this.options.endpoint); diff --git a/app/assets/javascripts/lib/utils/axios_utils.js b/app/assets/javascripts/lib/utils/axios_utils.js new file mode 100644 index 00000000000..45bff245827 --- /dev/null +++ b/app/assets/javascripts/lib/utils/axios_utils.js @@ -0,0 +1,6 @@ +import axios from 'axios'; +import csrf from './csrf'; + +export default function setAxiosCsrfToken() { + axios.defaults.headers.common[csrf.headerKey] = csrf.token; +} |