kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Removes the CSRF token if the emojis.json is on a CDN

Browse source
This commit is contained in:
Tim Zallmann 2019-03-11 19:33:21 +00:00 committed by Mike Greiling
parent 496f9a9ea9
commit a0b3f621dc
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/javascripts/emoji/index.js
View file

@ -3,6 +3,7 @@ import createFlash from '~/flash';
import { s__ } from '~/locale';
import emojiAliases from 'emojis/aliases.json';
import axios from '../lib/utils/axios_utils';
import csrf from '../lib/utils/csrf';
import AccessorUtilities from '../lib/utils/accessor';
@ -24,7 +25,14 @@ export function initEmojiMap() {
resolve(emojiMap);
} else {
// We load the JSON from server
axios
const axiosInstance = axios.create();
// If the static JSON file is on a CDN we don't want to send the default CSRF token
if (gon.asset_host) {
delete axiosInstance.defaults.headers.common[csrf.headerKey];
}
axiosInstance
.get(
`${gon.asset_host || ''}${gon.relative_url_root ||
''}/-/emojis/${EMOJI_VERSION}/emojis.json`,