Merge branch 'tz-remove-csrf-token-for-emojis-json' into 'master'

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

Closes #58784

See merge request gitlab-org/gitlab-ce!25979
This commit is contained in:
Mike Greiling 2019-03-11 19:33:22 +00:00
commit fcf632ef99

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`,