From a44b4c44269d8b99da2dddf6280cb2fe7e743d0f Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Sat, 14 Jul 2018 22:03:19 -0700
Subject: [PATCH] Fix changing email address error handling

---
 .../scripts/components/dashboard/account/ChangePassword.vue   | 2 +-
 .../scripts/components/dashboard/account/UpdateEmail.vue      | 2 +-
 resources/assets/scripts/store/modules/auth.js                | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/assets/scripts/components/dashboard/account/ChangePassword.vue b/resources/assets/scripts/components/dashboard/account/ChangePassword.vue
index 02b2f2e7..494c76be 100644
--- a/resources/assets/scripts/components/dashboard/account/ChangePassword.vue
+++ b/resources/assets/scripts/components/dashboard/account/ChangePassword.vue
@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div id="change-password-container" :class>
         <form method="post" v-on:submit.prevent="submitForm">
             <div class="content-box">
                 <h2 class="mb-6 text-grey-darkest font-medium">{{ $t('dashboard.account.password.title') }}</h2>
diff --git a/resources/assets/scripts/components/dashboard/account/UpdateEmail.vue b/resources/assets/scripts/components/dashboard/account/UpdateEmail.vue
index b3e0de47..a228480a 100644
--- a/resources/assets/scripts/components/dashboard/account/UpdateEmail.vue
+++ b/resources/assets/scripts/components/dashboard/account/UpdateEmail.vue
@@ -1,5 +1,5 @@
 <template>
-    <div :class>
+    <div id="update-email-container" :class>
         <form method="post" v-on:submit.prevent="submitForm">
             <div class="content-box">
                 <h2 class="mb-6 text-grey-darkest font-medium">{{ $t('dashboard.account.email.title') }}</h2>
diff --git a/resources/assets/scripts/store/modules/auth.js b/resources/assets/scripts/store/modules/auth.js
index 04c67970..03a60f48 100644
--- a/resources/assets/scripts/store/modules/auth.js
+++ b/resources/assets/scripts/store/modules/auth.js
@@ -71,11 +71,11 @@ export default {
                     .then(response => {
                         // If there is a 302 redirect or some other odd behavior (basically, response that isnt
                         // in JSON format) throw an error and don't try to continue with the login.
-                        if (!(response.data instanceof Object)) {
+                        if (!(response.data instanceof Object) && response.status !== 201) {
                             return reject(new Error('An error was encountered while processing this request.'));
                         }
 
-                        commit('setEmail', response.data.email);
+                        commit('setEmail', email);
                         return resolve();
                     })
                     .catch(reject);