From b80bbe3a9455258a763e3e48ebed69cc329b59a7 Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Thu, 8 Nov 2018 12:15:07 -0500
Subject: [PATCH] MM-11477 Wrap objects thrown by Client4 in a proper error
 type (#2328)

* MM-11477 Wrap objects thrown by Client4 in a proper error type

* Update mattermost-redux
---
 app/fetch_preconfig.js | 17 +++++++++--------
 package-lock.json      |  4 ++--
 package.json           |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/fetch_preconfig.js b/app/fetch_preconfig.js
index fb1e64ee2..5aadce3bc 100644
--- a/app/fetch_preconfig.js
+++ b/app/fetch_preconfig.js
@@ -6,6 +6,7 @@ import RNFetchBlob from 'rn-fetch-blob';
 import urlParse from 'url-parse';
 
 import {Client4} from 'mattermost-redux/client';
+import {ClientError} from 'mattermost-redux/client/client4';
 
 import mattermostBucket from 'app/mattermost_bucket';
 import LocalConfig from 'assets/config';
@@ -30,10 +31,10 @@ const handleRedirectProtocol = (url, response) => {
 
 Client4.doFetchWithResponse = async (url, options) => {
     if (!Client4.online) {
-        throw {
+        throw new ClientError(this.getUrl(), {
             message: 'no internet connection',
             url,
-        };
+        });
     }
 
     const customHeaders = LocalConfig.CustomRequestHeaders;
@@ -62,21 +63,21 @@ Client4.doFetchWithResponse = async (url, options) => {
         data = await response.json();
     } catch (err) {
         if (response && response.resp && response.resp.data && response.resp.data.includes('SSL certificate')) {
-            throw {
+            throw new ClientError(this.getUrl(), {
                 message: 'You need to use a valid client certificate in order to connect to this Mattermost server',
                 status_code: 401,
                 url,
-            };
+            });
         }
 
-        throw {
+        throw new ClientError(this.getUrl(), {
             message: 'Received invalid response from the server.',
             intl: {
                 id: t('mobile.request.invalid_response'),
                 defaultMessage: 'Received invalid response from the server.',
             },
             url,
-        };
+        });
     }
 
     if (headers[HEADER_X_CLUSTER_ID] || headers[HEADER_X_CLUSTER_ID.toLowerCase()]) {
@@ -110,12 +111,12 @@ Client4.doFetchWithResponse = async (url, options) => {
         console.error(msg); // eslint-disable-line no-console
     }
 
-    throw {
+    throw new ClientError(this.getUrl(), {
         message: msg,
         server_error_id: data.id,
         status_code: data.status_code,
         url,
-    };
+    });
 };
 
 const initFetchConfig = async () => {
diff --git a/package-lock.json b/package-lock.json
index 0f0446457..0ace61350 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9802,8 +9802,8 @@
       "integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w="
     },
     "mattermost-redux": {
-      "version": "github:mattermost/mattermost-redux#b81ef9337c4e07bc4537a0e7862d0b7e09ffeff6",
-      "from": "github:mattermost/mattermost-redux#b81ef9337c4e07bc4537a0e7862d0b7e09ffeff6",
+      "version": "github:mattermost/mattermost-redux#9395b5287441a79c758edd0a7a5c0f6c188da0bf",
+      "from": "github:mattermost/mattermost-redux#9395b5287441a79c758edd0a7a5c0f6c188da0bf",
       "requires": {
         "deep-equal": "1.0.1",
         "eslint-plugin-header": "1.2.0",
diff --git a/package.json b/package.json
index cc34eb6ef..080afd877 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "intl": "1.2.5",
     "jail-monkey": "1.0.0",
     "jsc-android": "224109.1.0",
-    "mattermost-redux": "github:mattermost/mattermost-redux#b81ef9337c4e07bc4537a0e7862d0b7e09ffeff6",
+    "mattermost-redux": "github:mattermost/mattermost-redux#9395b5287441a79c758edd0a7a5c0f6c188da0bf",
     "mime-db": "1.36.0",
     "moment-timezone": "0.5.21",
     "prop-types": "15.6.2",