unify default headers

Author: vladimir-8

src/API.js

@@ -41,13 +41,6 @@ function Client(httpBaseURL, options = {}) {
   });
 
   this.axios.defaults.timeout = 30000;
-  this.axios.defaults.headers.common['X-Application-Version'] =
-    VersionNumber.bundleIdentifier +
-    '@' +
-    VersionNumber.appVersion +
-    ' (' +
-    VersionNumber.buildVersion +
-    ')';
 
   if (options.onCredentialsUpdated) {
     this.onCredentialsUpdated = options.onCredentialsUpdated;

src/App.js

@@ -1,6 +1,22 @@
 import React, { createRef, useEffect } from 'react';
 import { LogBox, Platform, useColorScheme } from 'react-native';
 
+import * as Sentry from '@sentry/react-native';
+import Config from 'react-native-config';
+
+if (!__DEV__) {
+  Sentry.init({
+    dsn: Config.SENTRY_DSN,
+  });
+}
+
+import axios from 'axios';
+import { defaultHeaders } from './utils/headers';
+
+for (const [key, value] of Object.entries(defaultHeaders())) {
+  axios.defaults.headers.common[key] = value;
+}
+
 import { NativeBaseProvider } from 'native-base';
 import tracker from './analytics/Tracker';
 
@@ -15,29 +31,8 @@ import { I18nextProvider } from 'react-i18next';
 import { Provider } from 'react-redux';
 import { PersistGate } from 'redux-persist/integration/react';
 
-import axios from 'axios';
-import VersionNumber from 'react-native-version-number';
-
 import KeyboardManager from 'react-native-keyboard-manager';
 
-import * as Sentry from '@sentry/react-native';
-import Config from 'react-native-config';
-
-if (!__DEV__) {
-  Sentry.init({
-    dsn: Config.SENTRY_DSN,
-  });
-}
-
-if (Platform.OS === 'ios') {
-  KeyboardManager.setEnable(false);
-  KeyboardManager.setEnableAutoToolbar(false);
-  KeyboardManager.setToolbarPreviousNextButtonEnable(false);
-}
-
-axios.defaults.headers.common['X-CoopCycle-App-Version'] =
-  VersionNumber.appVersion;
-
 // import i18n first
 import i18n from './i18n';
 
@@ -67,6 +62,12 @@ import {
   navigationContainerOnReady,
 } from './Datadog';
 
+if (Platform.OS === 'ios') {
+  KeyboardManager.setEnable(false);
+  KeyboardManager.setEnableAutoToolbar(false);
+  KeyboardManager.setToolbarPreviousNextButtonEnable(false);
+}
+
 if (Config.APP_ENV === 'test') {
   LogBox.ignoreAllLogs(true);
 }

src/redux/api/baseQuery.js

@@ -1,4 +1,3 @@
-import VersionNumber from 'react-native-version-number';
 import { fetchBaseQuery } from '@reduxjs/toolkit/dist/query/react';
 import { selectBaseURL, selectLoggedInUser } from '../App/selectors';
 import { Mutex } from 'async-mutex';
@@ -7,29 +6,24 @@ import AppUser from '../../AppUser';
 import { logout, setModal } from '../App/actions';
 import { setUser } from '../middlewares/HttpMiddleware';
 import { selectCart } from '../Checkout/selectors';
+import { defaultHeaders } from '../../utils/headers';
 
 const guestCheckoutEndpoints = [
   'getOrderValidate',
   'getOrderTiming',
   'updateOrder',
 ];
 
-const appVersion =
-  VersionNumber.bundleIdentifier +
-  '@' +
-  VersionNumber.appVersion +
-  ' (' +
-  VersionNumber.buildVersion +
-  ')';
-
 // create a new mutex
 const mutex = new Mutex();
 
 const buildBaseQuery = (baseUrl, anonymous = false) => {
   return fetchBaseQuery({
     baseUrl,
     prepareHeaders: (headers, { getState, endpoint }) => {
-      headers.set('X-Application-Version', appVersion);
+      for (const [key, value] of Object.entries(defaultHeaders())) {
+        headers.set(key, value);
+      }
 
       if (!anonymous) {
         const loggedInUser = selectLoggedInUser(getState());

src/utils/headers.js

@@ -0,0 +1,14 @@
+import VersionNumber from 'react-native-version-number';
+
+export function defaultHeaders() {
+  return {
+    'X-Application-Version':
+      VersionNumber.bundleIdentifier +
+      '@' +
+      VersionNumber.appVersion +
+      ' (' +
+      VersionNumber.buildVersion +
+      ')',
+    'X-CoopCycle-App-Version': VersionNumber.appVersion,
+  };
+}