Disable fetch calls when offline (#522)

* Disable fetch calls when offline * Move online check to doFetchWithResponse
mattermost · Jun 7, 2018 · 8870c69 · 8870c69
1 parent bdbe023
commit 8870c69
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/src/client/client4.js b/src/client/client4.js
@@ -34,6 +34,7 @@ export default class Client4 {
  this.userId = '';
  this.diagnosticId = '';
  this.includeCookies = true;
+ this.online = true;
 
  this.translations = {
  connectionError: 'There appears to be a problem with your internet connection.',
@@ -49,6 +50,10 @@ export default class Client4 {
  this.url = url;
  }
 
+ setOnline(online) {
+ this.online = online;
+ }
+
  setUserAgent(userAgent) {
  this.userAgent = userAgent;
  }
@@ -2394,6 +2399,13 @@ export default class Client4 {
  };
 
  doFetchWithResponse = async (url, options) => {
+ if (!this.online) {
+ throw {
+ message: 'no internet connection',
+ url,
+ };
+ }
+
  const response = await fetch(url, this.getOptions(options));
  const headers = parseAndMergeNestedHeaders(response.headers);
 

diff --git a/src/store/configureStore.dev.js b/src/store/configureStore.dev.js
@@ -10,6 +10,7 @@ import {REHYDRATE} from 'redux-persist/constants';
 import {createOfflineReducer, networkStatusChangedAction, offlineCompose} from 'redux-offline';
 import defaultOfflineConfig from 'redux-offline/lib/defaults';
 import createActionBuffer from 'redux-action-buffer';
+import {Client4} from 'client';
 
 const devToolsEnhancer = (
  typeof window !== 'undefined' && window.__REDUX_DEVTOOLS_EXTENSION__ ? // eslint-disable-line no-underscore-dangle
@@ -74,6 +75,7 @@ export default function configureServiceStore(preloadedState, appReducer, userOf
 
  if (baseOfflineConfig.detectNetwork) {
  baseOfflineConfig.detectNetwork((online) => {
+ Client4.setOnline(online);
  store.dispatch(networkStatusChangedAction(online));
  });
  }

diff --git a/src/store/configureStore.prod.js b/src/store/configureStore.prod.js
@@ -8,6 +8,7 @@ import {REHYDRATE} from 'redux-persist/constants';
 import {createOfflineReducer, networkStatusChangedAction, offlineCompose} from 'redux-offline';
 import defaultOfflineConfig from 'redux-offline/lib/defaults';
 import createActionBuffer from 'redux-action-buffer';
+import {Client4} from 'client';
 
 import {General} from 'constants';
 import serviceReducer from 'reducers';
@@ -68,6 +69,7 @@ export default function configureOfflineServiceStore(preloadedState, appReducer,
 
  if (baseOfflineConfig.detectNetwork) {
  baseOfflineConfig.detectNetwork((online) => {
+ Client4.setOnline(online);
  store.dispatch(networkStatusChangedAction(online));
  });
  }