Use same http client for all non-standard calls

Author: c-w

app/server/static/components/annotationMixin.js

@@ -1,9 +1,7 @@
 import * as marked from 'marked';
 import VueJsonPretty from 'vue-json-pretty';
 import isEmpty from 'lodash.isempty';
-import HTTP, { rootUrl, newHttpClient } from './http';
-
-const httpClient = newHttpClient();
+import HTTP, { rootUrl, defaultHttpClient } from './http';
 
 const getOffsetFromUrl = (url) => {
   const offsetMatch = url.match(/[?#].*offset=(\d+)/);
@@ -176,7 +174,7 @@ export default {
     HTTP.get().then((response) => {
       this.guideline = response.data.guideline;
     });
-    httpClient.get(`${rootUrl}/v1/me`).then((response) => {
+    defaultHttpClient.get(`${rootUrl}/v1/me`).then((response) => {
       this.isSuperuser = response.data.is_superuser;
     });
     this.submit();

app/server/static/components/http.js

@@ -8,5 +8,5 @@ const HTTP = axios.create({
 });
 
 export const rootUrl = window.location.href.split('/').slice(0, 3).join('/');
-export const newHttpClient = axios.create;
+export const defaultHttpClient = axios.create();
 export default HTTP;

app/server/static/components/projects.vue

@@ -120,9 +120,7 @@
 
 <script>
 import { title, daysAgo } from './filter';
-import { rootUrl, newHttpClient } from './http';
-
-const httpClient = newHttpClient();
+import { rootUrl, defaultHttpClient } from './http';
 
 export default {
   filters: { title, daysAgo },
@@ -152,8 +150,8 @@ export default {
 
   created() {
     Promise.all([
-      httpClient.get(`${rootUrl}/v1/projects`),
-      httpClient.get(`${rootUrl}/v1/me`),
+      defaultHttpClient.get(`${rootUrl}/v1/projects`),
+      defaultHttpClient.get(`${rootUrl}/v1/me`),
     ]).then(([projects, me]) => {
       this.items = projects.data;
       this.username = me.data.username;
@@ -163,7 +161,7 @@ export default {
 
   methods: {
     deleteProject() {
-      httpClient.delete(`${rootUrl}/v1/projects/${this.project.id}`).then(() => {
+      defaultHttpClient.delete(`${rootUrl}/v1/projects/${this.project.id}`).then(() => {
         this.isDelete = false;
         const index = this.items.indexOf(this.project);
         this.items.splice(index, 1);
@@ -197,7 +195,7 @@ export default {
         guideline: 'Please write annotation guideline.',
         resourcetype: this.resourceType(),
       };
-      httpClient.post(`${rootUrl}/v1/projects`, payload)
+      defaultHttpClient.post(`${rootUrl}/v1/projects`, payload)
         .then((response) => {
           window.location = `${rootUrl}/projects/${response.data.id}/docs/create`;
         })

app/server/static/components/uploadMixin.js

@@ -1,6 +1,6 @@
 import hljs from 'highlight.js/lib/highlight';
 import hljsLanguages from './hljsLanguages';
-import HTTP, { newHttpClient } from './http';
+import HTTP, { defaultHttpClient } from './http';
 import Messages from './messages.vue';
 
 hljsLanguages.forEach((languageName) => {
@@ -27,7 +27,7 @@ export default {
   },
 
   created() {
-    newHttpClient().get('/v1/features').then((response) => {
+    defaultHttpClient.get('/v1/features').then((response) => {
       this.canUploadFromCloud = response.data.cloud_upload;
     });
   },