diff --git a/src/assets/js/map-util.js b/src/assets/js/map-util.js
index 8b6ed9b8f8d5497deafc879ab79c939a064c9806..594050a5d6865420ffa664fa459d27081ed849a8 100644
--- a/src/assets/js/map-util.js
+++ b/src/assets/js/map-util.js
@@ -4,15 +4,9 @@
 import L from "leaflet"
 import "leaflet/dist/leaflet.css";
 import flip from '@turf/flip'
-import axios from "axios"
+import axios from '@/axios-client.js';
 import "leaflet.vectorgrid";
 
-axios.defaults.headers.common['X-CSRFToken'] = (name => {
-  var re = new RegExp(name + "=([^;]+)");
-  var value = re.exec(document.cookie);
-  return (value != null) ? unescape(value[1]) : null;
-})('csrftoken');
-
 import { FillSymbolizer, PointSymbolizer, LineSymbolizer } from "@/assets/js/vector_tile_fix.js";
 
 let map;
diff --git a/src/axios-client.js b/src/axios-client.js
new file mode 100644
index 0000000000000000000000000000000000000000..fa6b3d958ba2c8e4ec140a407d117a8137aee1c2
--- /dev/null
+++ b/src/axios-client.js
@@ -0,0 +1,35 @@
+import axios from 'axios';
+
+axios.defaults.withCredentials = true;
+
+// Add a request interceptor
+axios.interceptors.request.use(function (config) {
+
+  config.headers['X-CSRFToken'] = (name => {
+    const re = new RegExp(name + "=([^;]+)");
+    const value = re.exec(document.cookie);
+    return (value != null) ? unescape(value[1]) : null;
+  })('csrftoken');
+
+  return config;
+
+  }, function (error) {
+    return Promise.reject(error);
+  });
+
+// Add a response interceptor
+axios.interceptors.response.use(function (response) {
+
+  response.headers['X-CSRFToken'] = (name => {
+    const re = new RegExp(name + "=([^;]+)");
+    const value = re.exec(document.cookie);
+    return (value != null) ? unescape(value[1]) : null;
+  })('csrftoken');
+
+  return response;
+
+  }, function (error) {
+    return Promise.reject(error);
+  });
+
+export default axios;
\ No newline at end of file
diff --git a/src/services/map-api.js b/src/services/map-api.js
index fa4c5ddba7178edc5d26a91095d1dedb3c976e46..f4b8f45edf3b0f2d8835344f0fcb088f45059c88 100644
--- a/src/services/map-api.js
+++ b/src/services/map-api.js
@@ -1,11 +1,6 @@
-import axios from 'axios';
+import axios from '@/axios-client.js';
 import store from '../store';
 
-axios.defaults.headers.common['X-CSRFToken'] = (name => {
-  var re = new RegExp(name + "=([^;]+)");
-  var value = re.exec(document.cookie);
-  return (value !== null) ? unescape(value[1]) : null;
-})('csrftoken');
 
 const baseUrl = store.state.configuration.VUE_APP_DJANGO_API_BASE;
 
diff --git a/src/services/project-api.js b/src/services/project-api.js
index b918ad2270c8dbcd20cd0d46f8c903af3176a3a4..f3d439cd4b4648a8080ec68e540dfbcf451d8810 100644
--- a/src/services/project-api.js
+++ b/src/services/project-api.js
@@ -1,12 +1,7 @@
-import axios from 'axios';
+import axios from '@/axios-client.js';
 import store from '../store'
 
 
-axios.defaults.headers.common['X-CSRFToken'] = (name => {
-  var re = new RegExp(name + "=([^;]+)");
-  var value = re.exec(document.cookie);
-  return (value !== null) ? unescape(value[1]) : null;
-})('csrftoken');
 
 
 const baseUrl = store.state.configuration.VUE_APP_DJANGO_API_BASE;
diff --git a/src/store/index.js b/src/store/index.js
index 6f543f6d8a48b83ba0b027c7cf7c051f5c4a6a75..326af9583fae47c8d7d016c4f011a1b2c26b83b2 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1,5 +1,4 @@
-const axios = require("axios");
-
+import axios from '@/axios-client.js';
 import Vue from 'vue';
 import Vuex from 'vuex';
 import router from '../router'
@@ -7,26 +6,26 @@ import feature_type from "./modules/feature_type"
 import feature from "./modules/feature"
 import map from "./modules/map"
 
-axios.defaults.headers.common['X-CSRFToken'] = (name => {
-  var re = new RegExp(name + "=([^;]+)");
-  var value = re.exec(document.cookie);
-  return (value !== null) ? unescape(value[1]) : null;
-})('csrftoken');
+// axios.defaults.headers.common['X-CSRFToken'] = (name => {
+//   var re = new RegExp(name + "=([^;]+)");
+//   var value = re.exec(document.cookie);
+//   return (value !== null) ? unescape(value[1]) : null;
+// })('csrftoken');
 
 
 Vue.use(Vuex);
 
 
-axios.defaults.withCredentials = true; // * add cookies to axios
-function updateAxiosHeader() {
-  axios.defaults.headers.common['X-CSRFToken'] = (name => {
-    var re = new RegExp(name + "=([^;]+)");
-    var value = re.exec(document.cookie);
-    return (value !== null) ? unescape(value[1]) : null;
-  })('csrftoken');
-}
-// ! À vérifier s'il y a un changement de token pendant l'éxécution de l'appli
-updateAxiosHeader();
+// axios.defaults.withCredentials = true; // * add cookies to axios
+// function updateAxiosHeader() {
+//   axios.defaults.headers.common['X-CSRFToken'] = (name => {
+//     var re = new RegExp(name + "=([^;]+)");
+//     var value = re.exec(document.cookie);
+//     return (value !== null) ? unescape(value[1]) : null;
+//   })('csrftoken');
+// }
+// // ! À vérifier s'il y a un changement de token pendant l'éxécution de l'appli
+// updateAxiosHeader();
 
 const noPermissions = { "can_view_project": true, "can_create_project": false, "can_update_project": false, "can_view_feature": true, "can_view_archived_feature": true, "can_create_feature": false, "can_update_feature": false, "can_delete_feature": false, "can_publish_feature": false, "can_create_feature_type": false, "can_view_feature_type": true, "is_project_administrator": false }
 
diff --git a/src/store/modules/feature.js b/src/store/modules/feature.js
index 2b9eb239c3eded5a247a1572731689d54e219a94..e72e524d4d9d0614df74203326a67f9e841c7040 100644
--- a/src/store/modules/feature.js
+++ b/src/store/modules/feature.js
@@ -1,11 +1,11 @@
-const axios = require("axios");
+import axios from '@/axios-client.js';
 import router from '../../router'
 
-axios.defaults.headers.common['X-CSRFToken'] = (name => {
-  var re = new RegExp(name + "=([^;]+)");
-  var value = re.exec(document.cookie);
-  return (value !== null) ? unescape(value[1]) : null;
-})('csrftoken');
+// axios.defaults.headers.common['X-CSRFToken'] = (name => {
+//   var re = new RegExp(name + "=([^;]+)");
+//   var value = re.exec(document.cookie);
+//   return (value !== null) ? unescape(value[1]) : null;
+// })('csrftoken');
 
 
 const feature = {
diff --git a/src/store/modules/feature_type.js b/src/store/modules/feature_type.js
index bed583d904949de35706a19a93ea4d10a95e725d..cfc3c0ddb6f6d5d20bd0133ac18b4c046ee99b9a 100644
--- a/src/store/modules/feature_type.js
+++ b/src/store/modules/feature_type.js
@@ -1,10 +1,10 @@
-import axios from "axios"
+import axios from '@/axios-client.js';
 
-axios.defaults.headers.common['X-CSRFToken'] = (name => {
-  var re = new RegExp(name + "=([^;]+)");
-  var value = re.exec(document.cookie);
-  return (value !== null) ? unescape(value[1]) : null;
-})('csrftoken');
+// axios.defaults.headers.common['X-CSRFToken'] = (name => {
+//   var re = new RegExp(name + "=([^;]+)");
+//   var value = re.exec(document.cookie);
+//   return (value !== null) ? unescape(value[1]) : null;
+// })('csrftoken');
 
 const getColorsStyles = (customForms) => customForms.filter(customForm => customForm.options && customForm.options.length).map(el => {
   //* in dropdown, value is the name and name is the label to be displayed, could be changed...
diff --git a/src/store/modules/map.js b/src/store/modules/map.js
index c8e5ce93eab03a485b06f5a409be781a95cbe313..b9843087d53556c34c8fd0b7831b5e4560755305 100644
--- a/src/store/modules/map.js
+++ b/src/store/modules/map.js
@@ -1,11 +1,11 @@
-const axios = require("axios");
+import axios from '@/axios-client.js';
 import { mapUtil } from "@/assets/js/map-util.js";
 
-axios.defaults.headers.common['X-CSRFToken'] = (name => {
-  var re = new RegExp(name + "=([^;]+)");
-  var value = re.exec(document.cookie);
-  return (value !== null) ? unescape(value[1]) : null;
-})('csrftoken');
+// axios.defaults.headers.common['X-CSRFToken'] = (name => {
+//   var re = new RegExp(name + "=([^;]+)");
+//   var value = re.exec(document.cookie);
+//   return (value !== null) ? unescape(value[1]) : null;
+// })('csrftoken');
 
 
 const map = {
diff --git a/src/views/feature/Feature_detail.vue b/src/views/feature/Feature_detail.vue
index 24514f13d3786d43b7de0a829c2011b413a2a135..6bb76f5b71a1701e79257ee2149ec3b328f5a537 100644
--- a/src/views/feature/Feature_detail.vue
+++ b/src/views/feature/Feature_detail.vue
@@ -351,13 +351,13 @@ import frag from "vue-frag";
 import { mapGetters, mapState } from "vuex";
 import { mapUtil } from "@/assets/js/map-util.js";
 import featureAPI from "@/services/feature-api";
-const axios = require("axios");
+import axios from '@/axios-client.js';
 
-axios.defaults.headers.common['X-CSRFToken'] = (name => {
-  var re = new RegExp(name + "=([^;]+)");
-  var value = re.exec(document.cookie);
-  return (value !== null) ? unescape(value[1]) : null;
-})('csrftoken');
+// axios.defaults.headers.common['X-CSRFToken'] = (name => {
+//   var re = new RegExp(name + "=([^;]+)");
+//   var value = re.exec(document.cookie);
+//   return (value !== null) ? unescape(value[1]) : null;
+// })('csrftoken');
 
 export default {
   name: "Feature_detail",
diff --git a/src/views/feature/Feature_edit.vue b/src/views/feature/Feature_edit.vue
index 40e10c25703b2a6db077fb1bf2736aa092422899..42cb9d37e231967139fdbcb3a8f9b615a2563aec 100644
--- a/src/views/feature/Feature_edit.vue
+++ b/src/views/feature/Feature_edit.vue
@@ -274,14 +274,14 @@ import featureAPI from "@/services/feature-api";
 import L from "leaflet";
 import "leaflet-draw";
 import { mapUtil } from "@/assets/js/map-util.js";
-const axios = require("axios");
+import axios from '@/axios-client.js';
 import flip from "@turf/flip";
 
-axios.defaults.headers.common["X-CSRFToken"] = ((name) => {
-  var re = new RegExp(name + "=([^;]+)");
-  var value = re.exec(document.cookie);
-  return value !== null ? unescape(value[1]) : null;
-})("csrftoken");
+// axios.defaults.headers.common["X-CSRFToken"] = ((name) => {
+//   var re = new RegExp(name + "=([^;]+)");
+//   var value = re.exec(document.cookie);
+//   return value !== null ? unescape(value[1]) : null;
+// })("csrftoken");
 
 export default {
   name: "Feature_edit",
diff --git a/src/views/feature/Feature_list.vue b/src/views/feature/Feature_list.vue
index 0d6f394217197ab70f838e356cd0df2382725c33..d3b0e0c39f31db659070b6a9464f475d430cef86 100644
--- a/src/views/feature/Feature_list.vue
+++ b/src/views/feature/Feature_list.vue
@@ -186,13 +186,13 @@ import { mapUtil } from "@/assets/js/map-util.js";
 import SidebarLayers from "@/components/map-layers/SidebarLayers";
 import FeatureListTable from "@/components/feature/FeatureListTable";
 import Dropdown from "@/components/Dropdown.vue";
-const axios = require("axios");
+import axios from '@/axios-client.js';
 
-axios.defaults.headers.common['X-CSRFToken'] = (name => {
-  var re = new RegExp(name + "=([^;]+)");
-  var value = re.exec(document.cookie);
-  return (value !== null) ? unescape(value[1]) : null;
-})('csrftoken');
+// axios.defaults.headers.common['X-CSRFToken'] = (name => {
+//   var re = new RegExp(name + "=([^;]+)");
+//   var value = re.exec(document.cookie);
+//   return (value !== null) ? unescape(value[1]) : null;
+// })('csrftoken');
 
 export default {
   name: "Feature_list",
diff --git a/src/views/project/Project_detail.vue b/src/views/project/Project_detail.vue
index e866ac9cde74c9360d6b95906e846170198f9a7d..3a0a526ebb3581615e088edafbb15c208be22317 100644
--- a/src/views/project/Project_detail.vue
+++ b/src/views/project/Project_detail.vue
@@ -531,13 +531,13 @@ import { mapUtil } from "@/assets/js/map-util.js";
 import { mapGetters, mapState } from "vuex";
 import projectAPI from "@/services/project-api";
 
-const axios = require("axios");
+import axios from '@/axios-client.js';
 
-axios.defaults.headers.common['X-CSRFToken'] = (name => {
-  var re = new RegExp(name + "=([^;]+)");
-  var value = re.exec(document.cookie);
-  return (value !== null) ? unescape(value[1]) : null;
-})('csrftoken');
+// axios.defaults.headers.common['X-CSRFToken'] = (name => {
+//   var re = new RegExp(name + "=([^;]+)");
+//   var value = re.exec(document.cookie);
+//   return (value !== null) ? unescape(value[1]) : null;
+// })('csrftoken');
 
 export default {
   name: "Project_details",
diff --git a/src/views/project/Project_edit.vue b/src/views/project/Project_edit.vue
index a8e08c5b65cdc1545eb4e643826d04d525b71894..cb0b09e9e20feb412e9ce19aabd45ecc452060d5 100644
--- a/src/views/project/Project_edit.vue
+++ b/src/views/project/Project_edit.vue
@@ -191,16 +191,16 @@
 </template>
 
 <script>
-const axios = require("axios");
+import axios from '@/axios-client.js';
 import Dropdown from "@/components/Dropdown.vue";
 
 import { mapGetters } from "vuex";
 
-axios.defaults.headers.common["X-CSRFToken"] = ((name) => {
-  var re = new RegExp(name + "=([^;]+)");
-  var value = re.exec(document.cookie);
-  return value !== null ? unescape(value[1]) : null;
-})("csrftoken");
+// axios.defaults.headers.common["X-CSRFToken"] = ((name) => {
+//   var re = new RegExp(name + "=([^;]+)");
+//   var value = re.exec(document.cookie);
+//   return value !== null ? unescape(value[1]) : null;
+// })("csrftoken");
 
 export default {
   name: "Project_edit",
diff --git a/src/views/project/Project_members.vue b/src/views/project/Project_members.vue
index 34c89ac5718fa7b0dd64f1eeb0e3ac2ad83865d9..9745e86761b7abf5739873cc8b6f764e6117dcd8 100644
--- a/src/views/project/Project_members.vue
+++ b/src/views/project/Project_members.vue
@@ -106,17 +106,11 @@
 </template>
 
 <script>
-import axios from "axios";
+import axios from '@/axios-client.js';
 import frag from "vue-frag";
 import { mapGetters } from "vuex";
 import Dropdown from "@/components/Dropdown.vue";
 
-axios.defaults.headers.common['X-CSRFToken'] = (name => {
-  var re = new RegExp(name + "=([^;]+)");
-  var value = re.exec(document.cookie);
-  return (value !== null) ? unescape(value[1]) : null;
-})('csrftoken');
-
 export default {
   name: "Project_members",