homeflowjs 0.9.34 → 0.9.35

package/.eslintrc.js

@@ -4,6 +4,7 @@ module.exports = {
     fetch: 'readonly',
     Homeflow: 'readonly',
     document: 'readonly',
+    location: 'readonly',
     FormData: 'readonly',
     window: 'readonly',
     describe: 'readonly',

package/actions/user.actions.js

@@ -1,3 +1,4 @@
+/* eslint-disable import/no-cycle */
 import UserActionTypes from './user.types';
 import { fetchSavedProperties, setSavedProperties } from './properties.actions';
 import { fetchSavedSearches, setSavedSearches } from './search.actions';
@@ -153,11 +154,15 @@ export const signOutUser = () => (dispatch) => (
   fetch('/session', {
     method: 'DELETE',
   })
-    .then(() => {
-      dispatch(setCurrentUser(INITIAL_USER_DATA));
-      dispatch(setLocalUser(INITIAL_USER_DATA));
-      dispatch(setUserCredentials({ email: '', password: '' }));
-      dispatch(setSavedProperties([]));
-      dispatch(setSavedSearches([]));
+    .then((response) => {
+      if (response.ok) {
+        dispatch(setCurrentUser(INITIAL_USER_DATA));
+        dispatch(setLocalUser(INITIAL_USER_DATA));
+        dispatch(setUserCredentials({ email: '', password: '' }));
+        dispatch(setSavedProperties([]));
+        dispatch(setSavedSearches([]));
+      }
+
+      return response.ok;
     })
 );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homeflowjs",
-  "version": "0.9.34",
+  "version": "0.9.35",
   "description": "JavaScript toolkit for Homeflow themes",
   "main": "index.js",
   "scripts": {

package/user/sign-out-button/sign-out-button.component.jsx

@@ -1,23 +1,39 @@
 import React from 'react';
+import { useHistory } from 'react-router-dom';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 
 import { signOutUser } from '../../actions/user.actions';
 import notify from '../../app/notify';
 
-const SignOutButton = ({ signOutUser, children, ...otherProps }) => (
-  <button
-    type="button"
-    onClick={(e) => {
-      e.preventDefault();
-      signOutUser()
-        .then(() => notify('You have been signed out', 'success'));
-    }}
-    {...otherProps}
-  >
-    {children}
-  </button>
-);
+const SignOutButton = ({
+  signOutUser, pushHistory, reload, children, ...otherProps
+}) => {
+  const history = useHistory();
+  const handleClick = (e) => {
+    e.preventDefault();
+    signOutUser()
+      .then((success) => {
+        if (success) {
+          notify('You have been signed out', 'success');
+          if (pushHistory) history.push('/');
+          if (reload) location.reload(false);
+        } else {
+          notify('There was an error signing out', 'error');
+        }
+      });
+  };
+
+  return (
+    <button
+      type="button"
+      onClick={(e) => handleClick(e)}
+      {...otherProps}
+    >
+      {children}
+    </button>
+  );
+};
 
 SignOutButton.propTypes = {
   signOutUser: PropTypes.func.isRequired,
@@ -25,6 +41,13 @@ SignOutButton.propTypes = {
     PropTypes.element,
     PropTypes.string,
   ]).isRequired,
+  pushHistory: PropTypes.bool,
+  reload: PropTypes.bool,
+};
+
+SignOutButton.defaultProps = {
+  pushHistory: false,
+  reload: false,
 };
 
 const mapDispatchToProps = {