Merge pull request #92 from netlify/saving-state

Clear saving state when logout is called without a user

Author: bcomnes

src/components/app.js

@@ -165,15 +165,15 @@ class App extends Component {
           {this.renderBody()}
           {this.renderProviders()}
           {!store.user &&
-          page.link &&
-          store.gotrue && (
-            <button
-              onclick={pageLinkHandler}
-              className="btnLink forgotPasswordLink"
-            >
-              {page.link_text}
-            </button>
-          )}
+            page.link &&
+            store.gotrue && (
+              <button
+                onclick={pageLinkHandler}
+                className="btnLink forgotPasswordLink"
+              >
+                {page.link_text}
+              </button>
+            )}
         </Modal>
       </div>
     );

src/state/store.js

@@ -125,19 +125,21 @@ store.signup = action(function signup(name, email, password) {
 
 store.logout = action(function logout() {
   store.startAction();
-  return (
-    store.user &&
-    store.user
-      .logout()
-      .then(
-        action(() => {
-          store.user = null;
-          store.modal.page = "login";
-          store.saving = false;
-        })
-      )
-      .catch(store.setError)
-  );
+  return store.user
+    ? store.user
+        .logout()
+        .then(
+          action(() => {
+            store.user = null;
+            store.modal.page = "login";
+            store.saving = false;
+          })
+        )
+        .catch(store.setError)
+    : action(() => {
+        store.modal.page = "login";
+        store.saving = false;
+      });
 });
 
 store.updatePassword = action(function updatePassword(password) {